more sense splits and other fixes in the dictionaries

2016-06-04 22:06:57 +00:00
parent 70f3f39791
commit a82894c45f
19 changed files with 271 additions and 154 deletions
--- a/lib/src/translator/Dictionary.gf
+++ b/lib/src/translator/Dictionary.gf
@@ -4632,7 +4632,7 @@ fun bait_V2 : V2 ;                 -- 00850501	harass with persistent criticism
 fun baiting_N : N ;                -- 00425182	harassment especially of a tethered animal
 fun baiza_N : N ;                  -- 13697262	1,000 baiza equal 1 riyal-omani in Oman
 fun baize_N : N ;                  -- 02776505	a bright green fabric napped to resemble felt; used to cover gaming tables
-fun bake_V : V ;                   -- 00319886	cook and make edible by putting in a hot oven; "bake the potatoes"
+fun bake_V : V ;                   -- 02755565	be very hot, due to hot weather or exposure to the sun; "the tourists were baking in the heat"
 fun bake_V2 : V2 ;                 -- 00319886	cook and make edible by putting in a hot oven; "bake the potatoes"
 fun bakelite_N : N ;               -- 14596216	a thermosetting plastic used as electric insulators and for making plastic ware and telephone receivers etc.
 fun baker_N : N ;                  -- 09833651	someone who bakes commercially
@@ -5390,7 +5390,9 @@ fun beebread_N : N ;               -- 14774090	a mixture of nectar and pollen pr
 fun beech_N : N ;                  -- 12260799	any of several large deciduous trees with rounded spreading crowns and smooth grey bark and small sweet edible triangular nuts enclosed in burs; north temperate regions
 fun beechen_A : A ;                -- 02575733	consisting of or made of wood of the beech tree
 fun beechnut_N : N ;               -- 07771082	small sweet triangular nut of any of various beech trees
-fun beef_N : N ;                   -- 02404186	cattle that are reared for their meat
+fun beef_1_N : N ;                 -- 02404186	cattle that are reared for their meat
+fun beef_2_N : N ;                 -- 07663592	meat from an adult domestic bovine
+fun beef_3_N : N ;                 -- 07209965	informal terms for objecting; "I have a beef about the service here"
 fun beef_V : V ;                   -- 00910973	complain
 fun beef_up_V2 : V2 ;              -- 00220869	make strong or stronger
 fun beefcake_N : N ;               -- 02822762	a photograph of a muscular man in minimal attire
@@ -14193,7 +14195,8 @@ fun currant_N : N ;                -- 07744246	any of several tart red or black
 fun currawong_N : N ;              -- 01583495	bluish black fruit-eating bird with a bell-like call
 fun currency_N : N ;               -- 13385913	the metal or paper medium of exchange that is presently used
 fun current_A : A ;                -- 00666058	occurring in or belonging to the present time; "current events"; "the current topic"; "current negotiations"; "current psychoanalytic theories"; "the ship's current position"
-fun current_N : N ;                -- 11443532	a flow of electricity through a conductor; "the current was measured in amperes"
+fun current_1_N : N ;              -- 11443532	a flow of electricity through a conductor; "the current was measured in amperes"
+fun current_2_N : N ;              -- 07406765	a steady flow of a fluid (usually from natural causes); "the raft floated downstream on the current"
 fun currentness_N : N ;            -- 05050379	the property of belonging to the present time
 fun curricular_A : A ;             -- 02708020	of or relating to an academic course of study
 fun curriculum_N : N ;             -- 06676416	an integrated course of academic studies
@@ -30363,7 +30366,8 @@ fun juggler_N : N ;                -- 10226413	a performer who juggles objects a
 fun jugglery_N : N ;               -- 00754118	artful trickery designed to achieve an end; "the senator's tax program was mere jugglery"
 fun jugular_A : A ;                -- 02852756	relating to or located in the region of the neck or throat; "jugular vein"
 fun jugular_N : N ;                -- 05370918	veins in the neck that return blood from the head
-fun juice_N : N ;                  -- 07923748	the liquid part that can be extracted from plant or animal tissue by squeezing or cooking
+fun juice_1_N : N ;                -- 07923748	the liquid part that can be extracted from plant or animal tissue by squeezing or cooking
+fun juice_2_N : N ;                -- 11470348	electric current; "when the wiring was finished they turned on the juice"
 fun juice_up_V2 : V2 ;             -- 00192659	make more interesting or lively; "juice up a party"; "pep up your paper"
 fun juiceless_A : A ;              -- 01369404	lacking juice
 fun juiciness_N : N ;              -- 04996215	a juicy appetizingness
@@ -42497,7 +42501,8 @@ fun planning_N : N ;               -- 01144133	an act of formulating a program f
 fun planoconcave_A : A ;           -- 00536898	flat on one side and concave on the other
 fun planoconvex_A : A ;            -- 00538371	flat on one side and convex on the other
 fun planographic_A : A ;           -- 02779044	of or relating to or involving planography
-fun plant_N : N ;                  -- 03956922	buildings for carrying on industrial labor; "they built a large plant to manufacture automobiles"
+fun plant_1_N : N ;                -- 03956922	buildings for carrying on industrial labor; "they built a large plant to manufacture automobiles"
+fun plant_2_N : N ;                -- 00017222	a living organism lacking the power of locomotion
 fun plant_V2 : V2 ;                -- 01567275	put or set (seeds, seedlings, or plants) into the ground; "Let's plant flowers in the garden"
 fun plant_louse_N : N ;            -- 02251775	any of several small insects especially aphids that feed by sucking the juices from plants
 fun plant_out_V2 : V2 ;
@@ -49590,7 +49595,8 @@ fun scholastic_A : A ;             -- 02792903	of or relating to schools; "schol
 fun scholasticism_N : N ;          -- 04802079	orthodoxy of a scholastic variety
 fun scholiast_N : N ;              -- 10559009	a scholar who writes explanatory notes on an author (especially an ancient commentator on a classical author)
 fun scholium_N : N ;               -- 06506037	a marginal note written by a scholiast (a commentator on ancient or classical literature)
-fun school_N : N ;                 -- 08276720	an educational institution; "the school was founded in 1900"
+fun school_1_N : N ;               -- 08276720	an educational institution; "the school was founded in 1900"
+fun school_2_N : N ;               -- 07995453	a large group of fish; "a school of small glittering fish swam by"
 fun school_V2 : V2 ;               -- 02387910	educate in or as if in a school; "The children are schooled at great cost to their parents in private institutions"
 fun school_board_N : N ;           -- 08413408	a board in charge of local public schools
 fun schoolbag_N : N ;              -- 04146343	a bag for carrying school books and supplies; "found just the right dictionary to fit into his schoolbag"
@@ -50726,7 +50732,8 @@ fun sewer_rat_N : N ;              -- 02333819	brown rat commonly found in sewer
 fun sewerage_N : N ;               -- 14856893	waste matter carried away in sewers or drains
 fun sewing_N : N ;                 -- 00715674	joining or attaching by stitches
 fun sewing_machine_N : N ;         -- 04179913	a textile machine used as a home appliance for sewing
-fun sex_N : N ;                    -- 00844254	activities associated with sexual intercourse; "they had sex in the back seat"
+fun sex_1_N : N ;                  -- 00844254	activities associated with sexual intercourse; "they had sex in the back seat"
+fun sex_2_N : N ;                  -- 05006898	the properties that distinguish organisms on the basis of their reproductive roles; "she didn't want to know the sex of the foetus"
 fun sex_V2 : V2 ;                  -- 01762283	stimulate sexually
 fun sex_starved_A : A ;            -- 02134896	desiring but deprived of sexual gratification
 fun sex_up_V2 : V2 ;               -- 00586241	give erotic character to or make more interesting
@@ -56343,7 +56350,8 @@ fun tabernacle_N : N ;             -- 04374735	(Judaism) the place of worship fo
 fun tabes_N : N ;                  -- 14135181	wasting of the body during a chronic disease
 fun tabi_N : N ;                   -- 04378956	a sock with a separation for the big toe; worn with thong sandals by the Japanese
 fun tablature_N : N ;              -- 06816335	a musical notation indicating the fingering to be used
-fun table_N : N ;                  -- 08266235	a set of data arranged in rows and columns; "see table 1"
+fun table_1_N : N ;                -- 04379243	a piece of furniture having a smooth flat top that is usually supported by one or more vertical legs; "it was a sturdy table"
+fun table_2_N : N ;                -- 08266235	a set of data arranged in rows and columns; "see table 1"
 fun table_V2 : V2 ;                -- 02642814	hold back to a later time
 fun table_d'hote_A : A ;
 fun table_d'hote_Adv : Adv ;
@@ -58562,7 +58570,6 @@ fun towel_V2 : V2 ;                -- 01394335	wipe with a towel; "towel your ha
 fun towel_horse_N : N ;            -- 04459773	a rack consisting of one or more bars on which towels can be hung
 fun towel_rack_N : N ;             -- 04459773	a rack consisting of one or more bars on which towels can be hung
 fun towel_rail_N : N ;             -- 04459909	a horizontal bar a few inches from a wall for holding towels
-fun toweling_N : N ;               -- 04459610	any of various fabrics (linen or cotton) used to make towels
 fun towelling_N : N ;              -- 04459610	any of various fabrics (linen or cotton) used to make towels
 fun tower_N : N ;                  -- 04460130	a structure taller than its diameter; can stand alone or be attached to a larger building
 fun tower_V : V ;                  -- 02696503	appear very large or occupy a commanding position
--- a/lib/src/translator/DictionaryBul.gf
+++ b/lib/src/translator/DictionaryBul.gf
@@ -4637,7 +4637,7 @@ lin bait_V2 = variants {} ;
 lin baiting_N = mkN053 "стръв" ;
 lin baiza_N = variants {} ;
 lin baize_N = mkN054 "сукно" ;
-lin bake_V = variants {dualV (mkV186 "изпичам") (mkV148 "изпека"); dualV (mkV186 "напичам") (mkV148 "напека"); dualV (mkV186 "опичам") (mkV148 "опека"); singleV (mkV148 "пека"); dualV (mkV186 "понапичам") (mkV148 "понапека")} ; ----
+lin bake_V = medialV (singleV (mkV148 "пека")) Acc;
 lin bake_V2 = dirV2 (dualV (mkV148 "пека") (mkV148 "опека")) ;
 lin bakelite_N = mkN007 "бакелит" ;
 lin baker_N = mkN031a "пекар" ;
@@ -4646,7 +4646,7 @@ lin baking_N = mkN054 "печиво" ; ----
 lin baking_hot_A = variants {} ;
 lin baking_powder_N = mkN007 "бакпулвер" ;
 lin baklava_N = mkN041 "баклава" ;
-lin baksheesh_N = mkN007 "бакшиш" ; ----
+lin baksheesh_N = mkN007 "бакшиш" ;
 lin baku_PN = mkPN "Баку" Masc ;
 lin balaclava_N = mkN041 "балаклава" ;
 lin balagan_N = variants {} ;
@@ -5395,7 +5395,9 @@ lin beebread_N = variants {} ;
 lin beech_N = mkN001 "бук" ;
 lin beechen_A = mkA076 "буков" ; ----
 lin beechnut_N = variants {} ;
-lin beef_N = variants {} ;
+lin beef_1_N = dualN (mkN065 "теле") (mkA078 "телешки") ;
+lin beef_2_N = mkN014 "бифтек" ;
+lin beef_3_N = mkN072 "възражение" ;
 lin beef_V = dualV (mkV186 "засилвам") (mkV173 "засиля") ; ----
 lin beef_up_V2 = variants {} ;
 lin beefcake_N = variants {} ;
@@ -8470,7 +8472,7 @@ lin calender_N = mkN009 "каландър" ;
 lin calender_V2 = variants {} ;
 lin calendric_A = mkA079 "календарен" ;
 lin calendula_N = mkN007 "невен" ;
-lin calf_N = mkN065 "теле" ;
+lin calf_N = dualN (mkN065 "теле") (mkA078 "телешки") ;
 lin calf_love_N = variants {} ;
 lin cali_PN = mkPN "Кали" Masc ;
 lin caliber_N = variants {} ;
@@ -14197,7 +14199,8 @@ lin currant_N = mkN042 "касис" ;
 lin currawong_N = variants {} ;
 lin currency_N = mkN041 "валута" ;
 lin current_A = mkA079 "сегашен" ;
-lin current_N = mkN014 "поток" ;
+lin current_1_N = mkN014 "ток" ;
+lin current_2_N = mkN014 "поток" ;
 lin currentness_N = mkN049 "актуалност" ;
 lin curricular_A = mkA079 "конспектен" ;
 lin curriculum_N = mkN041 "програма" ; ----
@@ -20299,7 +20302,7 @@ lin fable_N = mkN047 "басня" ;
 lin fabled_A = mkA079 "легендарен" ; ----
 lin fabric_N = mkN001 "плат" ; ----
 lin fabricate_V2 = dirV2 (singleV (mkV186 "изфабрикувам")) ; ----
-lin fabrication_N = variants {mkN041 "измислица"; mkN071 "измисляне"; mkN041 "измишльотина"; mkN047 "фабрикация"} ; ----
+lin fabrication_N = mkN047 "фабрикация" ;
 lin fabulist_N = mkN008a "баснописец" ; ----
 lin fabulous_A = mkA079 "приказен" ;
 lin facade_N = mkN041 "фасада" ;
@@ -20347,15 +20350,15 @@ lin factoid_N = variants {} ;
 lin factor_N = mkN007 "фактор" ;
 lin factor_in_V = variants {} ;
 lin factorial_A = mkA079 "факториялен" ;
-lin factorial_N = mkN007 "факториел" ; ----
+lin factorial_N = mkN007 "факториел" ;
 lin factorization_N = variants {} ;
 lin factorize_V2 = variants {} ;
-lin factory_N = mkN041 "фабрика" ;
-lin factotum_N = mkN007 "фактотум" ; ----
+lin factory_N = dualN (mkN041 "фабрика") (mkA079 "фабричен") ;
+lin factotum_N = mkN007 "фактотум" ;
 lin factual_A = variants {mkA078 "фактически"; mkA079 "фактологичен"} ; ----
 lin factuality_N = variants {} ;
 lin facula_N = variants {} ;
-lin facultative_A = variants {mkA079 "извънпрограмен"; mkA079 "факултативен"} ; ----
+lin facultative_A = mkA079 "факултативен" ;
 lin faculty_N = mkN007 "факултет" ;
 lin fad_N = mkN047 "мания" ; ----
 lin faddish_A = mkA076 "чудат" ; ----
