From 3128bd2f85b1e625d19dfb7f9e2fae61bf1982a4 Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Fri, 30 Jan 2015 09:19:06 +0000 Subject: [PATCH] merge abridgement_N with abridgment_N --- lib/src/translator/Dictionary.gf | 1 - lib/src/translator/DictionaryBul.gf | 3 +-- lib/src/translator/DictionaryDut.gf | 2 +- lib/src/translator/DictionaryEng.gf | 3 +-- lib/src/translator/DictionaryFin.gf | 1 - lib/src/translator/DictionaryFre.gf | 3 +-- lib/src/translator/DictionaryGer.gf | 3 +-- lib/src/translator/DictionaryHin.gf | 3 +-- lib/src/translator/DictionaryIta.gf | 3 +-- lib/src/translator/DictionaryJpn.gf | 2 +- lib/src/translator/DictionarySpa.gf | 3 +-- lib/src/translator/DictionarySwe.gf | 1 - lib/src/translator/translate.probs | 1 - 13 files changed, 9 insertions(+), 20 deletions(-) diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf index 9f590525c..386a447ca 100644 --- a/lib/src/translator/Dictionary.gf +++ b/lib/src/translator/Dictionary.gf @@ -203,7 +203,6 @@ fun abreast_Adv : Adv ; fun abridge_V2 : V2 ; fun abridgement_N : N ; fun abridger_N : N ; -fun abridgment_N : N ; fun abroach_A : A ; fun abroad_A : A ; fun abroad_Adv : Adv ; diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index 1fb334be9..d08fce25a 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -208,9 +208,8 @@ lin abrasive_N = mkN007 "абразив" ; lin abrasiveness_N = mkN049 "абразивност" ; lin abreast_Adv = variants {} ; lin abridge_V2 = variants {} ; -lin abridgement_N = mkN072 "съкращение" ; ---- +lin abridgement_N = mkN072 "съкращение"; lin abridger_N = variants {} ; -lin abridgment_N = variants {} ; lin abroach_A = variants {} ; lin abroad_A = variants {} ; lin abroad_Adv = mkAdv "в чужбина" ; diff --git a/lib/src/translator/DictionaryDut.gf b/lib/src/translator/DictionaryDut.gf index f410fbbce..04c006cdd 100644 --- a/lib/src/translator/DictionaryDut.gf +++ b/lib/src/translator/DictionaryDut.gf @@ -98,7 +98,7 @@ lin abrade_V2 = mkV2 (mkV "schuren") ; -- status=guess, src=wikt lin abraham_PN = mkPN "Abraham" ; -- src=eng status=guess lin abreast_Adv = mkAdv "op de hoogte" | mkAdv "bekend" | mkAdv "goed ingelicht" | mkAdv "welingelicht" ; -- status=guess status=guess status=guess status=guess lin abridge_V2 = mkV2 (mkV "beroven") ; -- status=guess, src=wikt -lin abridgment_N = mkN "bekorting" | mkN "verkorting" ; -- status=guess status=guess +lin abridgement_N = mkN "bekorting" | mkN "verkorting" ; -- status=guess status=guess lin abroad_Adv = mkAdv "in het buitenland" | mkAdv "naar het buitenland" ; -- status=guess status=guess lin abrogate_V2 = mkV2 (mkV "afschaffen") ; -- status=guess, src=wikt lin abrupt_A = mkA "afgeknot" ; -- status=guess diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index ab88c23d8..2571b6a98 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -204,9 +204,8 @@ lin abrasive_N = mkN "abrasive" "abrasives"; lin abrasiveness_N = mkN "abrasiveness" ; lin abreast_Adv = mkAdv "abreast"; lin abridge_V2 = mkV2 (mkV "abridge" "abridges" "abridged" "abridged" "abridging"); -lin abridgement_N = mkN "abridgement" "abridgements"; +lin abridgement_N = variants {mkN "abridgement" "abridgements"; mkN "abridgment" "abridgments"}; lin abridger_N = mkN "abridger" ; -lin abridgment_N = mkN "abridgment" "abridgments"; lin abroach_A = mkA "abroach" ; lin abroad_A = mkA "abroad" ; lin abroad_Adv = mkAdv "abroad"; diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index 01de3ebf5..929d5c4fb 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/lib/src/translator/DictionaryFin.gf @@ -221,7 +221,6 @@ lin abreast_Adv = mkWAdv (k99 "vierekkäin") ; --UNCHK lin abridge_V2 = mkWV2 (k54A "vähentää") ; --UNCHK lin abridgement_N = mkWN (k10 "lyhennelmä") ; --UNCHK lin abridger_N = mkWN "lyhentäjä" ; --UNCHK -lin abridgment_N = mkWN (k10 "lyhennelmä") ; --UNCHK lin abroach_A = mkWA (k10 "oleva") "avattuna" ; --UNCHK lin abroad_A = mkWA (k38 "ulkomainen") ; --UNCHK lin abroad_Adv = mkWAdv "ulkomailla" ; --f56 diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf index 324269ca3..294799baa 100644 --- a/lib/src/translator/DictionaryFre.gf +++ b/lib/src/translator/DictionaryFre.gf @@ -144,8 +144,7 @@ lin abrade_V2 = mkV2 (mkV "abraser") ; -- tocheck lin abrasion_N = mkN "abrasion" feminine ; -- tocheck lin abrasive_A = mkA "abrasif" ; -- tocheck lin abridge_V2 = mkV2 (mkV "abréger") ; -- tocheck -lin abridgement_N = mkN "abréviation" | mkN "capsule" | mkN "condensation" ; -- UWN -lin abridgment_N = mkN "raccourcissement" ; -- tocheck +lin abridgement_N = mkN "abréviation" | mkN "capsule" | mkN "condensation"; mkN "raccourcissement" ; -- UWN -- tocheck lin abroad_Adv = variants {} ; -- lin abrocome_N = mkN "abrocomidae" ; -- UWN lin abrogation_N = mkN "abolition" | mkN "abrogation" | mkN "annulation" ; -- UWN diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf index e5f004736..8c3222aa5 100644 --- a/lib/src/translator/DictionaryGer.gf +++ b/lib/src/translator/DictionaryGer.gf @@ -215,9 +215,8 @@ lin abrasive_N = mkN "Schleifscheibe" feminine ; -- status=guess lin abrasiveness_N = variants {} ; lin abreast_Adv = mkAdv "auf" ; -- status=guess lin abridge_V2 = mkV2 (mkV "verkürzen") | mkV2 (mkV "kürzen") ; -- status=guess, src=wikt status=guess, src=wikt -lin abridgement_N = variants {} ; +lin abridgement_N = mkN "Auszug" "Auszüge" masculine | mkN "Kurzfassung" | mkN "Kurzform" "Kurzformen" feminine ; -- status=guess status=guess status=guess lin abridger_N = variants {} ; -lin abridgment_N = mkN "Auszug" "Auszüge" masculine | mkN "Kurzfassung" | mkN "Kurzform" "Kurzformen" feminine ; -- status=guess status=guess status=guess lin abroach_A = variants {} ; lin abroad_A = variants {} ; lin abroad_Adv = mkAdv "im Ausland" ; -- status=guess diff --git a/lib/src/translator/DictionaryHin.gf b/lib/src/translator/DictionaryHin.gf index c0e2c2ea0..268cc1852 100644 --- a/lib/src/translator/DictionaryHin.gf +++ b/lib/src/translator/DictionaryHin.gf @@ -175,8 +175,7 @@ lin abrasiveness_N = mkN "कर्कशता" ; -- tocheck lin abreast_Adv = mkAdv "अगल-बगल में" ; -- tocheck lin abridge_V2 = mkV2 (compoundV "कम" (mkV "करना")) ; -- tocheck lin abridgement_N = mkN "संक्षेपण" ; -- tocheck -lin abridger_N = mkN "संक्षेपक" ; -- tocheck -lin abridgment_N = mkN "संक्षेपण" ; -- tocheck +lin abridger_N = mkN "संक्षेपक" ; -- tocheck lin abroach_A = mkA "खुला" ; -- tocheck lin abroad_A = mkA "विदेशी" ; -- tocheck lin abroad_Adv = mkAdv "घर के बाहर" ; -- tocheck diff --git a/lib/src/translator/DictionaryIta.gf b/lib/src/translator/DictionaryIta.gf index 5253f5e5c..677d040dd 100644 --- a/lib/src/translator/DictionaryIta.gf +++ b/lib/src/translator/DictionaryIta.gf @@ -121,9 +121,8 @@ lin abranchiate_A = mkA "abranchiato" ; -- UWN lin abrasion_N = mkN "abrasione" feminine ; -- status=guess lin abreast_Adv = mkAdv "con i tempi" ; lin abridge_V2 = mkV2 (mkV "privare") | mkV2 (mkV "limitare") ; -- status=guess, src=wikt status=guess, src=wikt -lin abridgement_N = mkN "compendio" | mkN "edizione_ridotta" | mkN "riduzione" ; -- UWN +lin abridgement_N = mkN "compendio" | mkN "edizione_ridotta" | mkN "riduzione" | mkN "ompendio"; -- UWN lin abridger_N = mkN "abbreviatore" | mkN "compendiatore" | mkN "epitomatore" ; -- UWN -lin abridgment_N = mkN "ompendio" ; -- status=guess lin abroad_Adv = mkAdv "all'estero" ; -- status=guess lin abrogation_N = mkN "abrogazione" | mkN "annullamento" | mkN "cancellazione" | mkN "cassazione" ; -- UWN lin abrupt_A = mkA "brusco" | mkA "brusca" ; -- status=guess status=guess diff --git a/lib/src/translator/DictionaryJpn.gf b/lib/src/translator/DictionaryJpn.gf index d4596034d..c0954d749 100644 --- a/lib/src/translator/DictionaryJpn.gf +++ b/lib/src/translator/DictionaryJpn.gf @@ -53,7 +53,7 @@ lin about_Prep = S.on_Prep ; lin above_A = mkA "上述" "上述の" ; lin above_Adv = ParadigmsJpn.mkAdv "何よりも" ; lin above_Prep = S.above_Prep ; -lin abridgment_N = mkN "要約" ; +lin abridgement_N = mkN "要約" ; lin abroad_Adv = ParadigmsJpn.mkAdv "海外に" | ParadigmsJpn.mkAdv "国外に" ; lin abruptly_Adv = variants{} ; -- lin abscess_N = mkN "膿瘍" | mkN "はれもの" ; diff --git a/lib/src/translator/DictionarySpa.gf b/lib/src/translator/DictionarySpa.gf index 48c40250d..78fa7b156 100644 --- a/lib/src/translator/DictionarySpa.gf +++ b/lib/src/translator/DictionarySpa.gf @@ -140,9 +140,8 @@ lin abrasion_N = mkN "erosión" feminine ; -- status=guess lin abrasive_A = mkA "abrasivo" ; -- status=guess lin abreast_Adv = mkAdv "al corriente" ; -- status=guess lin abridge_V2 = mkV2 (mkV "privar") ; -- status=guess, src=wikt -lin abridgement_N = mkN "condensación" | mkN "cápsula" | mkN "reducción" | mkN "resumen" ; --UWN +lin abridgement_N = mkN "condensación" | mkN "cápsula" | mkN "reducción" | mkN "resumen" | mkN "abreviación" feminine | mkN "compendio" ; --UWN status=guess status=guess lin abridger_N = mkN "abreviador" | mkN "compendiador" ; --UWN -lin abridgment_N = mkN "abreviación" feminine | mkN "compendio" ; -- status=guess status=guess lin abroad_Adv = mkAdv "por todas partes" | mkAdv "en todas direciones" ; -- status=guess lin abrogate_V2 = mkV2 (mkV "abrogar") | mkV2 (mkV "derogar") ; -- status=guess, src=wikt status=guess, src=wikt lin abrupt_A = mkA "abrupto" ; -- status=guess diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index 4de93d818..0bd3df597 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -215,7 +215,6 @@ lin abreast_Adv = mkAdv "jämsides" ; -- status=guess lin abridge_V2 = variants {} ; -- status=guess lin abridgement_N = variants {} ; -- status=guess lin abridger_N = variants {} ; -- status=guess -lin abridgment_N = variants {} ; -- status=guess lin abroach_A = variants {} ; -- status=guess lin abroad_A = mkA "utrikes" ; -- comment=3 lin abroad_Adv = mkAdv "utomlands" ; -- comment=5 diff --git a/lib/src/translator/translate.probs b/lib/src/translator/translate.probs index e07d54361..fd35d67e3 100644 --- a/lib/src/translator/translate.probs +++ b/lib/src/translator/translate.probs @@ -433,7 +433,6 @@ abreast_Adv 8.668966832532898e-6 abridge_V2 3.219730508556434e-5 abridgement_N 3.729715012475897e-6 abridger_N 3.729715012475897e-6 -abridgment_N 3.729715012475897e-6 abroach_A 1.0773191989054437e-5 abroad_A 1.0773191989054437e-5 abroad_Adv 4.941311094543752e-4