one big patch with several changes in the different dictionaries

1. the duplicated variants in the French entries are merged
2. ~150 abstract words are split into masculine and feminine entries.
   The actual defininitions for English, Bulgarian, French and German differ.
   For the other languages they are just copied.
3. fan_N, intelligency_N, character_N and letter_N are split into
   different senses. The entries for Bulgarian, Swedish, German and French
   are sense disambiguated. For English they are just copied since they
   are ambiguous. For the other languages they are copied since I don't
   know how to translate them.

lib/src/bulgarian/DictEngBul.gf

@@ -5375,7 +5375,8 @@ lin beggarwoman_N = mkN047 "просякиня";
 lin beggary_N = mkN047 "просия" ; ----
 lin begin_V = dualV (mkV186 "започвам") (mkV152 "започна");
 lin begin_V2 = dirV2 (dualV (mkV186 "започвам") (mkV152 "започна"));
-lin begin_VV = mkVV (dualV (mkV186 "започвам") (mkV152 "започна"));
+lin begin_ing_VV = mkVV (dualV (mkV186 "започвам") (mkV152 "започна"));
+lin begin_to_VV = mkVV (dualV (mkV186 "започвам") (mkV152 "започна"));
 lin beginner_N = variants {};
 lin beginning_N = mkN054 "начало" ;
 lin begonia_N = variants {};
@@ -9631,7 +9632,8 @@ lin char_V2 = variants {};
 lin charabanc_1_N = variants {};
 lin charabanc_2_N = variants {};
 lin characin_N = variants {};
-lin character_N = mkN007 "характер" ;
+lin character_1_N = mkN007 "характер";
+lin character_2_N = mkN007 "символ";
 lin characteristic_A = mkA079 "характеристичен";
 lin characteristic_N = mkN041 "характеристика";
 lin characteristically_Adv = variants {};
@@ -10475,8 +10477,8 @@ lin clannish_A = variants {};
 lin clannishness_N = variants {};
 lin clansman_N = variants {};
 lin clap_N = variants {};
-lin clap_V = variants {};
-lin clap_V2 = variants {};
+lin clap_V = dualV (mkV186 "пляскам") (mkV152 "плесна");
+lin clap_V2 = prepV2 (dualV (mkV186 "пляскам") (mkV152 "плесна")) with_Prep;
 lin clapboard_N = variants {};
 lin clapper_N = mkN054 "кречетало" ; ----
 lin clapperboard_N = variants {};
@@ -10486,11 +10488,11 @@ lin clare_PN = variants {};
 lin clarence_N = variants {};
 lin claret_N = variants {};
 lin clarification_N = mkN071 "разясняване" ;
-lin clarify_V = variants {};
-lin clarify_V2 = variants {};
-lin clarinet_N = mkN007 "кларинет" ; ----
-lin clarinetist_N = mkN007 "кларинет" ; ----
-lin clarinettist_N = variants {};
+lin clarify_V = actionV (mkV186 "разяснявам") (mkV174 "разясня");
+lin clarify_V2 = dirV2 (actionV (mkV186 "разяснявам") (mkV174 "разясня"));
+lin clarinet_N = mkN007 "кларинет";
+lin clarinetistMasc_N = mkN007a (variants {"кларинетист"; "кларнетист"});
+lin clarinetistFem_N = mkN041 "кларнетистка";
 lin clarion_A = variants {};
 lin clarion_N = variants {};
 lin clarity_N = mkN041 "яснота" ; ----
@@ -10608,8 +10610,8 @@ lin cleethorpes_PN = variants {};
 lin clef_N = variants {};
 lin cleft_A = variants {};
 lin cleft_N = variants {};
-lin cleistogamous_A = variants {};
-lin cleistogamy_N = variants {};
+lin cleistogamous_A = mkA079 "клейстогамен";
+lin cleistogamy_N = mkN047 "клейстогамия";
 lin cleistothecium_N = variants {};
 lin clem_PN = variants {};
 lin clematis_N = mkN007 "повет" ; ----
@@ -11282,7 +11284,7 @@ lin colour_wash_N = variants {};
 lin colourful_A = mkA079 "цветен";
 lin colouring_N = variants {};
 lin colourless_A = mkA079 "безцветен";
-lin colourlessness_N = mkN049 "безцветност";
+lin colorlessness_N = mkN049 "безцветност";
 lin colpitis_N = variants {};
 lin colpocele_N = variants {};
 lin colpocystitis_N = variants {};
@@ -12366,8 +12368,8 @@ lin cookery_book_N = variants {};
 lin cookfire_N = variants {};
 lin cookham_PN = variants {};
 lin cookhouse_N = variants {};
-lin cookie_N = mkN041 "бисквитка" ; ----
-lin cooking_N = mkN054 "готварство" ;
+lin cookie_N = mkN047 "курабия";
+lin cooking_N = mkN054 "готварство";
 lin cookout_N = variants {};
 lin cookstove_N = variants {};
 lin cooky_N = variants {};
@@ -13823,8 +13825,8 @@ lin custody_N = mkN007 "притвор" ;
 lin custom_N = mkN032 "обичай" ;
 lin custom_built_A = variants {};
 lin custom_made_A = variants {};
-lin customary_A = mkA085 "обичаен" ; ----
-lin customerFem_N = mkN031a "потребител" ;
+lin customary_A = mkA085 "обичаен";
+lin customerFem_N = mkN041 "потребителка";
 lin customerMasc_N = mkN031a "потребител" ;
 lin customhouse_N = variants {};
 lin customize_V2 = variants {};
@@ -18256,7 +18258,6 @@ lin end_N = mkN036 "край";
 lin end_V = dualV (mkV186 "приключвам") (mkV176 "приключа");
 lin end_V2 = dirV2 (dualV (mkV186 "завършвам") (mkV176 "завърша"));
 lin end_VA = variants {};
-lin end_VS = variants {};
 lin end_all_N = variants {};
 lin end_tail_V2 = variants {};
 lin endameba_N = variants {};
@@ -18809,7 +18810,7 @@ lin eritrea_PN = variants {};
 lin eritrean_A = variants {};
 lin eritrean_N = variants {};
 lin erlangen_PN = variants {};
-lin ermineermine_N = mkN007 "хермелин";
+lin ermine_N = mkN007 "хермелин";
 lin ern_N = variants {};
 lin ernest_PN = variants {};
 lin ernie_PN = variants {};
@@ -19888,7 +19889,9 @@ lin famish_V2 = variants {};
 lin famotidine_N = variants {};
 lin famous_A = mkA079 "фамозен" ;
 lin famulus_N = variants {};
-lin fan_N = mkN007 "вентилатор" ;
+lin fan_1_N = mkN007 "вентилатор";
+lin fan_2_N = mkN001 "фен";
+lin fan_3_N = mkN054 "ветрило";
 lin fan_V = variants {};
 lin fan_V2 = variants {};
 lin fan_belt_N = variants {};
@@ -24771,7 +24774,6 @@ lin hazel_PN = variants {};
 lin hazelnut_N = variants {};
 lin haziness_N = variants {};
 lin hazy_A = variants {};
-lin he_N = variants {};
 lin he_Pron = mkPron "той" "него" "му" "негов" "неговия" "неговият" "негова" "неговата" "негово" "неговото" "негови" "неговите" (GSg Masc) P3;
 lin he_goat_N = variants {};
 lin he_man_N = variants {};
@@ -25193,7 +25195,6 @@ lin herd_V2 = variants {};
 lin herder_N = variants {};
 lin herdsman_N = variants {};
 lin here_Adv = ss "тук";
-lin here_N = variants {};
 lin hereabout_Adv = variants {};
 lin hereabouts_Adv = variants {};
 lin hereafter_Adv = variants {};
@@ -27804,7 +27805,7 @@ lin inherit_V2 = variants {};
 lin inheritable_A = variants {};
 lin inheritance_N = mkN071 "наследяване";
 lin inheritorFem_N = mkN041 "наследница";
-lin inheritor_N = mkN014 "наследник";
+lin inheritorMasc_N = mkN014 "наследник";
 lin inhibit_V2 = variants {};
 lin inhibition_N = variants {};
 lin inhibitor_N = variants {};
@@ -28120,7 +28121,8 @@ lin intellect_N = mkN007 "интелект" ;
 lin intellectual_A = mkA079 "интелектуален";
 lin intellectual_N = mkN008a "интелектуалец" ;
 lin intellectualization_N = variants {};
-lin intelligence_N = mkN071 "разузнаване";
+lin intelligence_1_N = mkN049 "интелигентност";
+lin intelligence_2_N = mkN071 "разузнаване";
 lin intelligent_A = mkA079 "интелигентен";
 lin intelligentsia_N = mkN047 "интелигенция";
 lin intelligibility_N = mkN049 "разбираемост";
@@ -29031,7 +29033,6 @@ lin jetty_N = variants {};
 lin jew_N = variants {};
 lin jewel_N = mkN049 "скъпоценност" ; ----
 lin jewel_V2 = variants {};
-lin jeweler_N = variants {};
 lin jeweller_N = variants {};
 lin jewellery_N = variants {};
 lin jewelry_N = variants {};
@@ -30819,7 +30820,8 @@ lin lethargic_A = mkA085 "бездеен" ; ----
 lin lethargically_Adv = variants {};
 lin lethargy_N = variants {};
 lin lethe_PN = variants {};
-lin letter_N = mkN054 "писмо" ;
+lin letter_1_N = mkN054 "писмо";
+lin letter_2_N = mkN041 "буква";
 lin letter_box_N = variants {};
 lin letter_card_N = variants {};
 lin letter_case_N = variants {};
@@ -34656,9 +34658,9 @@ lin monocytosis_N = variants {};
 lin monodic_A = variants {};
 lin monoecious_A = variants {};
 lin monogamist_N = variants {};
-lin monogamous_A = variants {};
-lin monogamy_N = mkN054 "едноженство" ;
-lin monogenesis_N = variants {};
+lin monogamous_A = mkA079 "моногамен";
+lin monogamy_N = mkN047 "моногамия";
+lin monogenesis_N = mkN041 "моногенеза";
 lin monogenic_A = variants {};
 lin monogram_N = variants {};
 lin monograph_N = variants {};
@@ -36805,7 +36807,6 @@ lin nostoc_N = variants {};
 lin nostril_N = variants {};
 lin nostrum_N = variants {};
 lin nosy_A = variants {};
-lin not_Adv = variants {};
 lin notability_N = variants {};
 lin notable_A = variants {};
 lin notable_N = variants {};
@@ -41542,15 +41543,16 @@ lin polyestrous_A = variants {};
 lin polyethylene_N = mkN007 "полиетилен";
 lin polyfoam_N = variants {};
 lin polygamist_N = variants {};
-lin polygamous_A = variants {};
-lin polygamy_N = mkN054 "многоженство" ;
+lin polygamous_A = mkA079 "полигамен";
+lin polygamy_N = mkN047 "полигамия";
 lin polygene_N = variants {};
 lin polygenic_A = variants {};
 lin polyglot_A = variants {};
-lin polyglot_N = variants {};
-lin polygon_N = variants {};
-lin polygonal_A = mkA079 "многоъгълен" ; ----
-lin polygraph_N = variants {};
+lin polyglotMasc_N = mkN007a "полиглот";
+lin polyglotFem_N = mkN041 "полиглотка";
+lin polygon_N = dualN (mkN014 "многоъгълник") (mkA079 "многоъгълен");
+lin polygonal_A = mkA079 "многоъгълен";
+lin polygraph_N = dualN (mkN007 "полиграф") (mkA079 "полиграфичен");
 lin polygynist_N = variants {};
 lin polygynous_A = variants {};
 lin polygyny_N = variants {};
@@ -41558,20 +41560,20 @@ lin polyhedral_A = variants {};
 lin polyhedron_N = variants {};
 lin polymastigote_N = variants {};
 lin polymath_N = variants {};
-lin polymer_N = variants {};
+lin polymer_N = dualN (mkN007 "полимер") (mkA079 "полимерен");
 lin polymerase_N = variants {};
-lin polymeric_A = variants {};
+lin polymeric_A = mkA079 "полимерен";
 lin polymerization_N = variants {};
 lin polymorph_N = variants {};
 lin polymorphemic_A = variants {};
-lin polymorphic_A = variants {};
-lin polymorphism_N = variants {};
-lin polymorphous_A = variants {};
+lin polymorphic_A = mkA079 "полиморфен";
+lin polymorphism_N = dualN (mkN011 "полиморфизъм") (mkA079 "полиморфен");
+lin polymorphous_A = mkA079 "полиморфен";
 lin polymyositis_N = variants {};
 lin polymyxin_N = variants {};
 lin polyneuritis_N = variants {};
-lin polynomial_A = variants {};
-lin polynomial_N = variants {};
+lin polynomial_A = mkA079 "полиномен";
+lin polynomial_N = dualN (mkN007 "полином") (mkA079 "полиномен");
 lin polynya_N = variants {};
 lin polyoma_N = variants {};
 lin polyp_N = mkN007 "полип";
@@ -41594,16 +41596,16 @@ lin polyptoton_N = variants {};
 lin polypus_N = variants {};
 lin polysaccharide_N = variants {};
 lin polysemant_N = variants {};
-lin polysemous_A = variants {};
-lin polysemy_N = variants {};
+lin polysemous_A = mkA079 "полисемантичен";
+lin polysemy_N = dualN (mkN047 "полисемия") (mkA079 "полисемантичен");
 lin polysomy_N = variants {};
 lin polystyrene_N = variants {};
-lin polysyllabic_A = mkA079 "многосричен" ; ----
+lin polysyllabic_A = mkA079 "многосричен";
 lin polysyllabically_Adv = variants {};
 lin polysyllable_N = variants {};
 lin polysyndeton_N = variants {};
 lin polytechnic_N = variants {};
-lin polytheism_N = mkN011 "политеизъм" ; ----
+lin polytheism_N = mkN011 "политеизъм";
 lin polytheist_N = variants {};
 lin polytheistic_A = variants {};
 lin polythene_N = variants {};
@@ -41615,11 +41617,11 @@ lin polyuria_N = variants {};
 lin polyvalence_N = variants {};
 lin polyvalent_A = variants {};
 lin pom_N = variants {};
-lin pomade_N = variants {};
+lin pomade_N = mkN041 "помада";
 lin pomade_V2 = variants {};
 lin pome_N = variants {};
-lin pomegranate_N = mkN001 "нар" ; ----
-lin pomelo_N = variants {};
+lin pomegranate_N = mkN001 "нар";
+lin pomelo_N = mkN054 "помело";
 lin pomfret_N = variants {};
 lin pommel_N = variants {};
 lin pommel_V2 = variants {};
@@ -41668,7 +41670,7 @@ lin pood_N = variants {};
 lin poodle_N = variants {};
 lin poof_N = variants {};
 lin pooh_pooh_V2 = variants {};
-lin pool_N = mkN007 "басейн" ; ----
+lin pool_N = mkN007 "басейн";
 lin pool_V2 = variants {};
 lin poole_PN = variants {};
 lin pooler_N = variants {};
@@ -41741,17 +41743,17 @@ lin pornographically_Adv = variants {};
 lin pornography_N = mkN047 "порнография" ; ----
 lin porose_A = variants {};
 lin porosity_N = variants {};
-lin porous_A = variants {};
+lin porous_A = mkA076 "порест";
 lin porousness_N = variants {};
 lin porphyria_N = variants {};
 lin porphyrin_N = variants {};
 lin porphyritic_A = variants {};
-lin porphyry_N = mkN007 "порфир" ; ----
+lin porphyry_N = mkN007 "порфир";
 lin porpoise_N = variants {};
-lin porridge_N = variants {};
+lin porridge_N = mkN041 "каша";
 lin porringer_N = variants {};
 lin port_A = variants {};
-lin port_N = mkN066 "пристанище" ; ----
+lin port_N = mkN066 "пристанище";
 lin port_V2 = variants {};
 lin port_glasgow_PN = variants {};
 lin port_talbot_PN = variants {};
@@ -45746,7 +45748,6 @@ lin respond_V2 = variants {};
 lin respond_VS = variants {};
 lin respondent_N = variants {};
 lin response_N = mkN007 "отговор";
-lin response_N2 = prepN2 (mkN007 "отговор") (mkPrep "на" Acc);
 lin responsibility_N = mkN049 "отговорност" ;
 lin responsible_A = mkA079 "отговорен" ;
 lin responsive_A = variants {};
@@ -50038,8 +50039,8 @@ lin skiffle_N = variants {};
 lin skiffle_group_N = variants {};
 lin skiing_N = variants {};
 lin skilful_A = variants {};
-lin skill_N = mkN007 "опит" ;
-lin skilled_A = mkA079 "опитен" ; ----
+lin skill_N = mkN072 "умение";
+lin skilled_A = mkA079 "опитен";
 lin skillet_N = variants {};
 lin skillfully_Adv = variants {};
 lin skillfulness_N = variants {};
