merge cantaloup_N with cantaloupe_N

2015-03-21 20:42:37 +00:00
parent 217d503f30
commit 7e9eec86c0
10 changed files with 3 additions and 13 deletions
--- a/lib/src/translator/Dictionary.gf
+++ b/lib/src/translator/Dictionary.gf
@@ -8854,7 +8854,6 @@ fun cant_V2 : V2 ;
 fun cantab_PN : PN ;
 fun cantabile_A : A ;
 fun cantala_N : N ;
-fun cantaloup_N : N ;
 fun cantaloupe_N : N ;
 fun cantankerous_A : A ;
 fun cantata_N : N ;
--- a/lib/src/translator/DictionaryBul.gf
+++ b/lib/src/translator/DictionaryBul.gf
@@ -8858,7 +8858,6 @@ lin cant_V2 = variants {} ;
 lin cantab_PN = mkPN "Кантаб" Masc ;
 lin cantabile_A = mkA079 "напевен" ;
 lin cantala_N = variants {} ;
-lin cantaloup_N = variants {} ;
 lin cantaloupe_N = mkN007 "пъпеш" ;
 lin cantankerous_A = variants {mkA076 "заядлив"; mkA076 "свадлив"} ; ----
 lin cantata_N = mkN041 "кантата" ; ----
--- a/lib/src/translator/DictionaryEng.gf
+++ b/lib/src/translator/DictionaryEng.gf
@@ -8884,8 +8884,7 @@ lin cant_V2 = mkV2 (mkV "cant" "cants" "canted" "canted" "canting");
 lin cantab_PN = mkPN "Cantab";
 lin cantabile_A = mkA "cantabile" ;
 lin cantala_N = mkN "cantala" ;
-lin cantaloup_N = mkN "cantaloup" "cantaloups";
-lin cantaloupe_N = mkN "cantaloupe" "cantaloupes";
+lin cantaloupe_N = variants {mkN "cantaloupe" "cantaloupes"; mkN "cantaloup" "cantaloups"};
 lin cantankerous_A = compoundA (mkA "cantankerous");
 lin cantata_N = mkN "cantata" "cantatas";
 lin canteen_N = mkN "canteen" "canteens";
--- a/lib/src/translator/DictionaryEst.gf
+++ b/lib/src/translator/DictionaryEst.gf
@@ -3216,7 +3216,6 @@ lin canonisation_N = mkN "kanoniseerimine" | mkN "pühaks tunnistamine" | mkN "k
 lin canon_N = mkN "kaanon" | mkN "kanoonik" ;
 lin canopy_N = mkN "baldahhiin" | mkN "kuppel" | mkN "varikatus" ;
 lin cantaloupe_N = mkN "muskusmelon" ;
-lin cantaloup_N = mkN "muskusmelon" ;
 lin cantata_N = mkN "kantaat" ;
 lin canteen_N = mkN "kantiin" | mkN "plasku" | mkN "söökla" ;
 lin canter_N = mkN "galopeerima" | mkN "galopp" | mkN "kenter" ;
--- a/lib/src/translator/DictionaryFin.gf
+++ b/lib/src/translator/DictionaryFin.gf
@@ -8141,7 +8141,6 @@ lin cant_N = mkWN (k40 "vinous") ; --UNCHK
 lin cant_V = mkWV (k53A "viettää") ; --UNCHK
 lin cant_V2 = mkWV2 (k53A "viettää") ; --UNCHK
 lin cantabile_A = mkWA "laulaen" ; --UNCHK
-lin cantaloup_N = mkWN (compoundN "cantaloupe" (k6 "meloni")) ; --UNCHK
 lin cantaloupe_N = mkWN (compoundN "cantaloupe" (k6 "meloni")) ; --UNCHK
 lin cantankerous_A = mkWA (k1 "häijy") ; --UNCHK
 lin cantata_N = mkWN (k3 "oratorio") ; --UNCHK
--- a/lib/src/translator/DictionaryFre.gf
+++ b/lib/src/translator/DictionaryFre.gf
@@ -4604,7 +4604,6 @@ lin canon_N = mkN "canon" masculine | mkN "chanoine" masculine ; -- tocheck
 lin canonization_N = mkN "canonisation" feminine ; -- tocheck
 lin canopy_N = mkN "canopée" feminine | mkN "dais" masculine | mkN "marquise" feminine ; -- tocheck
 lin cant_N = mkN "argot" masculine | mkN "lamentation" feminine ; -- tocheck
-lin cantaloup_N = mkN "cantaloup" ; -- UWN
 lin cantaloupe_N = mkN "cantaloup" ; -- tocheck
 lin cantankerous_A = mkA "irritable" ; -- tocheck
 lin cantata_N = mkN "cantate" | mkN "oratorio" ; -- UWN
