diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf index 9dcb2cb02..1d21e9fc6 100644 --- a/lib/src/translator/Dictionary.gf +++ b/lib/src/translator/Dictionary.gf @@ -64111,7 +64111,7 @@ fun whizbang_N : N ; fun whizz_kid_N : N ; fun whoPl_IP : IP ; fun whoSg_IP : IP ; ---- fun who_N : N ; -- as WHO, should be NP +fun who_PN : PN ; -- | World Health Organization fun whodunit_N : N ; fun whoever_NP : NP ; fun whole_A : A ; diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index 3f90302b9..3667ce322 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -64155,7 +64155,7 @@ lin whizbang_N = variants {} ; lin whizz_kid_N = variants {} ; lin whoPl_IP = mkIP "кои" "кои" GPl ; lin whoSg_IP = mkIP "кой" "кого" (GSg Masc) ; -lin who_N = variants {} ; +lin who_PN = mkPN "СЗО" Fem ; lin whodunit_N = mkN065 "криминале" ; lin whoever_NP = variants {} ; lin whole_A = mkA081 "цял" ; diff --git a/lib/src/translator/DictionaryChi.gf b/lib/src/translator/DictionaryChi.gf index 6b8cde625..89ae68cc1 100644 --- a/lib/src/translator/DictionaryChi.gf +++ b/lib/src/translator/DictionaryChi.gf @@ -36062,7 +36062,7 @@ lin whiz_N = mkN "飕飕声" ; lin whiz_V = mkV "作呼呼声" | mkV "发出嗖嗖声" | mkV "发出嗡嗡声" | mkV "发飕飕声" | mkV "嗡嗡转动" | mkV "飕飕作声" ; -- open-multilingual-wordnet lin whoPl_IP = S.whoPl_IP ; lin whoSg_IP = S.whoSg_IP ; -lin who_N = mkN "谁" | {-HSK-} mkN "谁""" ; +lin who_PN = foreignPN "WHO" ; lin whodunit_N = mkN "偵探小說" | mkN "侦探小说" ; -- status=guess -- status=guess lin whoever_NP = variants {} ; lin whole_A = mkA "一" | mkA "全部" | mkA "完" | mkA "完全" | mkA "整个" ; diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index 255470c42..553d5f58b 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -64413,7 +64413,7 @@ lin whizbang_N = mkN "whizbang" ; lin whizz_kid_N = mkN "whizz-kid" "whizz-kids"; lin whoPl_IP = mkIP "who" "whom" "whose" plural ; lin whoSg_IP = mkIP "who" "whom" "whose" singular ; -lin who_N = mkN "WHO" ; ---- what is this? +lin who_PN = mkPN "WHO" ; lin whodunit_N = mkN "whodunit" "whodunits"; lin whoever_NP = mkNP "whoever" "whoever" "whoever's" singular P3 human ; lin whole_A = compoundA (mkA "whole"); diff --git a/lib/src/translator/DictionaryEst.gf b/lib/src/translator/DictionaryEst.gf index 7b6e692cf..ecb5e393a 100644 --- a/lib/src/translator/DictionaryEst.gf +++ b/lib/src/translator/DictionaryEst.gf @@ -21089,7 +21089,7 @@ lin whole_N = mkN "kogu" | mkN "päris-" | mkN "terve" | mkN "tervik" | mkN "tä lin wholeness_N = mkN "terviklikkus" ; lin wholesale_N = mkN "hulgimüük" | mkN "laialdane" ; lin wholesomeness_N = mkN "kasulikkus" | mkN "mõistlikkus" | mkN "tervislikkus" ; -lin who_N = mkN "kes" ; +lin who_PN = variants {} ; lin cough_N = mkN "köha" | mkN "köhatama" | mkN "köhima" ; lin whopper_N = mkN "lausvale" | mkN "purakas" ; lin whorehouse_N = mkN "litsimaja" ; diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index 4381a518f..ab6a0522c 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/lib/src/translator/DictionaryFin.gf @@ -59001,7 +59001,7 @@ lin whiz_V = mkWV (k73 "kehrätä") ; --UNCHK lin whizbang_N = mkWN (k38 "sähikäinen") ; --UNCHK lin whoPl_IP = S.whoPl_IP ; lin whoSg_IP = S.whoSg_IP ; -lin who_N = mkWN (compoundN "terveys" (k2 "järjestö")) "Maailman" ; --UNCHK +lin who_PN = foreignPN "WHO" ; lin whodunit_N = mkWN (k6 "dekkari") ; --UNCHK lin whoever_NP = {s = table {NPAcc => "kenet" ++ "tahansa" ; c => S.kukaInt ! Sg ! npform2case Sg c ++ "tahansa"} ; a = agrP3 Sg ; isPron, isNeg = False} ; -- lin whole_A = mkA "kokonainen" ; diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf index 0a9cac823..404cbfb35 100644 --- a/lib/src/translator/DictionaryFre.gf +++ b/lib/src/translator/DictionaryFre.gf @@ -33067,6 +33067,7 @@ lin whitworth_PN = mkPN "Whitworth" ; -- status=guess src=geonames lin whiz_V = mkV "ronronner" ; -- UWN lin whoPl_IP = S.whoPl_IP ; lin whoSg_IP = S.whoSg_IP | E.QuiestcequeIP ; +lin who_PN = mkPN "OMS" ; lin whodunit_N = mkN "mystère" | mkN "whodunit" | mkN "whodunnit" ; -- UWN lin whoever_NP = variants {} ; -- lin whole_A = mkA "entier" ; ---- up to this checked by AR diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf index d6d822eef..175379d1e 100644 --- a/lib/src/translator/DictionaryGer.gf +++ b/lib/src/translator/DictionaryGer.gf @@ -64102,7 +64102,7 @@ lin whizbang_N = variants {} ; lin whizz_kid_N = variants {} ; lin whoPl_IP = S.whoPl_IP ; lin whoSg_IP = S.whoSg_IP ; -lin who_N = variants {} ; +lin who_PN = mkPN "WHO" ; lin whodunit_N = mkN "Kriminalroman" "Kriminalromane" masculine | mkN "Krimi" "Krimis" masculine ; -- status=guess status=guess lin whoever_NP = variants {} ; -- lin whole_A = mkA "ganz" ; diff --git a/lib/src/translator/DictionaryHin.gf b/lib/src/translator/DictionaryHin.gf index 7192a206b..f934c8f73 100644 --- a/lib/src/translator/DictionaryHin.gf +++ b/lib/src/translator/DictionaryHin.gf @@ -32920,7 +32920,7 @@ lin whiz_V = compoundV "घरघराने" (mkV "लगना") ; -- tocheck lin whizbang_N = mkN "धमाकेदार पटाखा" ; -- tocheck lin whoPl_IP = mkIP "कौन" "किन" "किनहों" Pl Masc ; lin whoSg_IP = mkIP "कौन" "किस" "किस" Sg Masc ; -lin who_N = mkN "विश्व स्वास्थ्य संगठन" ; -- tocheck +lin who_PN = variants {}; lin whodunit_N = mkN "जासूसी कहानी" ; -- tocheck lin whole_A = mkA "पूरा" ; -- tocheck lin whole_N = mkN "समष्टि" ; -- tocheck diff --git a/lib/src/translator/DictionaryIta.gf b/lib/src/translator/DictionaryIta.gf index 8970c3b2c..200014a30 100644 --- a/lib/src/translator/DictionaryIta.gf +++ b/lib/src/translator/DictionaryIta.gf @@ -29419,6 +29419,7 @@ lin whitworth_PN = mkPN "Whitworth" ; -- status=guess src=geonames lin whiz_V = mkV "urinare" ; -- status=guess, src=wikt lin whoPl_IP = S.whoPl_IP ; -- comment=CHECKED lin whoSg_IP = S.whoSg_IP ; -- comment=CHECKED +lin who_PN = mkPN "OMS" ; lin whodunit_N = mkN "giallo" ; -- UWN lin whoever_NP = variants {} ; -- lin whole_A = mkA "intero" ; -- status=guess diff --git a/lib/src/translator/DictionaryMlt.gf b/lib/src/translator/DictionaryMlt.gf index 5e45bd84f..55d87a54e 100644 --- a/lib/src/translator/DictionaryMlt.gf +++ b/lib/src/translator/DictionaryMlt.gf @@ -489,6 +489,7 @@ lin which_IQuant = ss "liema" ; lin white_A = mkA "abjad" "bajda" "bojod" ; lin whoPl_IP = mkIP "min" plural ; lin whoSg_IP = mkIP "min" singular ; +lin who_PN = mkPN "ODS" ; lin why_IAdv = ss "għalfejn" ; lin wide_A = broad_A ; lin wife_N = mkN "mara" "nisa" ; diff --git a/lib/src/translator/DictionarySpa.gf b/lib/src/translator/DictionarySpa.gf index 745b996e3..369a0fcc6 100644 --- a/lib/src/translator/DictionarySpa.gf +++ b/lib/src/translator/DictionarySpa.gf @@ -32502,6 +32502,7 @@ lin whittlesey_PN = mkPN "Whittlesey" ; -- status=guess src=geonames lin whitworth_PN = mkPN "Whitworth" ; -- status=guess src=geonames lin whoPl_IP = S.whoPl_IP ; lin whoSg_IP = S.whoSg_IP ; +lin who_PN = mkPN "OMS" ; lin whodunit_N = mkN "whodunit" ; --UWN lin whoever_NP = variants {} ; -- lin whole_A = mkA "entero" ; diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index a7d453587..5926b12d9 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -63478,7 +63478,7 @@ lin whizbang_N = variants {} ; -- status=guess lin whizz_kid_N = mkN "allvetare" utrum ; lin whoPl_IP = S.whoPl_IP ; lin whoSg_IP = S.whoSg_IP ; -lin who_N = mkN "vem" ; -- src=google +lin who_PN = mkPN "WHO" neutrum ; lin whodunit_N = mkN "deckare" utrum ; -- status=guess lin whoever_NP = variants {} ; -- lin whole_A = mkA "hel" | mkA "välbehållen" "välbehållet" ; diff --git a/lib/src/translator/translate.probs b/lib/src/translator/translate.probs index 92911a312..cc8c7d28c 100644 --- a/lib/src/translator/translate.probs +++ b/lib/src/translator/translate.probs @@ -63930,7 +63930,6 @@ whizbang_N 3.729715012475897e-6 whizz_kid_N 3.729715012475897e-6 whoPl_IP 6.41025641025641e-3 whoSg_IP 8.333333333333333e-2 -who_N 3.729715012475897e-6 whodunit_N 3.729715012475897e-6 whole_A 9.049481270805727e-4 whole_N 9.697259032437332e-5