From 43db38832d32747e70621c8d5e82473666c69bea Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Sun, 1 Feb 2015 13:48:49 +0000 Subject: [PATCH] split spring_N into four senses --- lib/src/translator/Dictionary.gf | 5 ++++- lib/src/translator/DictionaryBul.gf | 5 ++++- lib/src/translator/DictionaryCat.gf | 5 ++++- lib/src/translator/DictionaryChi.gf | 7 +++++-- lib/src/translator/DictionaryDut.gf | 5 ++++- lib/src/translator/DictionaryEng.gf | 5 ++++- lib/src/translator/DictionaryEst.gf | 5 ++++- lib/src/translator/DictionaryFin.gf | 2 +- lib/src/translator/DictionaryFre.gf | 5 ++++- lib/src/translator/DictionaryGer.gf | 7 +++++-- lib/src/translator/DictionaryHin.gf | 5 ++++- lib/src/translator/DictionarySpa.gf | 7 +++++-- lib/src/translator/DictionarySwe.gf | 7 +++++-- lib/src/translator/translate.probs | 2 +- 14 files changed, 54 insertions(+), 18 deletions(-) diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf index a8a1afd56..530e274f8 100644 --- a/lib/src/translator/Dictionary.gf +++ b/lib/src/translator/Dictionary.gf @@ -54205,7 +54205,10 @@ fun sprig_N : N ; fun sprigged_A : A ; fun sprightliness_N : N ; fun sprightly_A : A ; -fun spring_N : N ; +fun spring_1_N : N ; +fun spring_2_N : N ; +fun spring_3_N : N ; +fun spring_4_N : N ; fun spring_V : V ; fun spring_V2 : V2 ; fun spring_back_V : V ; diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index 3a3a79600..f6e9aa0a0 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -54248,7 +54248,10 @@ lin sprig_N = variants {mkN041 "клонка"; mkN001 "стрък"} ; ---- lin sprigged_A = variants {} ; lin sprightliness_N = variants {mkN049 "бодрост"; mkN049 "живост"; mkN049 "напетост"} ; ---- lin sprightly_A = mkA080 "бодър" ; ---- -lin spring_N = mkN049 "пролет" ; +lin spring_1_N = mkN049 "пролет"; +lin spring_2_N = mkN041 "пружина"; +lin spring_3_N = mkN007 "извор"; +lin spring_4_N = mkN001 "скок"; lin spring_V = variants {singleV (mkV186 "извирам"); dualV (mkV186 "изпъквам") (mkV152 "изпъкна"); dualV (mkV186 "подплашвам") (mkV176 "подплаша"); dualV (mkV186 "произлизам") (mkV147 "произляза"); dualV (mkV186 "произтичам") (mkV148 "произтека"); singleV (mkV186 "сервирам")} ; ---- lin spring_V2 = dirV2 (dualV (mkV186 "възниквам") (mkV152 "възникна")) ; ---- lin spring_back_V = variants {} ; diff --git a/lib/src/translator/DictionaryCat.gf b/lib/src/translator/DictionaryCat.gf index e465d659b..f91fce675 100644 --- a/lib/src/translator/DictionaryCat.gf +++ b/lib/src/translator/DictionaryCat.gf @@ -15231,7 +15231,10 @@ lin spray_N = mkN "esprai" masculine ; --auto lin spread_V = mkV "divulgar" | mkV "estendre" | mkV "untar" ; --auto lin spread_V2 = mkV2 "divulgar" | mkV2 "estendre" | mkV2 "untar" ; --auto lin spread_out_V2 = prepV2 OP_spread_V OP_out_Prep ; -- guess-p-verb -lin spring_N = mkN "font" feminine | mkN "molla" feminine | mkN "primavera" feminine ; --auto +lin spring_1_N = mkN "primavera" feminine; +lin spring_2_N = mkN "ressort"; +lin spring_3_N = mkN "font" feminine; +lin spring_4_N = variants {}; lin spring_V = mkV "saltar" ; --auto lin spring_V2 = mkV2 "saltar" ; --auto lin springboard_N = mkN "trampolí" masculine ; --auto diff --git a/lib/src/translator/DictionaryChi.gf b/lib/src/translator/DictionaryChi.gf index cb604b8c0..4e928ff59 100644 --- a/lib/src/translator/DictionaryChi.gf +++ b/lib/src/translator/DictionaryChi.gf @@ -30766,13 +30766,16 @@ lin spreader_N = mkN "散布机" ; -- open-multilingual-wordnet lin spreadsheet_N = mkN "試算表" | mkN "试算表" | mkN "電子表格" | mkN "电子表格" ; -- status=guess -- status=guess -- status=guess -- status=guess lin spree_N = mkN "大礼包" ; lin sprightly_A = mkA "活泼" ; -lin spring_N = mkN "春" | {-HSK-} mkN "春天" ; +lin spring_1_N = mkN "春" | {-HSK-} mkN "春天" ; +lin spring_2_N = variants {}; +lin spring_3_N = variants {}; +lin spring_4_N = mkN "跳"; lin spring_V = mkV "春天" ; lin spring_V2 = mkV2 "春天" ; lin springboard_N = mkN "跳板" ; -- status=guess lin springer_N = mkN "猎獚" ; -- open-multilingual-wordnet lin springfield_PN = mkPN ("斯普林菲尔德" | "斯普林菲爾德") ; -- comment=src=geonames status=guess -lin springtime_N = mkN "春季""" ; +lin springtime_N = mkN "春季" ; lin sprinkle_V2 = mkV2 "洒" ; lin sprinkler_N = mkN "洒水车" "辆" ; lin sprint_N = mkN "短跑" ; -- status=guess diff --git a/lib/src/translator/DictionaryDut.gf b/lib/src/translator/DictionaryDut.gf index b28e1f0a5..5947eaf55 100644 --- a/lib/src/translator/DictionaryDut.gf +++ b/lib/src/translator/DictionaryDut.gf @@ -19047,7 +19047,10 @@ lin spread_N = variants {} ; -- lin spread_V = mkV "spreiden" | mkV "verspreiden" ; ---- END edits by EdG lin spread_V2 = mkV2 spread_V ; lin spread_out_V2 = prepV2 OP_spread_V OP_out_Prep ; -- guess-p-verb -lin spring_N = mkN "voorjaarsschoonmaak" ; -- status=guess +lin spring_1_N = mkN "voorjaar"; +lin spring_2_N = mkN "veer"; +lin spring_3_N = mkN "bron"; +lin spring_4_N = mkN "sprong"; lin spring_V = springen_V ; -- status=guess, src=wikt lin spring_V2 = mkV2 (springen_V) ; -- status=guess, src=wikt lin springboard_N = mkN "springplank" ; -- status=guess diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index ef0f0575a..a247eb754 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -54472,7 +54472,10 @@ lin sprig_N = mkN "sprig" "sprigs"; lin sprigged_A = compoundA (mkA "sprigged"); lin sprightliness_N = mkN "sprightliness" ; lin sprightly_A = mkA "sprightly" "sprightlier"; -lin spring_N = mkN "spring" "springs"; +lin spring_1_N = mkN "spring" "springs"; +lin spring_2_N = mkN "spring" "springs"; +lin spring_3_N = mkN "spring" "springs"; +lin spring_4_N = mkN "spring" "springs"; lin spring_V = IrregEng.spring_V; lin spring_V2 = mkV2 (IrregEng.spring_V); lin spring_back_V = partV IrregEng.spring_V "back"; diff --git a/lib/src/translator/DictionaryEst.gf b/lib/src/translator/DictionaryEst.gf index 54f69cf9f..5c35e2513 100644 --- a/lib/src/translator/DictionaryEst.gf +++ b/lib/src/translator/DictionaryEst.gf @@ -18468,7 +18468,10 @@ lin spree_N = mkN "hoog" | mkN "joomatuur" | mkN "tujudele järeleandmine" ; lin springboard_N = mkN "hoolaud" | mkN "trampliin" ; lin springbok_N = mkN "Lõuna-Aafrika gasell" ; lin mattress_N = mkN "madrats" ; -lin spring_N = mkN "allikas" | mkN "kargama" | mkN "kevad" | mkN "vedru" | mkN "välja purskuma" ; +lin spring_1_N = mkN "kevad"; +lin spring_2_N = mkN "vedru"; +lin spring_3_N = mkN "allikas"; +lin spring_4_N = mkN "kargama"; lin springtide_N = mkN "õitselepuhkemine" ; lin sprinkler_N = mkN "piserdi" | mkN "veeprits" | mkN "vihmuti" ; lin sprite_N = mkN "haldjas" | mkN "metsahaldjas" | mkN "metsavaim" ; diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index 4b74b4253..50aff7586 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/lib/src/translator/DictionaryFin.gf @@ -49399,7 +49399,7 @@ lin sprig_N = mkWN (k10 "lehvä") ; --UNCHK lin sprigged_A = mkWA (compoundA "lehvä" (k38 "kuvioinen")) ; --UNCHK lin sprightliness_N = mkWN (k40 "reippaus") ; --UNCHK lin sprightly_A = mkWA (k15 "vireä") ; --UNCHK -lin spring_N = mkN "kevät" "kevään" "keväitä" ; ---AR mkWN (k39 "hyppäys") ; --f97 +lin spring_1_N = mkN "kevät" "kevään" "keväitä" ; ---AR mkWN (k39 "hyppäys") ; --f97 lin spring_V = mkV "syöksyä" ; --mkWV (k63 "saada") ; lin spring_V2 = mkV2 "laukaista" ; --mkWV2 (k63 "saada") ; lin spring_balance_N = mkWN (compoundN "jousi" (k9A "vaaka")) ; --UNCHK diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf index 05ae59bb8..5e16734a5 100644 --- a/lib/src/translator/DictionaryFre.gf +++ b/lib/src/translator/DictionaryFre.gf @@ -28220,7 +28220,10 @@ lin spree_N = mkN "frénésie" feminine ; -- tocheck lin sprig_N = mkN "brin" ; -- tocheck lin sprightliness_N = mkN "esprit" | mkN "spiritueux" | mkN "vie" | mkN "vigueur" ; -- UWN lin sprightly_A = mkA "animé" | mkA "vif" ; -- tocheck -lin spring_N = mkN "ressort" masculine | mkN "printemps" masculine | mkN "garde" feminine | mkN "source" feminine ; -- tocheck +lin spring_1_N = mkN "printemps" masculine; +lin spring_2_N = mkN "ressort" masculine; +lin spring_3_N = mkN "source" feminine; +lin spring_4_N = mkN "saut" masculine; lin spring_V = variants {} ; -- mkV2 (mkV "sauter") ; -- tocheck lin spring_V2 = mkV2 (mkV "sauter") ; -- tocheck lin springboard_N = mkN "tremplin" masculine ; -- tocheck diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf index c2cd3ba4c..cfe07a08b 100644 --- a/lib/src/translator/DictionaryGer.gf +++ b/lib/src/translator/DictionaryGer.gf @@ -54199,7 +54199,10 @@ lin sprig_N = variants {} ; lin sprigged_A = variants {} ; lin sprightliness_N = variants {} ; lin sprightly_A = variants {} ; -lin spring_N = mkN "Frühjahrsputz" ; -- status=guess +lin spring_1_N = mkN "Frühjahr"; +lin spring_2_N = mkN "Feder"; +lin spring_3_N = mkN "Quelle"; +lin spring_4_N = mkN "Sprung"; lin spring_V = irregV "springen" "springt" "sprang" "spränge" "gesprungen" ; -- status=guess, src=wikt lin spring_V2 = mkV2 (irregV "springen" "springt" "sprang" "spränge" "gesprungen") ; -- status=guess, src=wikt lin spring_back_V = variants {} ; @@ -54220,7 +54223,7 @@ lin springfield_PN = mkPN "Springfield" ; -- src=geonames status=guess lin springless_A = variants {} ; lin springlike_A = variants {} ; lin springtide_N = variants {} ; -lin springtime_N = variants {} ; +lin springtime_N = mkN "Frühjahr"; lin springy_A = variants {} ; lin sprinkle_N = mkN "Nieselregen" "Nieselregen" masculine ; -- status=guess lin sprinkle_V2 = mkV2 (mkV "sprühen") ; -- status=guess, src=wikt diff --git a/lib/src/translator/DictionaryHin.gf b/lib/src/translator/DictionaryHin.gf index e2f8605a4..680da5d61 100644 --- a/lib/src/translator/DictionaryHin.gf +++ b/lib/src/translator/DictionaryHin.gf @@ -26362,7 +26362,10 @@ lin sprig_N = mkN "फूलों के गुच्छे जैसा आभ lin sprigged_A = mkA "बेल-बूटों के नमूने से सजा" ; -- tocheck lin sprightliness_N = mkN "जीवंतता" ; -- tocheck lin sprightly_A = mkA "चुस्त-दुरुस्त" ; -- tocheck -lin spring_N = mkN "झरना" ; -- tocheck +lin spring_1_N = mkN "वसंत" ; -- tocheck +lin spring_2_N = mkN "झरना" ; -- tocheck +lin spring_3_N = mkN "झरना" ; -- tocheck +lin spring_4_N = mkN "झरना" ; -- tocheck lin spring_V = compoundV "एकाएक उत्पन्न" (mkV "होना") ; -- tocheck lin spring_V2 = mkV2 (mkV "लगाना") ; -- tocheck lin spring_from_V2 = mkV2 (compoundV "से उत्पन्न" (mkV "होना")) ; -- tocheck diff --git a/lib/src/translator/DictionarySpa.gf b/lib/src/translator/DictionarySpa.gf index 78fa7b156..603e8e1c0 100644 --- a/lib/src/translator/DictionarySpa.gf +++ b/lib/src/translator/DictionarySpa.gf @@ -27632,12 +27632,15 @@ lin sprechgesang_N = mkN "sprechgesang" ; --UWN lin spree_N = mkN "aventura_amorosa" | mkN "cana_al_aire" ; --UWN lin sprig_N = mkN "ramita" ; -- status=guess lin sprightliness_N = mkN "vida" ; --UWN -lin spring_N = mkN "resorte" | mkN "muelle" masculine ; -- status=guess +lin spring_1_N = mkN "primavera" masculine ; -- status=guess +lin spring_2_N = mkN "resorte" ; -- status=guess +lin spring_3_N = mkN "origen" masculine ; -- status=guess +lin spring_4_N = mkN "subida" masculine ; -- status=guess lin spring_V = mkV "saltar" ; -- status=guess lin spring_V2 = mkV2 (mkV "saltar") ; -- status=guess lin springboard_N = mkN "trampolín" masculine ; -- status=guess lin springfield_PN = mkPN "Springfield" ; -- status=guess src=geonames -lin springtime_N = mkN "primavera" ; --UWN +lin springtime_N = mkN "primavera"; lin sprinkle_V2 = mkV2 (mkV "rociar") | mkV2 (mkV "salpicar") | mkV2 (mkV "espolvorear") ; -- status=guess, src=wikt status=guess, src=wikt status=guess, src=wikt lin sprinkler_N = mkN "aspersor" masculine ; -- status=guess lin sprint_V = mkV "esprintar" ; -- status=guess, src=wikt diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index f7f0a6860..4b725d28a 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -53664,7 +53664,10 @@ lin sprig_N = variants {} ; -- status=guess lin sprigged_A = variants {} ; -- status=guess lin sprightliness_N = variants {} ; -- status=guess lin sprightly_A = mkA "pigg" ; -- comment=3 -lin spring_N = mkN "vår" ; -- SaldoWN +lin spring_1_N = mkN "vår"; +lin spring_2_N = mkN "fjäder"; +lin spring_3_N = mkN "källa"; +lin spring_4_N = mkN "hopp" neutrum; lin spring_V = mkV "hoppar" ; -- comment=3 lin spring_V2 = dirV2 (partV (mkV "hoppar")"över") ; -- comment=2 lin spring_back_V = mkV "hoppar" ; -- comment=3 @@ -53684,7 +53687,7 @@ lin springfield_PN = mkPN "Springfield" neutrum ; -- src=geonames status=guess lin springless_A = variants {} ; -- status=guess lin springlike_A = variants {} ; -- status=guess lin springtide_N = variants {} ; -- status=guess -lin springtime_N = variants {} ; -- status=guess +lin springtime_N = mkN "vår"; lin springy_A = variants {} ; -- status=guess lin sprinkle_N = mkN "stänk" neutrum ; -- comment=4 lin sprinkle_V2 = variants {} ; -- status=guess diff --git a/lib/src/translator/translate.probs b/lib/src/translator/translate.probs index b8dff7384..ce11a5eac 100644 --- a/lib/src/translator/translate.probs +++ b/lib/src/translator/translate.probs @@ -54076,7 +54076,7 @@ sprig_N 3.729715012475897e-6 sprigged_A 1.0773191989054437e-5 sprightliness_N 3.729715012475897e-6 sprightly_A 3.231957596716331e-5 -spring_N 3.655120712226379e-4 +spring_1_N 3.655120712226379e-4 spring_V 2.4946704767088494e-4 spring_V2 1.609865254278217e-5 spring_back_V 2.2678822515534993e-5