From aa9cd64bb119ad92152ec76e1da61fbe955132aa Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Tue, 30 Dec 2014 10:21:54 +0000 Subject: [PATCH] split correction_N into two senses. remove corrections_N --- lib/src/translator/Dictionary.gf | 4 ++-- lib/src/translator/DictionaryBul.gf | 4 ++-- lib/src/translator/DictionaryCat.gf | 3 ++- lib/src/translator/DictionaryChi.gf | 3 ++- lib/src/translator/DictionaryDut.gf | 3 ++- lib/src/translator/DictionaryEng.gf | 4 ++-- lib/src/translator/DictionaryEst.gf | 3 ++- lib/src/translator/DictionaryFin.gf | 4 ++-- lib/src/translator/DictionaryFre.gf | 3 ++- lib/src/translator/DictionaryGer.gf | 4 ++-- lib/src/translator/DictionaryHin.gf | 3 ++- lib/src/translator/DictionaryIta.gf | 3 ++- lib/src/translator/DictionarySpa.gf | 3 ++- lib/src/translator/DictionarySwe.gf | 4 ++-- lib/src/translator/translate.probs | 4 ++-- 15 files changed, 30 insertions(+), 22 deletions(-) diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf index a0bdb8700..f682f2436 100644 --- a/lib/src/translator/Dictionary.gf +++ b/lib/src/translator/Dictionary.gf @@ -13143,9 +13143,9 @@ fun correct_V : V ; fun correct_V2 : V2 ; fun correct_VS : VS ; fun correctable_A : A ; -fun correction_N : N ; +fun correction_1_N : N; -- | the process of correction +fun correction_2_N : N; -- | the effect of the correction fun correctional_A : A ; -fun corrections_N : N ; fun correctitude_N : N ; fun corrective_A : A ; fun corrective_N : N ; diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index 1b62f1b89..60b682794 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -13147,9 +13147,9 @@ lin correct_V = variants {dualV (mkV187 "изправям") (mkV173 "изпра lin correct_V2 = dirV2 (singleV (mkV186 "коригирам")) ; ---- lin correct_VS = variants {} ; lin correctable_A = mkA076 "поправим" ; -lin correction_N = mkN071 "коригиране" ; +lin correction_1_N = mkN071 "коригиране"; +lin correction_2_N = mkN047 "корекция"; lin correctional_A = variants {mkA079 "изправителен"; mkA079 "поправителен"} ; ---- -lin corrections_N = mkN047 "корекция" ; ---- lin correctitude_N = mkN049 "коректност" ; lin corrective_A = mkA079 "изправителен" ; lin corrective_N = mkN007 "коректив" ; diff --git a/lib/src/translator/DictionaryCat.gf b/lib/src/translator/DictionaryCat.gf index f92f99f09..1589a689b 100644 --- a/lib/src/translator/DictionaryCat.gf +++ b/lib/src/translator/DictionaryCat.gf @@ -3739,7 +3739,8 @@ lin correct_A = L.correct_A ; lin correct_V = mkV "corregir" ; --auto lin correct_V2 = mkV2 "corregir" ; --auto lin correctable_A = mkA "corregible" ; --auto -lin correction_N = mkN "correcció" feminine ; --auto +lin correction_1_N = mkN "correcció" feminine ; --auto +lin correction_2_N = mkN "correcció" feminine ; --auto lin correlate_V = mkV "correlacionar" | mkV "correlar" ; --auto lin correlate_V2 = mkV2 "correlacionar" | mkV2 "correlar" ; --auto lin correlation_N = mkN "correlació" feminine ; --auto diff --git a/lib/src/translator/DictionaryChi.gf b/lib/src/translator/DictionaryChi.gf index 592ac6ec4..7934f074b 100644 --- a/lib/src/translator/DictionaryChi.gf +++ b/lib/src/translator/DictionaryChi.gf @@ -8258,7 +8258,8 @@ lin correct_V = mkV "改正" | {-HSK-} mkV "纠正" ; lin correct_V2 = mkV2 "改正" | {-HSK-} mkV2 "纠正" ; lin correct_VS = mkVS "改正" | {-HSK-} mkVS "纠正" ; lin correctable_A = mkA "修正" | mkA "改正" | mkA "纠正" ; -- open-multilingual-wordnet -lin correction_N = mkN "改正" "個" | {-HSK-} mkN "更正" ; +lin correction_1_N = mkN "改正" "個" | {-HSK-} mkN "更正" ; +lin correction_2_N = mkN "改正" "個" | {-HSK-} mkN "更正" ; lin corrective_A = mkA "矫正" ; lin corrective_N = mkN "恢复药" ; -- open-multilingual-wordnet lin correlation_N = mkN "相关" ; diff --git a/lib/src/translator/DictionaryDut.gf b/lib/src/translator/DictionaryDut.gf index 07dee69e2..89835d4b9 100644 --- a/lib/src/translator/DictionaryDut.gf +++ b/lib/src/translator/DictionaryDut.gf @@ -4622,7 +4622,8 @@ lin correct_A = L.correct_A ; lin correct_V = mkV "corrigeren" | mkV "verbeteren" ; -- status=guess, src=wikt status=guess, src=wikt lin correct_V2 = mkV2 (mkV "corrigeren") | mkV2 (mkV "verbeteren") ; -- status=guess, src=wikt status=guess, src=wikt lin correct_VS = mkVS (mkV "corrigeren") | mkVS (mkV "verbeteren") ; -- status=guess, src=wikt status=guess, src=wikt -lin correction_N = mkN "verbetering" feminine | mkN "correctie" feminine ; -- status=guess status=guess +lin correction_1_N = mkN "verbetering" feminine | mkN "correctie" feminine ; -- status=guess status=guess +lin correction_2_N = mkN "verbetering" feminine | mkN "correctie" feminine ; -- status=guess status=guess lin correctness_N = mkN "correctheid" feminine | mkN "juistheid" feminine ; -- status=guess status=guess lin correlation_N = mkN "correlatie" feminine ; -- status=guess lin correspond_V = mkV "corresponderen" ; -- status=guess, src=wikt diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index 8b7a661f8..eeda5697c 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -13201,9 +13201,9 @@ lin correct_V = mkV "correct"; lin correct_V2 = mkV2 (mkV "correct" "corrects" "corrected" "corrected" "correcting"); lin correct_VS = mkVS (mkV "correct"); lin correctable_A = mkA "correctable" ; -lin correction_N = mkN "correction" "corrections"; +lin correction_1_N = mkN "correction" "corrections"; +lin correction_2_N = mkN "correction" "corrections"; lin correctional_A = mkA "correctional" ; -lin corrections_N = mkN "corrections" ; lin correctitude_N = mkN "correctitude" ; lin corrective_A = compoundA (mkA "corrective"); lin corrective_N = mkN "corrective" "correctives"; diff --git a/lib/src/translator/DictionaryEst.gf b/lib/src/translator/DictionaryEst.gf index 518a02442..47b7de445 100644 --- a/lib/src/translator/DictionaryEst.gf +++ b/lib/src/translator/DictionaryEst.gf @@ -4946,7 +4946,8 @@ lin corpulence_N = mkN "kehakus" | mkN "korpulentsus" | mkN "täidlus" ; lin corpuscle_N = mkN "korpuskul" | mkN "osake" | mkN "verelible" ; lin corpus_N = mkN "keha" | mkN "korpus" | mkN "põhikapital" ; lin corral_N = mkN "karjatara" | mkN "koguma" | mkN "tarandik" | mkN "tarandikku ajama" ; -lin correction_N = mkN "karistus" | mkN "korrektuur" | mkN "parandus" | mkN "õgvendus" ; +lin correction_1_N = mkN "karistus" | mkN "korrektuur" | mkN "parandus" | mkN "õgvendus" ; +lin correction_2_N = mkN "karistus" | mkN "korrektuur" | mkN "parandus" | mkN "õgvendus" ; lin correctitude_N = mkN "korrektsus" | mkN "õige käitumine" ; lin corrective_N = mkN "parandav" ; lin correctness_N = mkN "korrektsus" | mkN "veatus" ; diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index 2275cbed7..35542d084 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/lib/src/translator/DictionaryFin.gf @@ -12053,9 +12053,9 @@ lin correct_V = mkWV (k73 "korjata") ; --UNCHK lin correct_V2 = mkWV2 (k73 "korjata") ; --UNCHK lin correct_VS = mkWVS (k73 "korjata") ; --UNCHK lin correctable_A = mkWA (k10 "oleva") "oikaistavissa" ; --UNCHK -lin correction_N = mkWN (k2 "oikaisu") ; --UNCHK +lin correction_1_N = mkWN (k2 "oikaisu") ; --UNCH +lin correction_2_N = mkWN (compoundN "seuraamus" (k10 "järjestelmä")) ; --UNCHKK lin correctional_A = mkWA "parannus-" ; --UNCHK -lin corrections_N = mkWN (compoundN "seuraamus" (k10 "järjestelmä")) ; --UNCHK lin correctitude_N = mkWN (k40 "säädyllisyys") ; --UNCHK lin corrective_A = mkWA (compoundA "korj" (k9 "aava")) ; --UNCHK lin corrective_N = mkWN (compoundN "parannus" (k1 "keino")) ; --UNCHK diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf index 7b5a7835c..69aa6697b 100644 --- a/lib/src/translator/DictionaryFre.gf +++ b/lib/src/translator/DictionaryFre.gf @@ -6962,7 +6962,8 @@ lin correct_A = L.correct_A ; lin correct_V = variants {} ; -- mkV2 (mkV "corriger") ; -- tocheck lin correct_V2 = mkV2 (mkV "corriger") ; -- tocheck lin correct_VS = variants {} ; -- mkV2 (mkV "corriger") ; -- tocheck -lin correction_N = mkN "correction" feminine ; -- tocheck +lin correction_1_N = mkN "correction" feminine ; -- tocheck +lin correction_2_N = mkN "correction" feminine ; -- tocheck lin corrective_A = mkA "correcteur" ; -- tocheck lin corrective_N = mkN "correcteur" | mkN "correction" ; -- UWN lin correctness_N = mkN "conformité" ; -- tocheck diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf index 3a2918b8c..3a01f7881 100644 --- a/lib/src/translator/DictionaryGer.gf +++ b/lib/src/translator/DictionaryGer.gf @@ -13154,9 +13154,9 @@ lin correct_V = prefixV "aus" ( regV "bessern" ) | irregV "korrigieren" "korrigi lin correct_V2 = mkV2 (prefixV "aus" (regV "bessern") | irregV "korrigieren" "korrigiert" "korrigierte" "korrigierte" "korrigiert" | mkV "richtigstellen" | regV "berichtigen") ; -- status=guess, src=wikt status=guess, src=wikt status=guess, src=wikt status=guess, src=wikt status=guess, src=wikt lin correct_VS = mkVS (prefixV "aus" (regV "bessern") | irregV "korrigieren" "korrigiert" "korrigierte" "korrigierte" "korrigiert" | mkV "richtigstellen" | regV "berichtigen") ; -- status=guess, src=wikt status=guess, src=wikt status=guess, src=wikt status=guess, src=wikt status=guess, src=wikt lin correctable_A = regA "korrigierbar" ; -- status=guess -lin correction_N = mkN "Korrektur" "Korrekturen" feminine | mkN "Berichtigung" | mkN "Verbesserung" ; -- status=guess status=guess status=guess +lin correction_1_N = mkN "Korrektur" "Korrekturen" feminine | mkN "Berichtigung" | mkN "Verbesserung" ; -- status=guess status=guess status=guess +lin correction_2_N = mkN "Korrektur" "Korrekturen" feminine | mkN "Berichtigung" | mkN "Verbesserung" ; -- status=guess status=guess status=guess lin correctional_A = variants {} ; -lin corrections_N = variants {} ; lin correctitude_N = variants {} ; lin corrective_A = variants {} ; lin corrective_N = variants {} ; diff --git a/lib/src/translator/DictionaryHin.gf b/lib/src/translator/DictionaryHin.gf index e4af75c6e..d51d438c4 100644 --- a/lib/src/translator/DictionaryHin.gf +++ b/lib/src/translator/DictionaryHin.gf @@ -6056,7 +6056,8 @@ lin correct_A = mkA "शुद्ध" ; -- tocheck lin correct_V = mkV "सुधारना" ; -- tocheck lin correct_V2 = mkV2 (mkV "सुधारना") ; -- tocheck lin correct_VS = mkVS (mkV "सुधारना" ); -- tocheck -lin correction_N = mkN "सजा" ; -- tocheck +lin correction_1_N = mkN "सजा" ; -- tocheck +lin correction_2_N = mkN "सजा" ; -- tocheck lin correctitude_N = mkN "मर्यादाअ" ; -- tocheck lin corrective_A = mkA "संशोधनात्मक" ; -- tocheck lin corrective_N = mkN "संशोधनात्मक टिप्पणी" ; -- tocheck diff --git a/lib/src/translator/DictionaryIta.gf b/lib/src/translator/DictionaryIta.gf index 132e55c99..83fbcf70e 100644 --- a/lib/src/translator/DictionaryIta.gf +++ b/lib/src/translator/DictionaryIta.gf @@ -6219,7 +6219,8 @@ lin correct_A = L.correct_A ; lin correct_V = mkV "correggere" ; -- status=guess, src=wikt lin correct_V2 = mkV2 (mkV "correggere") ; -- status=guess, src=wikt lin correct_VS = mkVS (mkV "correggere") ; -- status=guess, src=wikt -lin correction_N = mkN "correzione" feminine ; -- status=guess +lin correction_1_N = mkN "correzione" feminine ; -- status=guess +lin correction_2_N = mkN "correzione" feminine ; -- status=guess lin correctitude_N = mkN "convenienza" ; -- UWN lin correctness_N = mkN "aggiustatezza" | mkN "correttezza" | mkN "esattezza" ; -- UWN lin correlation_N = mkN "correlazione" feminine ; -- status=guess diff --git a/lib/src/translator/DictionarySpa.gf b/lib/src/translator/DictionarySpa.gf index 7623ec8ac..f9f9eac9d 100644 --- a/lib/src/translator/DictionarySpa.gf +++ b/lib/src/translator/DictionarySpa.gf @@ -7031,7 +7031,8 @@ lin correct_V = corregir_V ; -- status=guess lin correct_V2 = mkV2 (corregir_V) ; -- status=guess lin correct_VS = mkVS (corregir_V) ; -- status=guess lin correctable_A = mkA "corregible" ; -- status=guess -lin correction_N = mkN "corrección" feminine ; -- status=guess +lin correction_1_N = mkN "corrección" feminine ; -- status=guess +lin correction_2_N = mkN "corrección" feminine ; -- status=guess lin correctitude_N = mkN "procedencia" | mkN "propiedad" | mkN "seriedad" ; --UWN lin corrective_A = mkA "correctivo" ; -- status=guess lin corrective_N = mkN "violación correctiva" | mkN "violación curativa" ; -- status=guess status=guess diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index 0d168a196..c1aed5e97 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -13033,9 +13033,9 @@ lin correct_V = mkV "tillrättavisar" ; -- comment=8 lin correct_V2 = dirV2 (partV (mkV "rättar")"till") ; -- status=guess lin correct_VS = mkVS (mkV "rätta") | mkVS (mkV "korrigerar") ; -- status=guess, src=wikt status=guess, src=wikt lin correctable_A = variants {} ; -- status=guess -lin correction_N = mkN "korrigering" | mkN "tillrättavisning" ; -- SaldoWN -- comment=9 +lin correction_1_N = mkN "korrigering" | mkN "tillrättavisning" ; -- SaldoWN -- comment=9 +lin correction_2_N = variants {} ; -- status=guess lin correctional_A = variants {} ; -- status=guess -lin corrections_N = variants {} ; -- status=guess lin correctitude_N = variants {} ; -- status=guess lin corrective_A = variants {} ; -- status=guess lin corrective_N = variants {} ; -- status=guess diff --git a/lib/src/translator/translate.probs b/lib/src/translator/translate.probs index 7a3735431..61fd4fa60 100644 --- a/lib/src/translator/translate.probs +++ b/lib/src/translator/translate.probs @@ -13268,9 +13268,9 @@ correct_V 9.071529006213997e-5 correct_V2 4.0246631356955425e-4 correct_VS 1.1552012938254491e-4 correctable_A 1.0773191989054437e-5 -correction_N 7.459430024951794e-5 +correction_1_N 7.459430024951794e-5 +correction_2_N 3.729715012475897e-6 correctional_A 1.0773191989054437e-5 -corrections_N 3.729715012475897e-6 correctitude_N 3.729715012475897e-6 corrective_A 3.231957596716331e-5 corrective_N 3.729715012475897e-6