From d551c879ba74ff24ed6f46f1b3078c36a980cbd1 Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Sun, 28 Dec 2014 13:10:04 +0000 Subject: [PATCH] merge orang_outan_N, orang_outang_N and orang_utan_N with orangutan_N --- lib/src/translator/Dictionary.gf | 3 --- lib/src/translator/DictionaryBul.gf | 3 --- lib/src/translator/DictionaryEng.gf | 5 +---- lib/src/translator/DictionaryGer.gf | 3 --- lib/src/translator/DictionarySwe.gf | 3 --- lib/src/translator/translate.probs | 3 --- 6 files changed, 1 insertion(+), 19 deletions(-) diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf index 5ac537794..150243fa4 100644 --- a/lib/src/translator/Dictionary.gf +++ b/lib/src/translator/Dictionary.gf @@ -39450,9 +39450,6 @@ fun oracular_A : A ; fun orad_Adv : Adv ; fun oral_A : A ; fun oral_N : N ; -fun orang_outan_N : N ; -fun orang_outang_N : N ; -fun orang_utan_N : N ; fun orange_1_N : N ; -- | round yellow to orange fruit of any of several citrus trees fun orange_2_N : N ; -- | orange color or pigment ; any of a range of colors between red and yellow fun orange_A : A ; diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index cfe136ac9..4a6a7e548 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -39490,9 +39490,6 @@ lin oracular_A = mkA078 "оракулски" ; lin orad_Adv = variants {} ; lin oral_A = mkA079 "устен" ; lin oral_N = variants {} ; -lin orang_outan_N = mkN007 "орангутан" ; -lin orang_outang_N = mkN007 "орангутан" ; -lin orang_utan_N = mkN007 "орангутан" ; lin orange_1_N = mkN007 "портокал" ; lin orange_2_N = mkN054 "оранжево" ; lin orange_A = mkA076 "оранжев" ; diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index 4bb16eef3..1bc162120 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -39629,9 +39629,6 @@ lin oracular_A = compoundA (mkA "oracular"); lin orad_Adv = mkAdv "orad" ; lin oral_A = compoundA (mkA "oral"); lin oral_N = mkN "oral" "orals"; -lin orang_outan_N = mkN "orang-outan" "orang-outans"; -lin orang_outang_N = mkN "orang-outang" "orang-outangs"; -lin orang_utan_N = mkN "orang-utan" "orang-utans"; lin orange_1_N = mkN "orange" "oranges"; lin orange_2_N = mkN "orange" "oranges"; lin orange_A = compoundA (mkA "orange"); @@ -39639,7 +39636,7 @@ lin orangeade_N = mkN "orangeade" ; lin orangeman_N = mkN masculine (mkN "orangeman" "orangemen"); lin orangery_N = mkN "orangery" ; lin orangewood_N = mkN "orangewood" ; -lin orangutan_N = mkN "orangutan" ; +lin orangutan_N = variants {mkN "orangutan"; mkN "orangutang"; mkN "orang-outan"; mkN "orang-outang"; mkN "orang-utan"; mkN "orang-utang"}; lin orate_V = mkV "orate" "orates" "orated" "orated" "orating"; lin oration_N = mkN "oration" "orations"; lin oratorFem_N = mkN feminine (mkN "orator" "orators"); diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf index fece20fad..56f873abd 100644 --- a/lib/src/translator/DictionaryGer.gf +++ b/lib/src/translator/DictionaryGer.gf @@ -39448,9 +39448,6 @@ lin oracular_A = variants {} ; lin orad_Adv = variants {} ; lin oral_A = regA "oral" ; -- status=guess lin oral_N = mkN "Mundhygiene" feminine | mkN "Zahnpflege" feminine | mkN "Mundpflege" feminine ; -- status=guess status=guess status=guess -lin orang_outan_N = variants {} ; -lin orang_outang_N = variants {} ; -lin orang_utan_N = variants {} ; lin orange_1_N = variants {} ; -- lin orange_2_N = variants {} ; -- lin orange_A = regA "orange" ; -- status=guess diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index 171329c70..ec2ed95df 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -39088,9 +39088,6 @@ lin oracular_A = variants {} ; -- status=guess lin orad_Adv = variants {} ; -- status=guess lin oral_A = mkA "muntlig" ; -- SaldoWN lin oral_N = mkN "oralsex" neutrum ; -- status=guess -lin orang_outan_N = variants {} ; -- status=guess -lin orang_outang_N = variants {} ; -- status=guess -lin orang_utan_N = variants {} ; -- status=guess lin orange_1_N = mkN "apelsin" ; lin orange_2_N = mkN "orange" "oranger" ; lin orange_A = mkA "orange" "orange" ; diff --git a/lib/src/translator/translate.probs b/lib/src/translator/translate.probs index 1f34146c0..3e21ae6af 100644 --- a/lib/src/translator/translate.probs +++ b/lib/src/translator/translate.probs @@ -39394,9 +39394,6 @@ oracular_A 1.0773191989054437e-5 orad_Adv 8.668966832532898e-6 oral_A 8.61855359124355e-5 oral_N 3.729715012475897e-6 -orang_outan_N 3.729715012475897e-6 -orang_outang_N 3.729715012475897e-6 -orang_utan_N 3.729715012475897e-6 orange_1_N 2.6108005087331277e-5 orange_2_N 3.729715012475897e-6 orange_A 5.3865959945272184e-5