Merge branch 'master' of https://github.com/GrammaticalFramework/GF

src/english/DictEng.gf

@@ -43164,11 +43164,11 @@ lin protuberant_A = compoundA (mkA "protuberant");
 lin proturan_N = mkN "proturan" ;
 lin proud_A = mkA "proud" "prouder";
 lin provable_A = compoundA (mkA "provable");
-lin prove_V = mkV "prove" "proves" "proved" "proved" "proving";
-lin prove_V2 = mkV2 (mkV "prove" "proves" "proved" "proved" "proving");
-lin prove_V2V = mkV2V (mkV "prove" "proves" "proved" "proved" "proving") noPrep to_Prep ;
-lin prove_VA = mkVA (mkV "prove" "proves" "proved" "proved" "proving");
-lin prove_VS = mkVS (mkV "prove" "proves" "proved" "proved" "proving");
+lin prove_V = mkV "prove" "proves" "proved" "proven" "proving";
+lin prove_V2 = mkV2 (mkV "prove" "proves" "proved" "proven" "proving");
+lin prove_V2V = mkV2V (mkV "prove" "proves" "proved" "proven" "proving") noPrep to_Prep ;
+lin prove_VA = mkVA (mkV "prove" "proves" "proved" "proven" "proving");
+lin prove_VS = mkVS (mkV "prove" "proves" "proved" "proven" "proving");
 lin provenance_N = mkN "provenance" ;
 lin provencal_A = mkA "provencal" ;
 lin provender_N = mkN "provender" ;

src/italian/BeschIta.gf

@@ -3170,6 +3170,71 @@ oper fare_52 : Str -> Verbo = \fare ->
     }
   } ;
 
+-- A variant of fare, found in _at least_ the verb "soffisfare"
+-- Source: http://www.wordreference.com/conj/ItVerbs.aspx?v=soddisfare
+-- Attested by forms "soddisfi" and "soddisfini" in GDPR
+oper fare_52' : Str -> Verbo = \fare ->
+  let f_ = Predef.tk 3 fare in
+ {s = table {
+    Inf => f_ + "are" ;
+    InfClit => f_ + "ar" ;
+    Indi Pres Sg P1 => f_ + "ò" ;
+    Indi Pres Sg P2 => f_ + "i" ;
+    Indi Pres Sg P3 => f_ + "a" ;
+    Indi Pres Pl P1 => f_ + "iamo" ;
+    Indi Pres Pl P2 => f_ + "ate" ;
+    Indi Pres Pl P3 => f_ + "ano" ;
+    Indi Imperf Sg P1 => f_ + "acevo" ; --# notpresent
+    Indi Imperf Sg P2 => f_ + "acevi" ; --# notpresent
+    Indi Imperf Sg P3 => f_ + "aceva" ; --# notpresent
+    Indi Imperf Pl P1 => f_ + "acevamo" ; --# notpresent
+    Indi Imperf Pl P2 => f_ + "acevate" ; --# notpresent
+    Indi Imperf Pl P3 => f_ + "acevano" ; --# notpresent
+    Pass Sg P1 => f_ + "eci" ; --# notpresent
+    Pass Sg P2 => f_ + "acesti" ; --# notpresent
+    Pass Sg P3 => f_ + "ece" ; --# notpresent
+    Pass Pl P1 => f_ + "acemmo" ; --# notpresent
+    Pass Pl P2 => f_ + "aceste" ; --# notpresent
+    Pass Pl P3 => f_ + "ecero" ; --# notpresent
+    Fut Sg P1 => f_ + "erò" ; --# notpresent
+    Fut Sg P2 => f_ + "erai" ; --# notpresent
+    Fut Sg P3 => f_ + "erà" ; --# notpresent
+    Fut Pl P1 => f_ + "eremo" ; --# notpresent
+    Fut Pl P2 => f_ + "erete" ; --# notpresent
+    Fut Pl P3 => f_ + "eranno" ; --# notpresent
+    Cong Pres Sg P1 => f_ + "i" ;
+    Cong Pres Sg P2 => f_ + "i" ;
+    Cong Pres Sg P3 => f_ + "i" ;
+    Cong Pres Pl P1 => f_ + "iamo" ;
+    Cong Pres Pl P2 => f_ + "iate" ;
+    Cong Pres Pl P3 => f_ + "ino" ;
+    Cong Imperf Sg P1 => f_ + "acessi" ; --# notpresent
+    Cong Imperf Sg P2 => f_ + "acessi" ; --# notpresent
+    Cong Imperf Sg P3 => f_ + "acesse" ; --# notpresent
+    Cong Imperf Pl P1 => f_ + "acessimo" ; --# notpresent
+    Cong Imperf Pl P2 => f_ + "aceste" ; --# notpresent
+    Cong Imperf Pl P3 => f_ + "acessero" ; --# notpresent
+    Cond Sg P1 => f_ + "erei" ; --# notpresent
+    Cond Sg P2 => f_ + "eresti" ; --# notpresent
+    Cond Sg P3 => f_ + "erebbe" ; --# notpresent
+    Cond Pl P1 => f_ + "eremmo" ; --# notpresent
+    Cond Pl P2 => f_ + "ereste" ; --# notpresent
+    Cond Pl P3 => f_ + "erebbero" ; --# notpresent
+    Imper SgP2 => f_ + "a'" ;
+    Imper PlP1 => f_ + "acciamo" ;
+    Imper PlP2 => f_ + "ate" ;
+    Ger => f_ + "acendo" ;
+    Part PresP Masc Sg => f_ + "acente" ;
+    Part PresP Masc Pl => f_ + "acenti" ;
+    Part PresP Fem Sg => f_ + "acente" ;
+    Part PresP Fem Pl => f_ + "acenti" ;
+    Part PassP Masc Sg => f_ + "atto" ;
+    Part PassP Masc Pl => f_ + "atti" ;
+    Part PassP Fem Sg => f_ + "atta" ;
+    Part PassP Fem Pl => f_ + "atte"
+    }
+  } ;
+
 oper flettere_53 : Str -> Verbo = \flettere ->
   let fle_ = Predef.tk 5 flettere in
  {s = table {

src/italian/IrregIta.gf

@@ -686,4 +686,5 @@ concrete IrregIta of IrregItaAbs = CatIta [V] ** open ParadigmsIta, BeschIta in
   lin decidere_V = verboV (ridere_74 "decidere") ;
   lin persistere_V = verboV (assistere_24 "persistere") ;
   lin incidere_V = verboV (ridere_74 "incidere") ;
+  lin soddisfare_V' = verboV (fare_52' "soddisfare") ;
 }

src/italian/IrregItaAbs.gf

@@ -683,4 +683,5 @@ abstract IrregItaAbs = Cat [V] ** {
   fun decidere_V : V ;
   fun persistere_V : V ;
   fun incidere_V : V ;
+  fun soddisfare_V' : V ;
 }