@@ -55289,7 +55290,6 @@ lin therapist_N = mkN008 "вражалец" ; ----
 lin therapsid_N = variants {};
 lin therapy_N = mkN047 "терапия" ; ----
 lin there_Adv = ss "там";
-lin there_N = variants {};
 lin thereabout_Adv = variants {};
 lin thereabouts_Adv = variants {};
 lin thereafter_Adv = variants {};
@@ -60219,8 +60219,8 @@ lin volumetrically_Adv = variants {};
 lin voluminous_A = variants {};
 lin voluntary_A = mkA079 "доброволен" ;
 lin voluntary_N = variants {};
-lin volunteer_N = variants {};
-lin volunteer_V = variants {};
+lin volunteerMasc_N = dualN (mkN008a "доброволец") (mkA078 "доброволчески");
+lin volunteerFem_N = dualN (mkN041 "доброволка") (mkA078 "доброволчески");
 lin volunteer_V2 = variants {};
 lin volunteer_V2V = variants {};
 lin volunteer_VS = variants {};

lib/src/chinese/DictEngChi.gf

@@ -407,7 +407,8 @@ lin
   stop_V = L.stop_V ; --CHECKED
   stove_N = L.stove_N ; --CHECKED
   straight_A = L.straight_A ; --CHECKED
-  student_N = L.student_N ; --CHECKED
+studentMasc_N = L.student_N ; --CHECKED
+studentFem_N = L.student_N ; --CHECKED
   stupid_A = L.stupid_A ; --CHECKED
   suck_V2 = L.suck_V2 ; --CHECKED
   sun_N = L.sun_N ; --CHECKED
@@ -851,7 +852,8 @@ total_A = mkA "总共" ; --CHECKED
 building_N = mkN "建筑" ; --CHECKED
 risk_N = mkN "风险" ; --CHECKED
 file_V = mkV "归档" ; --CHECKED
-buyer_N = mkN "买主" ; --CHECKED
+buyerMasc_N = mkN "买主" ; --CHECKED
+buyerFem_N = mkN "买主" ; --CHECKED
 create_V2 = mkV2 "创建" ; --CHECKED
 parent_N = mkN "父母亲" ; --CHECKED
 food_N = mkN "食物" ; --CHECKED
@@ -1063,7 +1065,8 @@ europe_PN = mkPN "欧洲" ; --CHECKED
 chain_N = mkN "连锁" ; --CHECKED
 seem_VV = mkVV "似乎" ; --CHECKED
 rating_N = mkN "等级" ; --CHECKED
-letter_N = mkN "书信" ; --CHECKED
+letter_1_N = mkN "书信" ;
+letter_2_N = mkN "书信" ;
 easy_A = mkA "简单" ; --CHECKED
 toward_Prep = mkPrep "对于" ; --CHECKED
 sign_N = mkN "签署" ; --CHECKED
@@ -1333,7 +1336,8 @@ list_N = mkN "目录" ; --CHECKED
 for_instance_Adv = mkAdv "例如" ; --CHECKED
 discuss_V2 = mkV2 "讨论" ; --CHECKED
 democratic_A = mkA "民主" ; --CHECKED
-adviser_N = mkN "顾问" ; --CHECKED
+adviserMasc_N = mkN "顾问" ; --CHECKED
+adviserFem_N = mkN "顾问" ; --CHECKED
 across_Prep = mkPrep "穿过" ;  --CHECKED
 value_V2 = mkV2 "价值" ; --CHECKED
 negotiation_N = mkN "谈判" ; --CHECKED
@@ -1485,7 +1489,8 @@ hope_N = mkN "希望" ; --CHECKED
 combine_V2 = mkV2 "结合" ; --CHECKED
 columbia_PN = mkPN "哥伦比亚" ; --CHECKED
 charge_V2 = mkV2 "指控" ; --CHECKED
-candidate_N = mkN "候选人" ; --CHECKED
+candidateMasc_N = mkN "候选人" ; --CHECKED
+candidateFem_N = mkN "候选人" ; --CHECKED
 block_V2 = mkV2 "阻止" ; --CHECKED
 beyond_Prep = mkPrep "超出" "以外" ; --CHECKED
 structure_N = mkN "结构" ; --CHECKED
@@ -1544,7 +1549,8 @@ serve_V = mkV "服务" ; --CHECKED
 seem_VA = mkVA "似乎" ; --CHECKED
 push_V = mkV "推" ; --CHECKED
 provide_V = mkV "提供" ; --CHECKED
-prosecutor_N = mkN "原告" ; --CHECKED
+prosecutorMasc_N = mkN "原告" ; --CHECKED
+prosecutorFem_N = mkN "原告" ; --CHECKED
 else_Adv = mkAdv "其他" ; --CHECKED
 electronic_A = mkA "电子" ; --CHECKED
 afternoon_N = mkN "下午" ; --CHECKED
@@ -1637,7 +1643,8 @@ tomorrow_N = mkN "明天" ; --CHECKED
 someone_NP = mkNPword "某个人" ; --CHECKED
 retirement_N = mkN "退休" ; --CHECKED
 representativeMasc_N = mkN "代表" ; --CHECKED
-reporter_N = mkN "记者" ; --CHECKED
+reporterMasc_N = mkN "记者" ; --CHECKED
+reporterFem_N = mkN "记者" ; --CHECKED
 remain_V2 = mkV2 "保持" ; --CHECKED
 relation_N = mkN "关系" ; --CHECKED
 receive_V = mkV "收到" ; --CHECKED
@@ -1757,7 +1764,8 @@ worth_A = mkA "值得" ;--CHECKED
 virtual_A = mkA "虚拟" ;--CHECKED
 tend_VV = mkVV "趋向" ;--CHECKED
 subject_N = mkN "主题" ;--CHECKED
-seller_N = mkN "卖家" ;--CHECKED
+sellerMasc_N = mkN "卖家" ;--CHECKED
+sellerFem_N = mkN "卖家" ;--CHECKED
 relief_N = mkN "缓解" ;--CHECKED
 possibility_N = mkN "可能性" ;--CHECKED
 hospital_N = mkN "医院" ;--CHECKED
@@ -1989,7 +1997,8 @@ experiment_N = mkN "实验" ;  --CHECKED
 ease_V = mkV "减轻" ;  --CHECKED
 defend_V2 = mkV2 "辩护" ;  --CHECKED
 colleague_N = mkN "同事" ;  --CHECKED
-character_N = mkN "字符" ;  --CHECKED
+character_1_N = mkN "字符" ;
+character_2_N = mkN "字符" ;
 cause_V2V = mkV2V "引起" ;  --CHECKED
 career_N = mkN "事业" ;  --CHECKED
 basket_N = mkN "篮" ;  --CHECKED
@@ -2101,7 +2110,8 @@ painting_N = mkN "画" ;  --CHECKED
 pact_N = mkN "协议" ;  --CHECKED
 minimum_N = mkN "极少" ;  --CHECKED
 market_V2 = mkV2 "市场" ;  --CHECKED
-intelligence_N = mkN "情报" ;  --CHECKED
+intelligence_1_N = mkN "情报" ;
+intelligence_2_N = mkN "情报" ;
 gasoline_N = mkN "汽油" ;  --CHECKED
 feel_V = mkV "感觉" ;  --CHECKED
 exposure_N = mkN "曝光" ;  --CHECKED
@@ -2131,7 +2141,9 @@ influence_N = mkN "影响" ;  --CHECKED
 hit_N = mkN "击中" ;  --CHECKED
 founder_N = mkN "创办人" ;  --CHECKED
 fix_V2 = mkV2 "修理" ;  --CHECKED
-fan_N = mkN "爱好者" ;  --CHECKED
+fan_1_N = mkN "爱好者" ;
+fan_2_N = mkN "爱好者" ;
+fan_3_N = mkN "爱好者" ;
 exclusive_A = mkA "独家" ;  --CHECKED
 design_V2V = mkV2V "设计" ;  --CHECKED
 copy_N = mkN "拷贝" ;  --CHECKED
@@ -2248,7 +2260,8 @@ efficient_A = mkA "高效" ;  --CHECKED
 disease_N = mkN "疾病" ;  --CHECKED
 disappointing_A = mkA "令人失望" ;  --CHECKED
 deputy_N = mkN "副" ;  --CHECKED
-citizen_N = mkN "公民" ;  --CHECKED
+citizenMasc_N = mkN "公民" ; --CHECKED
+citizenFem_N = mkN "公民" ; --CHECKED
 bonus_N = mkN "奖金" ;  --CHECKED
 back_V = mkV "支持" ;  --CHECKED
 attractive_A = mkA "引人注意" ;  --CHECKED
@@ -2259,7 +2272,8 @@ syndicate_N = mkN "报系" ;  --CHECKED
 speed_N = mkN "速度" ;  --CHECKED
 sophisticated_A = mkA "深入细致" ;  --CHECKED
 pill_N = mkN "药片" ;  --CHECKED
-opponent_N = mkN "反对者" ;  --CHECKED
+opponentMasc_N = mkN "反对者" ; --CHECKED
+opponentFem_N = mkN "反对者" ; --CHECKED
 once_Prep = mkPrep "一旦" ;  --CHECKED
 neither7nor_DConj = mkConj "既不" "也不" ;  --Question?
 metric_A = mkA "测量" ;  --CHECKED
@@ -2313,7 +2327,8 @@ bolster_V2 = mkV2 "加强" ;  --CHECKED
 assumption_N = mkN "假设" ;  --CHECKED
 associate_N = mkN "关联" ;  --CHECKED
 assembly_N = mkN "集成" ;  --CHECKED
-agent_N = mkN "代理人" ;  --CHECKED
+agentMasc_N = mkN "代理人" ; --CHECKED
+agentFem_N = mkN "代理人" ; --CHECKED
 advice_N = mkN "忠告" ;  --CHECKED
 widespread_A = mkA "广泛" ;  --CHECKED
 tumble_V = mkV "下跌" ;  --CHECKED
@@ -2350,7 +2365,8 @@ boston_PN = mkPN "波士顿" ;  --CHECKED
 body_N = mkN "身体" ;  --CHECKED
 appropriate_A = mkA "适当" ;  --CHECKED
 adjust_V = mkV "调整" ;  --CHECKED
-activist_N = mkN "活动家" ;  --CHECKED
+activistMasc_N = mkN "活动家" ; --CHECKED
+activistFem_N = mkN "活动家" ; --CHECKED
 unemployment_N = mkN "失业" ;  --CHECKED
 tobacco_N = mkN "烟" ;  --CHECKED
 successor_N = mkN "继任者" ;  --CHECKED
@@ -2390,7 +2406,8 @@ unsecured_A = mkA "无抵押" ;  --CHECKED
 tourist_N = mkN "游客" ;  --CHECKED
 suppose_V2V = mkV2V "假设" ;  --CHECKED
 split_N = mkN "分裂" ;  --CHECKED
-speculator_N = mkN "投机者" ;  --CHECKED
+speculatorMasc_N = mkN "投机者" ; --CHECKED
+speculatorFem_N = mkN "投机者" ; --CHECKED
 scientific_A = mkA "科学" ;  --CHECKED
 quite_AdA = mkAdA "相当" ;  --CHECKED
 publication_N = mkN "刊物" ;  --CHECKED
@@ -2795,7 +2812,8 @@ complicate_V2 = mkV2 "使+复杂" ;  --CHECKED
 charge_VS = mkVS "指控" ;  --CHECKED
 authorize_V2 = mkV2 "授权" ;  --CHECKED
 along_Adv = mkAdv "沿着" ;  --CHECKED
-advocate_N = mkN "主张" ;  --CHECKED
+advocateMasc_N = mkN "主张" ; --CHECKED
+advocateFem_N = mkN "主张" ; --CHECKED
 adverse_A = mkA "不利" ;  --CHECKED
 actor_N = mkN "演员" ;  --CHECKED
 well_N = mkN "井" ;  --CHECKED
@@ -2961,7 +2979,8 @@ entity_N = mkN "实体" ;  --CHECKED
 emphasis_N = mkN "重点" ;  --CHECKED
 element_N = mkN "元素" ;  --CHECKED
 due_Adv = mkAdv "应有" ;  --CHECKED
-driver_N = mkN "司机" ;  --CHECKED
+driverMasc_N = mkN "司机" ; --CHECKED
+driverFem_N = mkN "司机" ; --CHECKED
 discipline_N = mkN "纪律" ;  --CHECKED
 disappointment_N = mkN "失望" ;  --CHECKED
 designer_N = mkN "设计师" ;  --CHECKED
@@ -3280,7 +3299,8 @@ formula_N = mkN "公式" ;
 flee_V = mkV "逃跑" ;
 fill_V = mkV "充满" ;
 fail_V2 = mkV2 "失败" ;
-exporter_N = mkN "出口" ;
+exporterMasc_N = mkN "出口" ;
+exporterFem_N = mkN "出口" ;
 examine_V2 = mkV2 "检查" ;
 even_A = mkA "平均" ;
 establishment_N = mkN "编制" ;
@@ -3569,10 +3589,12 @@ auction_V2 = mkV2 "拍卖" ;
 assure_V2 = mkV2 "保证" ;
 array_N = mkN "排列"  ;
 arise_V = mkV "出现" ;
-architect_N = mkN "建筑师" ;
+architectMasc_N = mkN "建筑师" ;
+architectFem_N = mkN "建筑师" ;
 appliance_N = mkN "器具" ;
 anxious_A = mkA "焦急" ;
-administrator_N = mkN "管理员" ;
+administratorMasc_N = mkN "管理员" ;
+administratorFem_N = mkN "管理员" ;
 address_N = mkN "地址" ;
 wealthy_A = mkA "富裕" ;
 waive_V2 = mkV2 "放弃" ;
@@ -3588,7 +3610,8 @@ text_N = mkN "文本" ;
 swift_A = mkA "迅速" ;
 suburban_A = mkA "郊区" ;
 stress_VS = mkVS "强调" ;
-spouse_N = mkN "配偶" ;
+spouseMasc_N = mkN "配偶" ;
+spouseFem_N = mkN "配偶" ;
 sink_V2 = mkV2 "下沉" ;
 sink_V = mkV "下沉" ;
 share_V = mkV "共享" ;
@@ -3679,7 +3702,8 @@ wrongdoing_N = mkN "坏事" "件" ;
 wipe_V = mkV "擦拭" ;
 wear_V = mkV "穿" ;
 wait_VV = mkVV "等待" ;
-volunteer_N = mkN "志愿者" ;
+volunteerMasc_N = mkN "志愿者" ;
+volunteerFem_N = mkN "志愿者" ;
 vision_N = mkN "视力"  [] ;
 virus_N = mkN "病毒"  "种" ;
 uphold_V2 = mkV2 "坚持" ;
@@ -3705,7 +3729,8 @@ search_V = mkV "搜索" ;
 sag_V = mkV "下垂" ;
 royalty_N = mkN "特许权" ;
 rout_N = mkN "大败" ;
-rider_N = mkN "骑士" ;
+riderMasc_N = mkN "骑士" ;
+riderFem_N = mkN "骑士" ;
 reveal_V2 = mkV2 "揭示" ;
 revamp_V2 = mkV2 "修补" ;
 resemble_V2 = mkV2 "相似" ;
@@ -3868,7 +3893,8 @@ cool_V = mkV "冷却" ;
 consume_V2 = mkV2 "消耗" ;
 condemn_V2 = mkV2 "谴责" ;
 concentrate_V2 = mkV2 "集中" ;
-columnist_N = mkN "专栏作家" ;
+columnistMasc_N = mkN "专栏作家" ;
+columnistFem_N = mkN "专栏作家" ;
 coach_N = mkN "教练" ;
 cheat_V = mkV "骗" ;
 cast_N = mkN "铸件" ;
@@ -3953,7 +3979,8 @@ move_VV = mkVV "移动" ;
 morePl_Det = mkpDet "更多" ;
 monopoly_N = mkN "垄断" ;
 minimal_A = mkA "最小" ;
-middleman_N = mkN "中间人" ;
+middlemanMasc_N = mkN "中间人" ;
+middlemanFem_N = mkN "中间人" ;
 mess_N = mkN "混乱" [] ;
 mention_V = mkV "提到" ;
 memo_N = mkN "备忘录" ;
@@ -4493,7 +4520,8 @@ beneath_Prep = mkPrep "下面" ;
 bed_N = mkN "床" ;
 base_A = mkA "基地" ;
 balloon_V = mkV "气球" ;
-backer_N = mkN "靠山" ;
+backerMasc_N = mkN "靠山" ;
+backerFem_N = mkN "靠山" ;
 availability_N = mkN "可用性" ;
 assault_N = mkN "攻击" ;
 antibody_N = mkN "抗体" ;
@@ -4507,7 +4535,8 @@ writing_N = mkN "文章" "篇" ;
 wonderful_A = mkA "精彩" ;
 wish_N = mkN "愿望" ;
 widen_V2 = mkV2 "扩大" ;
-watcher_N = mkN "守望者" ;
+watcherMasc_N = mkN "守望者" ;
+watcherFem_N = mkN "守望者" ;
 waiver_N = mkN "弃权" ;
 vivid_A = mkA "生动" ;
 upset_V2 = mkV2 "打乱" ;
