merge teetotaler_N and teetotaller_N

2026-04-09 04:59:31 -06:00 · 2016-07-29 11:52:56 +00:00
parent c60860201b
commit b5c803b52c
13 changed files with 3 additions and 14 deletions
--- a/lib/src/translator/Dictionary.gf
+++ b/lib/src/translator/Dictionary.gf
@@ -57010,7 +57010,6 @@ fun teeter_V : V ;                 -- 01881034	move unsteadily, with a rocking m
 fun teethe_V : V ;                 -- 00095990	grow teeth; cut the baby teeth; "The little one is teething now"
 fun teething_N : N ;               -- 13565781	the eruption through the gums of baby teeth
 fun teetotal_A : A ;               -- 00799953	practicing complete abstinence from alcoholic beverages; "no thank you; I happen to be teetotal"
-fun teetotaler_N : N ;             -- 10697282	a total abstainer
 fun teetotaling_N : N ;            -- 01069867	abstaining from alcohol
 fun teetotaller_N : N ;            -- 10697282	a total abstainer
 fun teetotum_N : N ;               -- 04454240	a conical child's plaything tapering to a steel point on which it can be made to spin
--- a/lib/src/translator/DictionaryBul.gf
+++ b/lib/src/translator/DictionaryBul.gf
@@ -57055,7 +57055,6 @@ lin teeter_V = variants {} ;
 lin teethe_V = variants {} ;
 lin teething_N = variants {} ;
 lin teetotal_A = variants {} ;
-lin teetotaler_N = mkN031a "въздържател" ;
 lin teetotaling_N = variants {} ;
 lin teetotaller_N = mkN031a "въздържател" ;
 lin teetotum_N = mkN041 "въртележка" ; ----
--- a/lib/src/translator/DictionaryDut.gf
+++ b/lib/src/translator/DictionaryDut.gf
@@ -20604,7 +20604,6 @@ lin teenage_A = variants {} ; --
 lin teenager_N = mkN "tiener" ; -- status=guess
 lin teesside_PN = mkPN "Teesside" ; -- src=eng status=guess
 lin teeter_V = mkV "wankelen" | mkV "waggelen" ; -- status=guess, src=wikt status=guess, src=wikt
-lin teetotaler_N = mkN "geheelonthouder" masculine | mkN "geheelonthoudster" feminine ; -- status=guess status=guess
 lin teetotaller_N = mkN "geheelonthouder" masculine | mkN "geheelonthoudster" feminine ; -- status=guess status=guess
 lin teheran_PN = mkPN "Teheran" ; -- src=eng status=guess
 lin teignmouth_PN = mkPN "Teignmouth" ; -- src=geonames status=guess
--- a/lib/src/translator/DictionaryEng.gf
+++ b/lib/src/translator/DictionaryEng.gf
@@ -57270,9 +57270,8 @@ lin teeter_V = mkV "teeter" "teeters" "teetered" "teetered" "teetering";
 lin teethe_V = mkV "teethe" "teethes" "teethed" "teethed" "teething";
 lin teething_N = mkN "teething" ;
 lin teetotal_A = compoundA (mkA "teetotal");
-lin teetotaler_N = mkN "teetotaler" ;
 lin teetotaling_N = mkN "teetotaling";
-lin teetotaller_N = mkN "teetotaller" "teetotallers";
+lin teetotaller_N = variants {mkN "teetotaller" "teetotallers"; mkN "teetotaler"} ;
 lin teetotum_N = mkN "teetotum" "teetotums";
 lin teff_N = mkN "teff" ;
 lin teg_N = mkN "teg" "tegs";
--- a/lib/src/translator/DictionaryEst.gf
+++ b/lib/src/translator/DictionaryEst.gf
@@ -29139,7 +29139,7 @@ lin teenager_N = D.teismeline_N ;
 lin teeny_A = mkA "pisitillu" ;
 lin teeter_V = D.vaaruma_V ;
 lin teetotal_A = mkA "täiskarske" ;
-lin teetotaler_N = mkN "täiskarsklane" ;
+lin teetotaller_N = mkN "täiskarsklane" ;
 lin teetotum_N = D.'täring_N' ;
 lin telecommunication_N = D.side_N ;
 lin telegram_N = D.telegramm_N ;
--- a/lib/src/translator/DictionaryFin.gf
+++ b/lib/src/translator/DictionaryFin.gf
@@ -52645,7 +52645,6 @@ lin teeter_V = mkWV (k52 "horjua") ; --UNCHK
 lin teethe_V = mkWV (k63 "saada") "hampaita" ; --UNCHK
 lin teething_N = mkWN "hampaiden" "puhkeaminen" ; --UNCHK
 lin teetotal_A = mkWA (k41A "raitis") ; --UNCHK
-lin teetotaler_N = mkWN (k41A "raitis") ; --UNCHK
 lin teetotaling_N = mkWN (k5 "absolutismi") ; --UNCHK
 lin teetotaller_N = mkWN (k41A "raitis") ; --UNCHK
 lin teetotum_N = mkWN (k10 "hyrrä") ; --UNCHK
--- a/lib/src/translator/DictionaryGer.gf
+++ b/lib/src/translator/DictionaryGer.gf
@@ -56981,7 +56981,6 @@ lin teeter_V = variants {} ;
 lin teethe_V = variants {} ;
 lin teething_N = mkN "Kinderkrankheit" ; ----en {f} {p}" ; -- status=guess
 lin teetotal_A = variants {} ;
