diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf index 844afa3c2..9351d5acc 100644 --- a/lib/src/translator/Dictionary.gf +++ b/lib/src/translator/Dictionary.gf @@ -11491,7 +11491,8 @@ fun companionable_A : A; fun companionate_A : A; fun companionship_N : N; fun companionway_N : N; -fun company_N : N; +fun company_1_N : N; +fun company_2_N : N; fun comparability_N : N; fun comparable_A : A; fun comparative_A : A; @@ -21446,7 +21447,9 @@ fun forgivingly_Adv : Adv; fun forgivingness_N : N; fun forgo_V2 : V2; fun forint_N : N; -fun fork_N : N; +fun fork_1_N : N; +fun fork_3_N : N; +fun fork_4_N : N; fun fork_V : V; fun fork_V2 : V2; fun forklift_N : N; diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index 39b7a33a2..25149cc8e 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -21467,7 +21467,9 @@ lin forgivingly_Adv = variants {}; lin forgivingness_N = variants {}; lin forgo_V2 = variants {}; lin forint_N = variants {}; -lin fork_N = variants {mkN041 "вилица"; mkN072 "разклонение"; mkN007 "чатал"}; ---- +lin fork_1_N = mkN041 "вилица"; +lin fork_3_N = mkN072 "разклонение"; +lin fork_4_N = mkN041 "вила"; lin fork_V = variants {dualV (mkV186 "набождам") (mkV145 "набода"); dualV (mkV186 "отклонявам") (mkV174 "отклоня"); dualV (mkV186 "разклонявам") (mkV174 "разклоня")}; ---- lin fork_V2 = variants {}; lin forklift_N = variants {}; diff --git a/lib/src/translator/DictionaryChi.gf b/lib/src/translator/DictionaryChi.gf index bfb37b734..8e67add0f 100644 --- a/lib/src/translator/DictionaryChi.gf +++ b/lib/src/translator/DictionaryChi.gf @@ -509,7 +509,7 @@ of_Prep = mkPrep [] "的" ; --CHECKED by_Prep = mkPrep "由" ; --CHECKED at_Prep = mkPrep "在" ; --CHECKED as_Prep = mkPrep "与" "一样" ; --CHECKED -company_N = mkN "公司" ; --CHECKED +company_1_N = mkN "公司" ; --CHECKED share_N = mkN "股份" ; --CHECKED market_N = mkN "市场" ; --CHECKED that_RP = mkRP "那个" ; --CHECKED @@ -13236,7 +13236,7 @@ flick_V2 = mkV2 "拂去" ; fling_V = mkV "一扔" ; flour_N = mkN "面粉" "包"; flourish_V2 = mkV2 "繁荣" ; -fork_N = mkN "叉" "只" ; +fork_1_N = mkN "叉" "只" ; fortnight_N = mkN "两星期" "个"; frown_V = mkV "皱眉" ; fuck_V2 = mkV2 "干" ; diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index cbb9b8464..7edccccf8 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -11509,7 +11509,8 @@ lin companionable_A = compoundA (mkA "companionable"); lin companionate_A = mkA "companionate" ; lin companionship_N = mkN "companionship" ; lin companionway_N = mkN "companionway" "companionways"; -lin company_N = mkN "company" "companies"; +lin company_1_N = mkN "company" "companies"; +lin company_2_N = mkN "company" "companies"; lin comparability_N = mkN "comparability" ; lin comparable_A = compoundA (mkA "comparable"); lin comparative_A = compoundA (mkA "comparative"); @@ -21466,7 +21467,9 @@ lin forgivingly_Adv = mkAdv "forgivingly" ; lin forgivingness_N = mkN "forgivingness" ; lin forgo_V2 = mkV2 (mkV "for" IrregEng.go_V); lin forint_N = mkN "forint" ; -lin fork_N = mkN "fork" "forks"; +lin fork_1_N = mkN "fork" "forks"; +lin fork_3_N = mkN "fork" "forks"; +lin fork_4_N = mkN "fork" "forks"; lin fork_V = mkV "fork" "forks" "forked" "forked" "forking"; lin fork_V2 = mkV2 (mkV "fork" "forks" "forked" "forked" "forking"); lin forklift_N = mkN "forklift" ; diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index c84dfe451..c778ad0a3 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/lib/src/translator/DictionaryFin.gf @@ -17944,7 +17944,7 @@ forgivingly_Adv = mkWAdv (compoundAdv "anteeksiantav" (k99 "asti")) ; --UNCHK forgivingness_N = mkWN (k40 "kiltteys") ; --UNCHK forgo_V2 = mkWV2 (k52A "pidättyä") ; --UNCHK forint_N = mkWN (compoundN "for" (k5A "intti")) ; --UNCHK -fork_N = mkWN (compoundN "haa" (k38 "roittuminen")) ; --UNCHK +fork_1_N = mkWN (compoundN "haa" (k38 "roittuminen")) ; --UNCHK fork_V = mkWV (k53A "harottaa") ; --UNCHK fork_V2 = mkWV2 (k53A "harottaa") ; --UNCHK fork_out_V = mkWV (k56A "antaa") ; --UNCHK @@ -53108,7 +53108,7 @@ work_V = mkV "toimia" ; change_V = mkV "muuttua" ; chief_N = mkN "päällikkö" ; claim_N = mkN "vaatimus" ; - company_N = mkN "yhtiö" ; + company_1_N = mkN "yhtiö" ; concern_N = mkN "konserni" ; corporate_A = mkA "yhtiönlaajuinen" ; cost_N = mkN "kustannus" ; diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf index 74369b2ab..655a1dfc7 100644 --- a/lib/src/translator/DictionaryFre.gf +++ b/lib/src/translator/DictionaryFre.gf @@ -4010,7 +4010,8 @@ commute_V2 = mkV2 (mkV "commuter"); commuter_N = mkN "navetteur" masculine; compact_A = mkA "compact"; companion_N = mkN "compagnon" masculine; -company_N = mkN "compagnie" feminine | mkN "société" feminine; +company_1_N = mkN "compagnie" feminine; +company_2_N = mkN "société" feminine; comparability_N = mkN "comparabilité"; comparable_A = mkA "comparable"; comparative_A = mkA "comparatif"; @@ -7467,7 +7468,7 @@ forgetful_A = mkA "oublieux"; forget_me_not_N = mkN "ne-m'oubliez-pas" masculine; forgettable_A = mkA "oubliable"; forgive_V2 = mkV2 (mkV "pardonner"); -fork_N = mkN "fourche" feminine | mkN "fourchette" feminine | mkN "fork" masculine | mkN "bifurcation" feminine; +fork_1_N = mkN "fourche" feminine | mkN "fourchette" feminine | mkN "fork" masculine ; forlorn_A = mkA "abandonné" | mkA "miserable"; form_N = mkN "formulaire" masculine | mkN "forme" feminine; form_V2 = mkV2 (reflV (mkV "former")) | mkV2 (mkV "former"); diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf index e736ed65a..cbccfe722 100644 --- a/lib/src/translator/DictionaryGer.gf +++ b/lib/src/translator/DictionaryGer.gf @@ -7135,7 +7135,7 @@ lin companion_N = reg2N "Gefährte" "Gefährten" masculine; lin companionable_A = variants {}; lin companionship_N = variants {}; lin companionway_N = variants {}; -lin company_N = reg2N "Firma" "Firmen" feminine; +lin company_1_N = reg2N "Firma" "Firmen" feminine; lin comparability_N = variants {}; lin comparable_A = regA "vergleichbar"; lin comparative_A = variants {}; @@ -14285,7 +14285,7 @@ lin forgive_V2 = variants {}; lin forgiveness_N = mkN "Vergebung"; lin forgiving_A = variants {}; lin forgo_V2 = variants {}; -lin fork_N = reg2N "Gabel" "Gabeln" feminine; +lin fork_1_N = reg2N "Gabel" "Gabeln" feminine; lin fork_V = variants {}; lin fork_V2 = variants {}; lin forked_A = variants {}; diff --git a/lib/src/translator/DictionaryHin.gf b/lib/src/translator/DictionaryHin.gf index 9dfbddd08..0cd05952d 100644 --- a/lib/src/translator/DictionaryHin.gf +++ b/lib/src/translator/DictionaryHin.gf @@ -5398,7 +5398,7 @@ lin compactness_N = mkN "ठोसपन" ; -- old -- old lin companion_N = mkN "सहयोगी" ; -- old -- old lin companionable_A = mkA "मिलनसार" ; -- old -- old lin companionship_N = mkN "साथ" ; -- old -- old -lin company_N = mkN "सहयोगी" ; -- old -- old +lin company_1_N = mkN "सहयोगी" ; -- old -- old lin comparable_A = mkA "तूलनीय" ; -- old -- old lin comparative_A = mkA "उत्तरावस्था" ; -- old -- old lin compare_N = mkN "तुलना" ; -- old -- old @@ -10489,7 +10489,7 @@ lin forgive_V = compoundV "ऋण मुक्त कर" (mkV "देना") ; lin forgive_V2 = mkV2 (compoundV "ऋण मुक्त कर" (mkV "देना")) ; lin forgiveness_N = mkN "क्षमा" ; -- old -- old lin forgo_V2 = mkV2 (mkV "त्यागएना") ; -lin fork_N = mkN "जंदर" ; -- old -- old +lin fork_1_N = mkN "जंदर" ; -- old -- old lin fork_V = compoundV "काँटा से" (mkV "खाना") ; -- old -- old lin fork_V2 = mkV2 (compoundV "द्विशाखित हो" (mkV "जाना")) ; lin forlorn_A = mkA "क्षीण" ; -- old -- old diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index 5492e21b7..4d0071336 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -11969,7 +11969,8 @@ lin companionable_A = mkA "sällskaplig" ; -- comment=2 lin companionate_A = variants {} ; lin companionship_N = mkN "kamratkänsla" ; lin companionway_N = variants {} ; -lin company_N = mkN "bolag" "bolag" | mkN "sällskap" neutrum ; --- sense +lin company_1_N = mkN "bolag" "bolag" ; +lin company_2_N = mkN "sällskap" neutrum ; lin comparability_N = mkN "likvärdighet" ; -- comment=2 lin comparable_A = mkA "jämförbar" | mkA "likvärdig" ; -- SaldoWN -- comment=3 lin comparative_A = mkA "komparativ" ; -- comment=3 @@ -22283,7 +22284,8 @@ lin forgivingly_Adv = variants {} ; lin forgivingness_N = variants {} ; lin forgo_V2 = variants {} ; lin forint_N = variants {} ; -lin fork_N = mkN "gaffel" | mkN "vägskäl" neutrum ; -- SaldoWN -- comment=5 +lin fork_1_N = mkN "gaffel" ; +lin fork_3_N = mkN "vägskäl" neutrum ; lin fork_V = mkV "ta" "tar" "ta" "tog" "tagit" "tagen" ; -- comment=5 lin fork_V2 = dirV2 (partV (mkV "ta" "tar" "ta" "tog" "tagit" "tagen")"ut"); -- comment=4 lin fork_out_V = mkV "ta" "tar" "ta" "tog" "tagit" "tagen" ; -- comment=5