@@ -4547,7 +4576,8 @@ specific_N = mkN "具体" [] ;
 sour_A = mkA "酸" ;
 so_PConj = mkPConj "所以" ;
 single_V2 = mkV2 "单一" ;
-shopper_N = mkN "购物者" ;
+shopperMasc_N = mkN "购物者" ;
+shopperFem_N = mkN "购物者" ;
 shaky_A = mkA "摇摇欲坠" ;
 setting_N = mkN "设置" ;
 service_V2 = mkV2 "服务" ;
@@ -4601,7 +4631,8 @@ manipulation_N = mkN "操纵"  "次" ;
 loom_V = mkV "织机" ;
 long_distance_A = mkA "长途" ;
 little_Det = mkpDet "小" ;
-listener_N = mkN "倾听者" ;
+listenerMasc_N = mkN "倾听者" ;
+listenerFem_N = mkN "倾听者" ;
 link_V = mkV "链接" ;
 lift_N = mkN "举起" "次" ;
 library_N = mkN "文库" ;
@@ -5045,7 +5076,8 @@ infringe_V = mkV "违犯" ;
 inefficient_A = mkA "低效" ;
 indonesia_PN = mkPN "印度尼西亚" ;
 inaccurate_A = mkA "不准确" ;
-importer_N = mkN "进口商" ;
+importerMasc_N = mkN "进口商" ;
+importerFem_N = mkN "进口商" ;
 imagine_VS = mkVS "想像" ;
 ill_A = mkA "生病" ;
 idle_V2 = mkV2 "怠" ;
@@ -5266,11 +5298,13 @@ pair_N = mkN "对" ;
 overstate_V2 = mkV2 "夸大" ;
 overlook_V2 = mkV2 "忽略" ;
 oklahoma_PN = mkPN "俄克拉何马州" ;
-offender_N = mkN "犯罪分子" ;
+offenderMasc_N = mkN "犯罪分子" ;
+offenderFem_N = mkN "犯罪分子" ;
 notorious_A = mkA "臭名昭著" ;
 neutral_A = mkA "中性" ;
 name_V2V = mkV2V "名称" ;
-musician_N = mkN "音乐家" ;
+musicianMasc_N = mkN "音乐家" ;
+musicianFem_N = mkN "音乐家" ;
 mushroom_N = mkN "蘑菇" ;
 murder_V2 = mkV2 "谋杀" ;
 motivate_V2 = mkV2 "刺激" ;
@@ -5372,7 +5406,8 @@ depth_N = mkN "深度" ;
 delta_N = mkN "三角洲" ;
 delicate_A = mkA "娇嫩" ;
 delaware_PN = mkPN "特拉华" ;
-defender_N = mkN "辩护人" ;
+defenderMasc_N = mkN "辩护人" ;
+defenderFem_N = mkN "辩护人" ;
 deductible_A = mkA "扣税" ;
 dedicate_V2 = mkV2 "奉献" ;
 deceptive_A = mkA "骗人" ;
@@ -5586,7 +5621,8 @@ adhesive_N = mkN "胶粘剂" ; -- 6
 vulnerability_N = mkN "漏洞" "个"; -- 5
 undemocratic_A = mkA "不民主" ; -- 5
 threshold_N = mkN "门槛" []; -- 5
-sucker_N = mkN "吸盘" "个"; -- 5
+suckerMasc_N = mkN "吸盘" "个"; -- 5
+suckerFem_N = mkN "吸盘" "个"; -- 5
 spare_V2 = mkV2 "饶恕" ; -- 5
 shakeout_N = mkN "重组" []; -- 5
 rumble_V = mkV "隆隆作响" ; -- 5
@@ -5728,7 +5764,8 @@ teeter_V = mkV "步履蹒跚" ; -- 2
 symbolize_V2 = mkV2 "象征" ; -- 2
 supercede_V2 = mkV2 "取代" ; -- 2
 stub_N = mkN "存根" ; -- 2
-statistician_N = mkN "统计学家" "名"; -- 2
+statisticianMasc_N = mkN "统计学家" "名"; -- 2
+statisticianFem_N = mkN "统计学家" "名"; -- 2
 sputter_V = mkV "溅散" ; -- 2
 spasm_N = mkN "痉挛" ; -- 2
 solemn_A = mkA "庄严" ; -- 2
@@ -5779,7 +5816,8 @@ gall_N = mkN "胆汁" [] ; -- 2
 fragment_V2 = mkV2 "使+破碎" ; -- 2
 flip_V2 = mkV2 "翻动" ; -- 2
 filipino_N = mkN "菲律宾人" ; -- 2
-favourite_N = mkN "最爱" [] ; -- 2
+favouriteMasc_N = mkN "最爱" [] ; -- 2
+favouriteFem_N = mkN "最爱" [] ; -- 2
 extradite_V2 = mkV2 "引渡" ; -- 2
 evince_V2 = mkV2 "表示出" ; -- 2
 envisage_V2 = mkV2 "设想" ; -- 2
@@ -6648,7 +6686,8 @@ disarm_V = mkV "撤防" ; -- 4
 deploy_V2 = mkV2 "部署" ; -- 4
 czech_A = mkA "捷克" ; -- 4
 cook_V = mkV "煮" ; -- 4
-confidant_N = mkN "知己" ; -- 4
+confidantMasc_N = mkN "知己" ; -- 4
+confidantFem_N = mkN "知己" ; -- 4
 clamp_V = mkV "夹住" ; -- 4
 census_N = mkN "普查" ; -- 4
 brink_N = mkN "迫近" ; -- 4
@@ -6780,7 +6819,8 @@ fry_V2 = mkV2 "炒" ; -- 2
 foreman_N = mkN "工头" ; -- 2
 flap_V = mkV "拍动" ; -- 2
 fervent_A = mkA "热切" ; -- 2
-fanatic_N = mkN "狂热" ; -- 2
+fanaticMasc_N = mkN "狂热" ; -- 2
+fanaticFem_N = mkN "狂热" ; -- 2
 expedition_N = mkN "远征""次" ; -- 2
 eschew_V2 = mkV2 "避开" ; -- 2
 encouraging_A = mkA "鼓舞" ; -- 2
@@ -7165,7 +7205,8 @@ tantamount_A = mkA "等于" ; -- 3
 sub_N = mkN "潜艇" ; -- 3
 steady_V = mkV "稳定" ; -- 3
 spy_V2 = mkV2 "暗中监视" ; -- 3
-solicitor_N = mkN "律师" ; -- 3
+solicitorMasc_N = mkN "律师" ; -- 3
+solicitorFem_N = mkN "律师" ; -- 3
 skid_N = mkN "滑橇" ; -- 3
 shelve_V2 = mkV2 "搁置" ; -- 3
 seduce_V2 = mkV2 "勾引" ; -- 3
@@ -8043,7 +8084,8 @@ virtue_N = mkN "美德" ; -- 7
 trigger_N = mkN "触发" ; -- 7
 sway_V = mkV "摇摆" ; -- 7
 smoke_V = mkV "吸烟" ; -- 7
-servant_N = mkN "仆人" ; -- 7
+servantMasc_N = mkN "仆人" ; -- 7
+servantFem_N = mkN "仆人" ; -- 7
 rename_V3 = mkV3 "重命名" ; -- 7
 propaganda_N = mkN "宣传" ; -- 7
 pit_V2 = mkV2 "安排竞争" ; -- 7
@@ -8380,7 +8422,8 @@ recuperation_N = mkN "恢复" ; -- 1
 rebirth_N = mkN "新生" ; -- 1
 re_create_V2 = mkV2 "重建" ; -- 1
 rank_A = mkA "繁茂" ; -- 1
-racist_N = mkN "种族主义者" ; -- 1
+racistMasc_N = mkN "种族主义者" ; -- 1
+racistFem_N = mkN "种族主义者" ; -- 1
 queer_N = mkN "同性恋者" ; -- 1
 purification_N = mkN "净化" ; -- 1
 provost_N = mkN "教务长" ; -- 1
@@ -8693,7 +8736,8 @@ guidance_N = mkN "指导" ; -- 3
 gist_N = mkN "主旨" ; -- 3
 formulation_N = mkN "构想" ; -- 3
 fluent_A = mkA "流畅" ; -- 3
-feminist_N = mkN "女权主义者" "位" ; -- 3
+feministMasc_N = mkN "女权主义者" "位" ; -- 3
+feministFem_N = mkN "女权主义者" "位" ; -- 3
 evolutionary_A = mkA "进化" ; -- 3
 embezzle_V2 = mkV2 "盗用" ; -- 3
 drape_N = mkN "窗帘" "块" ; -- 3
@@ -8997,7 +9041,8 @@ cleric_N = mkN "牧师" "位"; -- 1
 circuitous_A = mkA "迂曲" ; -- 1
 chisel_V2 = mkV2 "雕" ; -- 1
 chaste_A = mkA "纯洁" ; -- 1
-cellist_N = mkN "大提琴演奏家" "位"; -- 1
+cellistMasc_N = mkN "大提琴演奏家" "位"; -- 1
+cellistFem_N = mkN "大提琴演奏家" "位"; -- 1
 carpentry_N = mkN "木器" "件"; -- 1
 cant_N = mkN "斜面" ; -- 1		[mark]黑话
 cabal_N = mkN "阴谋" ; -- 1
@@ -9711,7 +9756,8 @@ bee_N = mkN "蜜蜂" ; -- 3
 austrian_A = mkA "奥地利" ; -- 3
 applaud_V = mkV "喝彩" ; -- 3
 alarming_A = mkA "恐吓" ; -- 3
-accuser_N = mkN "原告" ; -- 3
+accuserMasc_N = mkN "原告" ; -- 3
+accuserFem_N = mkN "原告" ; -- 3
 wrestle_V2 = mkV2 "摔跤" ; -- 2
 whistle_V2 = mkV2 "吹口哨" ; -- 2
 wayward_A = mkA "任性" ; -- 2
@@ -9873,7 +9919,8 @@ rig_V2 = mkV2 "操纵" ; -- 1
 retrospective_A = mkA "怀旧" ; -- 1
 restructure_V2V = mkV2V "调整" ; -- 1
 reprove_V2 = mkV2 "责骂" ; -- 1
-renegade_N = mkN "叛徒" ; -- 1
+renegadeMasc_N = mkN "叛徒" ; -- 1
+renegadeFem_N = mkN "叛徒" ; -- 1
 rejoin_V = mkV "再加入" ; -- 1
 reforestation_N = mkN "重新造林" ; -- 1
 rectangular_A = mkA "矩形" ; -- 1
@@ -10465,7 +10512,8 @@ facetious_A = mkA "诙谐" ; -- 1
 exposition_N = mkN "博览会" ; -- 1  
 exhale_V = mkV "呼气" ; -- 1  
 ethnically_Adv = mkAdv "人种上" ; -- 1  
-epileptic_N = mkN "癫痫患者" ; -- 1  
+epilepticMasc_N = mkN "癫痫患者" ; -- 1
+epilepticFem_N = mkN "癫痫患者" ; -- 1
 english_N = mkN "英文" ; -- 1  
 embellish_V2 = mkV2 "修饰" ; -- 1  
 eery_A = mkA "怪诞" ; -- 1  
@@ -10820,7 +10868,8 @@ well_meaning_A = mkA "善意" ; -- 1
 wart_N = mkN "疣"; -- 1
 voyage_N = mkN "航程"; -- 1
 villain_N = mkN "恶棍"; -- 1
-vegetarian_N = mkN "素" ; -- 1
+vegetarianMasc_N = mkN "素" ; -- 1
+vegetarianFem_N = mkN "素" ; -- 1
 usurpation_N = mkN "篡夺"; -- 1
 unthinkable_A = mkA "不可想象";-- 1
 unpopularity_N = mkN "不受欢迎";-- 1
@@ -10997,7 +11046,8 @@ classless_A = mkA "无阶级"; -- 1
 cinematic_A = mkA "影片"; -- 1
 chime_V = mkV "鸣响"; -- 1
 charisma_N = mkN "人格魅力";-- 1
-catholic_N = mkN "天主教徒";-- 1
+catholicMasc_N = mkN "天主教徒";-- 1
+catholicFem_N = mkN "天主教徒";-- 1
 carillon_N = mkN "钟琴"; -- 1
 cane_N = mkN "甘蔗"; -- 1
 bygone_A = mkA "过去";-- 1
@@ -11191,7 +11241,8 @@ inexperienced_A = mkA "不熟练" ; -- 3
 imitate_V2 = mkV2 "模仿" ; -- 3
 highlight_N = mkN "重头戏" ; -- 3
 grandson_N = mkN "孙子" ; -- 3
-gardener_N = mkN "园丁" "位" ; -- 3
+gardenerMasc_N = mkN "园丁" "位" ; -- 3
+gardenerFem_N = mkN "园丁" "位" ; -- 3
 footnote_N = mkN "脚注" ; -- 3
 firmness_N = mkN "坚定" [] ; -- 3
 fake_V2 = mkV2 "冒充" ; -- 3
@@ -11395,7 +11446,8 @@ placebo_N = mkN "安慰剂" ; -- 1
 picturesque_A = mkA "别致" ; -- 1
 perversity_N = mkN "邪恶" [] ; -- 1
 perch_V2 = mkV2 "栖息" ; -- 1
-pedagogue_N = mkN "教员" ; -- 1
+pedagogueMasc_N = mkN "教员" ; -- 1
+pedagogueFem_N = mkN "教员" ; -- 1
 patriarchy_N = mkN "父系社会" ; -- 1
 pariah_N = mkN "贱民" "位" ; -- 1
 panda_N = mkN "熊猫" "只" ; -- 1
@@ -11723,7 +11775,8 @@ unfaze_V2 = mkV2 "不怕" ; -- 2 ?
 unaware_of_A2 = mkA2 "没意思到" ; -- 2
 trim_A = mkA "整齐" ; -- 2
 tornado_N = mkN "龙卷风" ; -- 2
-thinker_N = mkN "思想家" ; -- 2
+thinkerMasc_N = mkN "思想家" ; -- 2
+thinkerFem_N = mkN "思想家" ; -- 2
 telephone_V = mkV "电话" ; -- 2
 sympathize_V = mkV "同情" ; -- 2
 superimpose_V2 = mkV2 "叠加" ; -- 2
@@ -12037,7 +12090,8 @@ flaw_V2 = mkV2 "破裂"; -- 8
 energetic_A = mkA "精力充沛"; -- 8
 devastate_V2 = mkV2 "毁灭"; -- 8
 convene_V2 = mkV2 "召集"; -- 8
-chemist_N = mkN "化学家"; -- 8
+chemistMasc_N = mkN "化学家"; -- 8
+chemistFem_N = mkN "化学家"; -- 8
 beef_V = mkV "抱怨"; -- 8
 accumulate_V2 = mkV2 "积累"; -- 8
 variable_N = mkN "变量"; -- 7
@@ -12216,7 +12270,8 @@ accent_N = mkN "口音" ""; -- 3
 workman_N = mkN "工人"; -- 2
 whim_N = mkN "奇想"; -- 2
 water_V2 = mkV2 "水"; -- 2
-violinist_N = mkN "小提琴家"; -- 2
+violinistMasc_N = mkN "小提琴家"; -- 2
+violinistFem_N = mkN "小提琴家"; -- 2
 vase_N = mkN "花瓶"; -- 2
 unwind_V2 = mkV2 "放松"; -- 2
 unplanned_A = mkA "计划外"; -- 2
@@ -12704,7 +12759,8 @@ den_N = mkN "巢穴" ; -- 3
 curious_A = mkA "好奇" ; -- 3
 coolant_N = mkN "冷却液" [] ; -- 3
 complementary_A = mkA "补充" ; -- 3
-clarinetist_N = mkN "单簧管演奏家" "位"; -- 3
+clarinetistMasc_N = mkN "单簧管演奏家" "位"; -- 3
+clarinetistFem_N = mkN "单簧管演奏家" "位"; -- 3
 cement_V2 = mkV2 "水泥" ; -- 3
 burst_V = mkV "爆裂" ; -- 3
 brandy_N = mkN "白兰地" "杯"; -- 3
@@ -12890,7 +12946,8 @@ prodigy_N = mkN "神童" "位"; -- 1
 presidentFem_N = mkN "presidentFem" ; -- 1 ---[mark]find no meannings of the word spurre
 prearrange_V2 = mkV2 "预先安排" ; -- 1
 posture_V = mkV "摆姿势" ; -- 1
-polish_N = mkN "抛光" "种"; -- 1
+polishMasc_N = mkN "抛光" "种"; -- 1
+polishFem_N = mkN "抛光" "种"; -- 1
 pliant_A = mkA "易弯" ; -- 1
 pivot_V = mkV "在枢轴上转动" ; -- 1
 pickle_N = mkN "咸菜" "种" ; -- 1
