mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-04-09 04:59:31 -06:00
merge theater and theatre
This commit is contained in:
@@ -58247,7 +58247,6 @@ fun thaw_N : N ;
|
||||
fun thaw_V : V ;
|
||||
fun thaw_V2 : V2 ;
|
||||
fun theanthropism_N : N ;
|
||||
fun theater_N : N ;
|
||||
fun theatre_N : N ;
|
||||
fun theatregoer_N : N ;
|
||||
fun theatrical_A : A ;
|
||||
|
||||
@@ -58297,9 +58297,8 @@ lin thaumatolatry_N = variants {};
|
||||
lin thaw_N = mkN071 "топене" ; ----
|
||||
lin thaw_V = variants {dualV (mkV186 "размразявам") (mkV174 "размразя"); dualV (mkV186 "разтопявам") (mkV174 "разтопя"); dualV (mkV186 "стопявам") (mkV174 "стопя"); singleV (mkV174 "топя")}; ----
|
||||
lin thaw_V2 = dirV2 (dualV (mkV186 "размразявам") (mkV174 "размразя")); ----
|
||||
lin theanthropism_N = mkN011 "антропоморфизъм"; ----
|
||||
lin theater_N = variants {};
|
||||
lin theatre_N = mkN009 "театър" ;
|
||||
lin theanthropism_N = mkN011 "антропоморфизъм";
|
||||
lin theatre_N = mkN009 "театър";
|
||||
lin theatregoer_N = variants {};
|
||||
lin theatrical_A = mkA079 "театрален" ;
|
||||
lin theatrical_N = mkN007a "театрал";
|
||||
|
||||
@@ -31919,8 +31919,7 @@ lin thaw_N = mkN "解冻" ;
|
||||
lin thaw_V = mkV "融化" | {-HSK-} mkV "解凍" | mkV "解冻" | {-mwn-} mkV "使溶解" | mkV "液化" | mkV "溶解" ; -- status=guess, src=wikt -- status=guess, src=wikt -- status=guess, src=wikt -- open-multilingual-wordnet
|
||||
lin thaw_V2 = mkV2 "融化" | {-HSK-} mkV2 (mkV "解凍") | mkV2 (mkV "解冻") | mkV2 (mkV "融化") ; -- status=guess, src=wikt -- status=guess, src=wikt -- status=guess, src=wikt
|
||||
lin theanthropism_N = mkN "拟人" | mkN "拟人论" ; -- open-multilingual-wordnet
|
||||
lin theater_N = mkN "劇場" | mkN "剧场" | {-HSK-} mkN "戏剧" ; -- status=guess -- status=guess
|
||||
lin theatre_N = mkN "剧院" ;
|
||||
lin theatre_N = mkN "剧院" | mkN "劇場" | mkN "剧场" | {-HSK-} mkN "戏剧" ; -- status=guess -- status=guess
|
||||
lin theatrical_A = mkA "戏剧" ;
|
||||
lin theatrical_N = mkN "戏剧演出" ;
|
||||
lin thebe_N = mkN "西比" ; -- open-multilingual-wordnet
|
||||
|
||||
@@ -19254,8 +19254,7 @@ lin thatcher_N = mkN "dakdekker" masculine ; -- status=guess
|
||||
lin thaw_N = mkN "dooi" ; -- status=guess
|
||||
lin thaw_V = mkV "ontdooien" ; -- status=guess, src=wikt
|
||||
lin thaw_V2 = mkV2 (mkV "ontdooien") ; -- status=guess, src=wikt
|
||||
lin theater_N = mkN "theater" neuter ; -- status=guess
|
||||
lin theatre_N = variants {} ; --
|
||||
lin theatre_N = mkN "theater" neuter ; -- status=guess
|
||||
lin theatrical_A = mkA "dramatisch" ; -- status=guess
|
||||
lin theft_N = mkN "diefstal" feminine ; -- status=guess
|
||||
lin theism_N = mkN "theïsme" neuter ; -- status=guess
|
||||
|
||||
@@ -58535,8 +58535,7 @@ lin thaumatolatry_N = mkN "thaumatolatry" ;
|
||||
lin thaw_N = mkN "thaw" "thaws";
|
||||
lin thaw_V = mkV "thaw" "thaws" "thawed" "thawed" "thawing";
|
||||
lin thaw_V2 = mkV2 (mkV "thaw" "thaws" "thawed" "thawed" "thawing");
|
||||
lin theanthropism_N = mkN "theanthropism" ;
|
||||
lin theater_N = mkN "theater" ;
|
||||
lin theanthropism_N = mkN "theanthropism";
|
||||
lin theatre_N = mkN (variants {"theatre"; "theater"});
|
||||
lin theatregoer_N = mkN "theatregoer" "theatregoers";
|
||||
lin theatrical_A = compoundA (mkA "theatrical");
|
||||
|
||||
@@ -23309,7 +23309,7 @@ lin terra_cotta_N = mkN "terrakota" ;
|
||||
lin terra_firma_N = mkN "kindel maa" | mkN "kuiv maa" ;
|
||||
lin terra_incognita_N = mkN "terra incognita" ;
|
||||
lin test_tube_N = mkN "katseklaas" ;
|
||||
lin theater_N = mkN "teater" ;
|
||||
lin theatre_N = mkN "teater" ;
|
||||
lin theme_N = mkN "kujundusteema" | mkN "teema" ;
|
||||
lin think_N = mkN "mõtlema" ;
|
||||
lin those_N = mkN "need" | mkN "neid" ;
|
||||
|
||||
@@ -48623,7 +48623,7 @@ lin rightmost_A = variants {} ;
|
||||
lin rightness_N = variants {} ;
|
||||
lin rigid_A = mk3A "steif" "steifer" "steifste" ; -- status=guess
|
||||
lin rigidity_N = variants {} ;
|
||||
lin rigmarole_N = theater_N | mkN "Zirkus" "Zirkusse" masculine ; -- status=guess status=guess
|
||||
lin rigmarole_N = theatre_N | mkN "Zirkus" "Zirkusse" masculine ; -- status=guess status=guess
|
||||
lin rigor_mortis_N = variants {} ;
|
||||
lin rigorous_A = mk3A "streng" "strenger" "strengste" ; -- status=guess
|
||||
lin rigour_N = variants {} ;
|
||||
@@ -58253,8 +58253,7 @@ lin thaw_N = mkN "Tauwetter" neuter ; -- status=guess
|
||||
lin thaw_V = mkV "auftauen" ; -- status=guess, src=wikt
|
||||
lin thaw_V2 = mkV2 (mkV "auftauen") ; -- status=guess, src=wikt
|
||||
lin theanthropism_N = variants {} ;
|
||||
lin theater_N = kino_N | mkN "Filmtheater" neuter | mkN "Lichtspielhaus" neuter ; -- status=guess status=guess status=guess
|
||||
lin theatre_N = variants {} ; --
|
||||
lin theatre_N = kino_N | mkN "Filmtheater" neuter | mkN "Lichtspielhaus" neuter ; -- status=guess status=guess status=guess
|
||||
lin theatregoer_N = variants {} ;
|
||||
lin theatrical_A = mk3A "theatralisch" "theatralischer" "theatralischste" | mk3A "dramatisch" "dramatischer" "dramatischste" ; -- status=guess status=guess
|
||||
lin theatrical_N = variants {} ;
|
||||
|
||||
Reference in New Issue
Block a user