diff --git a/lib/src/translator/CheckInflection.hs b/lib/src/translator/CheckInflection.hs index 58285d3e0..7a70a4c28 100644 --- a/lib/src/translator/CheckInflection.hs +++ b/lib/src/translator/CheckInflection.hs @@ -22,6 +22,10 @@ isError lang u v = case lang of "mkV" | head v == '"' -> notElem (dp 3 (stringOf v)) ["are","ere","ire","rsi"] "mkV2" | head v == '"' -> notElem (dp 3 (stringOf v)) ["are","ere","ire","rsi"] _ -> False + "Fre" -> case bareOp u of + "mkV" | head v == '"' -> notElem (dp 2 (stringOf v)) ["er","ir","re"] + "mkV2" | head v == '"' -> notElem (dp 2 (stringOf v)) ["er","ir","re"] + _ -> False dp :: Int -> String -> String dp i s = drop (length s - i) s diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf index 0d78094c6..fc12e14c6 100644 --- a/lib/src/translator/DictionaryFre.gf +++ b/lib/src/translator/DictionaryFre.gf @@ -707,7 +707,7 @@ lin alluring_A = mkA "séduisant" ; -- tocheck lin allusive_A = mkA "allusif" ; -- tocheck lin alluvial_A = mkA "alluvial" ; -- tocheck lin ally_N = mkN "allié" masculine ; -- tocheck -lin ally_V2 = mkV2 (mkV "allié") ; -- tocheck +lin ally_V2 = mkV2 (mkV "allier") ; -- tocheck lin almanac_N = mkN "almanach" masculine ; -- tocheck lin almandine_N = mkN "almandin" masculine ; -- tocheck lin almeria_PN = mkPN "Almeria" ; -- status=guess src=geonames @@ -1194,8 +1194,8 @@ lin apposition_N = mkN "apposition" feminine ; -- tocheck lin appraisal_N = mkN "estimation" feminine ; -- tocheck lin appraise_V2 = mkV2 (mkV "estimer") ; -- tocheck lin appreciable_A = mkA "appréciable" ; -- tocheck -lin appreciate_V = variants {} ; -- mkV2 (mkV "reconnaissant") ; -- tocheck -lin appreciate_V2 = mkV2 (mkV "reconnaissant") ; -- tocheck +lin appreciate_V = mkV "apprécier" ; +lin appreciate_V2 = mkV2 (mkV "apprécier") ; lin appreciation_N = variants {} ; -- lin apprehend_V2 = mkV2 (mkV "appréhender") ; -- tocheck lin apprehensive_A = mkA "soucieux" ; -- tocheck @@ -1206,7 +1206,7 @@ lin approach_V2 = mkV2 (mkV "approcher") ; -- tocheck lin approachable_A = mkA "approchable" ; -- tocheck lin approbation_N = mkN "approbation" feminine ; -- tocheck lin appropriate_A = mkA "approprié" ; -- tocheck -lin appropriate_V2 = mkV2 (mkV "approprié") ; -- tocheck +lin appropriate_V2 = mkV2 (mkV "approprier") ; -- tocheck lin appropriately_Adv = adjAdv appropriate_A ; -- -- derived lin approval_N = mkN "approbation" feminine | mkN "agrément" masculine ; -- tocheck lin approve_V = variants {} ; -- mkV2 (mkV "approuver") ; -- tocheck @@ -4490,8 +4490,8 @@ lin compel_V2 = variants {} ; -- mkV2V (mkV I.contraindre_V2) | mkV2V (mkV "obli lin compel_V2V = mkV2V (mkV I.contraindre_V2) | mkV2V (mkV "obliger") ; -- tocheck lin compel_VV = variants {} ; -- mkV2V (mkV I.contraindre_V2) | mkV2V (mkV "obliger") ; -- tocheck lin compendium_N = mkN "recueil" masculine ; -- tocheck -lin compensate_V = variants {} ; -- mkV2 (mkV "compinscate") ; -- tocheck -lin compensate_V2 = mkV2 (mkV "compinscate") ; -- tocheck +lin compensate_V = mkV "recompenser" ; +lin compensate_V2 = mkV2 (mkV "recompenser") ; lin compensation_N = mkN "compensation" feminine | mkN "dédommagement" masculine ; -- tocheck lin compete_V = mkV (mkV "rivaliser") ; -- tocheck lin competence_N = mkN "compétence" | mkN "compétence" feminine ; -- tocheck @@ -6366,7 +6366,7 @@ lin disappointment_N = mkN "déception" feminine ; -- tocheck lin disarm_V2 = mkV2 (mkV "désarmer") ; -- tocheck lin disarmament_N = mkN "désarmement" masculine ; -- tocheck lin disarray_N = mkN "désordre" masculine ; -- tocheck -lin disarray_V2 = mkV2 (mkV "zizanie") ; -- tocheck +lin disarray_V2 = mkV2 (mkV "désordonner") ; -- tocheck lin disaster_N = mkN "désastre" masculine ; -- tocheck lin disastrous_A = mkA "désastreux" ; -- tocheck lin disavow_V2 = mkV2 (mkV "désavouer") ; -- tocheck @@ -6444,7 +6444,7 @@ lin dishcloth_N = mkN "torchon" masculine | mkN "lavette" feminine ; -- tocheck lin dishearten_V2 = mkV2 (mkV "décourager") ; -- tocheck lin dishonest_A = mkA "malhonnête" ; -- tocheck lin dishonour_N = mkN "déshonneur" masculine ; -- tocheck -lin dishonour_V2 = mkV2 (mkV "déshonneur") ; -- tocheck +lin dishonour_V2 = mkV2 (mkV "déshonorer") ; -- tocheck lin dishwasher_N = mkN "lave-vaisselle" masculine | mkN "plongeur" masculine ; -- tocheck lin disinfect_V2 = mkV2 (mkV "désinfecter") ; -- tocheck lin disinfectant_N = mkN "désinfectant" masculine ; -- tocheck @@ -9095,7 +9095,7 @@ lin game_1_N = mkN "jeu" ; lin game_2_N = mkN "jeu" ; lin game_3_N = mkN "gibier" masculine ; lin game_N = mkN "jeu" masculine | mkN "gibier" masculine ; -- tocheck -lin game_V2 = mkV2 (mkV "jeu") ; -- tocheck +lin game_V2 = mkV2 (mkV "jouer") ; -- tocheck lin gamekeeper_N = mkN "garde-chasse" ; -- tocheck lin gamete_N = mkN "gamète" masculine ; -- tocheck lin gamma_N = mkN "gamme" feminine ; -- tocheck @@ -10848,7 +10848,7 @@ lin impinge_V = mkV (mkV "toucher") | mkV (mkV "influencer") ; -- tocheck lin impious_A = mkA "impie" ; -- tocheck lin impish_A = mkA "espiègle" ; -- tocheck lin implant_N = mkN "implant" masculine ; -- tocheck -lin implant_V2 = mkV2 (mkV "implant") ; -- tocheck +lin implant_V2 = mkV2 (mkV "implanter") ; -- tocheck lin implantation_N = mkN "implantation" feminine ; -- tocheck lin implement_N = mkN "instrument" masculine ; -- tocheck lin implement_V2 = mkV2 (mkV "appliquer") ; -- tocheck @@ -11415,8 +11415,8 @@ lin interoperability_N = mkN "interopérabilité" feminine ; -- tocheck lin interpellate_V2 = mkV2 (mkV "interpeller") ; -- tocheck lin interpersonal_A = mkA "interpersonnel" ; -- tocheck lin interplanetary_A = mkA "interplanétaire" ; -- tocheck -lin interpose_V2 = mkV2 (mkV "intercalé") | mkV2 (mkV I.interrompre_V2) ; -- tocheck -lin interpret_V = variants {} ; -- mkV2 (mkV "interpréter") | mkV2 (mkV I.traduire_V2) ; -- tocheck +lin interpose_V2 = mkV2 (mkV "intercaler") | mkV2 (mkV I.interrompre_V2) ; -- tocheck +lin interpret_V = mkV "interpréter" ; lin interpret_V2 = mkV2 (mkV "interpréter") | mkV2 (mkV I.traduire_V2) ; -- tocheck lin interpretation_N = mkN "interprétation" ; -- tocheck lin interpreter_N = mkN "interpréteur" masculine | mkN "interprète" ; -- tocheck @@ -12815,7 +12815,7 @@ lin lurid_A = mkA "jaunâtre" | mkA "blafard" | mkA "choquant" ; -- tocheck lin lurk_V = mkV (mkV "traîner") ; -- tocheck lin lush_N = mkN "alcoolique" masculine ; -- tocheck lin lust_N = mkN "luxure" feminine ; -- tocheck -lin lust_V = mkV (mkV "désirer") | mkV (mkV "joie") ; -- tocheck +lin lust_V = mkV (mkV "désirer") | mkV (mkV "jouir") ; -- tocheck lin luster_N = mkN "lustre" masculine | mkN "éclat" masculine | mkN "lustre" ; -- tocheck lin lustful_A = mkA "lubrique" ; -- tocheck lin lute_N = mkN "luth" masculine ; -- tocheck @@ -13178,7 +13178,7 @@ lin mask_N = mkN "masque" masculine | mkN "masque" ; -- tocheck lin masochism_N = mkN "masochisme" masculine ; -- tocheck lin masochist_N = mkN "masochiste" ; -- tocheck lin mason_N = mkN "maçon" masculine ; -- tocheck -lin masquerade_V = mkV (mkV "mascarade") ; -- tocheck +lin masquerade_V = mkV (mkV "mascarader") ; -- tocheck lin mass_A = variants {} ; -- lin mass_N = mkN "masse" feminine | mkN "messe" feminine ; -- tocheck lin massacre_N = mkN "massacre" masculine ; -- tocheck @@ -15363,7 +15363,7 @@ lin paratrooper_N = mkN "para" masculine ; -- tocheck lin parcel_N = mkN "parcelle" feminine | mkN "colis" masculine ; -- tocheck lin parchment_N = mkN "parchemin" masculine | mkN "vélin" masculine ; -- tocheck lin pardon_N = mkN "pardon" masculine | mkN "grâce" feminine ; -- tocheck -lin pardon_V2 = mkV2 (mkV "grâce") | mkV2 (mkV "pardonner") ; -- tocheck +lin pardon_V2 = mkV2 (mkV "pardonner") ; lin pardonable_A = mkA "pardonnable" ; -- tocheck lin pare_V2 = mkV2 (mkV "éplucher") | mkV2 (mkV "rogner") ; -- tocheck lin parent_N = mkN "parent" masculine ; @@ -16039,7 +16039,7 @@ lin piston_N = mkN "piston" masculine ; -- tocheck lin pit_N = mkN "fosse" feminine | mkN "noyau" masculine ; -- tocheck lin pit_V2 = mkV2 (mkV "dénoyauter") ; -- tocheck lin pitch_N = mkN "tangage" masculine | mkN "poix" feminine | mkN "pas" masculine | mkN "laïus" masculine | mkN "résine" feminine | mkN "lancer" masculine | mkN "inclinaison" feminine | mkN "terrain" masculine | mkN "ton" masculine ; -- tocheck -lin pitch_V2 = mkV2 (mkV "lancer") | mkV2 (mkV "monter ; -- tocheck") | mkV2 (mkV "promouvoir ; -- tocheck") | mkV2 (mkV "jeter ; -- tocheck") | mkV2 (mkV "lancer") ; -- tocheck +lin pitch_V2 = mkV2 (mkV "lancer") | mkV2 (mkV "monter") | mkV2 (mkV "promouvoir") | mkV2 (mkV "jeter") | mkV2 (mkV "lancer") ; -- tocheck lin pitcher_N = mkN "cruche" feminine | mkN "pichet" masculine | mkN "lanceur" masculine ; -- tocheck lin pitchfork_N = mkN "fourche" feminine ; -- tocheck lin piteous_A = mkA "pitoyable" ; -- tocheck @@ -16765,8 +16765,8 @@ lin proceed_N = variants {} ; -- lin proceed_V = variants {} ; -- mkV2 (mkV "procéder") ; -- tocheck lin proceeding_N = variants {} ; -- lin process_N = mkN "processus" ; -lin process_V = variants {} ; -- mkV2 (mkV "traiter}") ; -- tocheck -lin process_V2 = mkV2 (mkV "traiter}") ; -- tocheck +lin process_V = mkV "traiter" ; +lin process_V2 = mkV2 (mkV "traiter") ; -- tocheck lin processing_N = variants {} ; -- lin procession_N = mkN "procession" feminine ; -- tocheck lin processor_N = mkN "processeur" masculine ; -- tocheck @@ -16779,7 +16779,7 @@ lin procrastination_N = mkN "procrastination" feminine ; -- tocheck lin procreate_V2 = mkV2 (mkV "procréer") ; -- tocheck lin procreation_N = mkN "procréation" feminine ; -- tocheck lin proctology_N = mkN "proctologie" feminine ; -- tocheck -lin procure_V2 = mkV2 (mkV I.acquérir_V2) | mkV2 (mkV "procurer") | mkV2 (mkV "proxénétisme") ; -- tocheck +lin procure_V2 = mkV2 (mkV I.acquérir_V2) | mkV2 (mkV "procurer") ; lin procurement_N = mkN "achats" ; -- tocheck lin prod_V2V = mkV2V (mkV "encourager") | mkV2V (mkV "pousser") ; -- tocheck lin prodigy_N = mkN "prodige" | mkN "présage" ; -- tocheck @@ -20339,7 +20339,7 @@ lin stag_V = variants {} ; -- lin stage_N = mkN "scène" feminine | mkN "calèche" feminine | mkN "étape" feminine ; ---- split lin stage_V2 = mkV2 (mkV "organiser") ; -- tocheck lin stagflation_N = mkN "stagflation" feminine ; -- tocheck -lin stagger_V = variants {} ; -- mkV2 (mkV "quinconce") | mkV2 (mkV "chanceler") | mkV2 (mkV "tituber") ; -- tocheck +lin stagger_V = mkV "chanceler" | mkV "tituber" ; -- tocheck lin stagnate_V = mkV (mkV "stagner") ; -- tocheck lin stagnation_N = mkN "stagnation" feminine ; -- tocheck lin staid_A = mkA "terne" ; -- tocheck