@@ -14263,7 +14320,8 @@ fault_V2 = mkV2 "挑剔" ; -- 2
 expunge_V2 = mkV2 "删掉" ; -- 2
 euphemism_N = mkN "委婉语" "句" ; -- 2
 entertainer_N = mkN "演艺人员" "位" ;  -- 2
-elitist_N = mkN "优秀人才" "位" ; -- 2
+elitistMasc_N = mkN "优秀人才" "位" ; -- 2
+elitistFem_N = mkN "优秀人才" "位" ; -- 2
 dummy_N = mkN "傀儡" ; -- 2
 domino_N = mkN "多米诺" "副"; -- 2 [mark] 面具
 disrupt_V = mkV "破坏" ; -- 2
@@ -15106,9 +15164,11 @@ repossess_V2 = mkV2 "收回" ; -- 4
 re_examine_V2 = mkV2 "再检验" ; -- 4
 protract_V2 = mkV2 "延长" ; -- 4
 precarious_A = mkA "危险" ; -- 4
-pianist_N = mkN "钢琴家" ; -- 4
+pianistMasc_N = mkN "钢琴家" ; -- 4
+pianistFem_N = mkN "钢琴家" ; -- 4
 parody_N = mkN "拙劣的模仿" ; -- 4
-originator_N = mkN "鼻祖" ; -- 4
+originatorMasc_N = mkN "鼻祖" ; -- 4
+originatorFem_N = mkN "鼻祖" ; -- 4
 noble_A = mkA "高贵" ; -- 4
 mob_N = mkN "暴民" ; -- 4
 meaningless_A = mkA "无意义" ; -- 4
@@ -15220,7 +15280,8 @@ schizophrenia_N = mkN "精神分裂症" ; -- 2
 sage_N = mkN "圣人" ; -- 2
 roast_N = mkN "烤" ; -- 2
 rhyme_V = mkV "押韵" ; -- 2
-rescuer_N = mkN "救助者" ; -- 2
+rescuerMasc_N = mkN "救助者" ; -- 2
+rescuerFem_N = mkN "救助者" ; -- 2
 rejuvenation_N = mkN "回春" ; -- 2
 reckon_V = mkV "估计" ; -- 2
 rancher_N = mkN "农场工人" ; -- 2
@@ -15542,7 +15603,8 @@ abuse_V2 = mkV2 "虐待" ; -- 7 滥用
 vary_V2 = mkV2 "变化" ; -- 6
 tomorrow_Adv = mkAdv "明天" ; -- 6
 suit_V2 = mkV2 "适应" ; -- 6
-spectator_N = mkN "观众" ; -- 6
+spectatorMasc_N = mkN "观众" ; -- 6
+spectatorFem_N = mkN "观众" ; -- 6
 select_A = mkA "精心挑选" ; -- 6
 rift_N = mkN "裂缝" ; -- 6
 remedy_N = mkN "补救方法" ; -- 6
@@ -15657,9 +15719,11 @@ ramification_N = mkN "分支" ; -- 3
 prominence_N = mkN "卓越" ; -- 3
 pre_empt_V2 = mkV2 "预先" ; -- 3
 plutonium_N = mkN "钚" ; -- 3
-pessimist_N = mkN "悲观主义者" ; -- 3
+pessimistMasc_N = mkN "悲观主义者" ; -- 3
+pessimistFem_N = mkN "悲观主义者" ; -- 3
 overture_N = mkN "前奏" ; -- 3
-optimist_N = mkN "乐观主义者" ; -- 3
+optimistMasc_N = mkN "乐观主义者" ; -- 3
+optimistFem_N = mkN "乐观主义者" ; -- 3
 nonunion_A = mkA "不属于工会" ; -- 3
 motif_N = mkN "主题" ; -- 3
 methodical_A = mkA "有方法" ; -- 3
@@ -15793,7 +15857,8 @@ antiquated_A = mkA "废弃" ; -- 2
 amicable_A = mkA "友好" ; -- 2
 affirmation_N = mkN "认定" ; -- 2
 abstain_V = mkV "戒除" ; -- 2
-zealot_N = mkN "狂热者" ; -- 1
+zealotMasc_N = mkN "狂热者" ; -- 1
+zealotFem_N = mkN "狂热者" ; -- 1
 wrestler_N = mkN "摔跤运动员" ; -- 1
 wishful_A = mkA "愿望" ; -- 1
 whirl_V = mkV "旋转" ; -- 1
@@ -16159,7 +16224,8 @@ pragmatist_N = mkN "实用主义者" "名" ; -- 3
 plush_A = mkA "豪华" ; -- 3  
 pessimism_N = mkN "悲观" ;--"悲观情绪" ; -- 3  
 overt_A = mkA "明显" ; -- 3  
-opportunist_N = mkN "机会主义者" "名" ; -- 3  
+opportunistMasc_N = mkN "机会主义者" "名" ; -- 3
+opportunistFem_N = mkN "机会主义者" "名" ; -- 3
 nonstop_A = mkA "直达" ; -- 3  
 mortgage_V2 = mkV2 "抵押" ; -- 3  
 messenger_N = mkN "报信者" "名" ;--"送信者" ; -- 3  
@@ -16499,7 +16565,8 @@ ascendency_N = mkN "优势" ; -- 1
 arch_N = mkN "拱门" "扇";--"拱形" ; -- 1  
 antifreeze_N = mkN "防冻剂" "瓶" ; -- 1  
 anesthetize_V2 = mkV2 "使+麻醉" ; -- 1  
-amateur_N = mkN "爱好者" "名" ; -- 1  
+amateurMasc_N = mkN "爱好者" "名" ; -- 1
+amateurFem_N = mkN "爱好者" "名" ; -- 1
 airway_N = mkN "导气管" "条" ; -- 1  
 advisable_A = mkA "明智" ;--"可取的" ;--"适当的" ; -- 1  
 act_VA = mkVA "扮演" ; -- 1  
