diff --git a/lib/src/bulgarian/DictEngBul.gf b/lib/src/bulgarian/DictEngBul.gf index bbfce8fd8..a801784a2 100644 --- a/lib/src/bulgarian/DictEngBul.gf +++ b/lib/src/bulgarian/DictEngBul.gf @@ -54692,8 +54692,9 @@ lin teach_V2 = prepV2 (singleV (mkV176 "уча")) (mkPrep "на" Acc); lin teach_V2V = variants {}; lin teach_in_N = variants {}; lin teachable_A = variants {}; -lin teacher_N = mkN031a "учител"; -lin teachership_N = variants {}; +lin teacherMasc_N = mkN031a "учител"; +lin teacherFem_N = mkN031a "учителка"; +lin teachership_N = mkN054 "учителство"; lin teaching_N = mkN071 "преподаване"; lin teacup_N = variants {}; lin teahouse_N = variants {}; diff --git a/lib/src/chinese/DictEngChi.gf b/lib/src/chinese/DictEngChi.gf index d0344cf1f..c0e73720d 100644 --- a/lib/src/chinese/DictEngChi.gf +++ b/lib/src/chinese/DictEngChi.gf @@ -419,7 +419,8 @@ studentFem_N = L.student_N ; --CHECKED table_N = L.table_N ; --CHECKED tail_N = L.tail_N ; --CHECKED talk_V3 = L.talk_V3 ; --CHECKED - teacher_N = L.teacher_N ; --CHECKED + teacherMasc_N = L.teacher_N ; --CHECKED + teacherFem_N = L.teacher_N ; --CHECKED teach_V2 = L.teach_V2 ; --CHECKED television_N = L.television_N ; --CHECKED thick_A = L.thick_A ; --CHECKED diff --git a/lib/src/english/DictEng.gf b/lib/src/english/DictEng.gf index 157ebe625..2c082d656 100644 --- a/lib/src/english/DictEng.gf +++ b/lib/src/english/DictEng.gf @@ -49,7 +49,7 @@ lin abaxial_A = mkA "abaxial" ; lin abaya_N = mkN "abaya" ; lin abbacy_N = mkN "abbacy" ; lin abbatial_A = mkA "abbatial" ; -lin abbe_N = mkN masculine (mkN "abbé" "abbés"); +lin abbe_N = mkN masculine (mkN (variants {"abbé"; "abbe"})); lin abbess_N = mkN feminine (mkN "abbess" "abbesses"); lin abbey_N = mkN "abbey" "abbeys"; lin abbot_N = mkN "abbot" "abbots"; @@ -20457,7 +20457,7 @@ lin fight_N = mkN "fight" "fights"; lin fight_V = IrregEng.fight_V; lin fight_V2 = mkV2 (IrregEng.fight_V); lin fight_V2V = mkV2V (IrregEng.fight_V) noPrep to_Prep ; -lin fighter_N = mkN "fighter" "fighters"; +lin fighter_N = mkN human (mkN "fighter" "fighters"); lin fighting_N = mkN "fighting" ; lin figment_N = mkN "figment" "figments"; lin figural_A = mkA "figural" ; @@ -54704,7 +54704,8 @@ lin teach_V2 = mkV2 (IrregEng.teach_V); lin teach_V2V = mkV2V (IrregEng.teach_V) noPrep to_Prep ; lin teach_in_N = mkN "teach-in" "teach-ins"; lin teachable_A = compoundA (mkA "teachable"); -lin teacher_N = mkN "teacher" "teachers"; +lin teacherMasc_N = mkN masculine (mkN "teacher" "teachers"); +lin teacherFem_N = mkN feminine (mkN "teacher" "teachers"); lin teachership_N = mkN "teachership" ; lin teaching_N = mkN "teaching" "teachings"; lin teacup_N = mkN "teacup" "teacups"; diff --git a/lib/src/english/DictEngAbs.gf b/lib/src/english/DictEngAbs.gf index 352ec99b2..64391498a 100644 --- a/lib/src/english/DictEngAbs.gf +++ b/lib/src/english/DictEngAbs.gf @@ -54623,7 +54623,8 @@ fun teach_V2 : V2; fun teach_V2V : V2V; fun teach_in_N : N; fun teachable_A : A; -fun teacher_N : N; +fun teacherMasc_N : N; +fun teacherFem_N : N; fun teachership_N : N; fun teaching_N : N; fun teacup_N : N; diff --git a/lib/src/finnish/DictEngFin.gf b/lib/src/finnish/DictEngFin.gf index f21abc45e..74a5e8ba0 100644 --- a/lib/src/finnish/DictEngFin.gf +++ b/lib/src/finnish/DictEngFin.gf @@ -52074,7 +52074,8 @@ studentFem_N = L.student_N ; table_N = L.table_N ; tail_N = L.tail_N ; talk_V3 = L.talk_V3 ; - teacher_N = L.teacher_N ; + teacherMasc_N = L.teacher_N ; + teacherFem_N = L.teacher_N ; teach_V2 = L.teach_V2 ; television_N = L.television_N ; thick_A = L.thick_A ; diff --git a/lib/src/french/DictEngFre.gf b/lib/src/french/DictEngFre.gf index a12604061..c6396afdd 100644 --- a/lib/src/french/DictEngFre.gf +++ b/lib/src/french/DictEngFre.gf @@ -414,7 +414,8 @@ lin table_N = L.table_N; --CHECKED tail_N = L.tail_N; --CHECKED talk_V3 = L.talk_V3; --CHECKED - teacher_N = L.teacher_N; --CHECKED + teacherMasc_N = L.teacher_N; --CHECKED + teacherFem_N = regGenN "professeure" feminine; --CHECKED teach_V2 = L.teach_V2; --CHECKED television_N = L.television_N; --CHECKED thick_A = L.thick_A; --CHECKED diff --git a/lib/src/german/DictEngGer.gf b/lib/src/german/DictEngGer.gf index daaca0840..b0f1072c7 100644 --- a/lib/src/german/DictEngGer.gf +++ b/lib/src/german/DictEngGer.gf @@ -37942,7 +37942,8 @@ lin teach_V2V = variants {}; lin teach_VS = variants {}; lin teach_in_N = variants {}; lin teachable_A = variants {}; -lin teacher_N = reg2N "Lehrer" "Lehrer" masculine; +lin teacherMasc_N = reg2N "Lehrer" "Lehrer" masculine; +lin teacherFem_N = reg2N "Lehrerin" "Lehrerinnen" feminine; lin teaching_N = reg2N "Lehre" "Lehren" feminine; lin teacup_N = reg2N "Teetasse" "Teetassen" feminine; lin teahouse_N = variants {}; diff --git a/lib/src/hindi/DictEngHin.gf b/lib/src/hindi/DictEngHin.gf index 3e20120e0..472f2bc20 100644 --- a/lib/src/hindi/DictEngHin.gf +++ b/lib/src/hindi/DictEngHin.gf @@ -28070,7 +28070,8 @@ lin teach_V = mkV "पढ्ना" ; -- old -- old lin teach_V2 = mkV2 (mkV "पढ्ना") ; lin teach_VS = mkVS (mkV "पढ्ना" ); lin teachable_A = mkA "पाठनीय" ; -- old -- old -lin teacher_N = mkN "शिक्षक" ; -- old -- old +lin teacherMasc_N = mkN "शिक्षक" ; -- old -- old +lin teacherFem_N = mkN "शिक्षक" ; -- old -- old lin teaching_N = mkN "अध्यापन" ; -- old -- old lin teacup_N = mkN "चाय का कप" ; -- old -- old lin teahouse_N = mkN "चाय की दुकान" ; -- old -- old diff --git a/lib/src/swedish/DictEngSwe.gf b/lib/src/swedish/DictEngSwe.gf index d43538b5f..0dfd0ca3a 100644 --- a/lib/src/swedish/DictEngSwe.gf +++ b/lib/src/swedish/DictEngSwe.gf @@ -57061,7 +57061,8 @@ lin teach_V2 = L.teach_V2; lin teach_V2V = mkV2V (mkV "lära") | mkV2V (mkV (mkV "lära") "ut"); -- status=guess, src=wikt status=guess, src=wikt lin teach_in_N = variants {}; lin teachable_A = variants {}; -lin teacher_N = L.teacher_N; +lin teacherMasc_N = L.teacher_N; +lin teacherFem_N = L.teacher_N; lin teachership_N = variants {}; lin teaching_N = mkN "undervisning"; lin teacup_N = mkN "tekopp"; diff --git a/lib/src/urdu/DictEngUrd.gf b/lib/src/urdu/DictEngUrd.gf index 5d092738f..302ceb808 100644 --- a/lib/src/urdu/DictEngUrd.gf +++ b/lib/src/urdu/DictEngUrd.gf @@ -27412,7 +27412,8 @@ lin teach_V2 = mkV2 (compoundV "درس" (mkV "دینا")) ; -- from DictUr --lin teach_V2V = mkV2 (mkV "سکھانا") ; lin teach_VS = mkVS (mkV "سکھانا") ; lin teachable_A = mkA "لائق تدریس" ; -- from DictUrd -lin teacher_N = mkN "آموز گار" ; -- from DictUrd +lin teacherMasc_N = mkN "آموز گار" ; -- from DictUrd +lin teacherFem_N = mkN "آموز گار" ; -- from DictUrd lin teaching_N = mkN "درس" ; -- from DictUrd lin teak_N = mkN "تعمیری لکڑی" ; lin teal_N = mkN "مرغ ابی" ; -- from DictUrd