@@ -30382,7 +30385,8 @@ lin juggler_N = variants {mkN007 "жонгльор"; mkN041 "жонгльорк
 lin jugglery_N = variants {mkN054 "жонгльорство"; mkN054 "фокусничество"} ; ----
 lin jugular_A = mkA079 "югуларен" ;
 lin jugular_N = variants {} ;
-lin juice_N = mkN001 "сок" ;
+lin juice_1_N = mkN001 "сок" ;
+lin juice_2_N = mkN014 "ток" ;
 lin juice_up_V2 = variants {} ;
 lin juiceless_A = variants {} ;
 lin juiciness_N = mkN049 "сочност" ;
@@ -42539,7 +42543,8 @@ lin planning_N = variants {mkN071 "планиране"; mkN041 "планиров
 lin planoconcave_A = variants {} ;
 lin planoconvex_A = variants {} ;
 lin planographic_A = mkA079 "плоскографичен" ;
-lin plant_N = mkN041 "централа" ;
+lin plant_1_N = dualN (mkN007 "завод") (mkA078 "заводски") ;
+lin plant_2_N = dualN (mkN072 "растение") (mkA079 "растителен") ;
 lin plant_V2 = variants {} ;
 lin plant_louse_N = variants {} ;
 lin plant_out_V2 = prepV2 (lin V OP_plant_V2) OP_out_Prep ; -- guess-p-verb
@@ -45894,7 +45899,7 @@ lin railroad_V2 = variants {} ;
 lin railway_N = mkN041 "железница" ; ----
 lin railwayman_N = mkN031a "железничар" ; ----
 lin raiment_N = variants {mkN054 "облекло"; mkN072 "одеяние"} ; ----
-lin rain_N = mkN001 "дъжд" ;
+lin rain_N = dualN (mkN001 "дъжд") (mkA079 "дъждовен") ;
 lin rain_V = variants {} ;
 lin rain_V2 = variants {} ;
 lin rain_down_on_V2 = variants {} ;
@@ -49629,7 +49634,8 @@ lin scholastic_A = mkA079 "схоластичен" ;
 lin scholasticism_N = mkN049 "схоластичност" ;
 lin scholiast_N = mkN007a "схолиаст" ;
 lin scholium_N = variants {} ;
-lin school_N = mkN066 "училище" ;
+lin school_1_N = mkN066 "училище" ;
+lin school_2_N = mkN007 "пасаж" ;
 lin school_V2 = variants {} ;
 lin school_board_N = variants {} ;
 lin schoolbag_N = variants {} ;
@@ -50771,7 +50777,8 @@ lin sewer_rat_N = variants {} ;
 lin sewerage_N = mkN047 "канализация" ; ----
 lin sewing_N = variants {mkN001 "шев"; mkN071 "шиене"} ; ----
 lin sewing_machine_N = variants {} ;
-lin sex_N = mkN040a "секс" ;
+lin sex_1_N = dualN (mkN040a "секс") (mkA079 "сексуален") ;
+lin sex_2_N = dualN (mkN001 "пол") (mkA076 "полов") ;
 lin sex_V2 = variants {} ;
 lin sex_starved_A = variants {} ;
 lin sex_up_V2 = variants {} ;
@@ -51024,7 +51031,7 @@ lin shellfire_N = variants {} ;
 lin shellfish_N = mkN041 "мида" ;
 lin shellflower_N = variants {} ;
 lin shellproof_A = variants {} ;
-lin shelter_N = mkN040a "секс" ;
+lin shelter_N = mkN005 "подслон" ;
 lin shelter_V = variants {dualV (mkV186 "закривам") (mkV163 "закрия"); dualV (mkV187 "закрилям") (mkV174 "закриля"); dualV (mkV187 "засланям") (mkV174 "заслоня"); dualV (mkV186 "подслонявам") (mkV174 "подслоня"); dualV (mkV186 "прикривам") (mkV163 "прикрия"); dualV (mkV186 "приютявам") (mkV174 "приютя"); singleV (mkV186 "скривам")} ; ----
 lin shelter_V2 = variants {} ;
 lin shelve_V = variants {} ;
@@ -56387,7 +56394,8 @@ lin tabernacle_N = mkN047 "скиния" ;
 lin tabes_N = mkN071 "измършавяване" ;
 lin tabi_N = mkN065 "таби" ;
 lin tablature_N = mkN041 "таблатура" ;
-lin table_N = mkN041 "маса" ;
+lin table_1_N = mkN041 "маса" ;
+lin table_2_N = dualN (mkN041 "таблица") (mkA079 "табличен") ;
 lin table_V2 = dirV2 (singleV (mkV145a "внеса")) ; ----
 lin table_d'hote_A = variants {} ;
 lin table_d'hote_Adv = variants {} ;
@@ -58606,8 +58614,7 @@ lin towel_V2 = variants {} ;
 lin towel_horse_N = variants {} ;
 lin towel_rack_N = variants {} ;
 lin towel_rail_N = variants {} ;
-lin toweling_N = mkN039 "хавлия" ;
-lin towelling_N = variants {mkN016 "пердах"; mkN047 "хавлия"} ; ----
+lin towelling_N = mkN047 "хавлия" ;
 lin tower_N = mkN041 "кула" ;
 lin tower_V = variants {dualV (mkV186 "вдигам") (mkV152 "вдигна"); singleV (mkV186 "доминирам"); dualV (mkV186 "издигам") (mkV152 "издигна")} ; ----
 lin tower_block_N = variants {} ;
@@ -64199,7 +64206,7 @@ lin workmate_N = mkN038 "колега" ;
 lin workpiece_N = mkN007 "детайл" ;
 lin workplace_N = variants {} ;
 lin workroom_N = mkN041a "работилница" ;
-lin works_N = variants {mkN007 "завод"; mkN007 "комбинат"; mkN011 "механизъм"; mkN072 "укрепление"; mkN041 "фабрика"} ; ----
+lin works_N = mkN007 "комбинат" ;
 lin worksheet_N = variants {} ;
 lin workshop_N = mkN041 "работилница" ;
 lin workshy_A = variants {} ;
--- a/lib/src/translator/DictionaryCat.gf
+++ b/lib/src/translator/DictionaryCat.gf
@@ -1682,7 +1682,8 @@ lin bedspread_N = mkN "cobrellit" masculine ; --auto
 lin bee_N = mkN "abella" feminine ; --auto
 lin beech_N = mkN "faig" masculine ; --auto
 lin beechnut_N = mkN "radioenllaç" masculine ; --auto
-lin beef_N = mkN "vedella" feminine ; --auto
+lin beef_1_N = mkN "vedella" feminine ; --auto
+lin beef_2_N = mkN "vedella" feminine ; --auto
 lin beer_N = L.beer_N ;
 lin beetle_N = mkN "escarabat" masculine ; --auto
 lin beetroot_N = mkN "remolatxa" feminine ; --auto
@@ -4151,7 +4152,8 @@ lin curl_N = mkN "rínxol" masculine ; --auto
 lin curler_N = mkN "arrissador" masculine ; --auto
 lin currency_N = mkN "moneda" feminine ; --auto
 lin current_A = mkA "actual" ;
-lin current_N = mkN "corrent" masculine ; --auto
+lin current_1_N = mkN "corrent" masculine ; --auto
+lin current_2_N = mkN "corrent" masculine ; --auto
 lin curriculum_N = mkN "currículum" masculine ; --auto
 lin curry_N = mkN "curri" masculine ; --auto
 lin currycomb_N = mkN "estríjol" masculine ; --auto
@@ -9161,7 +9163,8 @@ lin judicature_N = mkN "judicatura" feminine ; --auto
 lin judicial_A = mkA "judicial" ; --auto
 lin jug_N = mkN "gerra" feminine ; --auto
 lin juggler_N = mkN "malabarista" ; --auto
-lin juice_N = mkN "suc" masculine ; --auto
+lin juice_1_N = mkN "suc" masculine ; --auto
+lin juice_2_N = mkN "suc" masculine ; --auto
 lin julian_A = mkA "julià" ; --auto
 lin jump_N = mkN "salt" masculine ; --auto
 lin jump_V = L.jump_V ;
@@ -12412,7 +12415,8 @@ lin planetary_A = mkA "planetari" ; --auto
 lin plankton_N = mkN "plàncton" masculine ; --auto
 lin planner_N = mkN "planificador" feminine | mkN "planificador" masculine ; --auto
 lin planning_N = mkN "planificació" feminine ;
-lin plant_N = mkN "planta" feminine ;
+lin plant_1_N = mkN "planta" feminine ;
+lin plant_2_N = mkN "planta" feminine ;
 lin plant_V2 = mkV2 "plantar" ; --auto
 lin plant_out_V2 = prepV2 (lin V OP_plant_V2) OP_out_Prep ; -- guess-p-verb
 lin plantation_N = mkN "plantació" feminine ; --auto
@@ -14541,7 +14545,8 @@ lin scholarly_A = mkA "erudit" ; --auto
 lin scholarship_N = mkN "beca" feminine ; --auto
 lin scholastic_A = mkA "escolàstic" ; --auto
 lin scholasticism_N = mkN "escolàstica" feminine ; --auto
-lin school_N = L.school_N ;
+lin school_1_N = L.school_N ;
+lin school_2_N = L.school_N ;
 lin sciatica_N = mkN "ciàtica" feminine ; --auto
 lin science_N = L.science_N ;
 lin scientific_A = mkA "científic" ; --auto
@@ -14845,7 +14850,8 @@ lin sewage_N = mkN "aigües residuals" feminine ; --auto
 lin sewer_N = mkN "cosidor" masculine ; --auto
 lin sewerage_N = mkN "clavegueram" masculine ; --auto
 lin sewing_N = mkN "costura" feminine ; --auto
-lin sex_N = mkN "sexe" masculine ;
+lin sex_1_N = mkN "sexe" masculine ;
+lin sex_2_N = mkN "sexe" masculine ;
 lin sexagesimal_A = mkA "sexagesimal" ; --auto
 lin sexless_A = mkA "asexuat" ; --auto
 lin sextant_N = mkN "sextant" masculine ; --auto
@@ -16343,7 +16349,8 @@ lin systematic_A = mkA "sistemàtic" ; --auto
 lin systematics_N = mkN "sistemàtica" feminine ; --auto
 lin systole_N = mkN "sístole" feminine ; --auto
 lin tab_N = mkN "tabulador" masculine ; --auto
-lin table_N = L.table_N ;
+lin table_1_N = L.table_N ;
+lin table_2_N = L.table_N ;
 lin tablet_N = mkN "comprimit" masculine | mkN "pastilla" feminine ; --auto
 lin tableware_N = mkN "vaixella" feminine ; --auto
 lin tabular_A = mkA "tabular" ; --auto
--- a/lib/src/translator/DictionaryChi.gf
+++ b/lib/src/translator/DictionaryChi.gf
@@ -3827,7 +3827,8 @@ lin bedwas_PN = foreignPN "Bedwas" ; -- comment=src=geonames status=guess
 lin bee_N = mkN "蜜蜂" | {-HSK-} mkN "蜜蜂" "隻" ;
 lin beebread_N = mkN "蜂的幼虫食料" | mkN "蜜蜂食料" ; -- open-multilingual-wordnet
 lin beech_N = mkN "山毛櫸" | mkN "山毛榉" ; -- status=guess -- status=guess
-lin beef_N = mkN "牛肉" [] ;
+lin beef_1_N = mkN "牛肉" [] ;
+lin beef_2_N = mkN "牛肉" [] ;
 lin beef_V = mkV "抱怨" ;
 lin beefsteak_N = mkN "牛排" ; -- status=guess
 lin beefy_A = mkA "结实" ;
@@ -8936,7 +8937,8 @@ lin curling_N = mkN "冰壺" | mkN "冰壶" ; -- status=guess -- status=guess
 lin curly_A = mkA "卷曲" ;
 lin currency_N = mkN "货币" ;
 lin current_A = mkA "当前" | {-HSK-} mkA "现在" | mkA "行" ;
-lin current_N = mkN "当前" | {-HSK-} mkN "现在" | mkN "行" ;
+lin current_1_N = mkN "当前" | {-HSK-} mkN "现在" | mkN "行" ;
+lin current_2_N = mkN "当前" | {-HSK-} mkN "现在" | mkN "行" ;
 lin curricular_A = mkA "课程" ; -- open-multilingual-wordnet
 lin curriculum_N = mkN "课程" "节" ;
 lin curriculum_vitae_N = mkN "履历" "份" ;
@@ -18329,7 +18331,8 @@ lin juggle_V = mkV "耍" ;
 lin juggle_V2 = mkV2 "欺骗" ;
 lin juggler_N = mkN "变戏法者" ;
 lin jugular_A = mkA "咽喉" | mkA "颈部" ; -- open-multilingual-wordnet
-lin juice_N = mkN "果汁" "杯" ;
+lin juice_1_N = mkN "果汁" "杯" ;
+lin juice_2_N = mkN "果汁" "杯" ;
 lin juicy_A = mkA "多汁" ; -- status=guess
 lin juju_N = mkN "物神" | mkN "符咒" | mkN "迷信" ; -- open-multilingual-wordnet
 lin jujube_N = mkN "棗" | mkN "枣" | mkN "棗實" | mkN "枣实" ; -- status=guess -- status=guess -- status=guess -- status=guess
@@ -24946,7 +24949,8 @@ lin planned_A = variants {} ;
 lin planner_N = mkN "计划者" ;
 lin planning_N = mkN "规划" "次" ;
 lin planographic_A = mkA "平版" | mkA "平面印刷" ; -- open-multilingual-wordnet
-lin plant_N = mkN "厂" | {-HSK-} mkN "植物" "種" ;
+lin plant_1_N = mkN "厂" | {-HSK-} mkN "植物" "種" ;
+lin plant_2_N = mkN "厂" | {-HSK-} mkN "植物" "種" ;
 lin plant_V2 = mkV2 "厂" ;
 lin plant_out_V2 = prepV2 (lin V OP_plant_V2) OP_out_Prep ; -- guess-p-verb
 lin plantain_N = mkN "芣苢" ; -- status=guess
@@ -28832,7 +28836,8 @@ lin scholar_N = mkN "大方" | {-HSK-} mkN "学者" ;
 lin scholarly_A = mkA "博学" ;
 lin scholarship_N = mkN "奖学金" "份" ;
 lin scholastic_A = mkA "学校" ; -- open-multilingual-wordnet
-lin school_N = L.school_N | {-HSK-} mkN "学校" "所" | mkN "派" | mkN "门" ;
+lin school_1_N = L.school_N ;
+lin school_2_N = mkN "学校" "所" | mkN "派" | mkN "门" ;
 lin school_V2 = mkV2 "学校" ;
 lin schoolbag_N = mkN "書包" | mkN "书包" ; -- status=guess -- status=guess
 lin schoolbook_N = mkN "教科书" | mkN "课本" ; -- open-multilingual-wordnet
@@ -29378,7 +29383,8 @@ lin sewage_N = mkN "污水" "堆" ;
 lin sewer_N = mkN "裁缝师" ; -- comment=[mark]或下水道 4
 lin sewerage_N = mkN "下水道" ; -- status=guess
 lin sewing_N = mkN "缝纫" ;
-lin sex_N = mkN "性别" ;
+lin sex_1_N = mkN "性别" ;
+lin sex_2_N = mkN "性别" ;
 lin sexism_N = mkN "性別歧視" | mkN "性别歧视" ; -- status=guess -- status=guess
 lin sexist_A = mkA "性别歧视" ;
 lin sexploitation_N = mkN "性泛滥" | mkN "性渲染" | mkN "色情利用" ; -- open-multilingual-wordnet
@@ -32307,7 +32313,8 @@ lin tabbouleh_N = mkN "塔布勒沙拉" ; -- status=guess
 lin tabby_N = mkN "虎斑貓" | mkN "虎斑猫" | mkN "斑貓" | mkN "斑猫" | {-mwn-} mkN "雌猫" ; -- status=guess -- status=guess -- status=guess -- status=guess -- open-multilingual-wordnet
 lin tabernacle_N = mkN "临时房屋""座" ;
 lin tabes_N = mkN "脊髓痨" ; -- open-multilingual-wordnet
-lin table_N = L.table_N | {-HSK-} mkN "桌子" "張" | mkN "表格" "張" ;
+lin table_1_N = L.table_N ;
+lin table_2_N = {-HSK-} mkN "桌子" "張" | mkN "表格" "張" ;
 lin table_V2 = mkV2 "使+嵌合" ;
 lin tablecloth_N = mkN "桌布" ; -- status=guess
 lin tableland_N = mkN "高原" ; -- status=guess
--- a/lib/src/translator/DictionaryDut.gf
+++ b/lib/src/translator/DictionaryDut.gf
@@ -1857,7 +1857,8 @@ lin bedroom_N = mkN "slaapkamer" feminine ; -- status=guess
 lin bedwas_PN = mkPN "Bedwas" ; -- src=geonames status=guess
 lin bee_N = mkN "bij" feminine | mkN "honingbij" feminine | mkN "imme" feminine ; -- status=guess status=guess status=guess
 lin beech_N = mkN "beuk" ; -- status=guess
-lin beef_N = mkN "bief" | mkN "biefstuk" | mkN "rundvlees" neuter ; -- status=guess status=guess status=guess
+lin beef_1_N = mkN "bief" | mkN "biefstuk" | mkN "rundvlees" neuter ; -- status=guess status=guess status=guess
+lin beef_2_N = mkN "bief" | mkN "biefstuk" | mkN "rundvlees" neuter ; -- status=guess status=guess status=guess
 lin beehive_N = mkN "bijenkorf" masculine | mkN "bijenhuif" feminine | mkN "huif" feminine | mkN "bijennest" neuter | mkN "immenhuif" feminine | mkN "immenkorf" masculine ; -- status=guess status=guess status=guess status=guess status=guess status=guess
 lin beekeeper_N = mkN "imker" | mkN "bijenhouder" masculine ; -- status=guess status=guess
 lin beeline_N = mkN "rechte lijn" ; -- status=guess
@@ -5107,7 +5108,8 @@ lin curmudgeon_N = mkN "iezegrim" masculine | mkN "kankeraar" ; -- status=guess
 lin currant_N = mkN "aalbes" feminine ; -- status=guess
 lin currency_N = mkN "munteenheid" feminine | mkN "valuta" ; -- status=guess status=guess
 lin current_A = mkA "huidig" | mkA "actueel" ;
-lin current_N = mkN "zichtrekening" feminine | mkN "lopende rekening" ; -- status=guess status=guess
+lin current_1_N = mkN "zichtrekening" feminine | mkN "lopende rekening" ; -- status=guess status=guess
+lin current_2_N = mkN "zichtrekening" feminine | mkN "lopende rekening" ; -- status=guess status=guess
 lin curriculum_N = mkN "curriculum" neuter | mkN "levensloop" masculine ; -- status=guess status=guess
 lin currie_PN = mkPN "Currie" ; -- src=geonames status=guess
 lin curry_N = mkN "kerrieschotel" | mkN "curryschotel" ; -- status=guess status=guess
@@ -11159,7 +11161,8 @@ lin juggle_V = mkV "jongeleren" ; -- status=guess, src=wikt
 lin juggle_V2 = mkV2 (mkV "jongeleren") ; -- status=guess, src=wikt
 lin jugular_A = mkA "jugulair" ; -- status=guess
 lin jugular_N = mkN "halsader" masculine ; -- status=guess
-lin juice_N = mkN "sap" neuter ; -- status=guess
+lin juice_1_N = mkN "sap" neuter ; -- status=guess
+lin juice_2_N = mkN "sap" neuter ; -- status=guess
 lin juicy_A = mkA "sappig" ; -- status=guess
 lin jukebox_N = mkN "jukebox" masculine ; -- status=guess
 lin jul_PN = mkPN "Jul" ; -- src=eng status=guess
@@ -15383,7 +15386,8 @@ lin plank_N = mkN "plank" masculine feminine ; -- status=guess
 lin planned_A = variants {} ; --
 lin planner_N = variants {} ; --
 lin planning_N = mkN ("planning") ;
-lin plant_N = mkN "plant" masculine ;
+lin plant_1_N = mkN "plant" masculine ;
+lin plant_2_N = mkN "plant" masculine ;
 lin plant_V2 = mkV2 (mkV "planten") | mkV2 (mkV "poten") ; -- status=guess, src=wikt status=guess, src=wikt
 lin plant_out_V2 = prepV2 (lin V OP_plant_V2) OP_out_Prep ; -- guess-p-verb
 lin plantain_N = mkN "bakbanaan" ; -- status=guess
@@ -17919,7 +17923,8 @@ lin schizophrenia_N = mkN "schizofrenie" ; -- status=guess
 lin schlimazel_N = mkN "pechvogel" | mkN "schlemiel" ; -- status=guess status=guess
 lin scholar_N = mkN "herdersmat" ; -- status=guess
 lin scholarship_N = mkN "studiebeurs or" masculine ; -- status=guess
-lin school_N = L.school_N ;
+lin school_1_N = L.school_N ;
+lin school_2_N = L.school_N ;
 lin school_V2 = mkV2 (mkV "scholen") ; -- status=guess, src=wikt
 lin schooner_N = mkN "schoener" ; -- status=guess
 lin schwa_N = mkN "sjwa" | mkN "doffe e" ; -- status=guess status=guess
@@ -18276,7 +18281,8 @@ lin sew_V2 = mkV2 (mkV "naaien") ; -- status=guess, src=wikt
 lin sewer_N = mkN "naaier" masculine | mkN "naaister" feminine ; -- status=guess status=guess
 lin sewerage_N = mkN "riolering" ; -- status=guess
 lin sewing_N = mkN "naaimachine" feminine ; -- status=guess
-lin sex_N = mkN "seks" masculine | mkN "geslachtsgemeenschap" masculine | mkN "vrijen" neuter ;
+lin sex_1_N = mkN "seks" masculine | mkN "geslachtsgemeenschap" masculine | mkN "vrijen" neuter ;
+lin sex_2_N = mkN "seks" masculine | mkN "geslachtsgemeenschap" masculine | mkN "vrijen" neuter ;
 lin sex_V2 = mkV2 (vrijen_V) | mkV2 (mkV (mkV "de") "liefde bedrijven") ; -- status=guess, src=wikt status=guess, src=wikt
 lin sexton_N = mkN "koster" masculine ; -- status=guess
 lin sexual_A = mkA "seksueel" ;
@@ -20296,7 +20302,8 @@ lin syzygy_N = mkN "syzygie" feminine ; -- status=guess
 lin t_shirt_N = variants {} ; --
 lin tab_N = mkN "rekening" ; -- status=guess
 lin tabernacle_N = mkN "tabernakel " neuter ; -- status=guess
-lin table_N = L.table_N ;
+lin table_1_N = L.table_N ;
+lin table_2_N = L.table_N ;
 lin table_V2 = mkV2 (mkV (mkV "ter") "tafel brengen") ; -- status=guess, src=wikt
 lin tablecloth_N = mkN "tafelkleed" ; -- status=guess
 lin tableland_N = mkN "plateau" neuter ; -- status=guess
--- a/lib/src/translator/DictionaryEng.gf
+++ b/lib/src/translator/DictionaryEng.gf
@@ -5413,7 +5413,9 @@ lin beebread_N = mkN "beebread" ;
 lin beech_N = mkN "beech" "beeches";
 lin beechen_A = mkA "beechen" ;
 lin beechnut_N = mkN "beechnut" ;
-lin beef_N = mkN "beef" "beeves" {- FIXME: guessed plural form -};
+lin beef_1_N = variants {mkN "beef" "beeves"; mkN "beef" "beefs"};
+lin beef_2_N = variants {mkN "beef" "beeves"; mkN "beef" "beefs"; mkN "boeuf"};
+lin beef_3_N = variants {mkN "beef" "beeves"; mkN "beef" "beefs"};
 lin beef_V = mkV "beef" "beefs" "beefed" "beefed" "beefing";
 lin beef_up_V2 = mkV2 (partV (mkV "beef") "up");
 lin beefcake_N = mkN "beefcake" ;
@@ -14254,7 +14256,8 @@ lin currant_N = mkN "currant" "currants";
 lin currawong_N = mkN "currawong" ;
 lin currency_N = mkN "currency" "currencies";
 lin current_A = compoundA (mkA "current");
-lin current_N = mkN "current" "currents";
+lin current_1_N = mkN "current" "currents";
+lin current_2_N = mkN "current" "currents";
 lin currentness_N = mkN "currentness" ;
 lin curricular_A = mkA "curricular" ;
 lin curriculum_N = mkN "curriculum" "curriculums";
@@ -30493,7 +30496,8 @@ lin juggler_N = mkN "juggler" "jugglers";
 lin jugglery_N = mkN "jugglery" ;
 lin jugular_A = compoundA (mkA "jugular");
 lin jugular_N = mkN "jugular" ;
-lin juice_N = mkN "juice" "juices";
+lin juice_1_N = mkN "juice" "juices";
+lin juice_2_N = mkN "juice" "juices";
 lin juice_up_V2 = mkV2 (partV (mkV "juice") "up");
 lin juiceless_A = mkA "juiceless" ;
 lin juiciness_N = mkN "juiciness" ;
@@ -42671,7 +42675,8 @@ lin planning_N = mkN "planning" ;
 lin planoconcave_A = mkA "planoconcave" ;
 lin planoconvex_A = mkA "planoconvex" ;
 lin planographic_A = mkA "planographic" ;
-lin plant_N = mkN "plant" "plants";
+lin plant_1_N = mkN "plant" "plants";
+lin plant_2_N = mkN "plant" "plants";
 lin plant_V2 = mkV2 (mkV "plant" "plants" "planted" "planted" "planting");
 lin plant_louse_N = variants {mkN "plant-louse" "plant-lice"; mkN "plant louse" "plant lice"};
 lin plant_out_V2 = mkV2 (partV (mkV "plant") "out");
@@ -49810,7 +49815,8 @@ lin scholastic_A = irregAdv (compoundA (mkA "scholastic")) (variants {"scholasti
 lin scholasticism_N = mkN "scholasticism" ;
 lin scholiast_N = mkN "scholiast" ;
 lin scholium_N = variants {mkN "scholium"; mkN "scholia"};
-lin school_N = mkN "school" "schools";
+lin school_1_N = mkN "school" "schools";
+lin school_2_N = mkN "school" "schools";
 lin school_V2 = mkV2 (mkV "school" "schools" "schooled" "schooled" "schooling");
 lin school_board_N = variants {mkN "school-board" "school-boards"; mkN "school board" "school boards"};
 lin schoolbag_N = mkN "schoolbag" ;
@@ -50954,7 +50960,8 @@ lin sewer_rat_N = variants {mkN "sewer-rat" "sewer-rats"; mkN "sewer rat" "sewer
 lin sewerage_N = mkN "sewerage" "sewerages";
 lin sewing_N = mkN "sewing" ;
 lin sewing_machine_N = variants {mkN "sewing-machine" "sewing-machines"; mkN "sewing machine" "sewing machines"};
-lin sex_N = mkN "sex" "sexes";
+lin sex_1_N = mkN "sex" "sexes";
+lin sex_2_N = mkN "sex" "sexes";
 lin sex_V2 = mkV2 (mkV "sex" "sexes" "sexed" "sexed" "sexing");
 lin sex_starved_A = compoundA (mkA "sex-starved");
 lin sex_up_V2 = mkV2 (partV (mkV "sex") "up");
@@ -56598,7 +56605,8 @@ lin tabernacle_N = mkN "tabernacle" "tabernacles";
 lin tabes_N = mkN "tabes" ;
 lin tabi_N = mkN "tabi";
 lin tablature_N = mkN "tablature" ;
-lin table_N = mkN "table" "tables";
+lin table_1_N = mkN "table" "tables";
+lin table_2_N = mkN "table" "tables";
 lin table_V2 = mkV2 (mkV "table" "tables" "tabled" "tabled" "tabling");
 lin table_d'hote_A = compoundA (mkA "table d'hôte");
 lin table_d'hote_Adv = mkAdv "table d'hôte";
@@ -58824,8 +58832,7 @@ lin towel_V2 = mkV2 (mkV "towel" "towels" "towelled" "towelled" "towelling");
 lin towel_horse_N = variants {mkN "towel-horse" "towel-horses"; mkN "towel horse" "towel horses"};
 lin towel_rack_N = variants {mkN "towel-rack" "towel-racks"; mkN "towel rack" "towel racks"};
 lin towel_rail_N = variants {mkN "towel-rail" "towel-rails"; mkN "towel rail" "towel rails"};
-lin toweling_N = mkN "toweling" ;
-lin towelling_N = mkN "towelling" ;
+lin towelling_N = mkN "towelling" | mkN "toweling";
 lin tower_N = mkN "tower" "towers";
 lin tower_V = mkV "tower" "towers" "towered" "towered" "towering";
 lin tower_block_N = variants {mkN "tower-block" "tower-blocks"; mkN "tower block" "tower blocks"};
--- a/lib/src/translator/DictionaryEst.gf
+++ b/lib/src/translator/DictionaryEst.gf
@@ -2842,7 +2842,8 @@ lin beebread_N = D.suir_N ;
 lin beech_N = mkN "pöögipuit" ;
 lin beechen_A = mkA "pöögipuidust" ;
 lin beechnut_N = mkN "pöögipähkel" ;
-lin beef_N = mkN "nurin" ;
+lin beef_1_N = mkN "nurin" ;
+lin beef_2_N = mkN "nurin" ;
 lin beef_V = D.nurisema_V ;
 lin beefsteak_N = D.biifsteek_N ;
 lin beefy_A = D.lihaseline_A ;
@@ -7942,7 +7943,8 @@ lin curly_A = D.'kähar_A' ;
 lin currant_N = D.korint_N ;
 lin currency_N = mkN "käibivus" ;
 lin current_A = mkA "hoovus" ;
-lin current_N = D.hoovus_N ;
+lin current_1_N = D.hoovus_N ;
+lin current_2_N = D.hoovus_N ;
 lin currentness_N = mkN "nüüdisaegsus" ;
 lin curriculum_N = D.'õppekava_N' ;
 lin currish_A = mkA "klähviv" ;
@@ -17578,7 +17580,8 @@ lin juggle_N = mkN "žongleerima" ;
 lin juggle_V = D.'žongleerima_V' ;
 lin juggle_V2 = mkV2 "žongleerima" ;
 lin juggler_N = D.'žonglöör_N' ;
-lin juice_N = D.mahl_N ;
+lin juice_1_N = D.mahl_N ;
+lin juice_2_N = D.mahl_N ;
 lin juicy_A = D.mahlane_A ;
 lin juju_N = mkN "juju" ;
 lin jujube_N = mkN "kreektürn" ;
@@ -22493,7 +22496,8 @@ lin plank_N = D.laud_N ;
 lin plankton_N = D.plankton_N ;
 lin planned_A = mkA "kavandatud" ;
 lin planner_N = D.kavandaja_N ;
-lin plant_N = mkN "istutama" ;
+lin plant_1_N = mkN "istutama" ;
+lin plant_2_N = mkN "istutama" ;
 lin plant_V2 = D.istutama_V2 ;
 lin plant_louse_N = mkN "lehetäi" ;
 lin plantain_N = mkN "plantaan" ;
@@ -25732,7 +25736,8 @@ lin scholarly_A = D.'õpetatud_A' ;
 lin scholarship_N = D.stipendium_N ;
 lin scholastic_A = D.skolastiline_A ;
 lin scholasticism_N = D.skolastika_N ;
-lin school_N = L.school_N ;
+lin school_1_N = L.school_N ;
+lin school_2_N = L.school_N ;
 lin school_V2 = mkV2 "koolitama" ;
 lin schoolbag_N = D.koolikott_N ;
 lin schoolbook_N = D.'õpik_N' ;
@@ -26233,7 +26238,8 @@ lin sewer_N = D.kanalisatsioon_N ;
 lin sewerage_N = D.kanalisatsioon_N ;
 lin sewing_N = D.'õmblemine_N' ;
 lin sewing_machine_N = D.'õmblusmasin_N' ;
-lin sex_N = D.seks_N ;
+lin sex_1_N = D.seks_N ;
+lin sex_2_N = D.seks_N ;
 lin sexism_N = D.seksism_N ;
 lin sexist_A = mkA "seksist" ;
 lin sexist_N = D.seksist_N ;
@@ -28732,7 +28738,8 @@ lin tabby_N = mkN "labane" ;
 lin tabernacle_N = D.palvemaja_N ;
 lin tabes_N = mkN "kuive" ;
 lin tablature_N = D.tabulatuur_N ;
-lin table_N = L.table_N ;
+lin table_1_N = L.table_N ;
+lin table_2_N = L.table_N ;
 lin table_knife_N = D.lauanuga_N ;
 lin table_linen_N = mkN "laudlinad" ;
 lin table_talk_N = D.'lauakõne_N' ;
--- a/lib/src/translator/DictionaryFin.gf
+++ b/lib/src/translator/DictionaryFin.gf
@@ -5070,7 +5070,8 @@ lin beebread_N = mkWN (compoundN "mehiläis" (k10A "leipä")) ; --UNCHK
 lin beech_N = mkWN (k5A "pyökki") ; --UNCHK
 lin beechen_A = mkWA (compoundA "pyökki" (k38 "puinen")) ; --UNCHK
 lin beechnut_N = mkWN (k1 "terho") "pyökin" ; --UNCHK
-lin beef_N = mkWN (compoundN "liha" (k9 "karja")) ; --UNCHK
+lin beef_1_N = mkWN (compoundN "liha" (k9 "karja")) ; --UNCHK
+lin beef_2_N = mkWN (compoundN "liha" (k9 "karja")) ; --UNCHK
 lin beef_V = mkWV (k53A "valittaa") ;
 lin beef_up_V2 = mkWV2 (k53 "voimistaa") ; --UNCHK
 lin beefeater_N = mkWN (k12 "vartija") ; --UNCHK
@@ -13138,7 +13139,8 @@ lin currant_N = mkWN (compoundN "viini" (k9 "marja")) ; --UNCHK
 lin currawong_N = mkWN (k5A "huilukorppi") ; --UNCHK
 lin currency_N = mkN "valuutta" ;
 lin current_A = mkA "nykyinen" ;
-lin current_N = mkWN (k9A "virta") ; --UNCHK
+lin current_1_N = mkWN (k9A "virta") ; --UNCHK
+lin current_2_N = mkWN (k9A "virta") ; --UNCHK
 lin currentness_N = mkWN (k40 "ajanmukaisuus") ; --UNCHK
 lin curricular_A = mkWA "oppikurssin" ; --UNCHK
 lin curriculum_N = mkWN (compoundN "opetus" (k10 "suunnitelma")) ; --UNCHK
@@ -27978,7 +27980,8 @@ lin juggler_N = mkWN (k5 "jonglööri") ; --UNCHK
 lin jugglery_N = mkWN (k1A "temppu") ; --UNCHK
 lin jugular_A = mkWA "kaula-" ; --UNCHK
 lin jugular_N = mkWN (kH1 "kohta") "heikko" ; --UNCHK
-lin juice_N = mkWN (k48 "neste") ; --UNCHK
+lin juice_1_N = mkWN (k48 "neste") ; --UNCHK
+lin juice_2_N = mkWN (k48 "neste") ; --UNCHK
 lin juice_up_V2 = mkWV2 (k53 "virkistää") ; --UNCHK
 lin juiceless_A = mkWA "nesteetön" ; --UNCHK
 lin juiciness_N = mkWN (k40 "mehukkuus") ; --UNCHK
@@ -39238,7 +39241,8 @@ lin planning_N = mkWN (k2 "suunnittelu") ;
 lin planoconcave_A = mkWA (compoundA "taso" (k10 "kovera")) ; --UNCHK
 lin planoconvex_A = mkWA (compoundA "taso" (k10 "kupera")) ; --UNCHK
 lin planographic_A = mkWA "laakapaino-" ; --UNCHK
-lin plant_N = mkN "kasvi" | mkN "laitos" ; ---- split
+lin plant_1_N = mkN "laitos" ;
+lin plant_2_N = mkN "kasvi" ;
 lin plant_V2 = mkWV2 (k53A "juurruttaa") ; --UNCHK
 lin plant_louse_N = mkWN (k9 "kirva") ; --UNCHK
 lin plant_out_V2 = prepV2 (lin V OP_plant_V2) OP_out_Prep ; -- guess-p-verb
@@ -45874,7 +45878,8 @@ lin scholarship_N = mkN "stipendi" ; --mkWN (k39 "tietämys") ;
 lin scholastic_A = mkWA (k38 "akateeminen") ; --UNCHK
 lin scholasticism_N = mkWN (k40 "akateemisuus") ; --UNCHK
 lin scholium_N = mkWN (compoundN "ala" (k48A "viite")) ; --UNCHK
-lin school_N = L.school_N ;
+lin school_1_N = L.school_N ;
+lin school_2_N = L.school_N ;
 lin school_V2 = mkWV2 (k62 "uida") "parvessa" ; --UNCHK
 lin school_board_N = mkWN "opetuslautakunta" ; --UNCHK
 lin schoolbag_N = mkWN (compoundN "koulu" (k1A "laukku")) ; --UNCHK
@@ -46889,7 +46894,8 @@ lin sewer_rat_N = mkWN (compoundN "viemäri" (k10A "rotta")) ; --UNCHK
 lin sewerage_N = mkWN (k5A "kloaakki") ; --UNCHK
 lin sewing_N = mkWN (k9A "harsinta") ; --UNCHK
 lin sewing_machine_N = mkWN (compoundN "ompelu" (k48 "kone")) ; --UNCHK
-lin sex_N = mkN "seksi" | mkN "sukupuoli" "sukupuolia" ; ---- split
+lin sex_1_N = mkN "seksi" ;
+lin sex_2_N = mkN "sukupuoli" "sukupuolia" ;
 lin sex_V2 = mkWV2 (k53A "määrittää") "sukupuoli" ; --UNCHK
 lin sex_up_V2 = mkWV2 (k62 "erotisoida") ; --UNCHK
 lin sexagenarian_A = mkWA (compoundA "kuusi" (k38 "kymppinen")) ; --UNCHK
@@ -52021,7 +52027,8 @@ lin tabernacle_N = mkWN (k6 "temppeli") ; --UNCHK
 lin tabes_N = mkWN "tabes" ; --UNCHK
 lin tabi_N = mkWN (compoundN "varvas" (k10A "sukka")) ; --UNCHK
 lin tablature_N = mkWN (compoundN "tabula" (k5 "tuuri")) ; --UNCHK
-lin table_N = L.table_N ;
+lin table_1_N = L.table_N ;
+lin table_2_N = L.table_N ;
 lin table_V2 = mkWV2 (k62 "taulukoida") ; --UNCHK
 lin table_d'hote_A = mkWA (k12 "ateria") "päivän" ; --UNCHK
 lin table_knife_N = mkWN (compoundN "pöytä" (k30 "veitsi")) ; --UNCHK
@@ -54059,7 +54066,6 @@ lin towel_V2 = mkWV2 (k61A "pyyhkiä") ; --UNCHK
 lin towel_horse_N = mkWN (compoundN "pyyhe" (k48 "teline")) ; --UNCHK
 lin towel_rack_N = mkWN (compoundN "pyyhe" (k48 "teline")) ; --UNCHK
 lin towel_rail_N = mkWN (compoundN "pyyhe" (k1A "tanko")) ; --UNCHK
-lin toweling_N = mkWN (k41A "pyyhekangas") ; --UNCHK
 lin towelling_N = mkWN (k41A "pyyhekangas") ; --UNCHK
 lin tower_N = mkWN (k5 "torni") ;
 lin tower_V = mkWV (k74 "kohota") "korkealle" ; --UNCHK
--- a/lib/src/translator/DictionaryFre.gf
+++ b/lib/src/translator/DictionaryFre.gf
@@ -2938,7 +2938,8 @@ lin bee_N = mkN "abeille" feminine ; -- tocheck
 lin beebread_N = mkN "ambroisie" ; -- UWN
 lin beech_N = mkN "hêtre" masculine ; -- tocheck
 lin beechnut_N = mkN "faine" feminine ; -- tocheck
-lin beef_N = mkN "boeuf" masculine ; -- tocheck
+lin beef_1_N = mkN "boeuf" masculine ; -- tocheck
+lin beef_2_N = mkN "boeuf" masculine ; -- tocheck
 lin beefcake_N = mkN "bellâtre" masculine ; -- tocheck
 lin beefeater_N = mkN "yeoman" ; -- UWN
 lin beefsteak_N = mkN "bifteck" masculine ; -- tocheck
@@ -7592,7 +7593,8 @@ lin currant_N = mkN "groseillier" masculine | mkN "groseille" feminine ; -- toch
 lin currawong_N = mkN "strepera" ; -- UWN
 lin currency_N = mkN "monnaie" feminine ; -- tocheck
 lin current_A = mkA "courant" | mkA "actuel" ; -- tocheck
-lin current_N = mkN "courant" masculine ; -- tocheck
+lin current_1_N = mkN "courant" masculine ; -- tocheck
+lin current_2_N = mkN "courant" masculine ; -- tocheck
 lin currentness_N = mkN "devise" ; -- UWN
 lin curriculum_N = variants {} ; --
 lin currie_PN = mkPN "Currie" ; -- status=guess src=geonames
@@ -16378,7 +16380,8 @@ lin juggle_V2 = mkV2 (mkV "jongler") ; -- tocheck
 lin juggler_N = mkN "jongleur" masculine ; -- tocheck
 lin jugular_A = mkA "jugulaire" ; -- UWN
 lin jugular_N = mkN "jugulaire" ; -- UWN
-lin juice_N = mkN "jus" masculine ; -- tocheck
+lin juice_1_N = mkN "jus" masculine ; -- tocheck
+lin juice_2_N = mkN "jus" masculine ; -- tocheck
 lin juicy_A = mkA "juteux" | mkA "croustillant" ; -- tocheck
 lin juju_N = mkN "fétiche" | mkN "vaudou" ; -- UWN
 lin jujube_N = mkN "jujube" masculine | mkN "jujubier" masculine ; -- tocheck
@@ -22532,7 +22535,8 @@ lin plankton_N = mkN "plancton" masculine ; -- tocheck
 lin planned_A = variants {} ; --
 lin planner_N = mkN "organisateur" ; -- UWN
 lin planning_N = variants {} ; --
-lin plant_N = mkN "matériel" masculine | mkN "végétal" masculine | mkN "plante" feminine ; -- tocheck
+lin plant_1_N = mkN "plante" feminine ; -- tocheck
+lin plant_2_N = mkN "matériel" masculine ; -- tocheck
 lin plant_V2 = mkV2 (mkV "planter") ; -- tocheck
 lin plant_out_V2 = prepV2 (lin V OP_plant_V2) OP_out_Prep ; -- guess-p-verb
 lin plantain_N = mkN "plantain" masculine ; -- tocheck
@@ -26227,7 +26231,8 @@ lin scholarly_A = mkA "érudit" ; -- tocheck
 lin scholarship_N = mkN "érudition" feminine | mkN "bourse" feminine ; -- tocheck
 lin scholastic_A = mkA "scolaire" ; -- UWN
 lin scholasticism_N = mkN "scolastique" ; -- tocheck
-lin school_N = L.school_N ;
+lin school_1_N = L.school_N ;
+lin school_2_N = L.school_N ;
 lin schoolbag_N = mkN "cartable" ; -- tocheck
 lin schoolbook_N = mkN "livre_de_classe" | mkN "manuel" | mkN "texte" ; -- UWN
 lin schoolboy_N = mkN "élève" masculine ; -- tocheck
@@ -26773,7 +26778,8 @@ lin sewage_N = mkN "eaux_usées" ; -- UWN
 lin sewer_N = mkN "couturier" masculine | mkN "égout" masculine ; -- tocheck
 lin sewerage_N = mkN "assainissement" masculine ; -- tocheck
 lin sewing_N = mkN "couture" feminine | mkN "couture" ; -- tocheck
-lin sex_N = mkN "sexe" masculine ; -- tocheck
+lin sex_1_N = mkN "sexe" masculine ; -- tocheck
+lin sex_2_N = mkN "sexe" masculine ; -- tocheck
 lin sex_V2 = mkV2 (mkV "sexer") ; -- tocheck
 lin sexism_N = mkN "sexisme" masculine ; -- tocheck
 lin sexist_A = mkA "sexiste" ; -- tocheck
@@ -29653,7 +29659,8 @@ lin tabby_N = mkN "chat_tigré" | mkN "dame" | mkN "reine" ; -- UWN
 lin tabernacle_N = mkN "tabernacle" masculine ; -- tocheck
 lin tabi_N = mkN "tabi" ; -- UWN
 lin tablature_N = mkN "tablature" ; -- tocheck
-lin table_N = L.table_N ;
+lin table_1_N = L.table_N ;
+lin table_2_N = L.table_N ;
 lin tablecloth_N = mkN "nappe" feminine ; -- tocheck
 lin tableland_N = mkN "plateau" masculine ; -- tocheck
 lin tablespoon_N = mkN "louche" feminine ; -- tocheck
--- a/lib/src/translator/DictionaryGer.gf
+++ b/lib/src/translator/DictionaryGer.gf
@@ -5400,7 +5400,8 @@ lin beebread_N = variants {} ;
 lin beech_N = mkN "Buche" "Buchen" feminine ; -- status=guess
 lin beechen_A = variants {} ;
 lin beechnut_N = mkN "Buchecker" "Bucheckern" feminine ; -- status=guess
-lin beef_N = mkN "Rindfleisch" neuter | mkN "Ochsenfleisch" ; -- status=guess status=guess
+lin beef_1_N = mkN "Rindfleisch" neuter | mkN "Ochsenfleisch" ; -- status=guess status=guess
+lin beef_2_N = mkN "Rindfleisch" neuter | mkN "Ochsenfleisch" ; -- status=guess status=guess
 lin beef_V = variants {} ;
 lin beef_up_V2 = variants {} ;
 lin beefcake_N = mkN "Muskelprotz" masculine ; -- status=guess
@@ -14200,7 +14201,8 @@ lin currant_N = mkN "Johannisbeere" "Johannisbeeren" feminine ; -- status=guess
 lin currawong_N = variants {} ;
 lin currency_N = mkN "Währung" feminine ; -- status=guess
 lin current_A = mkA "gegenwärtig" ;
-lin current_N = mkN "Girokonto" neuter ; -- status=guess
+lin current_1_N = mkN "Girokonto" neuter ; -- status=guess
+lin current_2_N = mkN "Girokonto" neuter ; -- status=guess
 lin currentness_N = variants {} ;
 lin curricular_A = variants {} ;
 lin curriculum_N = mkN "Lebenslauf" "Lebensläufe" masculine ; -- status=guess
@@ -30354,7 +30356,8 @@ lin juggler_N = mkN "Jongleur" "Jongleure" masculine ; -- status=guess
 lin jugglery_N = variants {} ;
 lin jugular_A = variants {} ;
 lin jugular_N = variants {} ;
-lin juice_N = mkN "Saft" "Säfte" masculine ; -- status=guess
+lin juice_1_N = mkN "Saft" "Säfte" masculine ; -- status=guess
+lin juice_2_N = mkN "Saft" "Säfte" masculine ; -- status=guess
 lin juice_up_V2 = variants {} ;
 lin juiceless_A = variants {} ;
 lin juiciness_N = variants {} ;
@@ -42475,7 +42478,8 @@ lin planning_N = mkN "Planung" ; -- status=guess
 lin planoconcave_A = variants {} ;
 lin planoconvex_A = variants {} ;
 lin planographic_A = variants {} ;
-lin plant_N = mkN "Pflanze" ;
+lin plant_1_N = mkN "Pflanze" ;
+lin plant_2_N = mkN "Pflanze" ;
 lin plant_V2 = mkV2 (regV "pflanzen") ; -- status=guess, src=wikt
 lin plant_louse_N = variants {} ;
 lin plant_out_V2 = prepV2 (lin V OP_plant_V2) OP_out_Prep ; -- guess-p-verb
@@ -49563,7 +49567,8 @@ lin scholastic_A = variants {} ;
 lin scholasticism_N = mkN "Scholastik" feminine | mkN "Schulwissenschaft" feminine ; -- status=guess status=guess
 lin scholiast_N = variants {} ;
 lin scholium_N = variants {} ;
-lin school_N = L.school_N ;
+lin school_1_N = L.school_N ;
+lin school_2_N = L.school_N ;
 lin school_V2 = mkV2 (irregV "unterrichten" "unterrichtet" "unterrichtete" "unterrichte" "unterrichtet" | regV "schulen") ; -- status=guess, src=wikt status=guess, src=wikt
 lin school_board_N = variants {} ;
 lin schoolbag_N = mkN "Schultasche" feminine | mkN "Schulranzen" "Schulranzen" masculine ; -- status=guess status=guess
@@ -50698,7 +50703,8 @@ lin sewer_rat_N = variants {} ;
 lin sewerage_N = mkN "Kanalisation" ; -- status=guess
 lin sewing_N = mkN "Nähen" neuter ; -- status=guess
 lin sewing_machine_N = variants {} ;
-lin sex_N = mkN "Geschlecht" neuter | mkN "Sex" | mkN "Geschlechtsverkehr" ; -- split: gender / coitus
+lin sex_1_N = mkN "Sex" ;
+lin sex_2_N = mkN "Geschlecht" neuter | mkN "Geschlechtsverkehr" ; -- split: gender / coitus
 lin sex_V2 = mkV2 ( junkV "das Geschlecht" ( mkV "bestimmen" ) ) | mkV2 ( mkV "sexen" ) ; -- status = guess , src = wikt status = guess , src = wikt
 lin sex_starved_A = variants {} ;
 lin sex_up_V2 = variants {} ;
@@ -56314,7 +56320,8 @@ lin tabernacle_N = mkN "Tabernakel" "Tabernakel" masculine | mkN "Stiftshütte"
 lin tabes_N = variants {} ;
 lin tabi_N = variants {} ;
 lin tablature_N = variants {} ;
-lin table_N = L.table_N ;
+lin table_1_N = L.table_N ;
+lin table_2_N = L.table_N ;
 lin table_V2 = variants {} ;
 lin table_d'hote_A = variants {} ;
 lin table_d'hote_Adv = variants {} ;
@@ -58532,7 +58539,6 @@ lin towel_V2 = variants {} ;
 lin towel_horse_N = variants {} ;
 lin towel_rack_N = variants {} ;
 lin towel_rail_N = variants {} ;
-lin toweling_N = variants {} ;
 lin towelling_N = variants {} ;
 lin tower_N = variants {} ;
 lin tower_V = variants {} ;
--- a/lib/src/translator/DictionaryHin.gf
+++ b/lib/src/translator/DictionaryHin.gf
@@ -2574,7 +2574,8 @@ lin bedstead_N = mkN "पलँग का फ़्रेम्" ; -- tocheck
 lin bedwetter_N = mkN "बिस्तर में पेशाब करने वाला" ; -- tocheck       
 lin bee_N = mkN "मधुमक्खी" ; -- tocheck              
 lin beech_N = mkN "बीचवृक्ष्" ; -- tocheck              
-lin beef_N = mkN "शक्ति" ; -- tocheck              
+lin beef_1_N = mkN "शक्ति" ; -- tocheck              
+lin beef_2_N = mkN "शक्ति" ; -- tocheck              
 lin beef_V = compoundV "शिकायत" (mkV "करना") ; -- tocheck              
 lin beef_up_V2 = mkV2 (compoundV "मज़बूत" (mkV "करना")) ; -- tocheck
 lin beefeater_N = mkN "राजा का अंगरक्षक" ; -- tocheck              
@@ -6510,7 +6511,8 @@ lin curly_A = mkA "घुँघराला" ; -- tocheck
 lin currant_N = mkN "रसभरी की झाड़ी" ; -- tocheck              
 lin currency_N = mkN "व्यापकता" ; -- tocheck              
 lin current_A = mkA "चालू" ; -- tocheck              
-lin current_N = mkN "बिजली" ; -- tocheck              
+lin current_1_N = mkN "बिजली" ; -- tocheck              
+lin current_2_N = mkN "बिजली" ; -- tocheck              
 lin curriculum_N = mkN "पाठ्यक्रम" ; -- tocheck              
 lin curriculum_vitae_N = mkN "शैक्षिक अभिलेख एवं कार्य अनुभव" ; -- tocheck       
 lin curry_powder_N = mkN "शोरबे का मसला" ; -- tocheck       
@@ -14498,7 +14500,8 @@ lin juggle_V2 = mkV2 (compoundV "बाजीगरी" (mkV "करना")) ;
 lin juggler_N = mkN "बाजीगर" ; -- tocheck              
 lin jugular_A = mkA "कंठ्य" ; -- tocheck              
 lin jugular_N = mkN "ग्रीवा शिरा" ; -- tocheck       
-lin juice_N = mkN "शक्ति" ; -- tocheck              
+lin juice_1_N = mkN "शक्ति" ; -- tocheck              
+lin juice_2_N = mkN "शक्ति" ; -- tocheck              
 lin juiceless_A = mkA "नीरस" ; -- tocheck       
 lin juiciness_N = mkN "रसीलापन" ; -- tocheck              
 lin juicy_A = mkA "आकर्षक" ; -- tocheck              
@@ -19956,7 +19959,8 @@ lin planking_N = mkN "पटरे का फ़र्श" ; -- tocheck
 lin plankton_N = mkN "प्लवक" ; -- tocheck              
 lin planktonic_A = mkA "प्लवकीय" ; -- tocheck       
 lin planning_N = mkN "आयोजन" ; -- tocheck       
-lin plant_N = mkN "ठगी" ; -- tocheck              
+lin plant_1_N = mkN "ठगी" ; -- tocheck              
+lin plant_2_N = mkN "ठगी" ; -- tocheck              
 lin plant_V2 = mkV2 (compoundV "स्थापित" (mkV "करना")) ; -- tocheck
 lin plant_out_V2 = mkV2 (mkV "बोना") ; -- tocheck
 lin plantation_N = mkN "बाग" ; -- tocheck              
@@ -23851,7 +23855,8 @@ lin scholarly_A = mkA "अध्ययनशील" ; -- tocheck
 lin scholarship_N = mkN "छात्रवृत्ति" ; -- tocheck              
 lin scholastic_A = mkA "दार्शनिक" ; -- tocheck              
 lin scholasticism_N = mkN "शास्त्रीय रूढ़िवादिता" ; -- tocheck              
-lin school_N = mkN "मत" ; -- tocheck              
+lin school_1_N = mkN "मत" ; -- tocheck              
+lin school_2_N = mkN "मत" ; -- tocheck              
 lin school_V2 = mkV2 (mkV "सिख्ना") ; -- tocheck
 lin schoolboy_N = mkN "स्कूली लड़का" ; -- tocheck              
 lin schoolchild_N = mkN "स्कूली बच्चा" ; -- tocheck              
@@ -24473,7 +24478,8 @@ lin sewer_N = mkN "दरज़ी" ; -- tocheck
 lin sewerage_N = mkN "मल-निकास व्यवस्था" ; -- tocheck              
 lin sewing_N = mkN "सिलाई" ; -- tocheck              
 lin sewing_machine_N = mkN "सिलाई मशीन" ; -- tocheck       
-lin sex_N = mkN "कामुकता" ; -- tocheck              
+lin sex_1_N = mkN "कामुकता" ; -- tocheck              
+lin sex_2_N = mkN "कामुकता" ; -- tocheck              
 lin sex_V2 = mkV2 (compoundV "उत्तेजित" (mkV "करना")) ; -- tocheck
 lin sexism_N = mkN "लिंग के आधार पर भेद-भाव की नीति" ; -- tocheck              
 lin sexist_A = mkA "लिंग-भेद द्योतक" ; -- tocheck              
@@ -27795,7 +27801,8 @@ lin tabby_A = mkA "धारीदार" ; -- tocheck
 lin tabby_N = mkN "धारीदार भूरी बिल्ली" ; -- tocheck              
 lin tabby_cat_N = mkN "धारीदार भूरी बिल्ली" ; -- tocheck       
 lin tabernacle_N = mkN "अस्थायी उपासनागृह" ; -- tocheck              
-lin table_N = mkN "सूची" ; -- tocheck              
+lin table_1_N = mkN "सूची" ; -- tocheck              
+lin table_2_N = mkN "सूची" ; -- tocheck              
 lin table_V2 = mkV2 (compoundV "स्थगित" (mkV "करना")) ; -- tocheck
 lin table_d'hote_A = mkA "निर्धारित मूल्य" ; -- tocheck       
 lin table_knife_N = mkN "मेज चाकू" ; -- tocheck       
@@ -28983,7 +28990,6 @@ lin tow_N = mkN "अनुकर्षण" ; -- tocheck
 lin tow_V2 = mkV2 (mkV "घसीटना") ; -- tocheck
 lin towel_N = mkN "तौलिया" ; -- tocheck              
 lin towel_V2 = mkV2 (compoundV "तौलिये से" (mkV "पोंछना")) ; -- tocheck
-lin toweling_N = mkN "तौलिये का कपड़ा" ; -- tocheck       
 lin towelling_N = mkN "तौलिये का कपड़ा" ; -- tocheck              
 lin tower_N = mkN "मीनार" ; -- tocheck              
 lin tower_V = compoundV "हावी" (mkV "होना") ; -- tocheck              
--- a/lib/src/translator/DictionaryIta.gf
+++ b/lib/src/translator/DictionaryIta.gf
@@ -2588,7 +2588,8 @@ lin bedwas_PN = mkPN "Bedwas" ; -- status=guess src=geonames
 lin bee_N = mkN "ape" feminine ; -- status=guess
 lin beech_N = mkN "faggio" ; -- status=guess
 lin beechnut_N = mkN "faggiola" | mkN "faggina" ; -- status=guess status=guess
-lin beef_N = mkN "manzo" ; -- status=guess
+lin beef_1_N = mkN "manzo" ; -- status=guess
+lin beef_2_N = mkN "manzo" ; -- status=guess
 lin beefsteak_N = mkN "bistecca" ; -- status=guess
 lin beefy_A = mkA "carnoso" ; -- status=guess
 lin beehive_N = mkN "alveare" | mkN "arnia" ; -- status=guess status=guess
@@ -6818,7 +6819,8 @@ lin curmudgeon_N = mkN "burbero" | mkN "musone" masculine ; -- status=guess stat
 lin currant_N = mkN "ribes" ; -- status=guess
 lin currency_N = mkN "valuta" ; -- status=guess
 lin current_A = mkA "corrente" | mkA "attuale" ; -- status=guess status=guess
-lin current_N = mkN "corrente" feminine ; -- status=guess
+lin current_1_N = mkN "corrente" feminine ; -- status=guess
+lin current_2_N = mkN "corrente" feminine ; -- status=guess
 lin currentness_N = mkN "attualità" ; -- UWN
 lin curricular_A = mkA "curricolare" ; -- UWN
 lin curriculum_N = mkN "curriculum vitae" ; -- status=guess
@@ -14662,7 +14664,8 @@ lin juggle_V = mkV "giocolare" ; -- status=guess, src=wikt
 lin juggle_V2 = mkV2 (mkV "giocolare") ; -- status=guess, src=wikt
 lin juggler_N = mkN "giocoliere" masculine ; -- status=guess
 lin jugular_A = mkA "giugulare" | mkA "iugulare" ; -- UWN
-lin juice_N = mkN "succo" | mkN "spremuta" ; -- status=guess status=guess
+lin juice_1_N = mkN "succo" | mkN "spremuta" ; -- status=guess status=guess
+lin juice_2_N = mkN "succo" | mkN "spremuta" ; -- status=guess status=guess
 lin juiciness_N = mkN "gustosità" | mkN "succosità" | mkN "succulenza" | mkN "sugosità" ; -- UWN
 lin juicy_A = mkA "sugoso" | mkA "sugosa" ; -- status=guess status=guess
 lin juju_N = mkN "feticcio" ; -- UWN
@@ -20116,7 +20119,8 @@ lin plankton_N = mkN "plancton" masculine ; -- status=guess
 lin planned_A = variants {} ; --
 lin planner_N = variants {} ; --
 lin planning_N = mkN "pianificazione" feminine ; -- status=guess
-lin plant_N = mkN "pianta" ; -- status=guess
+lin plant_1_N = mkN "pianta" ; -- status=guess
+lin plant_2_N = mkN "pianta" ; -- status=guess
 lin plant_V2 = mkV2 (mkV "piantare") ; -- status=guess, src=wikt
 lin plant_out_V2 = prepV2 (lin V OP_plant_V2) OP_out_Prep ; -- guess-p-verb
 lin plantain_N = mkN "piantaggine" feminine ; -- status=guess
@@ -23370,7 +23374,8 @@ lin scholar_N = mkN "erudito" | mkN "dotto" ; -- status=guess status=guess
 lin scholarly_A = mkA "erudito" ; -- UWN
 lin scholarship_N = mkN "borsa di studi" ; -- status=guess
 lin scholasticism_N = mkN "scolasticismo" ; -- status=guess
-lin school_N = L.school_N ;
+lin school_1_N = L.school_N ;
+lin school_2_N = L.school_N ;
 lin schoolbook_N = mkN "libro_di_testo" ; -- UWN
 lin schoolboy_N = mkN "alunno" | mkN "scolaro" ; -- status=guess status=guess
 lin schoolchild_N = mkN "alunno" | mkN "alunna" | mkN "scolaro" | mkN "scolara" ; -- status=guess status=guess status=guess status=guess status=guess
@@ -23853,7 +23858,8 @@ lin sewage_N = mkN "liquame" ; -- UWN
 lin sewer_N = mkN "fogna" | mkN "chiavica" | mkN "cloaca" ; -- status=guess status=guess status=guess
 lin sewerage_N = mkN "cloaca" | mkN "fogna" | mkN "fognatura" | mkN "rete_fognaria" ; -- UWN
 lin sewing_N = mkN "cucito" ; -- status=guess
-lin sex_N = mkN "sesso" ; -- status=guess
+lin sex_1_N = mkN "sesso" ; -- status=guess
+lin sex_2_N = mkN "sesso" ; -- status=guess
 lin sex_V2 = mkV2 (mkV (I.fare_V) "sesso") ; -- status=guess, src=wikt
 lin sexism_N = mkN "sessismo" ; -- status=guess
 lin sexist_A = mkA "sessista" ; -- status=guess
@@ -26394,7 +26400,8 @@ lin tab_N = mkN "linguetta" ; -- status=guess
 lin tabby_A = mkA "soriano" ; -- status=guess
 lin tabby_N = mkN "soriano" ; -- status=guess
 lin tabernacle_N = mkN "tabernacolo" ; -- status=guess
-lin table_N = L.table_N ;
+lin table_1_N = L.table_N ;
+lin table_2_N = L.table_N ;
 lin tablecloth_N = mkN "tovaglia" ; -- status=guess
 lin tableland_N = mkN "altopiano" | mkN "pianoro" | mkN "tavoliere" masculine ; -- status=guess status=guess status=guess
 lin tablespoon_N = mkN "cucchiaio da tavola" ; -- status=guess
--- a/lib/src/translator/DictionaryJpn.gf
+++ b/lib/src/translator/DictionaryJpn.gf
@@ -1424,7 +1424,9 @@ lin bedspread_N = mkN "ベッドカバー" ;
 lin bedtime_N = mkN "寝物語" ;
 lin bee_N = mkN "蜂" | mkN "蜜蜂" ;
 lin beech_N = mkN "ブナ" | mkN "ぶな" ;
-lin beef_N = mkN "牛肉" | mkN "ビーフ" ;
+lin beef_1_N = mkN "牛肉" | mkN "ビーフ" ;
+lin beef_2_N = mkN "牛肉" | mkN "ビーフ" ;
+lin beef_3_N = mkN "牛肉" | mkN "ビーフ" ;
 lin beefsteak_N = mkN "ビーフステーキ" ;
 lin beehive_N = mkN "人込みの場所" ;
 lin beekeeping_N = mkN "養蜂" ;
@@ -3706,7 +3708,8 @@ lin curling_N = mkN "カーリング" ;
 lin curly_A = mkA "巻き毛の" ;
 lin currency_N = mkN "通貨" | mkN "貨幣" ;
 lin current_A = mkA "現行" | mkA "現在" | mkA "当座" ;
-lin current_N = mkN "当座預金" ;
+lin current_1_N = mkN "当座預金" ;
+lin current_2_N = mkN "当座預金" ;
 lin currently_Adv = variants {} ; --
 lin curriculum_N = mkN "履歴書" ;
 lin curry_N = mkN "カレー" ;
@@ -7951,7 +7954,8 @@ lin juggle_V = mkV "ジャグリングする" | mkV "ジャッグルする" ;
 lin juggle_V2 = mkV2 "ジャグリングする" | mkV2 "ジャッグルする" ;
 lin juggler_N = mkN "ジャグラー" ;
 lin jugular_N = mkN "頸静脈" ;
-lin juice_N = mkN "ジュース" ;
+lin juice_1_N = mkN "ジュース" ;
+lin juice_2_N = mkN "ジュース" ;
 lin jujube_N = mkN "棗" | mkN "ナツメ" ;
 lin jukebox_N = mkN "ジュークボックス" ;
 lin julienne_N = mkN "繊切り" | mkN "千切り" ;
@@ -10930,7 +10934,8 @@ lin plankton_N = mkN "プランクトン" ;
 lin planned_A = variants {} ; --
 lin planner_N = variants {} ; --
 lin planning_N = variants {} ; --
-lin plant_N = mkN "草" | mkN "草花" ;
+lin plant_1_N = mkN "草" | mkN "草花" ;
+lin plant_2_N = mkN "草" | mkN "草花" ;
 lin plant_V2 = mkV2 "植える" ;
 lin plantain_N = mkN "バショウ属" ;
 lin plantation_N = mkN "プランテーション" | mkN "農園" ;
@@ -12833,7 +12838,8 @@ lin schnapps_N = mkN "シュナップス" ;
 lin schnitzel_N = mkN "シュニッツェル" ;
 lin scholar_N = variants {} ; --
 lin scholarship_N = mkN "奨学金" ;
-lin school_N = L.school_N | mkN "群れ" | mkN "魚群" ;
+lin school_1_N = L.school_N ;
+lin school_2_N = mkN "群れ" | mkN "魚群" ;
 lin schoolbag_N = mkN "通学かばん" ;
 lin schoolboy_N = mkN "男生徒" | mkN "男子生徒" ;
 lin schoolchild_N = mkN "学童" | mkN "児童" | mkN "生徒" | mkN "学生" | mkN "弟子" ;
@@ -13101,7 +13107,8 @@ lin sewage_N = mkN "汚水" ;
 lin sewer_N = mkN "下水道" ;
 lin sewerage_N = mkN "下水" | mkN "下水道" ;
 lin sewing_N = mkN "縫い物" ;
-lin sex_N = mkN "性交" | mkN "セックス" ;
+lin sex_1_N = mkN "性交" | mkN "セックス" ;
+lin sex_2_N = mkN "性交" | mkN "セックス" ;
 lin sex_V2 = mkV2 "セックスする" ;
 lin sexism_N = mkN "性差別" ;
 lin sextant_N = mkN "六分儀" ;
@@ -14625,7 +14632,8 @@ lin tab_N = mkN "タブ" ;
 lin tabbouleh_N = mkN "タブーラ" ;
 lin tabby_N = mkN "トラネコ" | mkN "虎猫" | mkN "トラ猫" ;
 lin tabernacle_N = mkN "幕屋" ;
-lin table_N = L.table_N | mkN "表" ;
+lin table_1_N = L.table_N ;
+lin table_2_N = mkN "表" ;
 lin table_V2 = mkV2 "棚上げにする" ;
 lin tablecloth_N = mkN "テーブル掛け" | mkN "テーブルクロス" ;
 lin tableland_N = mkN "高原" ;
--- a/lib/src/translator/DictionaryMlt.gf
+++ b/lib/src/translator/DictionaryMlt.gf
@@ -375,7 +375,8 @@ lin run_V = gera_GRJ_1_8131_V ;
 lin salt_N = mkN "melħ" "melħiet" ;
 lin sand_N = mkNColl "ramla" "ramel" "ramliet" ;
 lin say_VS = qal_QWL_1_9357_V ;
-lin school_N = mkN "skola" "skejjel" ;
+lin school_1_N = mkN "skola" "skejjel" ;
+lin school_2_N = mkN "skola" "skejjel" ;
 lin science_N = mkN "xjenza" "xjenzi" ;
 lin scratch_V2 = lilV2 (barax_BRX_1_7504_V) ;
 lin sea_N = mkNDual "baħar" "baħrejn" "ibħra" ;
@@ -435,7 +436,8 @@ lin swell_V = ntefah_NFH_8_8970_V ;
 lin swim_V = gham_GHWM_1_10750_V ;
 lin switch8off_V2 = dirV2 (tefa_TFJ_1_9960_V) ;
 lin switch8on_V2 = dirV2 (xeghel_XGHL_1_10155_V) ;
-lin table_N = mkN "mejda" "mwejjed" ;
+lin table_1_N = mkN "mejda" "mwejjed" ;
+lin table_2_N = mkN "mejda" "mwejjed" ;
 lin tail_N = (mkN "denb" "dnieb") ;
 lin talk_V3 = mkV3 kellem_KLM_2_8597_V maP fuqP ; -- PAĊPAĊ, PARLA
 lin teach_V2 = lilV2 (ghallem_GHLM_2_10526_V) ;
--- a/lib/src/translator/DictionaryRus.gf
+++ b/lib/src/translator/DictionaryRus.gf
@@ -5394,7 +5394,9 @@ lin beebread_N = variants {} ;
 lin beech_N = mkN "бук" "бука" "буку" "бук" "буком" "буке" "буками" "буки" "буков" "букам" "буки" "буками" "буках" Masc Inanimate ;
 lin beechen_A = variants {} ;
 lin beechnut_N = variants {} ;
-lin beef_N = variants {} ;
+lin beef_1_N = variants {} ;
+lin beef_2_N = variants {} ;
+lin beef_3_N = variants {} ;
 lin beef_V = variants {} ;
 lin beef_up_V2 = variants {} ;
 lin beefcake_N = variants {} ;
@@ -14197,7 +14199,8 @@ lin currant_N = mkN "смородина" "смородины" "смородин
 lin currawong_N = variants {} ;
 lin currency_N = mkN "валюта" "валюты" "валюте" "валюту" "валютою" "валюте" "валютами" "валюты" "валют" "валютам" "валюты" "валютами" "валютах" Fem Inanimate ;
 lin current_A = mkA "современный" | mkA "текущий" ;
-lin current_N = mkN "ток" "тока" "току" "ток" "током" "токе" "току" "токи" "токов" "токам" "токи" "токами" "токах" Masc Inanimate | mkN "электроток" "электротока" "электротоку" "электроток" "электротоком" "электротоке" "электротоком" "электротоки" "электротоков" "электротокам" "электротоки" "электротоком" "электротоках" Masc Inanimate ;
+lin current_1_N = mkN "ток" "тока" "току" "ток" "током" "токе" "току" "токи" "токов" "токам" "токи" "токами" "токах" Masc Inanimate ;
+lin current_2_N = mkN "ток" "тока" "току" "ток" "током" "токе" "току" "токи" "токов" "токам" "токи" "токами" "токах" Masc Inanimate ;
 lin currentness_N = variants {} ;
 lin curricular_A = variants {} ;
 lin curriculum_N = variants {} ;
@@ -30365,7 +30368,8 @@ lin juggler_N = variants {} ;
 lin jugglery_N = variants {} ;
 lin jugular_A = mkA "шейный" ;
 lin jugular_N = variants {} ;
-lin juice_N = mkN "сок" "сока" "соку" "сок" "соком" "соке" "соку" "соки" "соков" "сокам" "соки" "соками" "соках" Masc Inanimate ;
+lin juice_1_N = mkN "сок" "сока" "соку" "сок" "соком" "соке" "соку" "соки" "соков" "сокам" "соки" "соками" "соках" Masc Inanimate ;
+lin juice_2_N = mkN "ток" "тока" "току" "ток" "током" "токе" "току" "токи" "токов" "токам" "токи" "токами" "токах" Masc Inanimate ;
 lin juice_up_V2 = variants {} ;
 lin juiceless_A = variants {} ;
 lin juiciness_N = variants {} ;
@@ -42497,7 +42501,8 @@ lin planning_N = variants {} ;
 lin planoconcave_A = variants {} ;
 lin planoconvex_A = variants {} ;
 lin planographic_A = variants {} ;
-lin plant_N = mkN "завод" "завода" "заводу" "завод" "заводом" "заводе" "заводами" "заводы" "заводов" "заводам" "заводы" "заводами" "заводах" Masc Inanimate ;
+lin plant_1_N = mkN "завод" "завода" "заводу" "завод" "заводом" "заводе" "заводами" "заводы" "заводов" "заводам" "заводы" "заводами" "заводах" Masc Inanimate ;
+lin plant_2_N = mkN "растенье" "растенья" "растенью" "растенье" "растеньем" "растеньи" "растеньями" "растенья" "растений" "растеньям" "растенья" "растеньями" "растеньях" Neut Inanimate ;
 lin plant_V2 = variants {} ;
 lin plant_louse_N = variants {} ;
 lin plant_out_V2 = variants {} ;
@@ -49590,7 +49595,8 @@ lin scholastic_A = variants {} ;
 lin scholasticism_N = variants {} ;
 lin scholiast_N = variants {} ;
 lin scholium_N = variants {} ;
-lin school_N = L.school_N ;
+lin school_1_N = L.school_N ;
+lin school_2_N = variants {} ;
 lin school_V2 = variants {} ;
 lin school_board_N = variants {} ;
 lin schoolbag_N = mkN "портфель" "портфеля" "портфелю" "портфель" "портфелем" "портфеле" "портфелями" "портфели" "портфелей" "портфелям" "портфели" "портфелями" "портфелях" Masc Inanimate | mkN "ранец" "ранца" "ранцу" "ранец" "ранцем" "ранце" "ранцами" "ранцы" "ранцев" "ранцам" "ранцы" "ранцами" "ранцах" Masc Inanimate | mkN "сумка" "сумки" "сумке" "сумку" "сумкою" "сумке" "сумками" "сумки" "сумок" "сумкам" "сумки" "сумками" "сумках" Fem Inanimate ;
@@ -50726,7 +50732,8 @@ lin sewer_rat_N = variants {} ;
 lin sewerage_N = variants {} ;
 lin sewing_N = variants {} ;
 lin sewing_machine_N = variants {} ;
-lin sex_N = mkN "секс" "секса" "сексу" "секс" "сексом" "сексе" "сексом" "сексом" "сексом" "сексом" "сексом" "сексом" "сексом" Masc Inanimate ;
+lin sex_1_N = mkN "секс" "секса" "сексу" "секс" "сексом" "сексе" "сексом" "сексом" "сексом" "сексом" "сексом" "сексом" "сексом" Masc Inanimate ;
+lin sex_2_N = mkN "пола" "полы" "поле" "полу" "полою" "поле" "полами" "полы" "пол" "полам" "полы" "полами" "полах" Fem Inanimate ;
 lin sex_V2 = variants {} ;
 lin sex_starved_A = variants {} ;
 lin sex_up_V2 = variants {} ;
@@ -56342,7 +56349,8 @@ lin tabernacle_N = mkN "синагога" "синагоги" "синагоге"
 lin tabes_N = variants {} ;
 lin tabi_N = variants {} ;
 lin tablature_N = variants {} ;
-lin table_N = L.table_N ;
+lin table_1_N = L.table_N ;
+lin table_2_N = mkN "таблица" "таблицы" "таблице" "таблицу" "таблицею" "таблице" "таблицами" "таблицы" "таблиц" "таблицам" "таблицы" "таблицами" "таблицах" Fem Inanimate ;
 lin table_V2 = variants {} ;
 lin table_d'hote_A = variants {} ;
 lin table_d'hote_Adv = variants {} ;
@@ -58561,7 +58569,6 @@ lin towel_V2 = variants {} ;
 lin towel_horse_N = variants {} ;
 lin towel_rack_N = variants {} ;
 lin towel_rail_N = variants {} ;
-lin toweling_N = variants {} ;
 lin towelling_N = variants {} ;
 lin tower_N = mkN "башня" "башни" "башне" "башню" "башнею" "башне" "башнями" "башни" "башен" "башням" "башни" "башнями" "башнях" Fem Inanimate | mkN "вышка" "вышки" "вышке" "вышку" "вышкою" "вышке" "вышками" "вышки" "вышек" "вышкам" "вышки" "вышками" "вышках" Fem Inanimate ;
 lin tower_V = variants {} ;
--- a/lib/src/translator/DictionarySpa.gf
+++ b/lib/src/translator/DictionarySpa.gf
@@ -3106,7 +3106,8 @@ lin bedwas_PN = mkPN "Bedwas" ; -- status=guess src=geonames
 lin bee_N = mkN "abejaruco" ; -- status=guess
 lin beebread_N = mkN "ambrosía" ; --UWN
 lin beech_N = mkN "haya" ; -- status=guess
-lin beef_N = mkN "vacuno" ; -- status=guess
+lin beef_1_N = mkN "vacuno" ; -- status=guess
+lin beef_2_N = mkN "vacuno" ; -- status=guess
 lin beef_V = mkV "chillar" | mkV "disputar" | mkV "graznar" | mkV "gritar" | mkV "lamentarse" | mkV "quejarse" | mkV "renegar" ; --UWN
 lin beefcake_N = mkN "galán" masculine | mkN "churro" | mkN "mijito rico" | mkN "guapetón" masculine ; -- status=guess status=guess status=guess status=guess status=guess status=guess status=guess
 lin beefeater_N = mkN "yeoman" ; --UWN
@@ -7681,7 +7682,8 @@ lin currant_N = mkN "grosella" ; -- status=guess
 lin currawong_N = mkN "stepera" ; --UWN
 lin currency_N = mkN "moneda" ; -- status=guess
 lin current_A = mkA "actual" ;
-lin current_N = mkN "cuenta corriente" ; -- status=guess
+lin current_1_N = mkN "cuenta corriente" ; -- status=guess
+lin current_2_N = mkN "cuenta corriente" ; -- status=guess
 lin currentness_N = mkN "actualidad" | mkN "contemporaneidad" | mkN "simultaneidad" ; --UWN
 lin curricular_A = mkA "curricular" ; --UWN
 lin curriculum_N = mkN "currículo" ; -- status=guess
@@ -16233,7 +16235,8 @@ lin juggler_N = mkN "malabarista" masculine ; -- status=guess
 lin jugglery_N = mkN "malabarismo" ; --UWN
 lin jugular_A = mkA "yugular" ; -- status=guess
 lin jugular_N = mkN "yugular" ; -- status=guess
-lin juice_N = mkN "jugo" | mkN "zumo" ; -- status=guess
+lin juice_1_N = mkN "jugo" | mkN "zumo" ; -- status=guess
+lin juice_2_N = mkN "jugo" | mkN "zumo" ; -- status=guess
 lin juiceless_A = mkA "seco" ; --UWN
 lin juiciness_N = mkN "jugosidad" | mkN "suculencia" ; --UWN
 lin juicy_A = mkA "jugoso" ; -- status=guess
@@ -22230,7 +22233,8 @@ lin planktonic_A = mkA "plancton" | mkA "planctónico" ; --UWN
 lin planned_A = variants {} ; --
 lin planner_N = variants {} ; --
 lin planning_N = mkN "plan" ;
-lin plant_N = mkN "planta" ; --- split mkN "fábrica"
+lin plant_1_N = mkN "fábrica" ;
+lin plant_2_N = mkN "planta" ;
 lin plant_V2 = mkV2 (mkV "plantar") | mkV2 (sembrar_V) ; -- status=guess
 lin plant_out_V2 = prepV2 (lin V OP_plant_V2) OP_out_Prep ; -- guess-p-verb
 lin plantain_N = mkN " plátano macho" | mkN "plátano" ; -- status=guess status=guess
@@ -25812,7 +25816,8 @@ lin scholarship_N = mkN "erudición" feminine | mkN "sabiduría" ; -- status=gue
 lin scholastic_A = mkA "escolar" ; --UWN
 lin scholasticism_N = mkN "escolástica" ; -- status=guess
 lin scholium_N = mkN "escolio" ; --UWN
-lin school_N = L.school_N ;
+lin school_1_N = L.school_N ;
+lin school_2_N = L.school_N ;
 lin schoolboy_N = mkN "colegial" | mkN "escolar" ; --UWN
 lin schoolchild_N = mkN "escolar" masculine | mkN "alumna" | mkN "colegiala" ; -- status=guess
 lin schoolfellow_N = mkN "compañera" | mkN "compañero" | mkN "compañero_de_clase" | mkN "compañero_de_colegio" ; --UWN
@@ -26330,7 +26335,8 @@ lin sew_V2 = mkV2 (mkV "coser") ; -- status=guess, src=wikt
 lin sewage_N = mkN "aguas residuales" ; -- status=guess
 lin sewer_N = mkN "costurero" | mkN "costurera" | mkN "cosedor" | mkN "cosedora" ; -- status=guess status=guess status=guess status=guess
 lin sewing_N = mkN "máquina de coser" ; -- status=guess
-lin sex_N = mkN "sexo" ;
+lin sex_1_N = mkN "sexo" ;
+lin sex_2_N = mkN "sexo" ;
 lin sex_V2 = mkV2 (mkV "sexar") ; -- status=guess, src=wikt
 lin sexcapade_N = mkN "aventura_sexual" ; --UWN
 lin sexism_N = mkN "sexismo" ; -- status=guess
@@ -29139,7 +29145,8 @@ lin tabby_N = mkN "gato atigrado" ; -- status=guess
 lin tabernacle_N = mkN "tabernáculo" ; -- status=guess
 lin tabi_N = mkN "tabi" ; --UWN
 lin tablature_N = mkN "tablatura" ; --UWN
-lin table_N = L.table_N ;
+lin table_1_N = L.table_N ;
+lin table_2_N = L.table_N ;
 lin table_V2 = mkV2 (mkV (mkV "traer") "a discusión") ; -- status=guess, src=wikt
 lin tableau_N = mkN "retablo" | mkN "cuadro vivo" ; -- status=guess status=guess
 lin tablecloth_N = mkN "mantel" masculine ; -- status=guess
--- a/lib/src/translator/DictionarySwe.gf
+++ b/lib/src/translator/DictionarySwe.gf
@@ -5388,7 +5388,8 @@ lin beebread_N = variants {} ; -- status=guess
 lin beech_N = mkN "bok" ; -- comment=2
 lin beechen_A = variants {} ; -- status=guess
 lin beechnut_N = mkN "bokollon" neutrum ; -- comment=2
-lin beef_N = mkN "biff" | mkN "nötkött" neutrum ; -- SaldoWN -- comment=8
+lin beef_1_N = mkN "biff" neutrum ; -- SaldoWN -- comment=8
+lin beef_2_N = mkN "biff" | mkN "nötkött" neutrum ; -- SaldoWN -- comment=8
 lin beef_V = mkV "styrker" ; -- comment=2
 lin beefcake_N = mkN "muskelknutte" utrum ; -- status=guess
 lin beefeater_N = variants {} ; -- status=guess
@@ -14115,7 +14116,8 @@ lin currant_N = mkN "vinbär" neutrum ; -- comment=2
 lin currawong_N = variants {} ; -- status=guess
 lin currency_N = mkN "valuta" ; -- SaldoWN
 lin current_A = mkA "aktuell" ;
-lin current_N = mkN "ström" "strömmen" "strömmar" "strömmarna" | mkN "rådande" ; -- SaldoWN -- comment=10
+lin current_1_N = mkN "ström" "strömmen" "strömmar" "strömmarna" | mkN "rådande" ; -- SaldoWN -- comment=10
+lin current_2_N = mkN "ström" "strömmen" "strömmar" "strömmarna" | mkN "rådande" ; -- SaldoWN -- comment=10
 lin currentness_N = mkN "aktualitet" "aktualiteter" ;
 lin curricular_A = variants {} ; -- status=guess
 lin curriculum_N = mkN "läroplan" "läroplaner" ; -- SaldoWN
@@ -29900,7 +29902,7 @@ lin jello_N = variants {} ; -- status=guess
 lin jelly_N = mkN "gelé" "geléer" ; -- SaldoWN
 lin jelly_V = variants {} ; -- status=guess
 lin jelly_V2 = variants {} ; -- status=guess
-lin jellyfish_N = mkN "brännmanet" "brännmaneter" ; -- comment=2
+lin jellyfish_N = mkN "manet" "maneter" ;
 lin jellyroll_N = variants {} ; -- status=guess
 lin jemmy_N = mkN "bräckjärn" neutrum | mkN "dyrk" ; -- SaldoWN -- comment=3
 lin jennet_N = variants {} ; -- status=guess
@@ -30179,7 +30181,8 @@ lin juggler_N = mkN "jonglör" "jonglörer" ; -- status=guess
 lin jugglery_N = variants {} ; -- status=guess
 lin jugular_A = variants {} ; -- status=guess
 lin jugular_N = variants {} ; -- status=guess
-lin juice_N = mkN "juice" "juicer" | mkN "saft" "safter" ; -- SaldoWN
+lin juice_1_N = mkN "juice" "juicer" | mkN "saft" "safter" ;
+lin juice_2_N = mkN "soppa" ;
 lin juice_up_V2 = variants {} ; -- status=guess
 lin juiceless_A = variants {} ; -- status=guess
 lin juiciness_N = mkN "saftighet" ;
@@ -42247,7 +42250,8 @@ lin planning_N = mkN "planering" ;
 lin planoconcave_A = variants {} ; -- status=guess
 lin planoconvex_A = variants {} ; -- status=guess
 lin planographic_A = variants {} ; -- status=guess
-lin plant_N = mkN "växt" "växter" | mkN "planta" ;
+lin plant_1_N = L.factory_N ;
+lin plant_2_N = mkN "växt" "växter" | mkN "planta" ;
 lin plant_V2 = dirV2 (partV (mkV "planterar")"om") ; -- status=guess
 lin plant_louse_N = mkN "bladlus" "bladlusen" "bladlöss" "bladlössen" ;
 lin plant_out_V2 = dirV2 (partV (mkV "planterar")"om") ; -- status=guess
@@ -49263,7 +49267,8 @@ lin scholastically_Adv = variants {} ; -- status=guess
 lin scholasticism_N = mkN "stik" ; -- src=google
 lin scholiast_N = variants {} ; -- status=guess
 lin scholium_N = variants {} ; -- status=guess
-lin school_N = L.school_N | mkN "gymnasium" "gymnasiet" "gymnasier" "gymnasierna" ; ---- sense gymnasium
+lin school_1_N = L.school_N ;
+lin school_2_N = mkN "stim" "stimmet" "stim" "stimmen" ;
 lin school_V2 = mkV2 (mkV "skolar") | mkV2 (mkV "lära") ; -- status=guess, src=wikt status=guess, src=wikt
 lin school_board_N = mkN "skola-board" ; -- src=google
 lin schoolbag_N = mkN "skolväska" ; -- status=guess
@@ -50392,7 +50397,8 @@ lin sewer_rat_N = mkN "kloak-råtta" ; -- src=google
 lin sewerage_N = mkN "avlopp" neutrum ;
 lin sewing_N = mkN "sömnad" "sömnader" ; -- status=guess
 lin sewing_machine_N = mkN "symaskin" "symaskiner" ;
-lin sex_N = mkN "sex" neutrum | mkN "kön" neutrum ; --- split -- | sex movie -- | both sexes
+lin sex_1_N = mkN "sex" neutrum ;
+lin sex_2_N = mkN "kön" neutrum ;
 lin sex_V2 = mkV2 (mkV "knullar") | mkV2 (mkV (mkV "ha") "samlag med") ; -- status=guess, src=wikt status=guess, src=wikt
 lin sex_starved_A = variants {} ; -- status=guess
 lin sexagenarian_A = variants {} ; -- status=guess
@@ -52726,7 +52732,7 @@ lin soundness_N = mkN "soliditet" "soliditeter" ;
 lin soundproof_A = mkA "ljudisolerad" ; -- status=guess
 lin soundproof_V2 = mkV2 (mkV "ljudisolerar") ; -- status=guess, src=wikt
 lin soundtrack_N = mkN "filmmusik" ; -- status=guess
-lin soup_N = mkN "soppa" ; -- SaldoWN = mkN "soppa" ;
+lin soup_N = mkN "soppa" ;
 lin soup_V2 = variants {} ; -- status=guess
 lin soup_kitchen_N = mkN "soppkök" neutrum ;
 lin soupcon_N = mkN "soupcon" ; -- src=google
@@ -55938,7 +55944,8 @@ lin tabernacle_N = mkN "tabernakel" neutrum ;
 lin tabes_N = variants {} ; -- status=guess
 lin tabi_N = variants {} ; -- status=guess
 lin tablature_N = mkN "tabulatur" "tabulaturer" ;
-lin table_N = L.table_N ;
+lin table_1_N = L.table_N ;
+lin table_2_N = mkN "tabell" ;
 lin table_V2 = mkV2 (mkV "bordlägga" "bordlade" "bordlagt") ; -- status=guess, src=wikt
 lin table_d'hote_A = variants {} ; -- status=guess
 lin table_d'hote_Adv = variants {} ; -- status=guess
@@ -58139,7 +58146,6 @@ lin towel_V2 = variants {} ; -- status=guess
 lin towel_horse_N = mkN "handduk-häst" ; -- src=google
 lin towel_rack_N = mkN "handdukshängare" ; -- src=google
 lin towel_rail_N = mkN "handduk-skena" ; -- src=google
-lin toweling_N = mkN "frotté" "frottéer" ;
 lin towelling_N = mkN "frotté" "frottéer" ;
 lin tower_N = mkN "torn" ; -- SaldoWN = mkN "torn" neutrum ;
 lin tower_V = variants {} ; -- status=guess
--- a/lib/src/translator/DictionaryTha.gf
+++ b/lib/src/translator/DictionaryTha.gf
@@ -3745,7 +3745,9 @@ lin beebread_N = mkN "แอมโบรเซีย" ; -- src=panlex
 lin beech_N = mkN "ต้นบีช" | mkN "ไม้บีช" | mkN "ไม้บีชวู้ด" | mkN "ไม้มะเดื่อ" | mkN "ต้นไม้จำพวกมะเดื่อ" ; -- src=panlex
 lin beechen_A = mkA "ไม้บีช" ; -- src=panlex
 lin beechnut_N = mkN "บีชนัท" ; -- src=panlex
-lin beef_N = mkN "เนื้อ" | mkN "การบ่น" | mkN "เนื้อโค" | mkN "โคเนื้อ" | mkN "วัวเนื้อ" | mkN "เนื้อวัว" | mkN "การบ่นไม่หยุด" | mkN "การบ่น" | mkN "อํานาจ" | mkN "เนื้อวัว" | mkN "พละกําลัง" | mkN "กําลังกล้ามเนื้อ" | mkN "วัวที่เลี้ยงไว้ฆ่าเป็นอาหาร" ; -- src=panlex
+lin beef_1_N = mkN "เนื้อ" | mkN "การบ่น" | mkN "เนื้อโค" | mkN "โคเนื้อ" | mkN "วัวเนื้อ" | mkN "เนื้อวัว" | mkN "การบ่นไม่หยุด" | mkN "การบ่น" | mkN "อํานาจ" | mkN "เนื้อวัว" | mkN "พละกําลัง" | mkN "กําลังกล้ามเนื้อ" | mkN "วัวที่เลี้ยงไว้ฆ่าเป็นอาหาร" ; -- src=panlex
+lin beef_2_N = mkN "เนื้อ" | mkN "การบ่น" | mkN "เนื้อโค" | mkN "โคเนื้อ" | mkN "วัวเนื้อ" | mkN "เนื้อวัว" | mkN "การบ่นไม่หยุด" | mkN "การบ่น" | mkN "อํานาจ" | mkN "เนื้อวัว" | mkN "พละกําลัง" | mkN "กําลังกล้ามเนื้อ" | mkN "วัวที่เลี้ยงไว้ฆ่าเป็นอาหาร" ; -- src=panlex
+lin beef_3_N = mkN "เนื้อ" | mkN "การบ่น" | mkN "เนื้อโค" | mkN "โคเนื้อ" | mkN "วัวเนื้อ" | mkN "เนื้อวัว" | mkN "การบ่นไม่หยุด" | mkN "การบ่น" | mkN "อํานาจ" | mkN "เนื้อวัว" | mkN "พละกําลัง" | mkN "กําลังกล้ามเนื้อ" | mkN "วัวที่เลี้ยงไว้ฆ่าเป็นอาหาร" ; -- src=panlex
 lin beef_V = mkV "บ่น" ; -- src=panlex
 lin beefcake_N = mkN "ภาพนักเพาะกาย" | mkN "ชายที่มีกล้ามใหญ่" ; -- src=panlex
 lin beefeater_N = mkN "หน่วยราชองครักษ์" ; -- src=panlex
@@ -9822,7 +9824,8 @@ lin currant_N = mkN "ลูกเกด" | mkN "ลูกเกด" | mkN "ล
 lin currawong_N = mkN "นกเบลแมกไพ" ; -- src=panlex
 lin currency_N = mkN "เงินตรา" | mkN "ปัจจุบัน" | mkN "การแพร่หลาย" | mkN "เงิน" | mkN "กระแสลม" | mkN "เงินตรา" | mkN "กระแสน้ํา" | mkN "การแพร่หลาย" | mkN "การหมุนเวียน" | mkN "การใช้กันทั่วไป" | mkN "ช่วงเวลาที่แพร่หลาย" | mkN "ช่วงระยะเวลาที่แพร่หลาย" ; -- src=panlex
 lin current_A = mkA "ซึ่งเกิดขึ้นในปัจจุบัน" | mkA "กระแสลม" | mkA "ปัจจุบัน" | mkA "แพร่หลาย" | mkA "กระแสไฟฟ้า" | mkA "เป็นที่ยอมรับ" | mkA "ความเร็วของกระแส" | mkA "ซึ่งเกิดขึ้นอยู่" | mkA "ซึ่งหมุนเวียนอยู่" | mkA "เป็นที่ยอมรับโดยทั่วไป" | mkA "ที่ใช้กันอยู่ในปัจจุบัน" ; -- src=panlex
-lin current_N = mkN "สาย" | mkN "กระแส" | mkN "กระแสไฟ" | mkN "กระแสไฟฟ้า" | mkN "กระแสลม" | mkN "แนวโน้ม" | mkN "ปัจจุบัน" | mkN "แพร่หลาย" | mkN "กระแสน้ํา" | mkN "กระแสเงิน" | mkN "กระแสไฟฟ้า" | mkN "ความเร็วของกระแส" | mkN "ซึ่งหมุนเวียนอยู่" | mkN "อัตราการไหลของกระแสไฟ" | mkN "เป็นที่ยอมรับโดยทั่วไป" ; -- src=panlex
+lin current_1_N = mkN "สาย" | mkN "กระแส" | mkN "กระแสไฟ" | mkN "กระแสไฟฟ้า" | mkN "กระแสลม" | mkN "แนวโน้ม" | mkN "ปัจจุบัน" | mkN "แพร่หลาย" | mkN "กระแสน้ํา" | mkN "กระแสเงิน" | mkN "กระแสไฟฟ้า" | mkN "ความเร็วของกระแส" | mkN "ซึ่งหมุนเวียนอยู่" | mkN "อัตราการไหลของกระแสไฟ" | mkN "เป็นที่ยอมรับโดยทั่วไป" ; -- src=panlex
+lin current_2_N = mkN "สาย" | mkN "กระแส" | mkN "กระแสไฟ" | mkN "กระแสไฟฟ้า" | mkN "กระแสลม" | mkN "แนวโน้ม" | mkN "ปัจจุบัน" | mkN "แพร่หลาย" | mkN "กระแสน้ํา" | mkN "กระแสเงิน" | mkN "กระแสไฟฟ้า" | mkN "ความเร็วของกระแส" | mkN "ซึ่งหมุนเวียนอยู่" | mkN "อัตราการไหลของกระแสไฟ" | mkN "เป็นที่ยอมรับโดยทั่วไป" ; -- src=panlex
 lin currentness_N = mkN "ปัจจุบัน" ; -- src=panlex
 lin curricular_A = mkA "เกี่ยวกับหลักสูตร" ; -- src=panlex
 lin curriculum_N = mkN "หลักสูตร" | mkN "หลักสูตร" ; -- src=panlex
@@ -20744,7 +20747,8 @@ lin juggler_N = mkN "จักเกลอร์" | mkN "นักโยนร
 lin jugglery_N = mkN "การแสดงจักเกิล" | mkN "การเล่นกล" | mkN "การเล่นโยนรับของหลายชิ้นด้วยมือ" ; -- src=panlex
 lin jugular_A = mkA "เกี่ยวกับคอ" | mkA "เกี่ยวกับหลอดเลือดดําใหญ่ที่คอ" ; -- src=panlex
 lin jugular_N = mkN "หลอดเลือดดำใหญ่จากสมอง" | mkN "เส้นเลือดใหญ่ช่วงคอที่นําเลือดจากศีรษะไปยังหัวใจ" ; -- src=panlex
-lin juice_N = mkN "จูซ" | mkN "น้ำหลั่ง" | mkN "กระแสไฟฟ้า" | mkN "สารน้ำคัดหลั่ง" | mkN "ไฟฟ้า" | mkN "น้ําหัว" | mkN "หัวกะทิ" | mkN "แก่นสาร" | mkN "น้ําสกัด" | mkN "น้ําผลไม้" | mkN "ส่วนสําคัญ" | mkN "กําลังไฟฟ้า" | mkN "ของเหลวของร่างกาย" | mkN "น้ําจากเนื้อเยื่อพืชหรือสัตว์" | mkN "น้ําจากเนื้อที่ผ่านการปรุงให้สุก" | mkN "ของเหลวในช่วงท้องที่ช่วยย่อยอาหาร" ; -- src=panlex
+lin juice_1_N = mkN "จูซ" | mkN "น้ำหลั่ง" | mkN "กระแสไฟฟ้า" | mkN "สารน้ำคัดหลั่ง" | mkN "ไฟฟ้า" | mkN "น้ําหัว" | mkN "หัวกะทิ" | mkN "แก่นสาร" | mkN "น้ําสกัด" | mkN "น้ําผลไม้" | mkN "ส่วนสําคัญ" | mkN "กําลังไฟฟ้า" | mkN "ของเหลวของร่างกาย" | mkN "น้ําจากเนื้อเยื่อพืชหรือสัตว์" | mkN "น้ําจากเนื้อที่ผ่านการปรุงให้สุก" | mkN "ของเหลวในช่วงท้องที่ช่วยย่อยอาหาร" ; -- src=panlex
+lin juice_2_N = mkN "จูซ" | mkN "น้ำหลั่ง" | mkN "กระแสไฟฟ้า" | mkN "สารน้ำคัดหลั่ง" | mkN "ไฟฟ้า" | mkN "น้ําหัว" | mkN "หัวกะทิ" | mkN "แก่นสาร" | mkN "น้ําสกัด" | mkN "น้ําผลไม้" | mkN "ส่วนสําคัญ" | mkN "กําลังไฟฟ้า" | mkN "ของเหลวของร่างกาย" | mkN "น้ําจากเนื้อเยื่อพืชหรือสัตว์" | mkN "น้ําจากเนื้อที่ผ่านการปรุงให้สุก" | mkN "ของเหลวในช่วงท้องที่ช่วยย่อยอาหาร" ; -- src=panlex
 lin juicy_A = mkA "ฉ่ำ" | mkA "ทะลึ่ง" | mkA "สองแง่สามง่าม" | mkA "ฉ่ํา" | mkA "น่าสนใจ" | mkA "ตื่นเต้น" | mkA "น่าเร้าใจ" | mkA "มีน้ํามาก" | mkA "น่าสนใจมาก" | mkA "เร้าอารมณ์" | mkA "น่าตื่นเต้น" | mkA "มีน้ําอยู่มาก" | mkA "มีน้ําเนื้อมาก" | mkA "เต็มไปด้วยสีสัน" ; -- src=panlex
 lin juju_N = mkN "วูดู" | mkN "ของขลัง" | mkN "เครื่องราง" | mkN "อํานาจเวทมนตร์คาถา" ; -- src=panlex
 lin jujube_N = mkN "พุทรา" | mkN "จูจู๊บ" | mkN "ต้นพุทรา" | mkN "พุทราจีน" | mkN "ลูกพุทรา" | mkN "ผลพุทรา" | mkN "ต้นพุทรา" ; -- src=panlex
@@ -28781,7 +28785,8 @@ lin planktonic_A = mkA "แพลงก์ตอน" | mkA "เกี่ยว
 lin planned_A = mkA "ตามแผนที่วางไว้" ; -- src=panlex
 lin planner_N = mkN "คนวางแผน" | mkN "นักวางแผน" | mkN "สมุดบันทึก" | mkN "ผู้วางแผน" | mkN "ผู้วางนโยบาย" | mkN "สมุดจดบันทึกตารางเวลา" ; -- src=panlex
 lin planning_N = mkN "การวางแผน" | mkN "การคิดวางแผน" ; -- src=panlex
-lin plant_N = mkN "พืช" | mkN "โรงงาน" | mkN "พฤกษชาติ" | mkN "โรงงานอุตสาหกรรม" | mkN "ฝัง" | mkN "พืช" | mkN "ตั้ง" | mkN "ปลูก" | mkN "แทรก" | mkN "สร้าง" | mkN "ต้นไม้" | mkN "ปักวาง" | mkN "โรงงาน" | mkN "การเกษตร" | mkN "การกสิกรรม" | mkN "เพาะเลี้ยง" | mkN "การเพาะปลูก" | mkN "เครื่องจักร" | mkN "เครื่องมือครบชุด" | mkN "โรงงานอุตสาหกรรม" | mkN "สิ่งหรือคนหลอกลวง" | mkN "อุปกรณ์ติดตั้งทั้งหมด" ; -- src=panlex
+lin plant_1_N = mkN "พืช" | mkN "โรงงาน" | mkN "พฤกษชาติ" | mkN "โรงงานอุตสาหกรรม" | mkN "ฝัง" | mkN "พืช" | mkN "ตั้ง" | mkN "ปลูก" | mkN "แทรก" | mkN "สร้าง" | mkN "ต้นไม้" | mkN "ปักวาง" | mkN "โรงงาน" | mkN "การเกษตร" | mkN "การกสิกรรม" | mkN "เพาะเลี้ยง" | mkN "การเพาะปลูก" | mkN "เครื่องจักร" | mkN "เครื่องมือครบชุด" | mkN "โรงงานอุตสาหกรรม" | mkN "สิ่งหรือคนหลอกลวง" | mkN "อุปกรณ์ติดตั้งทั้งหมด" ; -- src=panlex
+lin plant_2_N = mkN "พืช" | mkN "โรงงาน" | mkN "พฤกษชาติ" | mkN "โรงงานอุตสาหกรรม" | mkN "ฝัง" | mkN "พืช" | mkN "ตั้ง" | mkN "ปลูก" | mkN "แทรก" | mkN "สร้าง" | mkN "ต้นไม้" | mkN "ปักวาง" | mkN "โรงงาน" | mkN "การเกษตร" | mkN "การกสิกรรม" | mkN "เพาะเลี้ยง" | mkN "การเพาะปลูก" | mkN "เครื่องจักร" | mkN "เครื่องมือครบชุด" | mkN "โรงงานอุตสาหกรรม" | mkN "สิ่งหรือคนหลอกลวง" | mkN "อุปกรณ์ติดตั้งทั้งหมด" ; -- src=panlex
 lin plant_out_V2 = prepV2 (lin V OP_plant_V2) OP_out_Prep ; -- guess-p-verb
 lin plantain_N = mkN "กล้วยเพลนเตียน" | mkN "พืชชนิดหนึ่ง" ; -- src=panlex
 lin plantar_A = mkA "เกี่ยวกับฝ่าเท้า" ; -- src=panlex
@@ -33629,7 +33634,8 @@ lin scholarly_A = mkA "คงแก่เรียน" | mkA "เป็นนั
 lin scholarship_N = mkN "ทุนการศึกษา" | mkN "ภูมิความรู้" | mkN "ความรู้" | mkN "ทุนการศึกษา" | mkN "ทุนเล่าเรียน" | mkN "ความเป็นนักวิชาการ" | mkN "ความเป็นผู้คงแก่เรียน" | mkN "ความเป็นผู้เชี่ยวชาญหรือนักวิชาการ" ; -- src=panlex
 lin scholastic_A = mkA "ด้านการศึกษา" | mkA "เกี่ยวกับโรง-เรียน" | mkA "เกี่ยวกับการศึกษา" | mkA "เกี่ยวกับผู้คงแก่เรียน" ; -- src=panlex
 lin scholium_N = mkN "สโคเลีย" | mkN "สโคเลียม" ; -- src=panlex
-lin school_N = placeN (thword "โรง" "เรียน") | {-pan-} mkN "ร.ร." | mkN "รร." | mkN "สคูล" | mkN "สำนัก" | mkN "ฝูงปลา" | mkN "โรงเรียน" | mkN "เวลาเรียน" | mkN "อาคารเรียน" | mkN "การสอน" | mkN "ฝูงปลา" | mkN "การอบรม" | mkN "การศึกษา" | mkN "ภาคเรียน" | mkN "โรงเรียน" | mkN "การฝึกหัด" | mkN "สถานศึกษา" | mkN "เวลาเรียน" | mkN "ไปเป็นฝูง" | mkN "ระบบการศึกษา" | mkN "สถานที่เรียน" | mkN "กลุ่มนักเรียน" | mkN "สถาบันการศึกษา" | mkN "ฝูงปลาหรือสัตว์ทะเลอื่น" ; -- src=panlex
+lin school_1_N = placeN (thword "โรง" "เรียน") | {-pan-} mkN "ร.ร." | mkN "รร." | mkN "สคูล" | mkN "สำนัก" | mkN "ฝูงปลา" | mkN "โรงเรียน" | mkN "เวลาเรียน" | mkN "อาคารเรียน" | mkN "การสอน" | mkN "ฝูงปลา" | mkN "การอบรม" | mkN "การศึกษา" | mkN "ภาคเรียน" | mkN "โรงเรียน" | mkN "การฝึกหัด" | mkN "สถานศึกษา" | mkN "เวลาเรียน" | mkN "ไปเป็นฝูง" | mkN "ระบบการศึกษา" | mkN "สถานที่เรียน" | mkN "กลุ่มนักเรียน" | mkN "สถาบันการศึกษา" | mkN "ฝูงปลาหรือสัตว์ทะเลอื่น" ; -- src=panlex
+lin school_2_N = placeN (thword "โรง" "เรียน") | {-pan-} mkN "ร.ร." | mkN "รร." | mkN "สคูล" | mkN "สำนัก" | mkN "ฝูงปลา" | mkN "โรงเรียน" | mkN "เวลาเรียน" | mkN "อาคารเรียน" | mkN "การสอน" | mkN "ฝูงปลา" | mkN "การอบรม" | mkN "การศึกษา" | mkN "ภาคเรียน" | mkN "โรงเรียน" | mkN "การฝึกหัด" | mkN "สถานศึกษา" | mkN "เวลาเรียน" | mkN "ไปเป็นฝูง" | mkN "ระบบการศึกษา" | mkN "สถานที่เรียน" | mkN "กลุ่มนักเรียน" | mkN "สถาบันการศึกษา" | mkN "ฝูงปลาหรือสัตว์ทะเลอื่น" ; -- src=panlex
 lin schoolbag_N = mkN "กระเป๋านักเรียน" | mkN "กระเป๋าเรียน" ; -- src=panlex
 lin schoolbook_N = mkN "ตำรา" | mkN "เท็กต์" | mkN "ตำรับตำรา" | mkN "ตำราเรียน" | mkN "หนังสือเรียน" ; -- src=panlex
 lin schoolboy_N = mkN "ด.ช." | mkN "นักเรียนชาย" | mkN "เด็กนักเรียนชาย" | mkN "เด็กนักเรียนชาย" ; -- src=panlex
@@ -34390,7 +34396,8 @@ lin sewage_N = mkN "ของเสีย" | mkN "น้ำเสีย" | mkN "
 lin sewer_N = mkN "คนเย็บผ้า" | mkN "ท่อน้ำทิ้ง" | mkN "ช่างเย็บผ้า" | mkN "การสูญเสียเงิน" | mkN "ผู้เย็บ" | mkN "ท่อน้ําเสีย" | mkN "เครื่องเย็บ" | mkN "ท่อระบายน้ํา" | mkN "ท่อระบายของเสีย" ; -- src=panlex
 lin sewerage_N = mkN "ของเสีย" | mkN "น้ำเสีย" | mkN "ท่อน้ำทิ้ง" | mkN "สิ่งปฏิกูล" | mkN "น้ําเสีย" | mkN "สิ่งโสโครก" | mkN "คําพูดสกปรก" | mkN "ความคิดสกปรก" | mkN "ระบท่อน้ําเสีย" | mkN "การขับถ่ายน้ําเสีย" | mkN "การปล่อยสิ่งโสโครก" | mkN "การปล่อยของเสียออกทางท่อระบาย" | mkN "การระบายของเสียออกทางท่อระบาย" ; -- src=panlex
 lin sewing_N = mkN "รอยเย็บ" | mkN "การเย็บผ้า" | mkN "การเย็บ" | mkN "การเย็บจักร" | mkN "สิ่งที่เย็บ" | mkN "เส้นที่เย็บเล่ม" ; -- src=panlex
-lin sex_N = mkN "เพศ" | mkN "เพศสภาพ" | mkN "อารมณ์ทางเพศ" | mkN "กิจกรรมทางเพศ" | mkN "ความรู้สึกทางเพศ" | mkN "กาม" | mkN "เพศ" | mkN "อวัยวะเพศ" | mkN "การร่วมเพศ" | mkN "เรื่องประเวณี" | mkN "การร่วมประเวณี" | mkN "ความสนใจทางเพศ" | mkN "สัญชาตญาณทางเพศ" | mkN "ความรู้สึกทางเพศ" | mkN "ความสนใจเรื่องเพศ" | mkN "เสน่ห์ดึงดูดทางเพศ" ; -- src=panlex
+lin sex_1_N = mkN "เพศ" | mkN "เพศสภาพ" | mkN "อารมณ์ทางเพศ" | mkN "กิจกรรมทางเพศ" | mkN "ความรู้สึกทางเพศ" | mkN "กาม" | mkN "เพศ" | mkN "อวัยวะเพศ" | mkN "การร่วมเพศ" | mkN "เรื่องประเวณี" | mkN "การร่วมประเวณี" | mkN "ความสนใจทางเพศ" | mkN "สัญชาตญาณทางเพศ" | mkN "ความรู้สึกทางเพศ" | mkN "ความสนใจเรื่องเพศ" | mkN "เสน่ห์ดึงดูดทางเพศ" ; -- src=panlex
+lin sex_2_N = mkN "เพศ" | mkN "เพศสภาพ" | mkN "อารมณ์ทางเพศ" | mkN "กิจกรรมทางเพศ" | mkN "ความรู้สึกทางเพศ" | mkN "กาม" | mkN "เพศ" | mkN "อวัยวะเพศ" | mkN "การร่วมเพศ" | mkN "เรื่องประเวณี" | mkN "การร่วมประเวณี" | mkN "ความสนใจทางเพศ" | mkN "สัญชาตญาณทางเพศ" | mkN "ความรู้สึกทางเพศ" | mkN "ความสนใจเรื่องเพศ" | mkN "เสน่ห์ดึงดูดทางเพศ" ; -- src=panlex
 lin sexagenarian_A = mkA "ที่มีอายุหกสิบถึงหกสิบเก้าปี" ; -- src=panlex
 lin sexagenarian_N = mkN "ผู้มีอายุมากกว่าหกสิบปี" ; -- src=panlex
 lin sexism_N = mkN "อคติทางเพศ" | mkN "การกีดกันเพศ" | mkN "การแบ่งแยกเพศ" ; -- src=panlex
@@ -38203,7 +38210,8 @@ lin tabernacle_N = mkN "สุเหร่ายิว" | mkN "ปะรํา"
 lin tabes_N = mkN "ภาวะซูบโทรม" ; -- src=panlex
 lin tabi_N = mkN "ทาบิ" ; -- src=panlex
 lin tablature_N = mkN "แท็บ" ; -- src=panlex
-lin table_N = mkN "โต๊ะ" "ตัว" | {-pan-} mkN "โต๊ะ" | mkN "ตาราง" | mkN "อาหาร" | mkN "เนินเมซา" | mkN "เนินยอดราบ" | mkN "ผู้ร่วมโต๊ะ" | mkN "ผู้ร่วมรับประทานอาหาร" | mkN "แผ่น" | mkN "โต๊ะ" | mkN "ตาราง" | mkN "บัญชี" | mkN "บัวเสา" | mkN "รายการ" | mkN "แผ่นหิน" | mkN "แผ่นไม้" | mkN "คําจารึก" | mkN "ที่ราบสูง" | mkN "แผ่นจารึก" | mkN "โต๊ะอาหาร" | mkN "ตารางรายการ" | mkN "ผิวหน้าเรียบ" | mkN "กระดานหมากรุก" | mkN "อาหารที่จัดเตรียมไว้อย่างดีในภัตตาคารหรือราชสํานัก" ; -- src=panlex ----?
+lin table_1_N = mkN "โต๊ะ" "ตัว" | {-pan-} mkN "โต๊ะ" | mkN "ตาราง" | mkN "อาหาร" | mkN "เนินเมซา" | mkN "เนินยอดราบ" | mkN "ผู้ร่วมโต๊ะ" | mkN "ผู้ร่วมรับประทานอาหาร" | mkN "แผ่น" | mkN "โต๊ะ" | mkN "ตาราง" | mkN "บัญชี" | mkN "บัวเสา" | mkN "รายการ" | mkN "แผ่นหิน" | mkN "แผ่นไม้" | mkN "คําจารึก" | mkN "ที่ราบสูง" | mkN "แผ่นจารึก" | mkN "โต๊ะอาหาร" | mkN "ตารางรายการ" | mkN "ผิวหน้าเรียบ" | mkN "กระดานหมากรุก" | mkN "อาหารที่จัดเตรียมไว้อย่างดีในภัตตาคารหรือราชสํานัก" ; -- src=panlex ----?
+lin table_2_N = mkN "โต๊ะ" "ตัว" | {-pan-} mkN "โต๊ะ" | mkN "ตาราง" | mkN "อาหาร" | mkN "เนินเมซา" | mkN "เนินยอดราบ" | mkN "ผู้ร่วมโต๊ะ" | mkN "ผู้ร่วมรับประทานอาหาร" | mkN "แผ่น" | mkN "โต๊ะ" | mkN "ตาราง" | mkN "บัญชี" | mkN "บัวเสา" | mkN "รายการ" | mkN "แผ่นหิน" | mkN "แผ่นไม้" | mkN "คําจารึก" | mkN "ที่ราบสูง" | mkN "แผ่นจารึก" | mkN "โต๊ะอาหาร" | mkN "ตารางรายการ" | mkN "ผิวหน้าเรียบ" | mkN "กระดานหมากรุก" | mkN "อาหารที่จัดเตรียมไว้อย่างดีในภัตตาคารหรือราชสํานัก" ; -- src=panlex ----?
 lin tableau_N = mkN "ฉาก" | mkN "ภาพ" | mkN "รูป" | mkN "ภาพวาด" | mkN "ละครนิ่ง" | mkN "เรื่องในละคร" ; -- src=panlex
 lin tablecloth_N = mkN "ผ้าปูโต๊ะ" | mkN "ผ้าปูโต๊ะ" ; -- src=panlex
 lin tablefork_N = mkN "ส้อม" ; -- src=panlex
@@ -39684,7 +39692,6 @@ lin tout_V2 = mkV2 "คุยโว" ; ---- | mkV "โอ้อวด" | mkV "
 lin tow_N = mkN "การพ่วง" | mkN "การจูง" | mkN "การลาก" | mkN "การพ่วง" | mkN "กลุ่มเส้นใย" | mkN "สิ่งที่ใช้ลากโยง" | mkN "เชือกที่ใช้ลากโยง" ; -- src=panlex
 lin toward_Prep = mkPrep "ใกล้ ๆ กับ" | mkPrep "จวนแจ" | mkPrep "ไปถึง" | mkPrep "ไปทาง" | mkPrep "ไปยัง" | mkPrep "ไปสู่" | mkPrep "หันไปทาง" | mkPrep "เป็นมงคล" | mkPrep "เกี่ยวกับ" | mkPrep "เนื่องจาก" | mkPrep "ใกล้จะถึง" | mkPrep "เกือบจะถึง" | mkPrep "ให้ประโยชน์" | mkPrep "อยู่ในระหว่าง" | mkPrep "ในเรื่องเกี่ยวกับ" | mkPrep "ช่วยเหลือทางการเงินต่อ" ; -- src=panlex
 lin towel_N = mkN "ผ้าขนหนู" | mkN "ผ้าขนหนู" | mkN "ผ้าเช็ดตัว" | mkN "ผ้าเช็ดหน้า" | mkN "ผ้าเช็ดจานชาม" | mkN "กระดาษเช็ดมือเช็ดหน้า" ; -- src=panlex
-lin toweling_N = mkN "ผ้าขนหนู" ; -- src=panlex
 lin towelling_N = mkN "ผ้าขนหนู" ; -- src=panlex
 lin tower_N = mkN "หอคอย" | mkN "เรือลาก" | mkN "ทาวเวอร์" | mkN "รูปทรงยาวบาง" | mkN "รูปร่างเหมือนเสา" | mkN "หอคอย" | mkN "หอสูง" | mkN "ตึกสูง" | mkN "บินสูง" | mkN "ป้อมปราการ" | mkN "สูงขึ้นมาก" | mkN "ยืนตระหง่าน" | mkN "ตั้งตระหง่าน" | mkN "ชั้นเก็บแผ่นซีดีหรือวีดีโอ" ; -- src=panlex
 lin tower_V = mkV "วางเด่น" | mkV "สูงตระหง่าน" | mkV "ตระหง่าน" | mkV "สูงขึ้นไป" | mkV "เหนือกว่า" ; -- src=panlex
--- a/lib/src/translator/translate.probs
+++ b/lib/src/translator/translate.probs
@@ -5578,7 +5578,7 @@ beebread_N	3.729715012475897e-6
 beech_N	3.729715012475897e-6
 beechen_A	1.0773191989054437e-5
 beechnut_N	3.729715012475897e-6
-beef_N	5.967544019961435e-5
+beef_1_N	5.967544019961435e-5
 beef_V	2.0410940263981494e-4
 beef_up_V2	1.609865254278217e-5
 beefcake_N	3.729715012475897e-6
@@ -14358,7 +14358,7 @@ currant_N	3.729715012475897e-6
 currawong_N	3.729715012475897e-6
 currency_N	6.676189872331855e-4
 current_A	6.970255216918221e-3
-current_N	4.848629516218666e-5
+current_1_N	4.848629516218666e-5
 currentness_N	3.729715012475897e-6
 curricular_A	1.0773191989054437e-5
 curriculum_N	3.729715012475897e-6
@@ -30428,7 +30428,7 @@ juggler_N	7.459430024951794e-6
 jugglery_N	3.729715012475897e-6
 jugular_A	1.0773191989054437e-5
 jugular_N	3.729715012475897e-6
-juice_N	4.848629516218666e-5
+juice_1_N	4.848629516218666e-5
 juice_up_V2	1.609865254278217e-5
 juiceless_A	1.0773191989054437e-5
 juiciness_N	3.729715012475897e-6
@@ -42521,7 +42521,7 @@ planning_N	3.729715012475897e-6
 planoconcave_A	1.0773191989054437e-5
 planoconvex_A	1.0773191989054437e-5
 planographic_A	1.0773191989054437e-5
-plant_N	1.6149666004020634e-3
+plant_1_N	1.6149666004020634e-3
 plant_V2	3.219730508556434e-4
 plant_louse_N	3.729715012475897e-6
 plant_out_V2	1.609865254278217e-5
@@ -49596,7 +49596,7 @@ scholastically_Adv	8.668966832532898e-6
 scholasticism_N	3.729715012475897e-6
 scholiast_N	3.729715012475897e-6
 scholium_N	3.729715012475897e-6
-school_N	6.86267562295565e-4
+school_1_N	6.86267562295565e-4
 school_V2	3.219730508556434e-5
 school_board_N	3.729715012475897e-6
 schoolbag_N	3.729715012475897e-6
@@ -50742,7 +50742,7 @@ sewer_rat_N	3.729715012475897e-6
 sewerage_N	3.729715012475897e-6
 sewing_N	7.459430024951794e-6
 sewing_machine_N	3.729715012475897e-6
-sex_N	1.305400254366564e-4
+sex_1_N	1.305400254366564e-4
 sex_V2	1.609865254278217e-5
 sex_starved_A	1.0773191989054437e-5
 sex_up_V2	1.609865254278217e-5
@@ -56340,7 +56340,7 @@ tabernacle_N	3.729715012475897e-6
 tabes_N	3.729715012475897e-6
 tabi_N	3.729715012475897e-6
 tablature_N	3.729715012475897e-6
-table_N	2.16323470723602e-4
+table_1_N	2.16323470723602e-4
 table_V2	1.609865254278217e-5
 table_d'hote_A	1.0773191989054437e-5
 table_d'hote_Adv	8.668966832532898e-6
@@ -58552,7 +58552,6 @@ towel_V2	1.609865254278217e-5
 towel_horse_N	3.729715012475897e-6
 towel_rack_N	3.729715012475897e-6
 towel_rail_N	3.729715012475897e-6
-toweling_N	3.729715012475897e-6
 towelling_N	3.729715012475897e-6
 tower_N	1.0070230533684921e-4
 tower_V	9.071529006213997e-5