-lin teetotaler_N = mkN "Abstinenzler" "Abstinenzler" masculine | mkN "Antialkoholiker" "Antialkoholiker" masculine | mkN "Temperenzler" masculine ; -- status=guess status=guess status=guess
 lin teetotaling_N = variants {} ;
 lin teetotaller_N = mkN "Abstinenzler" "Abstinenzler" masculine | mkN "Antialkoholiker" "Antialkoholiker" masculine | mkN "Temperenzler" masculine ; -- status=guess status=guess status=guess
 lin teetotum_N = variants {} ;
--- a/lib/src/translator/DictionaryHin.gf
+++ b/lib/src/translator/DictionaryHin.gf
@@ -28222,7 +28222,6 @@ lin teeter_V = mkV "लड़खड़ाना" ; -- tocheck
 lin teethe_V = compoundV "दाँत" (mkV "निकलना") ; -- tocheck              
 lin teething_N = mkN "दंतुरण" ; -- tocheck       
 lin teetotal_A = mkA "मद्यत्यागी" ; -- tocheck              
-lin teetotaler_N = mkN "पूर्णतया मद्यत्यागी" ; -- tocheck       
 lin teetotaling_N = mkN "मद्यत्याग" ; -- tocheck       
 lin teetotaller_N = mkN "पूर्णतया मद्यत्यागी" ; -- tocheck              
 lin teetotum_N = mkN "लट्टू" ; -- tocheck              
--- a/lib/src/translator/DictionaryRus.gf
+++ b/lib/src/translator/DictionaryRus.gf
@@ -57011,7 +57011,6 @@ lin teeter_V = variants {} ;
 lin teethe_V = variants {} ;
 lin teething_N = variants {} ;
 lin teetotal_A = variants {} ;
-lin teetotaler_N = variants {} ;
 lin teetotaling_N = variants {} ;
 lin teetotaller_N = variants {} ;
 lin teetotum_N = mkN "волчок" "волчка" "волчку" "волчок" "волчком" "волчке" "волчками" "волчки" "волчков" "волчкам" "волчки" "волчками" "волчках" Masc Inanimate ;
--- a/lib/src/translator/DictionarySpa.gf
+++ b/lib/src/translator/DictionarySpa.gf
@@ -29555,8 +29555,8 @@ lin teenager_N = mkN "adolescente" masculine ; -- status=guess
 lin teeoff_N = mkN "tee_de_salida" ; --UWN
 lin teeter_V = mkV "titubear" ; -- status=guess, src=wikt
 lin teetotal_A = mkA "abstemio" ; -- status=guess
-lin teetotaler_N = mkN "abstemio" | mkN "abstemia" ; -- status=guess status=guess
 lin teetotaling_N = mkN "abstención" | mkN "abstinencia" ; --UWN
+lin teetotaller_N = mkN "abstemio" | mkN "abstemia" ; -- status=guess status=guess
 lin tegument_N = mkN "piel" ; --UWN
 lin teignmouth_PN = mkPN "Teignmouth" ; -- status=guess src=geonames
 lin tektite_N = mkN "tectita" ; -- status=guess
--- a/lib/src/translator/DictionarySwe.gf
+++ b/lib/src/translator/DictionarySwe.gf
@@ -56595,7 +56595,6 @@ lin teeter_V = mkV "vippar" ; -- status=guess
 lin teethe_V = variants {} ; -- status=guess
 lin teething_N = mkN "barnsjukdom" ;
 lin teetotal_A = variants {} ; -- status=guess
-lin teetotaler_N = mkN "absolutist" "absolutister" ; -- status=guess
 lin teetotaling_N = variants {} ; -- status=guess
 lin teetotaller_N = mkN "absolutist" "absolutister" ; -- comment=2
 lin teetotum_N = variants {} ; -- status=guess
--- a/lib/src/translator/DictionaryTha.gf
+++ b/lib/src/translator/DictionaryTha.gf
@@ -38702,7 +38702,6 @@ lin teeter_V = mkV "โยกคลอน" | mkV "เดินโซเซ" | mk
 lin teethe_V = mkV "ฟันงอก" | mkV "ฟันขึ้น" | mkV "ฟันน้ำนมขึ้น" | mkV "ฟันน้ํานมขึ้น" ; -- src=panlex
 lin teething_N = mkN "การงอกของฟัน" | mkN "การงอกของฟัน" ; -- src=panlex
 lin teetotal_A = mkA "ซึ่งเลิกดื่ม" | mkA "เด็ดขาด" | mkA "โดยสิ้นเชิง" | mkA "เลิกเหล้าอย่างเด็ดขาด" | mkA "เกี่ยวกับการเลิกเหล้าอย่างสิ้นเชิง" ; -- src=panlex
-lin teetotaler_N = mkN "ผู้ที่ไม่บริโภคเครื่องดื่มแอลกอฮอล์" ; -- src=panlex
 lin teetotaller_N = mkN "ผู้ที่ไม่บริโภคเครื่องดื่มแอลกอฮอล์" ; -- src=panlex
 lin teetotum_N = mkN "ลูกข่าง" ; -- src=panlex
 lin teff_N = mkN "หญ้าเทฟ" ; -- src=panlex
--- a/lib/src/translator/translate.probs
+++ b/lib/src/translator/translate.probs
@@ -56945,7 +56945,6 @@ teeter_V	6.803646754660499e-5
 teethe_V	2.2678822515534993e-5
 teething_N	3.729715012475897e-6
 teetotal_A	1.0773191989054437e-5
-teetotaler_N	3.729715012475897e-6
 teetotaling_N	3.729715012475897e-6
 teetotaller_N	3.729715012475897e-6
 teetotum_N	3.729715012475897e-6