From cfa8a9c163663d36dad53769d6177d10c819a8cf Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Tue, 2 Dec 2014 10:10:18 +0000 Subject: [PATCH] split conservative_N into two senses --- lib/src/translator/Dictionary.gf | 3 ++- lib/src/translator/DictionaryBul.gf | 5 +++-- lib/src/translator/DictionaryChi.gf | 3 ++- lib/src/translator/DictionaryDut.gf | 3 ++- lib/src/translator/DictionaryEng.gf | 3 ++- lib/src/translator/DictionaryEst.gf | 3 ++- lib/src/translator/DictionaryFin.gf | 3 ++- lib/src/translator/DictionaryFre.gf | 3 ++- lib/src/translator/DictionaryGer.gf | 3 ++- lib/src/translator/DictionaryHin.gf | 3 ++- lib/src/translator/DictionaryIta.gf | 5 +++-- lib/src/translator/DictionarySpa.gf | 5 +++-- lib/src/translator/DictionarySwe.gf | 3 ++- 13 files changed, 29 insertions(+), 16 deletions(-) diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf index eb4a35983..fac56eaeb 100644 --- a/lib/src/translator/Dictionary.gf +++ b/lib/src/translator/Dictionary.gf @@ -12595,7 +12595,8 @@ fun conservancy_N : N ; fun conservation_N : N ; fun conservatism_N : N ; fun conservative_A : A ; -fun conservative_N : N ; +fun conservative_1_N : N ; -- | a person who is conservative +fun conservative_2_N : N ; -- | a preservative fun conservatoire_N : N ; fun conservator_N : N ; fun conservatory_N : N ; diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index 3c35cb55f..1eec993eb 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -12602,8 +12602,9 @@ lin conservancy_N = mkN071 "опазване"; lin conservation_N = mkN071 "консервиране" ; lin conservatism_N = mkN011 "консерватизъм"; lin conservative_A = mkA079 "консервативен"; -lin conservative_N = mkN007a "консерватор"; -lin conservatoire_N = mkN047 "консерватория"; ---- +lin conservative_1_N = mkN007a "консерватор"; +lin conservative_2_N = mkN007 "консервант"; +lin conservatoire_N = mkN047 "консерватория"; lin conservator_N = mkN007 "квестор"; lin conservatory_N = mkN047 "оранжерия" ; ---- lin conserve_N = mkN041 "консерва"; diff --git a/lib/src/translator/DictionaryChi.gf b/lib/src/translator/DictionaryChi.gf index d229ce6e8..665cf60a9 100644 --- a/lib/src/translator/DictionaryChi.gf +++ b/lib/src/translator/DictionaryChi.gf @@ -7735,7 +7735,8 @@ lin consequently_Adv = {-HSK-} mkAdv "于是" | mkAdv "因此" | adjAdv conseque lin conservation_N = mkN "保护" [] ; lin conservatism_N = mkN "保守主义" ; lin conservative_A = mkA "保守" ; -lin conservative_N = mkN "保守派" ; +lin conservative_1_N = mkN "保守派" ; -- status=guess +lin conservative_2_N = mkN "保守派" ; -- status=guess lin conservatoire_N = mkN "音樂學校" | mkN "音乐学校" | {-mwn-} mkN "艺术学校" ; -- status=guess -- status=guess -- open-multilingual-wordnet lin conservatory_N = mkN "温室" ; lin conserve_V2 = mkV2 "保存" | {-HSK-} mkV2 "节约" ; diff --git a/lib/src/translator/DictionaryDut.gf b/lib/src/translator/DictionaryDut.gf index c3bb0b3b0..b96e0103c 100644 --- a/lib/src/translator/DictionaryDut.gf +++ b/lib/src/translator/DictionaryDut.gf @@ -4177,7 +4177,8 @@ lin consequent_A = mkA "met als gevolg" ; -- status=guess lin consequently_Adv = mkAdv "bijgevolg" | adjAdv consequent_A ; -- status=guess -- derived lin conservation_N = mkN "natuurbescherming" ; -- status=guess lin conservative_A = variants {} ; -- -lin conservative_N = variants {} ; -- +lin conservative_1_N = variants {} ; -- +lin conservative_2_N = variants {} ; -- lin conservatoire_N = mkN "conservatorium" neuter ; -- status=guess lin conservator_N = mkN "conservator" masculine | mkN "bewaarder" masculine ; -- status=guess status=guess lin conservatory_N = mkN "conservatorium" neuter ; -- status=guess diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index 4f712c6c1..801e7f483 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -12649,7 +12649,8 @@ lin conservancy_N = mkN "conservancy" "conservancies"; lin conservation_N = mkN "conservation" ; lin conservatism_N = mkN "conservatism" ; lin conservative_A = compoundA (mkA "conservative"); -lin conservative_N = mkN "conservative" "conservatives"; +lin conservative_1_N = mkN "conservative" "conservatives"; +lin conservative_2_N = mkN "conservative" "conservatives"; lin conservatoire_N = mkN "conservatoire" "conservatoires"; lin conservator_N = mkN "conservator" ; lin conservatory_N = mkN "conservatory" "conservatories"; diff --git a/lib/src/translator/DictionaryEst.gf b/lib/src/translator/DictionaryEst.gf index db8703674..a8d02fe54 100644 --- a/lib/src/translator/DictionaryEst.gf +++ b/lib/src/translator/DictionaryEst.gf @@ -4670,7 +4670,8 @@ lin consequence_N = mkN "järelm" | mkN "tagajärg" | mkN "tähendusrikas" ; lin conservancy_N = mkN "kohalik laevanduskomisjon" | mkN "loodushoid" ; lin conservation_N = mkN "hoidmine" | mkN "kaitse" | mkN "loodushoid" | mkN "säilitamine" ; lin conservatism_N = mkN "konservatism" ; -lin conservative_N = mkN "konservatiiv" | mkN "konservatiivne" ; +lin conservative_1_N = mkN "konservatiiv" | mkN "konservatiivne" ; -- status=guess +lin conservative_2_N = mkN "konservatiiv" | mkN "konservatiivne" ; -- status=guess lin conservatoire_N = mkN "konservatoorium" | mkN "kunstikool" ; lin conservator_N = mkN "hooldaja" | mkN "kollektsiooni hooldaja" ; lin conservatory_N = mkN "konservatoorium" | mkN "kunstikool" | mkN "talveaed" ; diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index 01a1f4294..e80ab5a61 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/lib/src/translator/DictionaryFin.gf @@ -11448,7 +11448,8 @@ lin conservancy_N = mkWN (compoundN "luonnon" (k2 "suojelu")) ; --UNCHK lin conservation_N = mkWN (compoundN "ympäristön" (k2 "suojelu")) ; --UNCHK lin conservatism_N = mkWN (k40 "vanhoillisuus") ; --UNCHK lin conservative_A = mkWA (k38 "konservatiivinen") ; --f85 -lin conservative_N = mkN "konservatiivinen" ; +lin conservative_1_N = mkN "konservatiivinen" ; --UNCHK +lin conservative_2_N = mkN "konservatiivinen" ; --UNCHK lin conservatoire_N = mkWN (k3 "konservatorio") ; --UNCHK lin conservator_N = mkWN (compoundN "edun" (k10 "valvoja")) ; --UNCHK lin conservatory_N = mkWN "talvipuutarha" ; --UNCHK diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf index 57ebaaebe..e5e6dcee3 100644 --- a/lib/src/translator/DictionaryFre.gf +++ b/lib/src/translator/DictionaryFre.gf @@ -4745,7 +4745,8 @@ lin consequently_Adv = adjAdv consequent_A ; -- -- derived lin conservation_N = mkN "défense" feminine | mkN "préservation" feminine ; -- tocheck lin conservatism_N = mkN "conservatisme" masculine ; -- tocheck lin conservative_A = mkA "conservateur" ; -- tocheck -lin conservative_N = mkN "conservateur" ; -- tocheck +lin conservative_1_N = mkN "conservateur" ; -- tocheck +lin conservative_2_N = mkN "conservateur" ; -- tocheck lin conservatoire_N = mkN "conservatoire" masculine ; -- tocheck lin conservatory_N = mkN "serre" feminine | mkN "conservatoire" masculine ; -- tocheck lin conserve_V2 = mkV2 (mkV "conserver") ; -- tocheck diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf index 76bbb5c56..634a89aa9 100644 --- a/lib/src/translator/DictionaryGer.gf +++ b/lib/src/translator/DictionaryGer.gf @@ -12605,7 +12605,8 @@ lin conservancy_N = variants {} ; lin conservation_N = mkN "Schutz" "Schutze" masculine ; -- status=guess lin conservatism_N = mkN "Konservatismus" masculine ; -- status=guess lin conservative_A = mk3A "konservativ" "konservativer" "konservativste" ; -- status=guess -lin conservative_N = mkN "Konservativer" masculine ; -- status=guess +lin conservative_1_N = mkN "Konservativer" masculine ; -- status=guess +lin conservative_2_N = mkN "Konservativer" masculine ; -- status=guess lin conservatoire_N = mkN "Konservatorium" "Konservatorien" neuter | mkN "Musikkonservatorium" neuter | mkN "Musikakademie" feminine | mkN "Hochschule" "Hochschulen" feminine | mkN "Musikschule" "Musikschulen" feminine | mkN "höhere Musikschule" feminine ; -- status=guess status=guess status=guess status=guess status=guess status=guess lin conservator_N = variants {} ; lin conservatory_N = mkN "Wintergarten" "Wintergärten" masculine | mkN "Gewächshaus" neuter ; -- status=guess status=guess diff --git a/lib/src/translator/DictionaryHin.gf b/lib/src/translator/DictionaryHin.gf index 88bd9ca66..5a2d23380 100644 --- a/lib/src/translator/DictionaryHin.gf +++ b/lib/src/translator/DictionaryHin.gf @@ -5741,7 +5741,8 @@ lin conservancy_N = mkN "संरक्षण संस्था" ; -- tocheck lin conservation_N = mkN "अविनाशिता" ; -- tocheck lin conservatism_N = mkN "अनुदारवाद" ; -- tocheck lin conservative_A = mkA "ब्रिटेन का राजनीतिक दल" ; -- tocheck -lin conservative_N = mkN "अनुदारवादी" ; -- tocheck +lin conservative_1_N = mkN "अनुदारवादी" ; -- tocheck +lin conservative_2_N = mkN "अनुदारवादी" ; -- tocheck lin consider_V = mkV "मानना" ; -- tocheck lin consider_V2 = mkV2 (mkV "सोचना") ; -- tocheck lin consider_V2A = mkV2 (mkV "सोचना") ; -- tocheck diff --git a/lib/src/translator/DictionaryIta.gf b/lib/src/translator/DictionaryIta.gf index 8e3607438..ccc185c96 100644 --- a/lib/src/translator/DictionaryIta.gf +++ b/lib/src/translator/DictionaryIta.gf @@ -4112,7 +4112,8 @@ lin consequent_A = variants {} ; lin consequently_Adv = adjAdv consequent_A ; -- -- derived lin conservation_N = variants {} ; -- lin conservative_A = variants {} ; -- -lin conservative_N = variants {} ; -- +lin conservative_1_N = variants {} ; -- +lin conservative_2_N = variants {} ; -- lin conservatoire_N = mkN "conservatorio" ; -- status=guess lin conservatory_N = mkN "conservatorio" ; -- status=guess lin conserve_V2 = mkV2 (mkV "conservare") ; -- status=guess, src=wikt @@ -20485,4 +20486,4 @@ lin zoom_V = mkV "zoomare" ; -- status=guess, src=wikt lin zoophobia_N = mkN "zoofobia" ; -- status=guess lin zygomatic_A = mkA "zigomatico" ; -- status=guess lin zygote_N = mkN "zigote" masculine ; -- status=guess -} \ No newline at end of file +} diff --git a/lib/src/translator/DictionarySpa.gf b/lib/src/translator/DictionarySpa.gf index c95bc3893..97604a088 100644 --- a/lib/src/translator/DictionarySpa.gf +++ b/lib/src/translator/DictionarySpa.gf @@ -5045,7 +5045,8 @@ lin consequently_Adv = adjAdv consequent_A ; -- -- derived lin conservation_N = variants {} ; -- lin conservatism_N = mkN "conservadurismo" | mkN "conservatismo" ; -- status=guess status=guess lin conservative_A = mkA "conservador" ; -- status=guess -lin conservative_N = mkN "conservador" masculine ; -- status=guess +lin conservative_1_N = mkN "conservador" masculine ; -- status=guess +lin conservative_2_N = mkN "conservador" masculine ; -- status=guess lin conservator_N = mkN "apoderado" ; -- status=guess lin conserve_N = mkN "parque nacional" ; -- status=guess lin conserve_V2 = mkV2 (mkV "conservar") ; -- status=guess, src=wikt @@ -24398,4 +24399,4 @@ lin zygoma_N = mkN "cigoma" ; -- status=guess lin zygomatic_A = mkA "cigomático" ; -- status=guess lin zygomorphic_A = mkA "zigomorfo" ; -- status=guess lin zygote_N = mkN "cigoto" ; -- status=guess -} \ No newline at end of file +} diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index ca0259528..3f98d1310 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -12550,7 +12550,8 @@ lin conservancy_N = mkN "naturvård" ; -- comment=3 lin conservation_N = mkN "bevarande" ; -- SaldoWN lin conservatism_N = mkN "konservatism" "konservatismer" ; -- SaldoWN lin conservative_A = mkA "konservativ" ; -- SaldoWN -lin conservative_N = mkN "skydd" neutrum ; -- comment=5 +lin conservative_1_N = mkN "moderat" utrum; +lin conservative_2_N = mkN "konserveringsmedel" neutrum; lin conservatoire_N = mkN "konservatorium" "konservatoriet" "konservatorier" "konservatorierna" ; -- comment=2 lin conservator_N = variants {} ; -- status=guess lin conservatory_N = mkN "drivhus" neutrum ; -- comment=5