Merge branch 'main' into download-from-API

Author: catreedle

Keyboards/DataContracts/.gitkeep

@@ -28,97 +28,141 @@ conjugations:
       1:
         tenseTitle: Pr. Simple
         tenseForms:
-          I/you/plural: simplePresent
-          he/she/it: simplePresentThirdPersonSingular
+          1:
+            label: I/you/plural
+            value: simplePresent
+          2:
+            label: he/she/it
+            value: simplePresentThirdPersonSingular
 
       2:
         tenseTitle: Pr. Perfect
         tenseForms:
-          I/you/plural: "[have] pastParticiple"
-          he/she/it: "[has] pastParticiple"
+          1:
+            label: I/you/plural
+            value: "[have] pastParticiple"
+          2:
+            label: he/she/it
+            value: "[has] pastParticiple"
 
       3:
         tenseTitle: Pr. Continuous
         tenseForms:
-          I: "[am] presentParticiple"
-          you/plural: "[are] presentParticiple"
-          he/she/it: "[is] presentParticiple"
+          1:
+            label: I
+            value: "[am] presentParticiple"
+          2:
+            label: you/plural
+            value: "[are] presentParticiple"
+          3:
+            label: he/she/it
+            value: "[is] presentParticiple"
 
       4:
         tenseTitle: Pr. Perf. Continuous
         tenseForms:
-          I/you/plural: "[have been] presentParticiple"
-          he/she/it: "[has been] presentParticiple"
+          1:
+            label: I/you/plural
+            value: "[have been] presentParticiple"
+          2:
+            label: he/she/it
+            value: "[has been] presentParticiple"
 
   2:
     sectionTitle: Past
     tenses:
       1:
         tenseTitle: Past Simple
         tenseForms:
-          all: simplePast
+          1:
+            label: all
+            value: simplePast
 
       2:
         tenseTitle: Past Perfect
         tenseForms:
-          all: "[had] pastParticiple"
+          1:
+            label: all
+            value: "[had] pastParticiple"
 
       3:
         tenseTitle: Past Continuous
         tenseForms:
-          I/he/she/it: "[was] presentParticiple"
-          you/plural: "[were] presentParticiple"
+          1:
+            label: I/he/she/it
+            value: "[was] presentParticiple"
+          2:
+            label: you/plural
+            value: "[were] presentParticiple"
 
       4:
         tenseTitle: Past Perf. Continuous
         tenseForms:
-          all: "[had been] presentParticiple"
+          1:
+            label: all
+            value: "[had been] presentParticiple"
 
   3:
     sectionTitle: Future
     tenses:
       1:
         tenseTitle: Fut. Simple
         tenseForms:
-          all: "[will] infinitive"
+          1:
+            label: all
+            value: "[will] infinitive"
 
       2:
         tenseTitle: Fut. Perfect
         tenseForms:
-          all: "[will have] pastParticiple"
+          1:
+            label: all
+            value: "[will have] pastParticiple"
 
       3:
         tenseTitle: Fut. Continuous
         tenseForms:
-          all: "[will be] presentParticiple"
+          1:
+            label: all
+            value: "[will be] presentParticiple"
 
       4:
         tenseTitle: Fut. Perf. Continuous
         tenseForms:
-          all: "[will have been] presentParticiple"
+          1:
+            label: all
+            value: "[will have been] presentParticiple"
 
   4:
     sectionTitle: Conditional
     tenses:
       1:
         tenseTitle: Cond. Simple
         tenseForms:
-          all: "[would] infinitive"
+          1:
+            label: all
+            value: "[would] infinitive"
 
       2:
         tenseTitle: Cond. Perfect
         tenseForms:
-          all: "[would have] pastParticiple"
+          1:
+            label: all
+            value: "[would have] pastParticiple"
 
       3:
         tenseTitle: Cond. Continuous
         tenseForms:
-          all: "[would be] presentParticiple"
+          1:
+            label: all
+            value: "[would be] presentParticiple"
 
       4:
         tenseTitle: Cond. Perf. Continuous
         tenseForms:
-          all: "[would have been] presentParticiple"
+          1:
+            label: all
+            value: "[would have been] presentParticiple"
 
 # MARK: Translate
 

Keyboards/DataContracts/de.yaml

@@ -29,38 +29,74 @@ conjugations:
       1:
         tenseTitle: Presente
         tenseForms:
-          yo: indicativePresentFirstPersonSingular
-          tú: indicativePresentFirstPersonPlural
-          él/ella/Ud.: indicativePresentSecondPersonSingular
-          nosotros: indicativePresentSecondPersonPlural
-          vosotros: indicativePresentThirdPersonSingular
-          ellos/ellas/Uds.: indicativePresentThirdPersonPlural
+          1:
+            label: yo
+            value: indicativePresentFirstPersonSingular
+          2:
+            label: tú
+            value: indicativePresentSecondPersonSingular
+          3:
+            label: él/ella/Ud.
+            value: indicativePresentThirdPersonSingular
+          4:
+            label: nosotros
+            value: indicativePresentFirstPersonPlural
+          5:
+            label: vosotros
+            value: indicativePresentSecondPersonPlural
+          6:
+            label: ellos/ellas/Uds.
+            value: indicativePresentThirdPersonPlural
 
   2:
     sectionTitle: Pretérito
     tenses:
       1:
         tenseTitle: Pretérito
         tenseForms:
