diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf index 3a086e441..aae04aefd 100644 --- a/lib/src/translator/Dictionary.gf +++ b/lib/src/translator/Dictionary.gf @@ -52884,7 +52884,8 @@ fun solstice_N : N ; -- 15221818 either of the two times of the ye fun solubility_N : N ; -- 13583272 the quantity of a particular substance that can dissolve in a particular solvent (yielding a saturated solution) fun soluble_A : A ; -- 02265015 (of a substance) capable of being dissolved in some solvent (usually water) fun solute_N : N ; -- 15047849 the dissolved matter in a solution; the component of a solution that changes its state -fun solution_N : N ; -- 14589223 a homogeneous mixture of two or more substances; frequently (but not necessarily) a liquid solution; "he used a solution of peroxide and water" +fun solution_1_N : N ; -- 14589223 a homogeneous mixture of two or more substances; frequently (but not necessarily) a liquid solution; "he used a solution of peroxide and water" +fun solution_2_N : N ; -- 06743506 a statement that solves a problem or explains how to solve the problem; "they were trying to find a peaceful solution" fun solvability_N : N ; -- 05215483 the property (of a problem or difficulty) that makes it possible to solve fun solvable_A : A ; -- 02266451 capable of being solved; "such problems are perfectly solvable" fun solvate_N : N ; -- 15047988 a compound formed by solvation (the combination of solvent molecules with molecules or ions of the solute) diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index 13dbffbe8..49ce818bc 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -52929,7 +52929,8 @@ lin solstice_N = mkN071 "слънцестоене" ; lin solubility_N = mkN049 "разтворимост" ; lin soluble_A = mkA076 "разтворим" ; lin solute_N = mkN062 "разтворимо" ; -lin solution_N = mkN072 "решение" ; +lin solution_1_N = mkN007 "разтвор" ; +lin solution_2_N = mkN072 "решение" ; lin solvability_N = mkN049 "разрешимост" ; lin solvable_A = mkA076 "разрешим" ; lin solvate_N = mkN007 "солват" ; diff --git a/lib/src/translator/DictionaryCat.gf b/lib/src/translator/DictionaryCat.gf index e5aa98a8c..def8d68fe 100644 --- a/lib/src/translator/DictionaryCat.gf +++ b/lib/src/translator/DictionaryCat.gf @@ -15358,7 +15358,8 @@ lin solstice_N = mkN "solstici" masculine ; --auto lin solubility_N = mkN "solubilitat" feminine ; --auto lin soluble_A = mkA "soluble" ; --auto lin solute_N = mkN "solut" masculine ; --auto -lin solution_N = mkN "sol·lució" feminine ; +lin solution_1_N = mkN "sol·lució" feminine ; +lin solution_2_N = mkN "sol·lució" feminine ; lin solvable_A = mkA "resoluble" | mkA "solucionable" ; --auto lin solvation_N = mkN "solvatació" feminine ; --auto lin solve_V2 = mkV2 "solucionar" ; --auto diff --git a/lib/src/translator/DictionaryChi.gf b/lib/src/translator/DictionaryChi.gf index 6b13ab4ec..4bfd21d23 100644 --- a/lib/src/translator/DictionaryChi.gf +++ b/lib/src/translator/DictionaryChi.gf @@ -30438,7 +30438,8 @@ lin soloist_N = mkN "独奏者" ; lin solon_PN = foreignPN "Solon" ; -- comment=src=geonames status=guess lin solstice_N = mkN "至日" | mkN "至點" | mkN "至点" | mkN "冬至" | mkN "夏至" | {-mwn-} mkN "至" ; -- status=guess -- status=guess -- status=guess -- status=guess -- status=guess -- open-multilingual-wordnet lin soluble_A = mkA "可溶性" ; -lin solution_N = mkN "答案" "個" | {-HSK-} mkN "解决方案" ; +lin solution_1_N = mkN "答案" "個" | {-HSK-} mkN "解决方案" ; +lin solution_2_N = mkN "答案" "個" | {-HSK-} mkN "解决方案" ; lin solvable_A = mkA "可以解" | mkA "可以解决" | mkA "可分解" | mkA "可解决" ; -- open-multilingual-wordnet lin solvate_N = mkN "溶剂化物" ; -- open-multilingual-wordnet lin solvation_N = mkN "溶剂化" | mkN "溶剂化作用" | mkN "溶剂离解作用" ; -- open-multilingual-wordnet diff --git a/lib/src/translator/DictionaryDut.gf b/lib/src/translator/DictionaryDut.gf index db5bfbe27..57b300179 100644 --- a/lib/src/translator/DictionaryDut.gf +++ b/lib/src/translator/DictionaryDut.gf @@ -19047,7 +19047,8 @@ lin solo_N = mkN "solo" ; -- status=guess lin solon_PN = mkPN "Solon" ; -- src=geonames status=guess lin solstice_N = mkN "zonnewende" feminine | mkN "zonnestilstand" masculine ; -- status=guess status=guess lin solubility_N = mkN "oplosbaarheid" feminine ; -- status=guess -lin solution_N = mkN "oplossing" feminine ; +lin solution_1_N = mkN "oplossing" feminine ; +lin solution_2_N = mkN "oplossing" feminine ; lin solve_V2 = mkV2 (mkV "oplossen") ; -- status=guess, src=wikt lin solvent_N = mkN "oplosmiddel" ; -- status=guess lin somaliFem_N = variants {} ; ---- sense to be split diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index 4f83518f9..cb0bd51a5 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -53123,7 +53123,8 @@ lin solstice_N = mkN "solstice" "solstices"; lin solubility_N = mkN "solubility" ; lin soluble_A = compoundA (mkA "soluble"); lin solute_N = mkN "solute" ; -lin solution_N = mkN "solution" "solutions"; +lin solution_1_N = mkN "solution" "solutions"; +lin solution_2_N = mkN "solution" "solutions"; lin solvability_N = mkN "solvability" ; lin solvable_A = compoundA (mkA "solvable"); lin solvate_N = mkN "solvate" ; diff --git a/lib/src/translator/DictionaryEst.gf b/lib/src/translator/DictionaryEst.gf index 1af85514d..f4fbf8012 100644 --- a/lib/src/translator/DictionaryEst.gf +++ b/lib/src/translator/DictionaryEst.gf @@ -27130,7 +27130,8 @@ lin soloist_N = D.solist_N ; lin solstice_N = D.'pööripäev_N' ; lin solubility_N = D.lahustuvus_N ; lin soluble_A = mkA "lahustuv" ; -lin solution_N = D.lahendus_N ; +lin solution_1_N = D.lahendus_N ; +lin solution_2_N = D.lahendus_N ; lin solvable_A = mkA "lahendatav" ; lin solvate_N = D.lahus_N ; lin solvation_N = D.lahustumine_N ; diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index 4d90893e6..a3a0bb680 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/lib/src/translator/DictionaryFin.gf @@ -48838,7 +48838,8 @@ lin solon_PN = foreignPN "Solon" ; lin solstice_N = mkWN (compoundN "päivän" (k39 "seisaus")) ; --UNCHK lin solubility_N = mkWN (k40 "liukoisuus") ; --UNCHK lin soluble_A = mkWA (compoundA "liuke" (k9 "neva")) ; --UNCHK -lin solution_N = mkWN (k2 "ratkaisu") | mkN "liuos" ; ---- split +lin solution_1_N = mkN "liuos" ; +lin solution_2_N = mkWN (k2 "ratkaisu") ; lin solvability_N = mkWN "ratkeavuus" ; --UNCHK lin solvable_A = mkWA (k10 "oleva") "ratkaistavissa" ; --UNCHK lin solvate_N = mkWN "solvaatti" ; --UNCHK diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf index 34aaf58c0..c7353a07b 100644 --- a/lib/src/translator/DictionaryFre.gf +++ b/lib/src/translator/DictionaryFre.gf @@ -27828,7 +27828,8 @@ lin solstice_N = mkN "solstice" masculine ; -- tocheck lin solubility_N = mkN "solubilité" feminine ; -- tocheck lin soluble_A = mkA "soluble" ; -- tocheck lin solute_N = mkN "soluté" masculine ; -- tocheck -lin solution_N = mkN "solution" feminine ; -- tocheck +lin solution_1_N = mkN "solution" feminine ; -- tocheck +lin solution_2_N = mkN "solution" feminine ; -- tocheck lin solvability_N = mkN "solubilité" ; -- UWN lin solvable_A = mkA "soluble" | mkA "résoluble" ; -- tocheck lin solvation_N = mkN "solvatation" ; -- UWN diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf index a8fd2975c..412b68a84 100644 --- a/lib/src/translator/DictionaryGer.gf +++ b/lib/src/translator/DictionaryGer.gf @@ -52856,7 +52856,8 @@ lin solstice_N = mkN "Sonnenwende" "Sonnenwenden" feminine ; -- status=guess lin solubility_N = mkN "Löslichkeitsprodukt" neuter ; -- status=guess lin soluble_A = mkA "löslich" ; -- status=guess lin solute_N = variants {} ; -lin solution_N = mkN "Lösung" feminine ; +lin solution_1_N = mkN "Lösung" feminine ; +lin solution_2_N = mkN "Lösung" feminine ; lin solvability_N = variants {} ; lin solvable_A = mkA "löslich" ; -- status=guess lin solvate_N = variants {} ; diff --git a/lib/src/translator/DictionaryHin.gf b/lib/src/translator/DictionaryHin.gf index 0f9e00f65..0de188b12 100644 --- a/lib/src/translator/DictionaryHin.gf +++ b/lib/src/translator/DictionaryHin.gf @@ -25754,7 +25754,8 @@ lin soloist_N = mkN "एकल वादक" ; -- tocheck lin solstice_N = mkN "अयनांत" ; -- tocheck lin solubility_N = mkN "समाधेयता" ; -- tocheck lin soluble_A = mkA "समाधेय" ; -- tocheck -lin solution_N = mkN "विलयन" ; -- tocheck +lin solution_1_N = mkN "विलयन" ; -- tocheck +lin solution_2_N = mkN "विलयन" ; -- tocheck lin solvable_A = mkA "समाधेय" ; -- tocheck lin solve_V2 = mkV2 (compoundV "समाधान" (mkV "निकालना")) ; -- tocheck lin solvency_N = mkN "ऋण चुकाने की क्षमता" ; -- tocheck diff --git a/lib/src/translator/DictionaryIta.gf b/lib/src/translator/DictionaryIta.gf index 4dbc830ac..6b51c894f 100644 --- a/lib/src/translator/DictionaryIta.gf +++ b/lib/src/translator/DictionaryIta.gf @@ -24783,7 +24783,8 @@ lin solon_PN = mkPN "Solon" ; -- status=guess src=geonames lin solstice_N = mkN "solstizio" ; -- status=guess lin solubility_N = mkN "solubilità" feminine ; -- status=guess lin solute_N = mkN "soluto" ; -- status=guess -lin solution_N = mkN "soluzione" feminine ; -- status=guess +lin solution_1_N = mkN "soluzione" feminine ; -- status=guess +lin solution_2_N = mkN "soluzione" feminine ; -- status=guess lin solvation_N = mkN "solvatazione" feminine ; -- status=guess lin solve_V2 = variants {} ; -- lin solvency_N = mkN "solvenza" | mkN "solvibilità" ; -- UWN diff --git a/lib/src/translator/DictionaryJpn.gf b/lib/src/translator/DictionaryJpn.gf index dbacc9ae8..e61858d03 100644 --- a/lib/src/translator/DictionaryJpn.gf +++ b/lib/src/translator/DictionaryJpn.gf @@ -13650,7 +13650,8 @@ lin solitude_N = mkN "孤独" ; lin solo_N = mkN "ソロ" | mkN "独奏" | mkN "独唱" ; lin soloist_N = mkN "ソリスト" | mkN "独唱者" ; lin solstice_N = mkN "冬至" | mkN "夏至" ; -lin solution_N = mkN "解答" | mkN "解決" | mkN "解法" ; +lin solution_1_N = mkN "解答" | mkN "解決" | mkN "解法" ; +lin solution_2_N = mkN "解答" | mkN "解決" | mkN "解法" ; lin solve_V2 = mkV2 "解決する" ; lin solvency_N = mkN "支払能力" ; lin solvent_N = mkN "溶媒" | mkN "溶剤" ; diff --git a/lib/src/translator/DictionaryRus.gf b/lib/src/translator/DictionaryRus.gf index ca00a65bf..58d69d73d 100644 --- a/lib/src/translator/DictionaryRus.gf +++ b/lib/src/translator/DictionaryRus.gf @@ -52884,7 +52884,8 @@ lin solstice_N = variants {} ; lin solubility_N = variants {} ; lin soluble_A = mkA "растворимый" ; lin solute_N = variants {} ; -lin solution_N = mkN "раствор" "раствора" "раствору" "раствор" "раствором" "растворе" "растворами" "растворы" "растворов" "растворам" "растворы" "растворами" "растворах" Masc Inanimate ; +lin solution_1_N = mkN "раствор" "раствора" "раствору" "раствор" "раствором" "растворе" "растворами" "растворы" "растворов" "растворам" "растворы" "растворами" "растворах" Masc Inanimate ; +lin solution_2_N = mkN "решенье" "решенья" "решенью" "решенье" "решеньем" "решеньи" "решеньями" "решенья" "решений" "решеньям" "решенья" "решеньями" "решеньях" Neut Inanimate ; lin solvability_N = variants {} ; lin solvable_A = variants {} ; lin solvate_N = variants {} ; diff --git a/lib/src/translator/DictionarySpa.gf b/lib/src/translator/DictionarySpa.gf index 0c4baa3a4..b5fce86cf 100644 --- a/lib/src/translator/DictionarySpa.gf +++ b/lib/src/translator/DictionarySpa.gf @@ -27382,7 +27382,8 @@ lin solstice_N = mkN "solsticio" ; -- status=guess lin solubility_N = mkN "solubilidad" feminine ; -- status=guess lin soluble_A = mkA "soluble" ; -- status=guess lin solute_N = mkN "soluto" ; -- status=guess -lin solution_N = mkN "solución" feminine ; +lin solution_1_N = mkN "solución" feminine ; +lin solution_2_N = mkN "solución" feminine ; lin solvability_N = mkN "solubilidad" ; --UWN lin solvation_N = mkN "solvatación" feminine ; -- status=guess lin solve_V2 = mkV2 (resolver_V) | mkV2 (mkV "solucionar") ; -- status=guess diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index 90d94602a..df4523e8e 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -52521,7 +52521,8 @@ lin solstice_N = mkN "sommarsolstånd" | mkN "vintersolstånd" ; -- status=guess lin solubility_N = mkN "löslighet" ; lin soluble_A = mkA "löslig" ; -- status=guess lin solute_N = variants {} ; -- status=guess -lin solution_N = mkN "lösning" ; +lin solution_1_N = mkN "lösning" ; +lin solution_2_N = mkN "lösning" ; lin solvability_N = mkN "likviditetskriterier" ; -- src=google lin solvable_A = mkA "löslig" ; -- status=guess lin solvate_N = mkN "solvat" ; -- src=google diff --git a/lib/src/translator/DictionaryTha.gf b/lib/src/translator/DictionaryTha.gf index 724d88f73..507672404 100644 --- a/lib/src/translator/DictionaryTha.gf +++ b/lib/src/translator/DictionaryTha.gf @@ -35842,7 +35842,8 @@ lin solstice_N = mkN "อายัน" | mkN "จุดที่ถึง" | mkN lin solubility_N = mkN "ค่าการละลาย" | mkN "สภาพละลายได้" | mkN "ความสามารถในการละลาย" | mkN "การถูกละลายได้" | mkN "ความสามารถในการถูกละลายได้" ; -- src=panlex lin soluble_A = mkA "ซึ่งละลายได้" | mkA "ละลายได้" | mkA "ที่แก้ปัญหาได้" | mkA "สารที่ละลายได้" | mkA "ซึ่งคลี่คลายได้" | mkA "ซึ่งสามารถละลายได้" ; -- src=panlex lin solute_N = mkN "ตัวละลาย" | mkN "ตัวถูกละลาย" | mkN "ไม่ยึดติดกับสิ่งอื่น" ; -- src=panlex -lin solution_N = mkN "เฉลย" | mkN "คำตอบ" | mkN "สารละลาย" | mkN "โซลูชั่น" | mkN "การแก้ปัญหา" | mkN "วิธีแก้ปัญหา" | mkN "คําตอบ" | mkN "ทางออก" | mkN "วิธีการ" | mkN "วิธีแก้" | mkN "การละลาย" | mkN "สารละลาย" | mkN "การอธิบาย" | mkN "คําอธิบาย" | mkN "การแก้ปัญหา" | mkN "วิธีแก้ปัญหา" ; -- src=panlex +lin solution_1_N = mkN "เฉลย" | mkN "คำตอบ" | mkN "สารละลาย" | mkN "โซลูชั่น" | mkN "การแก้ปัญหา" | mkN "วิธีแก้ปัญหา" | mkN "คําตอบ" | mkN "ทางออก" | mkN "วิธีการ" | mkN "วิธีแก้" | mkN "การละลาย" | mkN "สารละลาย" | mkN "การอธิบาย" | mkN "คําอธิบาย" | mkN "การแก้ปัญหา" | mkN "วิธีแก้ปัญหา" ; -- src=panlex +lin solution_2_N = mkN "เฉลย" | mkN "คำตอบ" | mkN "สารละลาย" | mkN "โซลูชั่น" | mkN "การแก้ปัญหา" | mkN "วิธีแก้ปัญหา" | mkN "คําตอบ" | mkN "ทางออก" | mkN "วิธีการ" | mkN "วิธีแก้" | mkN "การละลาย" | mkN "สารละลาย" | mkN "การอธิบาย" | mkN "คําอธิบาย" | mkN "การแก้ปัญหา" | mkN "วิธีแก้ปัญหา" ; -- src=panlex lin solvable_A = mkA "ที่แก้ไขได้" | mkA "แก้ปัญ-หาได้" | mkA "ละลายได้" | mkA "แก้ไขได้" | mkA "ซึ่งละลายได้" | mkA "ซึ่งแก้ปัญหาได้" ; -- src=panlex lin solvate_N = mkN "สารที่เกิดจากปฏิกริยาของตัวทําละลายและตัวถูกละลาย" ; -- src=panlex lin solvation_N = mkN "ซอลเวชัน" ; -- src=panlex diff --git a/lib/src/translator/translate.probs b/lib/src/translator/translate.probs index eecc87161..6af456ec0 100644 --- a/lib/src/translator/translate.probs +++ b/lib/src/translator/translate.probs @@ -52904,7 +52904,7 @@ solstice_N 3.729715012475897e-6 solubility_N 3.729715012475897e-6 soluble_A 5.3865959945272184e-5 solute_N 3.729715012475897e-6 -solution_N 1.8275603561131894e-4 +solution_2_N 1.8275603561131894e-4 solvability_N 3.729715012475897e-6 solvable_A 1.0773191989054437e-5 solvate_N 3.729715012475897e-6