@@ -16508,7 +16575,8 @@ absorbent_A = mkA "能吸收" ; -- 1
 --concrete Assign_9 of DictEngAbs = CatChi ** open ParadigmsChi in {flags coding=utf8 ; lin
 revokeV2 = mkV2 "吊销"; -- 8
 raiser_N = mkN "专业户" ;-- 8
-peasant_N = mkN "农夫" ; -- 8
+peasantMasc_N = mkN "农夫" ; -- 8
+peasantFem_N = mkN "农夫" ; -- 8
 nightmare_N = mkN "梦魇" ; -- 8
 locate_V = mkV "定位"; -- 8
 input_N = mkN "输入"; -- 8

lib/src/urdu/DictEngUrd.gf

@@ -231,7 +231,8 @@ lin accusation_N = mkN "دعویٰ" ;       -- from DictUrd
 lin accusative_A = mkA "اسم منصوب" ;
 lin accusative_N = mkN "اسم منصوب" ;
 lin accuse_V2 = mkV2 (compoundV "الزام تراشی" (mkV "کرنا")) ;       -- from DictUrd
-lin accuser_N = mkN "الزام تراش" ;       -- from DictUrd
+lin accuserMasc_N = mkN "الزام تراش" ; -- from DictUrd
+lin accuserFem_N = mkN "الزام تراش" ; -- from DictUrd
 lin accustom_V2 = mkV2 (compoundV "عادی" (mkV "ہونا")) ;       -- from DictUrd
 lin ace_N = mkN "احسن" ;       -- from DictUrd
 lin acerbity_N = mkN "تلخ کلامی" ;
@@ -279,7 +280,8 @@ lin acreage_N = mkN "ایکڑ میں ناپا ہوا علاقہ" ;
 lin acrid_A = mkA "کڑوا" ;       -- from DictUrd
 lin acrimonious_A = mkA "کڑوا" ;       -- from DictUrd
 lin acrimony_N = mkN "حدت" ;       -- from DictUrd
-lin acrobat_N = mkN "بازی گر" ;       -- from DictUrd
+lin acrobatMasc_N = mkN "بازی گر" ; -- from DictUrd
+lin acrobatFem_N = mkN "بازی گر" ; -- from DictUrd
 lin acrobatic_A = mkA "بازی گرانہ" ;
 lin acrobatics_N = mkN "بازی گری" ;       -- from DictUrd
 lin acronym_N = mkN "مخفف" ;
@@ -299,7 +301,8 @@ lin actionable_A = mkA "قابلِ گرفت" ;
 lin activate_V2 = mkV2 (compoundV "متحرک" (mkV "کرنا")) ;       -- from DictUrd
 lin activation_N = mkN "افزودگی" ;
 lin active_A = mkA "عامل" ;       -- from DictUrd
-lin activist_N = mkN "سرگرم کارکن" ;
+lin activistMasc_N = mkN "سرگرم کارکن" ;
+lin activistFem_N = mkN "سرگرم کارکن" ;
 lin activity_N = mkN "عملیت" ;       -- from DictUrd
 lin actor_N = mkN "اداکار" ;       -- from DictUrd
 lin actress_N = mkN "اداکارہ" ;       -- from DictUrd
@@ -399,7 +402,8 @@ lin administer_V = compoundV "انتظام" (mkV "کرنا") ;
 lin administer_V2 = mkV2 (compoundV "بند و بست" (mkV "کرنا")) ;       -- from DictUrd
 lin administration_N = mkN "عمل" ;       -- from DictUrd
 lin administrative_A = mkA "عملی" ;       -- from DictUrd
-lin administrator_N = mkN "ناظم" ;       -- from DictUrd
+lin administratorMasc_N = mkN "ناظم" ; -- from DictUrd
+lin administratorFem_N = mkN "ناظم" ; -- from DictUrd
 lin admirable_A = mkA "قابل ستائش" ;       -- from DictUrd
 lin admiral_N = mkN "امیر البحر" ;       -- from DictUrd
 lin admiralty_N = mkN "امارت البحریہ" ;       -- from DictUrd
@@ -461,7 +465,8 @@ lin advantage_N = mkN "فائدہ" ;       -- from DictUrd
 lin advantage_V2 = mkV2 (mkV "فائدہ") ;
 lin advantageous_A = mkA "فائدہ مند" ;       -- from DictUrd
 lin advent_N = mkN "آمد" ;       -- from DictUrd
-lin adventist_N = mkN "معتقد ظہور ثانی" ;
+lin adventistMasc_N = mkN "معتقد ظہور ثانی" ;
+lin adventistFem_N = mkN "معتقد ظہور ثانی" ;
 lin adventitious_A = mkA "اجنبی" ;       -- from DictUrd
 lin adventure_N = mkN "پرہمت مہم" ;
 lin adventure_V2 = mkV2 (compoundV "پرہمت" (mkV "مہم")) ;
@@ -487,10 +492,12 @@ lin advise_V = compoundV "مشورہ" (mkV "لینا") ;       -- from DictUrd
 lin advise_V2 = mkV2 (compoundV "غور" (mkV "کرنا")) ;       -- from DictUrd
 lin advise_VS = mkVS (compoundV "نصیحت" (mkV "کرنا")) ;
 lin advised_A = mkA "ہوشیار" ;
-lin adviser_N = mkN "مشیر" ;
+lin adviserMasc_N = mkN "مشیر" ;
+lin adviserFem_N = mkN "مشیر" ;
 lin advisory_A = mkA "مشاورتی" ;       -- from DictUrd
 lin advocacy_N = mkN "حمایت" ;       -- from DictUrd
-lin advocate_N = mkN "وکیل" ;       -- from DictUrd
+lin advocateMasc_N = mkN "وکیل" ; -- from DictUrd
+lin advocateFem_N = mkN "وکیل" ; -- from DictUrd
 lin advocate_V2 = mkV2 (compoundV "حمایت" (mkV "کرنا")) ;       -- from DictUrd
 lin advocate_VS = mkVS (mkV "وکیل") ;
 lin adz_N = mkN "کدال" ;
@@ -512,7 +519,8 @@ lin aeroplane_N = mkN "ہوائی جہاز" ;
 lin aerosol_N = mkN "فوارچہ" ;
 lin aerospace_N = mkN "زمین کا کرہ" ;
 lin aery_N = mkN "ہوا دار" ;
-lin aesthete_N = mkN "خوش ذوق" ;
+lin aestheteMasc_N = mkN "خوش ذوق" ;
+lin aestheteFem_N = mkN "خوش ذوق" ;
 lin aesthetic_A = mkA "جمالیاتی" ;
 lin aesthetic_N = mkN "جمالیاتی" ;
 lin aesthetical_A = mkA "جمالیاتی" ;
@@ -555,7 +563,8 @@ lin affray_N = mkN "ہنگامہ" ;       -- from DictUrd
 lin affront_N = mkN "بے عزت" ;       -- from DictUrd
 lin affront_V2 = mkV2 (compoundV "آمنا سامنا" (mkV "ہونا")) ;       -- from DictUrd
 lin afghan_A = mkA "افغانستان کا باشندہ" ;
-lin afghan_N = mkN "افغانستان کا باشندہ" ;
+lin afghanMasc_N = mkN "افغانستان کا باشندہ" ;
+lin afghanFem_N = mkN "افغانستان کا باشندہ" ;
 lin afield_Adv = mkAdv "کھیت میں" ;
 lin afire_A = mkA "جلتا ہوا" ;
 lin aflame_A = mkA "شعلہ" ;
@@ -592,7 +601,8 @@ lin ageing_N = mkN "زمانہ" ;
 lin ageless_A = mkA "عمر رسیدگی سے مبرہ" ;       -- from DictUrd
 lin agency_N = mkN "آڑہت" ;       -- from DictUrd
 lin agenda_N = mkN "پیش نامہ" ;       -- from DictUrd
-lin agent_N = mkN "عامل" ;       -- from DictUrd
+lin agentMasc_N = mkN "عامل" ; -- from DictUrd
+lin agentFem_N = mkN "عامل" ; -- from DictUrd
 lin agent_provocateur_N = mkN "فتنہ انگيز جاسوس" ;
 lin agglomerate_A = mkA "ڈھیر باندھنا" ;
 lin agglomerate_V = compoundV "ڈھیر" (mkV "باندھنا") ;
@@ -610,7 +620,8 @@ lin aggregate_V2 = mkV2 (compoundV "اکٹھا" (mkV "کرنا")) ;       -- fro
 lin aggregation_N = mkN "بھیڑ" ;       -- from DictUrd
 lin aggression_N = mkN "عداوت" ;       -- from DictUrd
 lin aggressive_A = mkA "آمادہ جارحیت" ;       -- from DictUrd
-lin aggressor_N = mkN "حملہ آور" ;       -- from DictUrd
+lin aggressorMasc_N = mkN "حملہ آور" ; -- from DictUrd
+lin aggressorFem_N = mkN "حملہ آور" ; -- from DictUrd
 lin aggrieve_V2 = mkV2 (compoundV "آزردہ" (mkV "ہونا")) ;       -- from DictUrd
 lin aggro_N = mkN "تندی" ;
 lin aghast_A = mkA "بھونچکا" ;       -- from DictUrd
@@ -742,7 +753,8 @@ lin alias_Adv = mkAdv "لقب" ;
 lin alias_N = mkN "عرف" ;       -- from DictUrd
 lin alibi_N = mkN "بہانہ" ;       -- from DictUrd
 lin alien_A = mkA "غیر" ;       -- from DictUrd
-lin alien_N = mkN "اجنبی" ;       -- from DictUrd
+lin alienMasc_N = mkN "اجنبی" ; -- from DictUrd
+lin alienFem_N = mkN "اجنبی" ; -- from DictUrd
 lin alienate_V2 = mkV2 (compoundV "الگ" (mkV "کرنا")) ;
 lin alienation_N = mkN "دوری" ;       -- from DictUrd
 lin alienist_N = mkN "ماہر دماغی امراض" ;
@@ -839,7 +851,8 @@ lin alpine_A = mkA "کوہ اپلس کے متعلق" ;
 lin alpinist_N = mkN "Koh Peima" ;
 lin already_Adv = mkAdv "پہلے" ;       -- from DictUrd
 lin alright_Adv = mkAdv "ٹھیک" ;
-lin alsatian_N = mkN "السیشن کتا" ;
+lin alsatianMasc_N = mkN "السیشن کتا" ;
+lin alsatianFem_N = mkN "السیشن کتا" ;
 lin also_Adv = mkAdv "بھی" ;
 lin also_ran_N = mkN "مقابلے باز" ;
 lin altar_N = mkN "مذبح" ;       -- from DictUrd
@@ -878,7 +891,8 @@ lin amalgamation_N = mkN "انظما?" ;       -- from DictUrd
 lin amanuensis_N = mkN "نويسندہ" ;
 lin amaryllis_N = mkN "جنس نرگس" ;
 lin amass_V2 = mkV2 (compoundV "فراہم" (mkV "کرنا")) ;       -- from DictUrd
-lin amateur_N = mkN "شوقین" ;
+lin amateurMasc_N = mkN "شوقین" ;
+lin amateurFem_N = mkN "شوقین" ;
 lin amateurish_A = mkA "شوقيہ" ;
 lin amateurism_N = mkN "غير پيشہ ورانہ انداز" ;
 lin amatory_A = mkA "عاشقانہ" ;
@@ -996,7 +1010,8 @@ lin analytical_A = mkA "تحلیلی" ;
 lin analyze_V2 = mkV2 (compoundV "تجزیہ" (mkV "کرنا")) ;
 lin anarchic_A = mkA "نراجی" ;
 lin anarchism_N = mkN "فساد" ;
-lin anarchist_N = mkN "فوضوی" ;
+lin anarchistMasc_N = mkN "فوضوی" ;
+lin anarchistFem_N = mkN "فوضوی" ;
 lin anarchy_N = mkN "اندھیرا" ;       -- from DictUrd
 lin anathema_N = mkN "لعن" ;       -- from DictUrd
 lin anathematize_V = mkV "کوسنا" ;
@@ -1146,7 +1161,8 @@ lin anthrax_N = mkN "دنبل" ;       -- from DictUrd
 lin anthropoid_A = mkA "انسان کی مانند" ;
 lin anthropoid_N = mkN "انسان کی مانند" ;
 lin anthropological_A = mkA "بشریاتی" ;
-lin anthropologist_N = mkN "ماہر انسانیات" ;
+lin anthropologistMasc_N = mkN "ماہر انسانیات" ;
+lin anthropologistFem_N = mkN "ماہر انسانیات" ;
 lin anthropology_N = mkN "انسانیات" ;       -- from DictUrd
 lin anti_aircraft_A = mkA "طیارہ شکن توپ" ;
 lin anti_hero_N = mkN "ضد ہيرو" ;
@@ -1358,7 +1374,8 @@ lin aquiline_A = mkA "باز کا سا" ;
 lin arab_N = mkN "عرب کا باشندہ" ;
 lin arabesque_N = mkN "عربی قہوہ" ;
 lin arabian_A = mkA "عرب" ;
-lin arabian_N = mkN "عرب" ;
+lin arabianMasc_N = mkN "عرب" ;
+lin arabianFem_N = mkN "عرب" ;
 lin arabic_A = mkA "عربی" ;
 lin arabic_N = mkN "عربی" ;
 lin arabist_N = mkN "عربی دان" ;
@@ -1398,7 +1415,8 @@ lin archery_N = mkN "تیر اندازی" ;       -- from DictUrd
 lin archetype_N = mkN "اصل نمونہ" ;
 lin archimandrite_N = mkN "صدر خانقاہ" ;
 lin archipelago_N = mkN "بحرالجزائر" ;
-lin architect_N = mkN "بانی" ;       -- from DictUrd
+lin architectMasc_N = mkN "بانی" ; -- from DictUrd
+lin architectFem_N = mkN "بانی" ; -- from DictUrd
 lin architectural_A = mkA "عماریاتی" ;       -- from DictUrd
 lin architecture_N = mkN "فن تعمیر" ;       -- from DictUrd
 lin archivist_N = mkN "محافظ دستاويزات" ;
@@ -1524,7 +1542,8 @@ lin artlessness_N = mkN "سادگی" ;
 lin arty_A = mkA "ہنر نما" ;
 lin arum_N = mkN "عجالہ" ;
 lin aryan_A = mkA "آریائی" ;
-lin aryan_N = mkN "آریائی" ;
+lin aryanMasc_N = mkN "آریائی" ;
+lin aryanFem_N = mkN "آریائی" ;
 lin as_well_Adv = mkAdv "بھی" ;
 lin asbestos_N = mkN "ایک قسم کی دھات" ;
 lin ascend_V = mkV "چڑھنا" ;
@@ -1694,7 +1713,8 @@ lin atheism_N = mkN "الحاد" ;       -- from DictUrd
 lin atheist_N = mkN "دہریہ" ;       -- from DictUrd
 lin atheistic_A = mkA "ملحدانہ" ;
 lin athenian_A = mkA "یونانی" ;
-lin athenian_N = mkN "یونانی" ;
+lin athenianMasc_N = mkN "یونانی" ;
+lin athenianFem_N = mkN "یونانی" ;
 lin athirst_A = mkA "پیاسا" ;
 lin athlete_N = mkN "کھلاڑی" ;
 lin athletic_A = mkA "ورزشی" ;
@@ -1808,10 +1828,12 @@ lin austere_A = mkA "کرخت" ;       -- from DictUrd
 lin austerity_N = mkN "بیراگی" ;       -- from DictUrd
 lin australia_PN = mkPN "آسٹريليا سے متعلق" ;
 lin australian_A = mkA "آسٹريليا سے متعلق" ;
-lin australian_N = mkN "آسٹريليا سے متعلق" ;
+lin australianMasc_N = mkN "آسٹريليا سے متعلق" ;
+lin australianFem_N = mkN "آسٹريليا سے متعلق" ;
 lin austria_PN = mkPN "آسٹريا کا رہنے والا" ;
 lin austrian_A = mkA "آسٹريا کا رہنے والا" ;
-lin austrian_N = mkN "آسٹريا کا رہنے والا" ;
+lin austrianMasc_N = mkN "آسٹريا کا رہنے والا" ;
+lin austrianFem_N = mkN "آسٹريا کا رہنے والا" ;
 lin autarchy_N = mkN "استبدادیت" ;       -- from DictUrd
 lin autarky_N = mkN "معاشی آزآدی" ;
 lin authentic_A = mkA "اصلی" ;       -- from DictUrd
@@ -1882,7 +1904,8 @@ lin aversion_N = mkN "کراہت" ;       -- from DictUrd
 lin avert_V2 = mkV2 (compoundV "باز" (mkV "رکھنا")) ;       -- from DictUrd
 lin aviary_N = mkN "چڑيا خانہ" ;
 lin aviation_N = mkN "ہوا بازی" ;       -- from DictUrd
-lin aviator_N = mkN "ہوا باز" ;
+lin aviatorMasc_N = mkN "ہوا باز" ;
+lin aviatorFem_N = mkN "ہوا باز" ;
 lin avid_A = mkA "حریص" ;       -- from DictUrd
 lin avidity_N = mkN "حرص" ;
 lin avocado_N = mkN "مگر ناشپاتی" ;
@@ -1968,7 +1991,8 @@ lin backbite_V = compoundV "غیبت" (mkV "کرنا") ;
 lin backbite_V2 = mkV2 (compoundV "باتیں" (mkV "لگانا")) ;       -- from DictUrd
 lin backbiter_N = mkN "چغل خور" ;       -- from DictUrd
 lin backbone_N = mkN "ریڑھ کی ہڈی" ;       -- from DictUrd
-lin backer_N = mkN "ٹيک" ;
+lin backerMasc_N = mkN "ٹيک" ;
+lin backerFem_N = mkN "ٹيک" ;
 lin background_N = mkN "پس منظر" ;       -- from DictUrd
 lin backing_N = mkN "حمایت" ;       -- from DictUrd
 lin backlash_N = mkN "سخت رد عمل" ;
@@ -3414,7 +3438,8 @@ lin bruise_V2 = mkV2 (compoundV "چورا" (mkV "کرنا")) ;       -- from Dic
 lin bruiser_N = mkN "گھونسہ باز" ;
 lin bruit_V2 = mkV2 (mkV "چرچاکرنا") ;
 lin brunch_N = mkN "صبح اور دوپہر کے درمیان کا کھانا" ;
-lin brunette_N = mkN "مغربی ملیحہ" ;
+lin brunetteMasc_N = mkN "مغربی ملیحہ" ;
+lin brunetteFem_N = mkN "مغربی ملیحہ" ;
 lin brunt_N = mkN "حملے کا زور" ;
 lin brush_N = mkN "کوچی لگانا" ;       -- from DictUrd
 lin brush_V = mkV "برش" ;
@@ -3447,7 +3472,8 @@ lin buckram_N = mkN "گوند والا کپڑا" ;
 lin bud_N = mkN "غنچہ" ;       -- from DictUrd
 lin bud_V = compoundV "کلی" (mkV "نکلنا") ;       -- from DictUrd
 lin buddhism_N = mkN "بدھ مت" ;
-lin buddhist_N = mkN "بدھ" ;
+lin buddhistMasc_N = mkN "بدھ" ;
+lin buddhistFem_N = mkN "بدھ" ;
 lin budding_A = mkA "پھوٹتا ہوا" ;
 lin buddy_N = mkN "دوست" ;       -- from DictUrd
 lin budge_V = compoundV "ٹس" (mkV "سے مس ہونا") ;       -- from DictUrd
@@ -3646,7 +3672,8 @@ lin buxom_A = mkA "چنچل" ;       -- from DictUrd
 lin buy_N = mkN "خریدنا" ;
 lin buy_V = mkV "خریدنا" ;
 lin buy_V2 = mkV2 (mkV "خریدنا") "کو";       -- from DictUrd --changed
-lin buyer_N = mkN "خریدار" ;       -- from DictUrd
+lin buyerMasc_N = mkN "خریدار" ; -- from DictUrd
+lin buyerFem_N = mkN "خریدار" ; -- from DictUrd
 lin buzz_N = mkN "بھنبھناہٹ" ;
 lin buzz_V = mkV "بھنبھناہٹ" ;
 lin buzz_V2 = mkV2 (mkV "بھنبھناہٹ") ;
@@ -3823,7 +3850,8 @@ lin cancerous_A = mkA "سرطان کی طرح" ;
 lin candelabrum_N = mkN "چہل چراغ" ;       -- from DictUrd
 lin candid_A = mkA "بے ریا" ;       -- from DictUrd
 lin candidacy_N = mkN "اميدواری" ;
-lin candidate_N = mkN "نامزد" ;       -- from DictUrd
+lin candidateMasc_N = mkN "نامزد" ; -- from DictUrd
+lin candidateFem_N = mkN "نامزد" ; -- from DictUrd
 lin candidature_N = mkN "نامزدی" ;       -- from DictUrd
 lin candied_A = mkA "قندی" ;
 lin candle_N = mkN "موم بتی" ;       -- from DictUrd
@@ -4036,7 +4064,8 @@ lin cartography_N = mkN "نقشہ نگاری" ;
 lin carton_N = mkN "گتے کا ڈبہ" ;
 lin cartoon_N = mkN "مزاحیہ تصویریں" ;
 lin cartoon_V2 = mkV2 (compoundV "مزاحیہ" (mkV "تصویریں")) ;
-lin cartoonist_N = mkN "کارٹون نگار" ;
+lin cartoonistMasc_N = mkN "کارٹون نگار" ;
+lin cartoonistFem_N = mkN "کارٹون نگار" ;
 lin cartridge_N = mkN "کارتوس" ;
 lin cartridge_paper_N = mkN "کارتوس بنانے کا کاغذ" ;
 lin cartwheel_N = mkN "چھکڑے کا پہيہ" ;
@@ -4143,7 +4172,8 @@ lin cathedral_N = mkN "گرجہ" ;       -- from DictUrd
 lin catherine_PN = mkPN "پہیہ کھڑکی" ;
 lin cathode_N = mkN "منفی برقیرہ" ;
 lin catholic_A = mkA "ہمہ گیر" ;
-lin catholic_N = mkN "ہمہ گیر" ;
+lin catholicMasc_N = mkN "ہمہ گیر" ;
+lin catholicFem_N = mkN "ہمہ گیر" ;
 lin catholicism_N = mkN "کیتھولک مذہب" ;
 lin catholicity_N = mkN "وسیع المشرب" ;
 lin catkin_N = mkN "غنچہ یا پھول" ;
@@ -4152,7 +4182,8 @@ lin cattleman_N = mkN "گڈریا" ;
 lin catty_A = mkA "بلی جیسا" ;       -- from DictUrd
 lin catwalk_N = mkN "بہت تنگ راستہ" ;
 lin caucasian_A = mkA "کاکیشیائی" ;
-lin caucasian_N = mkN "کاکیشیائی" ;
+lin caucasianMasc_N = mkN "کاکیشیائی" ;
+lin caucasianFem_N = mkN "کاکیشیائی" ;
 lin caucus_N = mkN "سیاسی جماعت کا نمائندہ" ;
 lin caul_N = mkN "غلاف سر جنین" ;
 lin cauldron_N = mkN "دیگ" ;       -- from DictUrd
@@ -4384,7 +4415,8 @@ lin chapter_N = mkN "باب" ;       -- from DictUrd
 lin char_N = mkN "جلانا" ;
 lin char_V = mkV "جلانا" ;
 lin char_V2 = mkV2 (mkV "جلانا") ;
-lin character_N = mkN "چال چلن" ;       -- from DictUrd
+lin character_1_N = mkN "چال چلن" ;       -- from DictUrd
+lin character_2_N = mkN "چال چلن" ;       -- from DictUrd
 lin characteristic_A = mkA "امتیازی خصوصیت" ;       -- from DictUrd
 lin characteristic_N = mkN "خصوصیت" ;
 lin characteristically_Adv = mkAdv "اختصاصی طور پر" ;
@@ -4500,7 +4532,8 @@ lin chef_N = mkN "رکاب دار" ;       -- from DictUrd
 lin chemical_A = mkA "کیمیائی" ;
 lin chemical_N = mkN "کیمیائی" ;
 lin chemise_N = mkN "شمیض" ;
-lin chemist_N = mkN "دوا ساز" ;       -- from DictUrd
+lin chemistMasc_N = mkN "دوا ساز" ; -- from DictUrd
+lin chemistFem_N = mkN "دوا ساز" ; -- from DictUrd
 lin chemistry_N = mkN "کمیا" ;       -- from DictUrd
 lin chemotherapy_N = mkN "کیمیائی علاج" ;
 lin chenille_N = mkN "شنیل" ;
@@ -4541,7 +4574,8 @@ lin chide_V = compoundV "برا بھلا" (mkV "کہنا") ;
 lin chide_V2 = mkV2 (mkV "ڈانٹنا") ;       -- from DictUrd
 lin chief_A = mkA "خاص" ;
 lin chief_N = mkN "اہم" ;       -- from DictUrd
-lin chieftain_N = mkN "سردار" ;
+lin chieftainMasc_N = mkN "سردار" ;
+lin chieftainFem_N = mkN "سردار" ;
 lin chieftaincy_N = mkN "سردار کا حلقہ" ;
 lin chiffon_N = mkN "ششدرہ" ;
 lin chiffonier_N = mkN "ششدرہ" ;
@@ -4555,7 +4589,8 @@ lin childless_A = mkA "بے اولاد" ;       -- from DictUrd
 lin childlike_A = mkA "بچے سے مشابہ" ;
 lin chile_PN = mkPN "چلی شورہ" ;
 lin chilean_A = mkA "چلوی" ;
-lin chilean_N = mkN "چلوی" ;
+lin chileanMasc_N = mkN "چلوی" ;
+lin chileanFem_N = mkN "چلوی" ;
 lin chill_A = mkA "ٹھنڈ" ;
 lin chill_N = mkN "خنکی" ;       -- from DictUrd
 lin chill_V = mkV "ٹھنڈ" ;
@@ -4755,7 +4790,8 @@ lin cistern_N = mkN "سس ٹرن" ;
 lin citadel_N = mkN "گڑہی" ;       -- from DictUrd
 lin citation_N = mkN "حوالہ" ;       -- from DictUrd
 lin cite_V2 = mkV2 (compoundV "حوالہ" (mkV "دینا")) ;       -- from DictUrd
-lin citizen_N = mkN "باشندہ" ;       -- from DictUrd
+lin citizenMasc_N = mkN "باشندہ" ; -- from DictUrd
+lin citizenFem_N = mkN "باشندہ" ; -- from DictUrd
 lin citizenship_N = mkN "مدنیت" ;       -- from DictUrd
 lin citric_A = mkA "سٹرک" ;
 lin citron_N = mkN "سٹ رون" ;
@@ -5266,7 +5302,8 @@ lin colt_N = mkN "اناڑی" ;       -- from DictUrd
 lin coltish_A = mkA "البیلا" ;       -- from DictUrd
 lin columbia_PN = mkPN "امریکا کا تانيثی نام" ;
 lin column_N = mkN "فوجی قطار" ;       -- from DictUrd
-lin columnist_N = mkN "نامہ نگار خصوصی" ;
+lin columnistMasc_N = mkN "نامہ نگار خصوصی" ;
+lin columnistFem_N = mkN "نامہ نگار خصوصی" ;
 lin coma_N = mkN "غفلت کی نیند" ;       -- from DictUrd
 lin comatose_A = mkA "غافل" ;       -- from DictUrd
 lin comb_N = mkN "کنگھا" ;       -- from DictUrd
@@ -5655,7 +5692,8 @@ lin confession_N = mkN "اقبال" ;       -- from DictUrd
 lin confessional_N = mkN "اقبال جرم سے متعلق" ;
 lin confessor_N = mkN "معترف" ;
 lin confetti_N = mkN "مٹھائی کی نقل" ;
-lin confidant_N = mkN "ہم راز" ;       -- from DictUrd
+lin confidantMasc_N = mkN "ہم راز" ; -- from DictUrd
+lin confidantFem_N = mkN "ہم راز" ; -- from DictUrd
 lin confide_V = compoundV "بھروسا" (mkV "ہونا") ;
 lin confide_V2 = mkV2 (compoundV "بھروسا" (mkV "ہونا")) ;
 lin confide_VS = mkVS (compoundV "بھروسا" (mkV "ہونا")) ;
@@ -7352,7 +7390,8 @@ lin defenceless_A = mkA "بے بچاؤ" ;       -- from DictUrd
 lin defend_V = compoundV "حفاظت" (mkV "کرنا") ;
 lin defend_V2 = mkV2 (mkV "بچانا") ;       -- from DictUrd
 lin defendant_N = mkN "جواب دہ" ;
-lin defender_N = mkN "حامی" ;       -- from DictUrd
+lin defenderMasc_N = mkN "حامی" ; -- from DictUrd
+lin defenderFem_N = mkN "حامی" ; -- from DictUrd
 lin defensible_A = mkA "حفاظت پذیر" ;
 lin defensive_A = mkA "مدافعانہ" ;
 lin defensive_N = mkN "دفاعی" ;       -- from DictUrd
@@ -8205,7 +8244,8 @@ lin discover_V = compoundV "دریافت" (mkV "کرنا") ;
 lin discover_V2 = mkV2 (compoundV "دریافت" (mkV "کرنا")) ;       -- from DictUrd
 -- lin discover_V2V = mkV2 (compoundV "دریافت" (mkV "کرنا")) ;
 lin discover_VS = mkVS (compoundV "دریافت" (mkV "کرنا")) ;
-lin discoverer_N = mkN "کاشف" ;       -- from DictUrd
+lin discovererMasc_N = mkN "کاشف" ; -- from DictUrd
+lin discovererFem_N = mkN "کاشف" ; -- from DictUrd
 lin discovery_N = mkN "دریافت" ;       -- from DictUrd
 lin discredit_N = mkN "بدنامی" ;
 lin discredit_V2 = mkV2 (mkV "بدنامی") ;
@@ -8887,7 +8927,8 @@ lin drive_V2 = mkV2 (compoundV "بھگا" (mkV "دینا")) ;       -- from Dict
 lin drive_VS = mkVS (mkV "چلانا") ;
 lin drivel_N = mkN "بکواس" ;
 lin drivel_V = compoundV "بکواس" (mkV "کرنا") ;       -- from DictUrd
-lin driver_N = mkN "گاڑی والا" ;
+lin driverMasc_N = mkN "گاڑی والا" ;
+lin driverFem_N = mkN "گاڑی والا" ;
 lin driveway_N = mkN "پیش راستہ" ;
 lin driving_wheel_N = mkN "چلاوٴ پہیہ" ;
 lin drizzle_N = mkN "بوندا باندی" ;       -- from DictUrd
@@ -9378,7 +9419,8 @@ lin elliptical_A = mkA "بیضوی" ;
 lin elm_N = mkN "ایلم کی ولندیزی بیماری" ;
 lin elocution_N = mkN "فن خطابت" ;
 lin elocutionary_A = mkA "خطیبانہ" ;
-lin elocutionist_N = mkN "خطیب" ;
+lin elocutionistMasc_N = mkN "خطیب" ;
+lin elocutionistFem_N = mkN "خطیب" ;
 lin elongate_V = compoundV "لمبا" (mkV "کرنا") ;
 lin elongate_V2 = mkV2 (compoundV "لمبا" (mkV "کرنا")) ;
 lin elongation_N = mkN "درازی" ;
@@ -9778,7 +9820,8 @@ lin epigram_N = mkN "جگت" ;       -- from DictUrd
 lin epigrammatic_A = mkA "لطیف انداز میں" ;
 lin epilepsy_N = mkN "مرگی" ;       -- from DictUrd
 lin epileptic_A = mkA "سریع" ;       -- from DictUrd
-lin epileptic_N = mkN "صرعی" ;
+lin epilepticMasc_N = mkN "صرعی" ;
+lin epilepticFem_N = mkN "صرعی" ;
 lin epilogue_N = mkN "ختم مقال" ;
 lin epiphany_PN = mkPN "ظہور عیسیٰ کی یاد میں چھ جنوری کو منایا جانے والا تہوار" ;
 lin episcopal_A = mkA "اسقفی" ;
@@ -10215,7 +10258,8 @@ lin experiment_V = compoundV "تجربہ" (mkV "کرنا") ;
 lin experiment_V2 = mkV2 (compoundV "تجربہ" (mkV "کرنا")) ;
 lin experimental_A = mkA "تجربے سے متعلق" ;
 lin experimentation_N = mkN "تجربے کا عمل" ;
-lin experimenter_N = mkN "تجربہ کرنے والا" ;
+lin experimenterMasc_N = mkN "تجربہ کرنے والا" ;
+lin experimenterFem_N = mkN "تجربہ کرنے والا" ;
 lin expert_A = mkA "چالاک" ;       -- from DictUrd
 lin expert_N = mkN "ماہر" ;
 lin expertise_N = mkN "مشاقی" ;       -- from DictUrd
@@ -10244,7 +10288,8 @@ lin exploitation_N = mkN "ناجائز فائدہ (اٹھانا)" ;       -- fro
 lin exploration_N = mkN "دریافت" ;       -- from DictUrd
 lin explore_V2 = mkV2 (compoundV "دریافت" (mkV "کرنا")) ;       -- from DictUrd
 lin explore_VS = mkVS (compoundV "کھوج" (mkV "لگانا")) ;
-lin explorer_N = mkN "سیاح" ;
+lin explorerMasc_N = mkN "سیاح" ;
+lin explorerFem_N = mkN "سیاح" ;
 lin explosion_N = mkN "دھماکا" ;       -- from DictUrd
 lin explosive_A = mkA "آتش بار" ;       -- from DictUrd
 lin explosive_N = mkN "پھٹنے والا" ;
@@ -10257,7 +10302,8 @@ lin export_V = compoundV "برآمد" (mkV "کرنا") ;
 lin export_V2 = mkV2 (compoundV "برآمد" (mkV "کرنا")) ;
 lin exportable_A = mkA "قابل برآمد" ;
 lin exportation_N = mkN "برآمد کاری" ;
-lin exporter_N = mkN "برآمد کنندہ" ;
+lin exporterMasc_N = mkN "برآمد کنندہ" ;
+lin exporterFem_N = mkN "برآمد کنندہ" ;
 lin expose_N = mkN "ظاہر کرنا" ;
 lin expose_V = compoundV "ظاہر" (mkV "کرنا") ;
 lin expose_V2 = mkV2 (compoundV "افشا" (mkV "کرنا")) ;       -- from DictUrd
@@ -10273,7 +10319,8 @@ lin express_N = mkN "ظاہر کرنا" ;
 lin express_V2 = mkV2 (mkV "بتانا") ;       -- from DictUrd
 lin expression_N = mkN "عبارت" ;       -- from DictUrd
 lin expressionism_N = mkN "علامتيت" ;
-lin expressionist_N = mkN "اظہاريت پسند" ;
+lin expressionistMasc_N = mkN "اظہاريت پسند" ;
+lin expressionistFem_N = mkN "اظہاريت پسند" ;
 lin expressionless_A = mkA "لا اظہار" ;
 lin expressive_A = mkA "مظہر" ;
 lin expropriate_V2 = mkV2 (compoundV "بے دخل" (mkV "کرنا")) ;       -- from DictUrd
@@ -10477,11 +10524,14 @@ lin famine_N = mkN "کال" ;       -- from DictUrd
 lin famish_V = compoundV "فاقہ" (mkV "سے مرنا") ;       -- from DictUrd
 lin famish_V2 = mkV2 (compoundV "فاقہ" (mkV "کرنا")) ;       -- from DictUrd
 lin famous_A = mkA "مشہور" ;       -- from DictUrd
-lin fan_N = mkN "پنکھا" ;       -- from DictUrd
+lin fan_1_N = mkN "پنکھا" ;       -- from DictUrd
+lin fan_2_N = mkN "پنکھا" ;       -- from DictUrd
+lin fan_3_N = mkN "پنکھا" ;       -- from DictUrd
 lin fan_V = mkV "پنکھا" ;
 lin fan_V2 = mkV2 (compoundV "پنکھا" (mkV "جھلنا")) ;       -- from DictUrd
 lin fanatic_A = mkA "کٹر پیر" ;       -- from DictUrd
-lin fanatic_N = mkN "جنونی" ;
+lin fanaticMasc_N = mkN "جنونی" ;
+lin fanaticFem_N = mkN "جنونی" ;
 lin fanatical_A = mkA "معتصبانہ" ;
 lin fanaticism_N = mkN "مذہبی جنون" ;
 lin fancier_N = mkN "خاص دلچسپی لينے والا" ;
@@ -10547,7 +10597,8 @@ lin fat_N = mkN "چربی" ;       -- from DictUrd
 lin fat_V2 = mkV2 (mkV "موٹا") ;
 lin fatal_A = mkA "جان لیوا" ;       -- from DictUrd
 lin fatalism_N = mkN "قسمت" ;
-lin fatalist_N = mkN "مسئلہ جبر کے متعلق" ;
+lin fatalistMasc_N = mkN "مسئلہ جبر کے متعلق" ;
+lin fatalistFem_N = mkN "مسئلہ جبر کے متعلق" ;
 lin fatalistic_A = mkA "مسئلہ جبر کے متعلق" ;
 lin fatality_N = mkN "تقدير" ;
 lin fate_N = mkN "آب ودانہ" ;       -- from DictUrd
@@ -10584,7 +10635,8 @@ lin favour_N = mkN "احسان" ;       -- from DictUrd
 lin favour_V2 = mkV2 (compoundV "احسان" (mkV "کرنا")) ;       -- from DictUrd
 lin favourable_A = mkA "موافق" ;       -- from DictUrd
 lin favourite_A = mkA "عزیز" ;       -- from DictUrd
-lin favourite_N = mkN "پسندیدہ" ;
+lin favouriteMasc_N = mkN "پسندیدہ" ;
+lin favouriteFem_N = mkN "پسندیدہ" ;
 lin fawn_N = mkN "ہرن کا بچہ" ;       -- from DictUrd
 lin fawn_V = compoundV "چاپلوسی" (mkV "کرنا") ;       -- from DictUrd
 lin fealty_N = mkN "اطاعت" ;       -- from DictUrd
@@ -10670,7 +10722,8 @@ lin female_N = mkN "عورت" ;       -- from DictUrd
 lin feminine_A = mkA "مونث" ;       -- from DictUrd
 lin femininity_N = mkN "نسوانیت" ;
 lin feminism_N = mkN "تحريک نسواں" ;
-lin feminist_N = mkN "حامی مساوات نسواں" ;
+lin feministMasc_N = mkN "حامی مساوات نسواں" ;
+lin feministFem_N = mkN "حامی مساوات نسواں" ;
 lin femur_N = mkN "ران کی ہڈی" ;       -- from DictUrd
 lin fen_N = mkN "دلدل" ;       -- from DictUrd
 lin fence_N = mkN "باڑہ" ;       -- from DictUrd
@@ -11730,7 +11783,8 @@ lin futility_N = mkN "عبث" ;       -- from DictUrd
 lin future_A = mkA "مستقبل" ;
 lin future_N = mkN "مستقبل" ;
 lin futurism_N = mkN "خیال پرستی" ;       -- from DictUrd
-lin futurist_N = mkN "مستقبلی" ;
+lin futuristMasc_N = mkN "مستقبلی" ;
+lin futuristFem_N = mkN "مستقبلی" ;
 lin futurity_N = mkN "مستقبل" ;
 lin fuzz_N = mkN "پتلا آڑ جانے والا مادہ" ;
 lin fuzzy_A = mkA "دھندلا" ;       -- from DictUrd
@@ -11849,7 +11903,8 @@ lin garbage_can_N = mkN "کچرے کا ڈبہ" ;
 lin garble_V2 = mkV2 (mkV "چھاننا") ;       -- from DictUrd
 lin garden_N = mkN "باغ" ;       -- from DictUrd
 lin garden_V = compoundV "باغبانی" (mkV "کرنا") ;       -- from DictUrd
-lin gardener_N = mkN "باغبان" ;       -- from DictUrd
+lin gardenerMasc_N = mkN "باغبان" ; -- from DictUrd
+lin gardenerFem_N = mkN "باغبان" ; -- from DictUrd
 lin gardenia_N = mkN "گارڈینیا" ;
 lin gardening_N = mkN "باغبانی" ;       -- from DictUrd
 lin gargantuan_A = mkA "عظیم البحثہ" ;       -- from DictUrd
@@ -12005,7 +12060,8 @@ lin geocentric_A = mkA "ارض مرکزی" ;
 lin geographer_N = mkN "جغرافیہ دان" ;
 lin geographical_A = mkA "جغرافیائی طور پر" ;
 lin geography_N = mkN "علم الارض" ;       -- from DictUrd
-lin geologist_N = mkN "ماہر ارضیات" ;
+lin geologistMasc_N = mkN "ماہر ارضیات" ;
+lin geologistFem_N = mkN "ماہر ارضیات" ;
 lin geology_N = mkN "علم طبقات الارض" ;       -- from DictUrd
 lin geometric_A = mkA "ہندسی" ;
 lin geometrical_A = mkA "ہندسی تناسب" ;
@@ -12023,7 +12079,8 @@ lin geriatric_A = mkA "علم امراض شیخوخت" ;
 lin geriatrics_N = mkN "علم امراض شیخوخت" ;
 lin germ_N = mkN "اصل" ;       -- from DictUrd
 lin german_A = mkA "اول درجے کا" ;       -- from DictUrd
-lin german_N = mkN "عزیز" ;       -- from DictUrd
+lin germanMasc_N = mkN "عزیز" ; -- from DictUrd
+lin germanFem_N = mkN "عزیز" ; -- from DictUrd
 lin germane_A = mkA "نمایاں طور پر متعلق" ;
 lin germanic_A = mkA "جرمانی" ;
 lin germinate_V = compoundV "نمو" (mkV "پانا") ;       -- from DictUrd
@@ -13301,7 +13358,8 @@ lin help_V = compoundV "مدد" (mkV "کرنا") ;
 lin help_V2 = mkV2 (compoundV "آڑے" (mkV "آنا")) ;       -- from DictUrd
 -- lin help_V2V = mkV2 (compoundV "مدد" (mkV "کرنا")) ;
 lin help_VS = mkVS (compoundV "مدد" (mkV "کرنا")) ;
-lin helper_N = mkN "چارہ گر" ;       -- from DictUrd
+lin helperMasc_N = mkN "چارہ گر" ; -- from DictUrd
+lin helperFem_N = mkN "چارہ گر" ; -- from DictUrd
 lin helpful_A = mkA "مدد گار" ;       -- from DictUrd
 lin helpfulness_N = mkN "امداد" ;
 lin helping_N = mkN "دستگیری" ;
@@ -14322,7 +14380,8 @@ lin import_V2 = mkV2 (compoundV "درآمد" (mkV "کرنا")) ;       -- from D
 lin importance_N = mkN "اہمیت" ;       -- from DictUrd
 lin important_A = mkA "اہم" ;       -- from DictUrd
 lin importation_N = mkN "عمل درآمد" ;       -- from DictUrd
-lin importer_N = mkN "در آمد کرنے والا" ;
+lin importerMasc_N = mkN "در آمد کرنے والا" ;
+lin importerFem_N = mkN "در آمد کرنے والا" ;
 lin importunate_A = mkA "از حد جلدی والا" ;       -- from DictUrd
 lin importune_V2 = mkV2 (compoundV "خطرے میں" (mkV "ڈلوانا")) ;       -- from DictUrd
 lin importunity_N = mkN "تقاضا" ;       -- from DictUrd
@@ -15089,7 +15148,8 @@ lin integument_N = mkN "غلاف جلد" ;
 lin intellect_N = mkN "عالم" ;       -- from DictUrd
 lin intellectual_A = mkA "روشن خیال" ;       -- from DictUrd
 lin intellectual_N = mkN "اقلی" ;
-lin intelligence_N = mkN "خبر" ;
+lin intelligence_1_N = mkN "خبر" ;
+lin intelligence_2_N = mkN "خبر" ;
 lin intelligent_A = mkA "عاقل" ;       -- from DictUrd
 lin intelligentsia_N = mkN "پڑھا لکھا طبقہ" ;
 lin intelligibility_N = mkN "قابل فہم ہونے کی حالت" ;
@@ -15397,7 +15457,8 @@ lin iridescent_A = mkA "قذحی" ;       -- from DictUrd
 lin iris_N = mkN "قوس" ;       -- from DictUrd
 lin iris_PN = mkPN "آنکھ کی پُتلی" ;
 lin irish_A = mkA "آئرستانی" ;
-lin irish_N = mkN "آئرستانی" ;
+lin irishMasc_N = mkN "آئرستانی" ;
+lin irishFem_N = mkN "آئرستانی" ;
 lin irishman_N = mkN "آئرستانی آدمی" ;
 lin irishwoman_N = mkN "آئرستانی عورت" ;
 lin irk_V2 = mkV2 (compoundV "دق" (mkV "کرنا")) ;       -- from DictUrd
@@ -16559,7 +16620,8 @@ lin lethargic_A = mkA "بے حال" ;       -- from DictUrd
 lin lethargically_Adv = mkAdv "غفلت سے" ;
 lin lethargy_N = mkN "شدت کی نیند" ;       -- from DictUrd
 lin lethe_PN = mkPN "فراموشی" ;
-lin letter_N = mkN "چٹھی" ;       -- from DictUrd
+lin letter_1_N = mkN "چٹھی" ;       -- from DictUrd
+lin letter_2_N = mkN "چٹھی" ;       -- from DictUrd
 lin lettered_A = mkA "کاتب" ;
 lin lettering_N = mkN "نقاشی" ;
 lin letting_N = mkN "ليٹ" ;
@@ -16592,7 +16654,8 @@ lin lewd_A = mkA "بد" ;       -- from DictUrd
 lin lewdness_N = mkN "عیاشی" ;       -- from DictUrd
 lin lewis_PN = mkPN "فن تعمير" ;
 lin lexical_A = mkA "لغوی" ;
-lin lexicographer_N = mkN "لغت نويس" ;
+lin lexicographerMasc_N = mkN "لغت نويس" ;
+lin lexicographerFem_N = mkN "لغت نويس" ;
 lin lexicography_N = mkN "تالف لغت" ;       -- from DictUrd
 lin lexicon_N = mkN "فرہنگ" ;       -- from DictUrd
 lin ley_N = mkN "برق" ;
@@ -16839,7 +16902,8 @@ lin list_V2 = mkV2 (compoundV "کناری" (mkV "لگانا")) ;       -- from D
 --lin list_V2V = mkV2 (mkV "فہرست") ;
 lin list_price_N = mkN "قيمت نامہ" ;
 lin listen_V = compoundV "دھیان" (mkV "دینا") ;       -- from DictUrd
-lin listener_N = mkN "سامع" ;       -- from DictUrd
+lin listenerMasc_N = mkN "سامع" ; -- from DictUrd
+lin listenerFem_N = mkN "سامع" ; -- from DictUrd
 lin listing_N = mkN "فہرست سازی" ;
 lin listless_A = mkA "غافل" ;       -- from DictUrd
 lin listlessness_N = mkN "غفلت" ;       -- from DictUrd
@@ -17312,7 +17376,8 @@ lin magnum_N = mkN "بڑا ششہ" ;       -- from DictUrd
 lin magnum_opus_N = mkN "ادب" ;
 lin magpie_N = mkN "چتلا کوا" ;
 lin magyar_A = mkA "جغرافیہ" ;
-lin magyar_N = mkN "جغرافیہ" ;
+lin magyarMasc_N = mkN "جغرافیہ" ;
+lin magyarFem_N = mkN "جغرافیہ" ;
 lin maharaja_N = mkN "مہاراجہ" ;
 lin maharajah_N = mkN "مہاراجہ" ;
 lin maharanee_N = mkN "مہارانی" ;
@@ -17652,7 +17717,8 @@ lin marvel_V = compoundV "تعجب" (mkV "کرنا") ;
 lin marvel_VS = mkVS (compoundV "تعجب" (mkV "کرنا")) ;
 lin marvellous_A = variants {mkA "عجب"; mkA "حیرت"};       -- from DictUrd
 lin marxism_N = mkN "مارکسزم" ;
-lin marxist_N = mkN "مارکسی" ;
+lin marxistMasc_N = mkN "مارکسی" ;
+lin marxistFem_N = mkN "مارکسی" ;
 lin mary_PN = mkPN "مریم میگڈالینی" ;
 lin marzipan_N = mkN "حلوائے بادام" ;
 lin masc_PN = mkPN "نصیبے کی چیز" ;
@@ -17735,7 +17801,8 @@ lin maternal_A = mkA "مادری" ;       -- from DictUrd
 lin maternity_N = mkN "جناپا" ;       -- from DictUrd
 lin matey_A = mkA "دوست" ;       -- from DictUrd
 lin mathematical_A = mkA "ریاضی" ;
-lin mathematician_N = mkN "ریاضی دان" ;
+lin mathematicianMasc_N = mkN "ریاضی دان" ;
+lin mathematicianFem_N = mkN "ریاضی دان" ;
 lin mathematics_N = mkN "ریاضی" ;       -- from DictUrd
 lin maths_N = mkN "حساب" ;
 lin matinee_N = mkN "صبح کا شو" ;
@@ -18131,7 +18198,8 @@ lin middle_N = mkN "بیچ" ;       -- from DictUrd
 lin middle_aged_A = mkA "متوسط عمر کا" ;
 lin middle_class_A = mkA "متوسط طبقہ" ;
 lin middle_distance_A = mkA "جوفہ طبلی" ;
-lin middleman_N = mkN "واسطہ" ;       -- from DictUrd
+lin middlemanMasc_N = mkN "واسطہ" ; -- from DictUrd
+lin middlemanFem_N = mkN "واسطہ" ; -- from DictUrd
 lin middleweight_A = mkA "اوسط وزن" ;
 lin middleweight_N = mkN "اوسط وزن" ;
 lin middling_A = mkA "مدھم" ;       -- from DictUrd
@@ -18968,7 +19036,8 @@ lin music_box_N = mkN "موسیقی کا ڈبہ" ;
 lin music_hall_N = mkN "سرود خانہ" ;
 lin musical_A = mkA "خوش نوا" ;       -- from DictUrd
 lin musical_N = mkN "موسیقی کا" ;
-lin musician_N = mkN "موسیقیار" ;       -- from DictUrd
+lin musicianMasc_N = mkN "موسیقیار" ; -- from DictUrd
+lin musicianFem_N = mkN "موسیقیار" ; -- from DictUrd
 lin musicianship_N = mkN "مطربی" ;
 lin musingly_Adv = mkAdv "عالم محویت میں" ;
 lin musk_N = mkN "کستوری" ;
@@ -19024,7 +19093,8 @@ lin myrtle_N = mkN "آس" ;
 lin mysterious_A = mkA "پوشیدہ" ;       -- from DictUrd
 lin mystery_N = mkN "بھید" ;       -- from DictUrd
 lin mystic_A = mkA "صوفی" ;
-lin mystic_N = mkN "باطنی" ;       -- from DictUrd
+lin mysticMasc_N = mkN "باطنی" ; -- from DictUrd
+lin mysticFem_N = mkN "باطنی" ; -- from DictUrd
 lin mystical_A = mkA "صوفیانہ" ;
 lin mysticism_N = mkN "طریقت" ;       -- from DictUrd
 lin mystify_V2 = mkV2 (mkV "پیشیدہ") ;
@@ -19668,7 +19738,8 @@ lin offbeat_A = mkA "نرالا" ;       -- from DictUrd
 lin offence_N = mkN "گناہ" ;       -- from DictUrd
 lin offend_V = compoundV "ناراض" (mkV "کرنا") ;
 lin offend_V2 = mkV2 (compoundV "دل کھٹا" (mkV "کرنا")) ;       -- from DictUrd
-lin offender_N = mkN "حملہ آور" ;       -- from DictUrd
+lin offenderMasc_N = mkN "حملہ آور" ; -- from DictUrd
+lin offenderFem_N = mkN "حملہ آور" ; -- from DictUrd
 lin offensive_A = mkA "خراب" ;       -- from DictUrd
 lin offensive_N = mkN "ڈھٹائ" ;       -- from DictUrd
 lin offensiveness_N = mkN "برائی" ;       -- from DictUrd
@@ -19841,10 +19912,12 @@ lin opinionative_A = mkA "خود سر" ;
 lin opium_N = mkN "افیم" ;       -- from DictUrd
 lin opossum_N = mkN "موش کیسہ دار" ;
 lin opp_PN = mkPN "مخالف" ;
-lin opponent_N = mkN "حریف" ;       -- from DictUrd
+lin opponentMasc_N = mkN "حریف" ; -- from DictUrd
+lin opponentFem_N = mkN "حریف" ; -- from DictUrd
 lin opportune_A = mkA "بموقعہ" ;       -- from DictUrd
 lin opportunism_N = mkN "ابن الوقتی" ;       -- from DictUrd
-lin opportunist_N = mkN "ابن الوقت" ;       -- from DictUrd
+lin opportunistMasc_N = mkN "ابن الوقت" ; -- from DictUrd
+lin opportunistFem_N = mkN "ابن الوقت" ; -- from DictUrd
 lin opportunity_N = mkN "بار" ;       -- from DictUrd
 lin oppose_V = compoundV "مخالفت" (mkV "کرنا") ;
 lin oppose_V2 = mkV2 (compoundV "مخالفت" (mkV "کرنا")) ;       -- from DictUrd
@@ -19869,7 +19942,8 @@ lin optical_A = mkA "بصری" ;       -- from DictUrd
 lin optician_N = mkN "عینک کی دکان" ;
 lin optics_N = mkN "مناظریات" ;
 lin optimism_N = mkN "رجا" ;       -- from DictUrd
-lin optimist_N = mkN "خوش بین" ;       -- from DictUrd
+lin optimistMasc_N = mkN "خوش بین" ; -- from DictUrd
+lin optimistFem_N = mkN "خوش بین" ; -- from DictUrd
 lin optimistic_A = mkA "پرامیدی کا قائل" ;
 lin optimistically_Adv = mkAdv "رجائیت پسندی سے" ;
 lin optimization_N = mkN "پیش کارکردگی" ;
@@ -19888,7 +19962,8 @@ lin orange_N = mkN "نارنگی" ;       -- from DictUrd
 lin orangeman_N = mkN "بادشاہ ولیم سوم" ;
 lin orate_V = compoundV "تقریر" (mkV "کرنا") ;
 lin oration_N = mkN "کلام" ;       -- from DictUrd
-lin orator_N = mkN "خطیب" ;       -- from DictUrd
+lin oratorMasc_N = mkN "خطیب" ; -- from DictUrd
+lin oratorFem_N = mkN "خطیب" ; -- from DictUrd
 lin oratorical_A = mkA "خطبییانہ یا مقررانہ" ;
 lin oratorio_N = mkN "بھجن" ;
 lin oratory_N = mkN "خطابت" ;       -- from DictUrd
@@ -19944,7 +20019,8 @@ lin orient_N = mkN "مشرق" ;       -- from DictUrd
 lin orient_V2 = mkV2 (compoundV "مشرق کی طرف منہ" (mkV "کرنا")) ;       -- from DictUrd
 lin oriental_A = mkA "مشرقی" ;       -- from DictUrd
 lin oriental_N = mkN "مشرقی آرٹ" ;
-lin orientalist_N = mkN "مستشرق" ;       -- from DictUrd
+lin orientalistMasc_N = mkN "مستشرق" ; -- from DictUrd
+lin orientalistFem_N = mkN "مستشرق" ; -- from DictUrd
 lin orientate_V2 = mkV2 (compoundV "تشریق" (mkV "کرنا")) ;
 lin orientation_N = mkN "رخ کا تعین" ;       -- from DictUrd
 lin orifice_N = mkN "دہانہ" ;       -- from DictUrd
@@ -19954,7 +20030,8 @@ lin original_N = mkN "اصلی" ;
 lin originality_N = mkN "اصلیت" ;       -- from DictUrd
 lin originate_V = compoundV "وجود میں" (mkV "لانا") ;
 lin originate_V2 = mkV2 (compoundV "وجود میں" (mkV "لانا")) ;
-lin originator_N = mkN "بانی" ;       -- from DictUrd
+lin originatorMasc_N = mkN "بانی" ; -- from DictUrd
+lin originatorFem_N = mkN "بانی" ; -- from DictUrd
 lin oriole_N = mkN "سنہری کوا" ;
 lin orison_N = mkN "سلات" ;       -- from DictUrd
 lin ormolu_N = mkN "سنہری" ;
@@ -19966,7 +20043,8 @@ lin ornate_A = mkA "آراستہ" ;       -- from DictUrd
 lin ornateness_N = mkN "رنگینی" ;       -- from DictUrd
 lin ornery_A = mkA "بگڑی ہوی شکل" ;
 lin ornithological_A = mkA "طیوریات کی رو سے" ;
-lin ornithologist_N = mkN "ماہر طیوریات" ;
+lin ornithologistMasc_N = mkN "ماہر طیوریات" ;
+lin ornithologistFem_N = mkN "ماہر طیوریات" ;
 lin orotund_A = mkA "صوتی" ;
 lin orphan_N = mkN "یسیر" ;       -- from DictUrd
 lin orphan_V2 = mkV2 (mkV "یتیم") ;
@@ -20011,7 +20089,8 @@ lin otherwise_Adv = mkAdv "ورنہ" ;       -- from DictUrd
 lin otiose_A = mkA "آرام پسند" ;       -- from DictUrd
 lin ottawa_PN = mkPN "الگونی نسل کا انڈین قبیلہ" ;
 lin otter_N = mkN "اد بلاؤ" ;       -- from DictUrd
-lin ottoman_N = mkN "اوٹومن" ;
+lin ottomanMasc_N = mkN "اوٹومن" ;
+lin ottomanFem_N = mkN "اوٹومن" ;
 lin ounce_N = mkN "وزن کی ایک اکائی" ;
 lin oust_V = compoundV "بے دخل" (mkV "کرنا") ;
 lin oust_V2 = mkV2 (compoundV "در بدر" (mkV "کرنا")) ;       -- from DictUrd
@@ -20208,7 +20287,8 @@ lin pacific_PN = mkPN "کاہل" ;
 lin pacifically_Adv = mkAdv "امن پسند طریقے سے" ;
 lin pacification_N = mkN "ٹھنڈا کرنا" ;
 lin pacifism_N = mkN "مذہب امن" ;
-lin pacifist_N = mkN "جنگ کا مخالف" ;
+lin pacifistMasc_N = mkN "جنگ کا مخالف" ;
+lin pacifistFem_N = mkN "جنگ کا مخالف" ;
 lin pacify_V2 = mkV2 (mkV "سادھنا") ;       -- from DictUrd
 lin pack_N = mkN "باندھنا" ;
 lin pack_V = mkV "باندھنا" ;
@@ -20257,7 +20337,8 @@ lin pair_V = mkV "جوڑا" ;
 lin pair_V2 = mkV2 (compoundV "جوڑا" (mkV "بنانا")) ;       -- from DictUrd
 lin pakistan_PN = mkPN "پاکستان" ;
 lin pakistani_A = mkA "پاکستانی شہریت رکھنے والا" ;
-lin pakistani_N = mkN "پاکستانی شہریت رکھنے والا" ;
+lin pakistaniMasc_N = mkN "پاکستانی شہریت رکھنے والا" ;
+lin pakistaniFem_N = mkN "پاکستانی شہریت رکھنے والا" ;
 lin pal_N = mkN "آڑی" ;       -- from DictUrd
 lin pal_V = mkV "رفیق" ;
 lin palace_N = mkN "محل" ;       -- from DictUrd
@@ -20722,7 +20803,8 @@ lin pearl_PN = mkPN "موتی" ;
 lin pearl_V = mkV "موتی" ;
 lin pearl_barley_N = mkN "مقشر جو" ;
 lin pearly_A = mkA "موتی کی طرح کا" ;
-lin peasant_N = mkN "دہقان" ;       -- from DictUrd
+lin peasantMasc_N = mkN "دہقان" ; -- from DictUrd
+lin peasantFem_N = mkN "دہقان" ; -- from DictUrd
 lin peasantry_N = mkN "کسان لوگ" ;
 lin pease_N = mkN "مٹر کا پودا" ;
 lin peashooter_N = mkN "ایک نلکی عموما پلاسٹک کی" ;
@@ -20750,7 +20832,8 @@ lin peculiarity_N = mkN "خاصیت" ;       -- from DictUrd
 lin pecuniary_A = mkA "مالی" ;       -- from DictUrd
 lin pedagogic_A = mkA "معلمانہ" ;
 lin pedagogical_A = mkA "معلمانہ" ;       -- from DictUrd
-lin pedagogue_N = mkN "معلم" ;       -- from DictUrd
+lin pedagogueMasc_N = mkN "معلم" ; -- from DictUrd
+lin pedagogueFem_N = mkN "معلم" ; -- from DictUrd
 lin pedagogy_N = mkN "تدریسیات" ;       -- from DictUrd
 lin pedal_A = mkA "پیڈل سے چلانا" ;
 lin pedal_N = mkN "پائے دان" ;       -- from DictUrd
@@ -21092,7 +21175,8 @@ lin pervert_V2 = mkV2 (compoundV "خراب" (mkV "کرنا")) ;       -- from Di
 lin pesky_A = mkA "پریشان کن" ;
 lin pessary_N = mkN "رحم بند" ;
 lin pessimism_N = mkN "مایوسی" ;       -- from DictUrd
-lin pessimist_N = mkN "مایوس" ;
+lin pessimistMasc_N = mkN "مایوس" ;
+lin pessimistFem_N = mkN "مایوس" ;
 lin pessimistic_A = mkA "یاس پر مبنی" ;
 lin pessimistically_Adv = mkAdv "قنوطیت سے" ;
 lin pest_N = mkN "فتنہ" ;       -- from DictUrd
@@ -21259,7 +21343,8 @@ lin physiology_N = mkN "علم الحیات" ;
 lin physiotherapy_N = mkN "طبیعی معالجہ" ;
 lin physique_N = mkN "ڈھانچا" ;       -- from DictUrd
 lin pi_N = mkN "پائی" ;
-lin pianist_N = mkN "پیانوں بجانے والا" ;
+lin pianistMasc_N = mkN "پیانوں بجانے والا" ;
+lin pianistFem_N = mkN "پیانوں بجانے والا" ;
 lin piano_A = mkA "پیانو" ;
 lin piano_Adv = mkAdv "پیانو" ;
 lin piano_N = mkN "پیانو" ;
@@ -21797,7 +21882,8 @@ lin policy_N = mkN "حکمت عملی" ;       -- from DictUrd
 lin polio_N = mkN "پوليو" ;
 lin poliomyelitis_N = mkN "پوليو" ;
 lin polish_A = mkA "صاف کرنا" ;
-lin polish_N = mkN "آب" ;       -- from DictUrd
+lin polishMasc_N = mkN "آب" ; -- from DictUrd
+lin polishFem_N = mkN "آب" ; -- from DictUrd
 lin polish_V = compoundV "صاف" (mkV "کرنا") ;
 lin polish_V2 = mkV2 (compoundV "آب" (mkV "دینا")) ;       -- from DictUrd
 lin polisher_N = mkN "پالش کا برش" ;
@@ -21840,7 +21926,8 @@ lin polygamist_N = mkN "کثير زواجی شخص" ;
 lin polygamous_A = mkA "مخلوط الزوج پودا" ;
 lin polygamy_N = mkN "کثرت ازدواج" ;
 lin polyglot_A = mkA "ہفت زبان" ;
-lin polyglot_N = mkN "ہفت زبان" ;
+lin polyglotMasc_N = mkN "ہفت زبان" ;
+lin polyglotFem_N = mkN "ہفت زبان" ;
 lin polygon_N = mkN "کثیر الزاویہ شکل" ;
 lin polygonal_A = mkA "کثيرالاضلاع سے متعلق" ;
 lin polymorphic_A = mkA "کثير شکلی" ;
@@ -22785,7 +22872,8 @@ lin proscription_N = mkN "جلا وطنی" ;       -- from DictUrd
 lin prose_N = mkN "نثر" ;       -- from DictUrd
 lin prosecute_V2 = mkV2 (compoundV "حد" (mkV "لگانا")) ;       -- from DictUrd
 lin prosecution_N = mkN "استغاثہ" ;       -- from DictUrd
-lin prosecutor_N = mkN "پیروی کرنے والا" ;
+lin prosecutorMasc_N = mkN "پیروی کرنے والا" ;
+lin prosecutorFem_N = mkN "پیروی کرنے والا" ;
 lin proselyte_N = mkN "مرید" ;       -- from DictUrd
 lin proselytize_V = compoundV "معتقد" (mkV "بنانا") ;
 lin proselytize_V2 = mkV2 (compoundV "معتقد" (mkV "بنانا")) ;
@@ -22815,7 +22903,8 @@ lin protect_V = compoundV "حفاظت" (mkV "کرنا") ;
 lin protect_V2 = mkV2 (compoundV "آڑے" (mkV "آنا")) ;       -- from DictUrd
 lin protection_N = mkN "آڑ" ;       -- from DictUrd
 lin protectionism_N = mkN "تحفظ تجارت" ;
-lin protectionist_N = mkN "حامی تامین" ;
+lin protectionistMasc_N = mkN "حامی تامین" ;
+lin protectionistFem_N = mkN "حامی تامین" ;
 lin protective_A = mkA "بچانے والی" ;
 lin protector_N = mkN "عاصم" ;       -- from DictUrd
 lin protectorate_N = mkN "زیر نگرانی علاقہ" ;
@@ -23380,7 +23469,8 @@ lin rachel_PN = mkPN "ریچل" ;
 lin racial_A = mkA "نسلی" ;       -- from DictUrd
 lin racing_N = mkN "دوڑ" ;
 lin racism_N = mkN "نسل پرستی" ;
-lin racist_N = mkN "نسل پرست" ;       -- from DictUrd
+lin racistMasc_N = mkN "نسل پرست" ; -- from DictUrd
+lin racistFem_N = mkN "نسل پرست" ; -- from DictUrd
 lin rack_N = mkN "شکنجہ" ;       -- from DictUrd
 lin rack_V2 = mkV2 (mkV "شکنجہ") ;
 lin racket_N = mkN "دھکم پیل" ;       -- from DictUrd
@@ -23983,7 +24073,8 @@ lin rendering_N = mkN "نقش کاری" ;
 lin rendezvous_N = mkN "ملاقات" ;       -- from DictUrd
 lin rendezvous_V = mkV "مجمع" ;
 lin rendition_N = mkN "پرداخت" ;       -- from DictUrd
-lin renegade_N = mkN "بے وفا" ;       -- from DictUrd
+lin renegadeMasc_N = mkN "بے وفا" ; -- from DictUrd
+lin renegadeFem_N = mkN "بے وفا" ; -- from DictUrd
 lin renegade_V = compoundV "منکر" (mkV "دین") ;
 lin renew_V2 = mkV2 (compoundV "دو بارہ" (mkV "کرنا")) ;       -- from DictUrd
 lin renewal_N = mkN "تجدید" ;       -- from DictUrd
@@ -24114,7 +24205,8 @@ lin rescind_V2 = mkV2 (compoundV "باطل" (mkV "کرنا")) ;       -- from Di
 lin rescript_N = mkN "منشور" ;
 lin rescue_N = mkN "بچاؤ" ;       -- from DictUrd
 lin rescue_V2 = mkV2 (mkV "بچانا") ;       -- from DictUrd
-lin rescuer_N = mkN "رہا کرنے والا" ;
+lin rescuerMasc_N = mkN "رہا کرنے والا" ;
+lin rescuerFem_N = mkN "رہا کرنے والا" ;
 lin research_N = mkN "تحقیق" ;       -- from DictUrd
 lin research_V = mkV "تفتیش" ;
 lin research_V2 = mkV2 (mkV "تفتیش") ;
@@ -24385,7 +24477,8 @@ lin riddle_V2 = mkV2 (mkV "چھالنا") ;       -- from DictUrd
 lin ride_N = mkN "چڈھی" ;       -- from DictUrd
 lin ride_V = mkV "سواری" ;
 lin ride_V2 = mkV2 (compoundV "چڈھی" (mkV "لینا")) ;       -- from DictUrd
-lin rider_N = mkN "سواری" ;       -- from DictUrd
+lin riderMasc_N = mkN "سواری" ; -- from DictUrd
+lin riderFem_N = mkN "سواری" ; -- from DictUrd
 lin ridge_N = mkN "ناہموار چوٹی" ;
 lin ridge_V2 = mkV2 (compoundV "ناہموار" (mkV "چوٹی")) ;
 lin ridicule_N = mkN "بے عزتی" ;       -- from DictUrd
@@ -25216,7 +25309,8 @@ lin seriousness_N = mkN "متانت" ;       -- from DictUrd
 lin sermon_N = mkN "خطبہ" ;       -- from DictUrd
 lin serpent_N = mkN "سانپ" ;
 lin serpentine_A = mkA "مکار" ;
-lin servant_N = mkN "بندہ" ;       -- from DictUrd
+lin servantMasc_N = mkN "بندہ" ; -- from DictUrd
+lin servantFem_N = mkN "بندہ" ; -- from DictUrd
 lin serve_N = mkN "کام کرنا" ;
 lin serve_V = compoundV "کام" (mkV "کرنا") ;
 lin serve_V2 = mkV2 (compoundV "خمدت" (mkV "کرنا")) ;       -- from DictUrd
@@ -25386,7 +25480,8 @@ lin shoplift_V = compoundV "اٹھائی" (mkV "گیرا") ;
 lin shoplift_V2 = mkV2 (compoundV "اٹھائی" (mkV "گیرا")) ;
 lin shoplifter_N = mkN "دکان چور" ;       -- from DictUrd
 lin shoplifting_N = mkN "اٹھائی گیری" ;
-lin shopper_N = mkN "خریدار" ;
+lin shopperMasc_N = mkN "خریدار" ;
+lin shopperFem_N = mkN "خریدار" ;
 lin shopping_N = mkN "خرید و فروخت" ;       -- from DictUrd
 lin shore_N = mkN "کنارہ" ;       -- from DictUrd
 lin shore_V2 = mkV2 (mkV "ساحل") ;
@@ -25937,7 +26032,8 @@ lin solemn_A = mkA "متین" ;       -- from DictUrd
 lin solemnization_N = mkN "پوری رسومات کے ساتھ ادا کرنے کا عمل" ;
 lin solicit_V = compoundV "بے قرار" (mkV "ہونا") ;
 lin solicit_V2 = mkV2 (mkV "مانگنا") ;       -- from DictUrd
-lin solicitor_N = mkN "مختار" ;       -- from DictUrd
+lin solicitorMasc_N = mkN "مختار" ; -- from DictUrd
+lin solicitorFem_N = mkN "مختار" ; -- from DictUrd
 lin solicitous_A = mkA "متردد" ;
 lin solid_A = mkA "کٹھور" ;       -- from DictUrd
 lin solid_N = mkN "ٹھوس" ;
@@ -25972,7 +26068,8 @@ lin soothe_V2 = mkV2 (compoundV "تھپ" (mkV "تھپانا")) ;       -- from D
 lin soothsayer_N = mkN "نجومی" ;
 lin sop_N = mkN "کیچڑ" ;       -- from DictUrd
 lin sop_V2 = mkV2 (compoundV "شراب میں" (mkV "آمیزش")) ;
-lin sophist_N = mkN "تصنع والا" ;
+lin sophistMasc_N = mkN "تصنع والا" ;
+lin sophistFem_N = mkN "تصنع والا" ;
 lin sophisticated_A = mkA "پرتکلف" ;       -- from DictUrd
 lin sophistication_N = mkN "تصنع" ;
 lin soprano_N = mkN "غنائی آواز" ;
@@ -26096,14 +26193,16 @@ lin specked_A = mkA "ذرہ" ;
 lin spectacle_N = mkN "منظر" ;       -- from DictUrd
 lin spectacular_A = mkA "پرتماشہ" ;       -- from DictUrd
 lin spectacular_N = mkN "شاندار" ;
-lin spectator_N = mkN "تماشائ" ;       -- from DictUrd
+lin spectatorMasc_N = mkN "تماشائ" ; -- from DictUrd
+lin spectatorFem_N = mkN "تماشائ" ; -- from DictUrd
 lin spectre_N = mkN "عفریت" ;       -- from DictUrd
 lin spectrum_N = mkN "شعاع ریزی" ;
 lin speculate_V = mkV "سوچنا" ;
 lin speculate_VS = mkVS (mkV "سوچنا") ;
 lin speculation_N = mkN "سٹا" ;       -- from DictUrd
 lin speculative_A = mkA "قیاسی" ;
-lin speculator_N = mkN "سٹے باز" ;
+lin speculatorMasc_N = mkN "سٹے باز" ;
+lin speculatorFem_N = mkN "سٹے باز" ;
 lin speech_N = mkN "بیان" ;       -- from DictUrd
 lin speed_N = mkN "جلدی" ;       -- from DictUrd
 lin speed_V = mkV "رفتار" ;
@@ -26216,7 +26315,8 @@ lin spotlight_N = mkN "دائرہ نور" ;
 lin spotlight_V2 = mkV2 (compoundV "دائرہ" (mkV "نور")) ;
 lin spotted_A = mkA "بند کی والا" ;
 lin spotty_A = mkA "چتیوں بھرا" ;
-lin spouse_N = mkN "ذوج" ;       -- from DictUrd
+lin spouseMasc_N = mkN "ذوج" ; -- from DictUrd
+lin spouseFem_N = mkN "ذوج" ; -- from DictUrd
 lin spout_N = mkN "پرنالا" ;       -- from DictUrd
 lin spout_V = mkV "ٹونٹی" ;
 lin spout_V2 = mkV2 (mkV "ٹونٹی") ;
@@ -26662,7 +26762,8 @@ lin stubborn_A = mkA "ضدی" ;
 lin stuck_V2 = mkV2 (compoundV "پھنسا" (mkV "ہوا")) ;
 lin stud_N = mkN "نسل کش گھوڑا" ;       -- from DictUrd
 lin stud_V2 = mkV2 (mkV "جڑانا") ;       -- from DictUrd
-lin student_N = mkN "طالبعلم" ;       -- from DictUrd
+lin studentMasc_N = mkN "طالبعلم" ; -- from DictUrd
+lin studentFem_N = mkN "طالبعلم" ; -- from DictUrd
 lin studio_N = mkN "مصور کا کمرہ" ;
 lin study_N = mkN "مطالعہ" ;       -- from DictUrd
 lin study_V = compoundV "مطالعہ" (mkV "کرنا") ;
@@ -26778,7 +26879,8 @@ lin succumb_V = mkV "مطیع" ;
 lin suck_N = mkN "چوسنا" ;
 lin suck_V = mkV "چوسنا" ;
 lin suck_V2 = mkV2 (mkV "چسکنا") ;       -- from DictUrd
-lin sucker_N = mkN "چوسنے کی نلی" ;
+lin suckerMasc_N = mkN "چوسنے کی نلی" ;
+lin suckerFem_N = mkN "چوسنے کی نلی" ;
 lin suckle_V2 = mkV2 (compoundV "دودھ" (mkV "پلانا")) ;       -- from DictUrd
 lin suckling_N = mkN "شیر خوار" ;       -- from DictUrd
 lin suction_N = mkN "چوسنا" ;
@@ -27606,7 +27708,8 @@ lin think_V2 = mkV2 (compoundV "غور" (mkV "کرنا")) ;       -- from DictUr
 lin think_VA = compoundV "خیال" (mkV "کرنا") ;
 lin think_VS = mkVS (compoundV "خیال" (mkV "کرنا")) ;
 lin thinkable_A = mkA "قابل غور" ;
-lin thinker_N = mkN "فلسفی" ;       -- from DictUrd
+lin thinkerMasc_N = mkN "فلسفی" ; -- from DictUrd
+lin thinkerFem_N = mkN "فلسفی" ; -- from DictUrd
 lin thinking_A = mkA "سوچنا" ;
 lin thinking_N = mkN "بچار" ;       -- from DictUrd
 lin thinness_N = mkN "دبلا پن" ;
@@ -29126,7 +29229,8 @@ lin vector_N = mkN "خط حامل" ;       -- from DictUrd
 lin veer_V = compoundV "بدل" (mkV "جانا") ;       -- from DictUrd
 lin vegetable_A = mkA "سبزی" ;
 lin vegetable_N = mkN "نبات" ;       -- from DictUrd
-lin vegetarian_N = mkN "سبزی خور" ;       -- from DictUrd
+lin vegetarianMasc_N = mkN "سبزی خور" ; -- from DictUrd
+lin vegetarianFem_N = mkN "سبزی خور" ; -- from DictUrd
 lin vegetation_N = mkN "آب و گیر" ;       -- from DictUrd
 lin vehemence_N = mkN "غلبہ" ;       -- from DictUrd
 lin vehement_A = mkA "جوشیلا" ;       -- from DictUrd
@@ -29375,7 +29479,8 @@ lin volume_N = mkN "حجم" ;       -- from DictUrd
 lin voluminous_A = mkA "حجیم" ;       -- from DictUrd
 lin voluntary_A = mkA "عمداً" ;       -- from DictUrd
 lin voluntary_N = mkN "رغبت" ;
-lin volunteer_N = mkN "رضا کار" ;       -- from DictUrd
+lin volunteerMasc_N = mkN "رضا کار" ; -- from DictUrd
+lin volunteerFem_N = mkN "رضا کار" ; -- from DictUrd
 lin volunteer_V = compoundV "رضا" (mkV "کار") ;
 lin volunteer_V2 = mkV2 (compoundV "رضا" (mkV "کار")) ;
 -- lin volunteer_V2V = mkV2 (compoundV "رضا" (mkV "کار")) ;
@@ -29993,7 +30098,8 @@ lin zany_A = mkA "مسخرہ" ;
 lin zany_N = mkN "احمق" ;       -- from DictUrd
 lin zap_V2 = mkV2 (compoundV "دفعتاً برباد" (mkV "کرنا")) ;       -- from DictUrd
 lin zeal_N = mkN "چاؤ" ;       -- from DictUrd
-lin zealot_N = mkN "جان فشان" ;       -- from DictUrd
+lin zealotMasc_N = mkN "جان فشان" ; -- from DictUrd
+lin zealotFem_N = mkN "جان فشان" ; -- from DictUrd
 lin zealous_A = mkA "جوشیلا" ;       -- from DictUrd
 lin zebra_N = mkN "گور خر" ;       -- from DictUrd
 lin zebu_N = mkN "کوہان دار گائے" ;       -- from DictUrd