-          yo: preteriteFirstPersonSingular
-          tú: preteriteFirstPersonPlural
-          él/ella/Ud.: preteriteSecondPersonSingular
-          nosotros: preteriteSecondPersonPlural
-          vosotros: preteriteThirdPersonSingular
-          ellos/ellas/Uds.: preteriteThirdPersonPlural
+          1:
+            label: yo
+            value: preteriteFirstPersonSingular
+          2:
+            label: tú
+            value: preteriteSecondPersonSingular
+          3:
+            label: él/ella/Ud.
+            value: preteriteThirdPersonSingular
+          4:
+            label: nosotros
+            value: preteriteFirstPersonPlural
+          5:
+            label: vosotros
+            value: preteriteSecondPersonPlural
+          6:
+            label: ellos/ellas/Uds.
+            value: preteriteThirdPersonPlural
 
   3:
     sectionTitle: Imperfecto
     tenses:
       1:
         tenseTitle: Imperfecto
         tenseForms:
-          yo: pastImperfectFirstPersonSingular
-          tú: pastImperfectFirstPersonPlural
-          él/ella/Ud.: pastImperfectSecondPersonSingular
-          nosotros: pastImperfectSecondPersonPlural
-          vosotros: pastImperfectThirdPersonSingular
-          ellos/ellas/Uds.: pastImperfectThirdPersonPlural
+          1:
+            label: yo
+            value: pastImperfectFirstPersonSingular
+          2:
+            label: tú
+            value: pastImperfectSecondPersonSingular
+          3:
+            label: él/ella/Ud.
+            value: pastImperfectThirdPersonSingular
+          4:
+            label: nosotros
+            value: pastImperfectFirstPersonPlural
+          5:
+            label: vosotros
+            value: pastImperfectSecondPersonPlural
+          6:
+            label: ellos/ellas/Uds.
+            value: pastImperfectThirdPersonPlural
 
 # MARK: Translate
 

Keyboards/DataContracts/en.yaml

@@ -28,51 +28,99 @@ conjugations:
       1:
         tenseTitle: Présent
         tenseForms:
-          je: indicativePresentFirstPersonSingular
-          tu: indicativePresentFirstPersonPlural
-          il/elle: indicativePresentSecondPersonSingular
-          nous: indicativePresentSecondPersonPlural
-          vous: indicativePresentThirdPersonSingular
-          ils/elles: indicativePresentThirdPersonPlural
+          1:
+            label: je
+            value: indicativePresentFirstPersonSingular
+          2:
+            label: tu
+            value: indicativePresentSecondPersonSingular
+          3:
+            label: il/elle
+            value: indicativePresentThirdPersonSingular
+          4:
+            label: nous
+            value: indicativePresentFirstPersonPlural
+          5:
+            label: vous
+            value: indicativePresentSecondPersonPlural
+          6:
+            label: ils/elles
+            value: indicativePresentThirdPersonPlural
 
   2:
     sectionTitle: Passé simple
     tenses:
       1:
         tenseTitle: Passé simple
         tenseForms:
-          je: indicativePreteriteFirstPersonSingular
-          tu: indicativePreteriteFirstPersonPlural
-          il/elle: indicativePreteriteSecondPersonSingular
-          nous: indicativePreteriteSecondPersonPlural
-          vous: indicativePreteriteThirdPersonSingular
-          ils/elles: indicativePreteriteThirdPersonPlural
+          1:
+            label: je
+            value: indicativePreteriteFirstPersonSingular
+          2:
+            label: tu
+            value: indicativePreteriteSecondPersonSingular
+          3:
+            label: il/elle
+            value: indicativePreteriteThirdPersonSingular
+          4:
+            label: nous
+            value: indicativePreteriteFirstPersonPlural
+          5:
+            label: vous
+            value: indicativePreteriteSecondPersonPlural
+          6:
+            label: ils/elles
+            value: indicativePreteriteThirdPersonPlural
 
   3:
     sectionTitle: Imparfait
     tenses:
       1:
         tenseTitle: Imparfait
         tenseForms:
-          je: indicativeImperfectFirstPersonSingular
-          tu: indicativeImperfectFirstPersonPlural
-          il/elle: indicativeImperfectSecondPersonSingular
-          nous: indicativeImperfectSecondPersonPlural
-          vous: indicativeImperfectThirdPersonSingular
-          ils/elles: indicativeImperfectThirdPersonPlural
+          1:
+            label: je
+            value: indicativeImperfectFirstPersonSingular
+          2:
+            label: tu
+            value: indicativeImperfectSecondPersonSingular
+          3:
+            label: il/elle
+            value: indicativeImperfectThirdPersonSingular
+          4:
+            label: nous
+            value: indicativeImperfectFirstPersonPlural
+          5:
+            label: vous
+            value: indicativeImperfectSecondPersonPlural
+          6:
+            label: ils/elles
+            value: indicativeImperfectThirdPersonPlural
 
   4:
     sectionTitle: Futur
     tenses:
       1:
         tenseTitle: Futur
         tenseForms:
-          je: indicativeSimpleFutureFirstPersonSingular
-          tu: indicativeSimpleFutureFirstPersonPlural
-          il/elle: indicativeSimpleFutureSecondPersonSingular
-          nous: indicativeSimpleFutureSecondPersonPlural
-          vous: indicativeSimpleFutureThirdPersonSingular
-          ils/elles: indicativeSimpleFutureThirdPersonPlural
+          1:
+            label: je
+            value: indicativeSimpleFutureFirstPersonSingular
+          2:
+            label: tu
+            value: indicativeSimpleFutureSecondPersonSingular
+          3:
+            label: il/elle
+            value: indicativeSimpleFutureThirdPersonSingular
+          4:
+            label: nous
+            value: indicativeSimpleFutureFirstPersonPlural
+          5:
+            label: vous
+            value: indicativeSimpleFutureSecondPersonPlural
+          6:
+            label: ils/elles
+            value: indicativeSimpleFutureThirdPersonPlural
 
 # MARK: Translate