--- a/lib/src/translator/DictionaryGer.gf
+++ b/lib/src/translator/DictionaryGer.gf
@@ -8865,8 +8865,7 @@ lin cant_V2 = mkV2 (mkV "kanten" | regV "kippen") ; -- status=guess, src=wikt st
 lin cantab_PN = mkPN "Cantab" ; -- src=eng status=guess
 lin cantabile_A = variants {} ;
 lin cantala_N = variants {} ;
-lin cantaloup_N = variants {} ;
-lin cantaloupe_N = mkN "Kantalupe" ; -- status=guess
+lin cantaloupe_N = mkN "Kantalupe";
 lin cantankerous_A = mk3A "launisch" "launischer" "launischste" | mkA "zänkisch" | mkA "mürrisch" | mkA "übellaunig" ; -- status=guess status=guess status=guess status=guess
 lin cantata_N = variants {} ;
 lin canteen_N = mkN "Besteckkasten" masculine ; -- status=guess
--- a/lib/src/translator/DictionaryIta.gf
+++ b/lib/src/translator/DictionaryIta.gf
@@ -4094,8 +4094,7 @@ lin canon_N = mkN "canone" masculine ; -- status=guess
 lin canonist_N = mkN "canonista" masculine ; -- status=guess
 lin canonize_V2 = mkV2 (mkV "santificare") | mkV2 (mkV "canonizzare") ; -- status=guess, src=wikt status=guess, src=wikt
 lin canopy_N = mkN "baldacchino" ; -- status=guess
-lin cantaloup_N = mkN "cantalupo" | mkN "zatta" ; -- UWN
-lin cantaloupe_N = mkN "cantalupo" ; -- status=guess
+lin cantaloupe_N = mkN "cantalupo" | mkN "zatta" ; -- status=guess
 lin cantankerous_A = mkA "stizzoso" ; -- status=guess
 lin cantata_N = mkN "cantata" | mkN "oratorio" ; -- UWN
 lin canteen_N = mkN "mensa" ; -- status=guess
--- a/lib/src/translator/DictionarySwe.gf
+++ b/lib/src/translator/DictionarySwe.gf
@@ -8791,7 +8791,6 @@ lin cant_V2 = variants {} ; -- status=guess
 lin cantab_PN = mkPN "Cantab" ; -- src=eng status=guess
 lin cantabile_A = variants {} ; -- status=guess
 lin cantala_N = variants {} ; -- status=guess
-lin cantaloup_N = variants {} ; -- status=guess
 lin cantaloupe_N = mkN "cantaloupmelon"; -- src=google
 lin cantankerous_A = variants {} ; -- status=guess
 lin cantata_N = mkN "kantat" "kantater" ;
--- a/lib/src/translator/DictionaryTha.gf
+++ b/lib/src/translator/DictionaryTha.gf
@@ -5904,7 +5904,6 @@ lin cant_N = mkN "ความลาด" | mkN "ภาษาแสลง" | mkN
 lin cant_V = mkV "เอียง" | mkV "เอียงกะเท่เร่" | mkV "เอียง" ; -- src=panlex
 lin cant_V2 = mkV2 "เอียง" ; ---- | mkV "เอียงกะเท่เร่" | mkV "เอียง" ; -- src=panlex
 lin cantala_N = mkN "ต้นแคนตาลา" ; -- src=panlex
-lin cantaloup_N = mkN "แคนตาลูป" | mkN "ผลแคนตาลูป" | mkN "ต้นแคนตาลูป" | mkN "ลูกแคนตาลูป" | mkN "แคนตาลูป" | mkN "ผลไม้ชนิดหนึ่งมีเนื้อสีส้ม" ; -- src=panlex
 lin cantaloupe_N = mkN "แคนตาลูป" | mkN "ผลแคนตาลูป" | mkN "ต้นแคนตาลูป" | mkN "ลูกแคนตาลูป" | mkN "แคนตาลูป" | mkN "ผลไม้ชนิดหนึ่งมีเนื้อสีส้ม" ; -- src=panlex
 lin cantankerous_A = mkA "ขี้บ่น" | mkA "ชอบทะเลาะ" | mkA "อารมณ์ร้าย" | mkA "เจ้าอารมณ์" | mkA "ขี้หงุดหงิดและเอาใจยาก" ; -- src=panlex
 lin cantata_N = mkN "คันตาตา" | mkN "การร้องประสานเสียง" | mkN "การเล่นดนตรีและร้องเพลงที่มีเนื้อหาทางศาสนา" ; -- src=panlex