From 8121124d722b136b116dc27afaaae174233b6731 Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Tue, 10 Dec 2013 13:03:50 +0000
Subject: [PATCH] French inflection display in android

---
 src/ui/android/res/xml/inflection_fi.xml      | 263 +++++++++++++++++-
 src/ui/android/res/xml/inflection_fr.xml      | 242 ++++++++++++++++
 .../ui/android/Translator.java                |   2 +-
 3 files changed, 495 insertions(+), 12 deletions(-)
 create mode 100644 src/ui/android/res/xml/inflection_fr.xml

diff --git a/src/ui/android/res/xml/inflection_fi.xml b/src/ui/android/res/xml/inflection_fi.xml
index fe3d19452..595747059 100644
--- a/src/ui/android/res/xml/inflection_fi.xml
+++ b/src/ui/android/res/xml/inflection_fi.xml
@@ -89,7 +89,240 @@
 	    <tag>a</tag>
 	    <template>
 			<h1>Adjektiivi</h1>
-	
+			<h2>Positiivi</h2>
+
+			<table class="forms-table" rules="all" border="yes">
+				<tr>
+					<th></th>
+					<th>yksikkö</th>
+					<th>monikko</th>
+				</tr>
+				<tr>
+					<th>nominatiivi</th>
+					<td><lin form="s Posit (NCase Sg Nom)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Posit (NCase Pl Nom)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>genetiivi</th>
+					<td><lin form="s Posit (NCase Sg Gen)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Posit (NCase Pl Gen)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>partitiivi</th>
+					<td><lin form="s Posit (NCase Sg Part)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Posit (NCase Pl Part)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>translatiivi</th>
+					<td><lin form="s Posit (NCase Sg Transl)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Posit (NCase Pl Transl)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>essiivi</th>
+					<td><lin form="s Posit (NCase Sg Ess)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Posit (NCase Pl Ess)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>inessiivi</th>
+					<td><lin form="s Posit (NCase Sg Iness)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Posit (NCase Pl Iness)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>elatiivi</th>
+					<td><lin form="s Posit (NCase Sg Elat)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Posit (NCase Pl Elat)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>illatiivi</th>
+					<td><lin form="s Posit (NCase Sg Illat)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Posit (NCase Pl Illat)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>adessiivi</th>
+					<td><lin form="s Posit (NCase Sg Adess)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Posit (NCase Pl Adess)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>ablatiivi</th>
+					<td><lin form="s Posit (NCase Sg Ablat)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Posit (NCase Pl Ablat)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>allatiivi</th>
+					<td><lin form="s Posit (NCase Sg Allat)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Posit (NCase Pl Allat)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>abessiivi</th>
+					<td><lin form="s Posit (NCase Sg Abess)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Posit (NCase Pl Abess)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>komitatiivi</th>
+					<td colspan="2"><lin form="s Posit NComit">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>instruktiivi</th>
+					<td colspan="2"><lin form="s Posit NInstruct">DisplayA(<lemma/>)</lin></td>
+				</tr>
+			</table>
+			<h2>Komparatiivi</h2>
+
+			<table class="forms-table" rules="all" border="yes">
+				<tr>
+					<th></th>
+					<th>yksikkö</th>
+					<th>monikko</th>
+				</tr>
+				<tr>
+					<th>nominatiivi</th>
+					<td><lin form="s Compar (NCase Sg Nom)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Compar (NCase Pl Nom)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>genetiivi</th>
+					<td><lin form="s Compar (NCase Sg Gen)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Compar (NCase Pl Gen)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>partitiivi</th>
+					<td><lin form="s Compar (NCase Sg Part)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Compar (NCase Pl Part)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>translatiivi</th>
+					<td><lin form="s Compar (NCase Sg Transl)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Compar (NCase Pl Transl)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>essiivi</th>
+					<td><lin form="s Compar (NCase Sg Ess)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Compar (NCase Pl Ess)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>inessiivi</th>
+					<td><lin form="s Compar (NCase Sg Iness)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Compar (NCase Pl Iness)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>elatiivi</th>
+					<td><lin form="s Compar (NCase Sg Elat)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Compar (NCase Pl Elat)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>illatiivi</th>
+					<td><lin form="s Compar (NCase Sg Illat)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Compar (NCase Pl Illat)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>adessiivi</th>
+					<td><lin form="s Compar (NCase Sg Adess)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Compar (NCase Pl Adess)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>ablatiivi</th>
+					<td><lin form="s Compar (NCase Sg Ablat)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Compar (NCase Pl Ablat)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>allatiivi</th>
+					<td><lin form="s Compar (NCase Sg Allat)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Compar (NCase Pl Allat)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>abessiivi</th>
+					<td><lin form="s Compar (NCase Sg Abess)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Compar (NCase Pl Abess)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>komitatiivi</th>
+					<td colspan="2"><lin form="s Compar NComit">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>instruktiivi</th>
+					<td colspan="2"><lin form="s Compar NInstruct">DisplayA(<lemma/>)</lin></td>
+				</tr>
+			</table>
+			<h2>Superlatiivi</h2>
+
+			<table class="forms-table" rules="all" border="yes">
+				<tr>
+					<th></th>
+					<th>yksikkö</th>
+					<th>monikko</th>
+				</tr>
+				<tr>
+					<th>nominatiivi</th>
+					<td><lin form="s Superl (NCase Sg Nom)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Superl (NCase Pl Nom)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>genetiivi</th>
+					<td><lin form="s Superl (NCase Sg Gen)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Superl (NCase Pl Gen)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>partitiivi</th>
+					<td><lin form="s Superl (NCase Sg Part)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Superl (NCase Pl Part)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>translatiivi</th>
+					<td><lin form="s Superl (NCase Sg Transl)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Superl (NCase Pl Transl)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>essiivi</th>
+					<td><lin form="s Superl (NCase Sg Ess)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Superl (NCase Pl Ess)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>inessiivi</th>
+					<td><lin form="s Superl (NCase Sg Iness)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Superl (NCase Pl Iness)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>elatiivi</th>
+					<td><lin form="s Superl (NCase Sg Elat)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Superl (NCase Pl Elat)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>illatiivi</th>
+					<td><lin form="s Superl (NCase Sg Illat)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Superl (NCase Pl Illat)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>adessiivi</th>
+					<td><lin form="s Superl (NCase Sg Adess)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Superl (NCase Pl Adess)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>ablatiivi</th>
+					<td><lin form="s Superl (NCase Sg Ablat)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Superl (NCase Pl Ablat)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>allatiivi</th>
+					<td><lin form="s Superl (NCase Sg Allat)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Superl (NCase Pl Allat)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>abessiivi</th>
+					<td><lin form="s Superl (NCase Sg Abess)">DisplayA(<lemma/>)</lin></td>
+					<td><lin form="s Superl (NCase Pl Abess)">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>komitatiivi</th>
+					<td colspan="2"><lin form="s Superl NComit">DisplayA(<lemma/>)</lin></td>
+				</tr>
+				<tr>
+					<th>instruktiivi</th>
+					<td colspan="2"><lin form="s Superl NInstruct">DisplayA(<lemma/>)</lin></td>
+				</tr>
+			</table>
+
+
+			
 		</template>
 	</inflection>
 	<inflection>
@@ -109,6 +342,14 @@
 	<inflection>
 	    <cat>V</cat>
 	    <cat>V2</cat>
+		<cat>V3</cat>
+		<cat>V2V</cat>
+		<cat>V2S</cat>
+		<cat>V2Q</cat>
+		<cat>V2A</cat>
+		<cat>VS</cat>
+		<cat>VQ</cat>
+		<cat>VA</cat>
 		<tag>v</tag>
 		<template>
 			<h1>Verbi</h1>
@@ -124,7 +365,7 @@
 				</tr>
 				<tr>
 				        <th rowspan="3">yksikkö</th>
-					<th>1. persoona</th>
+					<th>1. p.</th>
 					<td><lin form="s (Presn Sg P1)">DisplayV(<lemma/>)</lin></td>
 					<td><lin form="s (Impf Sg P1)">DisplayV(<lemma/>)</lin></td>
 					<td><lin form="s (Condit Sg P1)">DisplayV(<lemma/>)</lin></td>
@@ -132,7 +373,7 @@
 					<td>-</td>
 				</tr>
 				<tr>
-					<th>2. persoona</th>
+					<th>2. p.</th>
 					<td><lin form="s (Presn Sg P2)">DisplayV(<lemma/>)</lin></td>
 					<td><lin form="s (Impf Sg P2)">DisplayV(<lemma/>)</lin></td>
 					<td><lin form="s (Condit Sg P2)">DisplayV(<lemma/>)</lin></td>
@@ -140,7 +381,7 @@
 					<td><lin form="s (Imper Sg)">DisplayV(<lemma/>)</lin></td>
 				</tr>
 				<tr>
-					<th>3. persoona</th>
+					<th>3. p.</th>
 					<td><lin form="s (Presn Sg P3)">DisplayV(<lemma/>)</lin></td>
 					<td><lin form="s (Impf Sg P3)">DisplayV(<lemma/>)</lin></td>
 					<td><lin form="s (Condit Sg P3)">DisplayV(<lemma/>)</lin></td>
@@ -149,7 +390,7 @@
 				</tr>
 				<tr>
 				        <th rowspan="4">monikko</th>
-					<th>1. persoona</th>
+					<th>1. p.</th>
 					<td><lin form="s (Presn Pl P1)">DisplayV(<lemma/>)</lin></td>
 					<td><lin form="s (Impf Pl P1)">DisplayV(<lemma/>)</lin></td>
 					<td><lin form="s (Condit Pl P1)">DisplayV(<lemma/>)</lin></td>
@@ -157,7 +398,7 @@
 					<td><lin form="s ImperP1Pl">DisplayV(<lemma/>)</lin></td>
 				</tr>
 				<tr>
-					<th>2. persoona</th>
+					<th>2. p.</th>
 					<td><lin form="s (Presn Pl P2)">DisplayV(<lemma/>)</lin></td>
 					<td><lin form="s (Impf Pl P2)">DisplayV(<lemma/>)</lin></td>
 					<td><lin form="s (Condit Pl P2)">DisplayV(<lemma/>)</lin></td>
@@ -165,7 +406,7 @@
 					<td><lin form="s (Imper Pl)">DisplayV(<lemma/>)</lin></td>
 				</tr>
 				<tr>
-					<th>3. persoona</th>
+					<th>3. p.</th>
 					<td><lin form="s (Presn Pl P3)">DisplayV(<lemma/>)</lin></td>
 					<td><lin form="s (Impf Pl P3)">DisplayV(<lemma/>)</lin></td>
 					<td><lin form="s (Condit Pl P3)">DisplayV(<lemma/>)</lin></td>
@@ -173,7 +414,7 @@
 					<td><lin form="s (ImperP3 Pl)">DisplayV(<lemma/>)</lin></td>
 				</tr>
 				<tr>
-					<th>kielteinen</th>
+					<th>kielt.</th>
 					<td><lin form="s (Imper Sg)">DisplayV(<lemma/>)</lin></td>
 					<td><lin form="s (PastPartAct (AN (NCase Pl Nom)))">DisplayV(<lemma/>)</lin></td>
 					<td><lin form="s (Condit Sg P3)">DisplayV(<lemma/>)</lin></td>
@@ -182,7 +423,7 @@
 				</tr>
 				<tr>
 				        <th rowspan="2">passiivi</th>
-				        <th>myönteinen</th>
+				        <th>myönt.</th>
 					<td><lin form="s (PassPresn True)">DisplayV(<lemma/>)</lin></td>
 					<td><lin form="s (PassImpf True)">DisplayV(<lemma/>)</lin></td>
 					<td><lin form="s (PassCondit True)">DisplayV(<lemma/>)</lin></td>
@@ -190,7 +431,7 @@
 					<td><lin form="s (PassImper True)">DisplayV(<lemma/>)</lin></td>
 				</tr>
 				<tr>
-				        <th>kielteinen</th>
+				        <th>kielt.</th>
 					<td><lin form="s (PassPresn False)">DisplayV(<lemma/>)</lin></td>
 					<td><lin form="s (PassImpf False)">DisplayV(<lemma/>)</lin></td>
 					<td><lin form="s (PassCondit False)">DisplayV(<lemma/>)</lin></td>
@@ -253,7 +494,7 @@
 				</tr>
 				<tr>
 					<th>instr. passiivi</th>
-					<td><lin form="s (Inf Inf3Instr)">DisplayV(<lemma/>)</lin></td>
+					<td><lin form="s (Inf Inf3InstrPass)">DisplayV(<lemma/>)</lin></td>
 				</tr>
 				<tr>
 					<th rowspan="2">4.</th>
diff --git a/src/ui/android/res/xml/inflection_fr.xml b/src/ui/android/res/xml/inflection_fr.xml
new file mode 100644
index 000000000..4cf010b08
--- /dev/null
+++ b/src/ui/android/res/xml/inflection_fr.xml
@@ -0,0 +1,242 @@
+<inflection_template>
+	<inflection>
+	    <cat>N</cat>
+	    <cat>N2</cat>
+	    <tag>n</tag>
+	    <template>
+
+
+<h1>Nom</h1>
+
+<i><lin form="s Nom ton">DetCN (DetQuant IndefArt NumSg) (UseN (<lemma/>))</lin></i>
+
+<p>
+			<table class="forms-table" rules="all" border="yes">
+<tr>
+<th>singulier</th>
+<td><form>s Sg</form></td>
+</tr>
+<tr>
+<th>pluriel</th>
+<td><form>s Pl</form></td>
+</tr>
+</table> 
+</p>
+		</template>
+	</inflection>
+
+
+
+
+	<inflection>
+	    <cat>A</cat>
+	    <cat>A2</cat>
+	    <tag>a</tag>
+	    <template>
+
+<h1>Adjectif</h1>
+			<table class="forms-table" rules="all" border="yes">
+<tr>
+<th></th>
+<th>singulier</th>
+<th>pluriel</th>
+</tr>
+<tr>
+<th>masculin</th>
+<td><form>s Posit (AF Masc Sg)</form></td><td><form>s Posit (AF Masc Pl)</form></td>
+</tr>
+<tr>
+<th>féminin</th>
+<td><form>s Posit (AF Fem Sg)</form></td><td><form>s Posit (AF Fem Pl)</form></td>
+</tr>
+</table>
+		</template>
+	</inflection>
+
+	<inflection>
+	    <cat>Adv</cat>
+	    <tag>adv</tag>
+	    <template>
+			<h1>Adverb</h1>
+			<p><form>s</form></p>
+		</template>
+	</inflection>
+	<inflection>
+	    <cat>Prep</cat>
+	    <tag>prep</tag>
+		<template>
+			<h1>Preposition</h1>
+			<p><form>s</form></p>
+		</template>
+	</inflection>
+	<inflection>
+	    <cat>V</cat>
+	    <cat>V2</cat> 
+		<cat>V3</cat>
+		<cat>V2V</cat>
+		<cat>V2S</cat>
+		<cat>V2Q</cat>
+		<cat>V2A</cat>
+		<cat>VV</cat>
+		<cat>VS</cat>
+		<cat>VQ</cat>
+		<cat>VA</cat>
+		<tag>v</tag>
+		<template>
+
+
+<h1>Verbe</h1>
+
+<i><form>s (VInfin False)</form></i>
+
+<p>
+
+
+			<table class="forms-table" rules="all" border="yes">
+<tr>
+<th colspan="2">présent</th>
+<th>indicatif</th>
+<th>subjonctif</th>
+</tr>
+<tr>
+<th rowspan="3">singulier</th>
+<th>1.p</th>
+<td><form>s (VFin (VPres Indic) Sg P1)</form></td><td><form>s (VFin (VPres Conjunct) Sg P1)</form></td>
+</tr>
+<tr>
+<th>2.p</th>  
+<td><form>s (VFin (VPres Indic) Sg P2)</form></td><td><form>s (VFin (VPres Conjunct) Sg P2)</form></td>
+</tr>
+<tr>
+<th>3.p</th>
+<td><form>s (VFin (VPres Indic) Sg P3)</form></td><td><form>s (VFin (VPres Conjunct) Sg P3)</form></td>
+</tr>
+<tr>
+<th rowspan="3">pluriel</th>
+<th>1.p</th>
+<td><form>s (VFin (VPres Indic) Pl P1)</form></td><td><form>s (VFin (VPres Conjunct) Pl P1)</form></td>
+</tr>
+<tr>
+<th>2.p</th>
+<td><form>s (VFin (VPres Indic) Pl P2)</form></td><td><form>s (VFin (VPres Conjunct) Pl P2)</form></td>
+</tr>
+<tr>
+<th>3.p</th>
+<td><form>s (VFin (VPres Indic) Pl P3)</form></td><td><form>s (VFin (VPres Conjunct) Pl P3)</form></td>
+</tr>
+</table>
+
+
+</p>
+<p>
+
+			<table class="forms-table" rules="all" border="yes">
+<tr>
+<th colspan="2">imparfait</th>
+<th>indicatif</th>
+<th>subjonctif</th>
+</tr>
+<tr>
+<th rowspan="3">singulier</th>
+<th>1.p</th>
+<td><form>s (VFin (VImperf Indic) Sg P1)</form></td><td><form>s (VFin (VImperf Conjunct) Sg P1)</form></td>
+</tr>
+<tr>
+<th>2.p</th>  
+<td><form>s (VFin (VImperf Indic) Sg P2)</form></td><td><form>s (VFin (VImperf Conjunct) Sg P2)</form></td>
+</tr>
+<tr>
+<th>3.p</th>
+<td><form>s (VFin (VImperf Indic) Sg P3)</form></td><td><form>s (VFin (VImperf Conjunct) Sg P3)</form></td>
+</tr>
+<tr>
+<th rowspan="3">pluriel</th>
+<th>1.p</th>
+<td><form>s (VFin (VImperf Indic) Pl P1)</form></td><td><form>s (VFin (VImperf Conjunct) Pl P1)</form></td>
+</tr>
+<tr>
+<th>2.p</th>
+<td><form>s (VFin (VImperf Indic) Pl P2)</form></td><td><form>s (VFin (VImperf Conjunct) Pl P2)</form></td>
+</tr>
+<tr>
+<th>3.p</th>
+<td><form>s (VFin (VImperf Indic) Pl P3)</form></td><td><form>s (VFin (VImperf Conjunct) Pl P3)</form></td>
+</tr>
+</table>
+
+</p>
+<p>
+
+
+			<table class="forms-table" rules="all" border="yes">
+<tr>
+<th colspan="2"></th>
+<th>passé simple</th>
+<th>futur</th>
+<th>conditionnel</th>
+</tr>
+<tr>
+<th rowspan="3">singulier</th>
+<th>1.p</th>
+<td><form>s (VFin VPasse Sg P1)</form></td><td><form>s (VFin VFut Sg P1)</form></td><td><form>s (VFin VFut Sg P1)</form></td>
+</tr>
+<tr>
+<th>2.p</th>  
+<td><form>s (VFin VPasse Sg P2)</form></td><td><form>s (VFin VFut Sg P2)</form></td><td><form>s (VFin VCondit Sg P2)</form></td>
+</tr>
+<tr>
+<th>3.p</th>
+<td><form>s (VFin VPasse Sg P3)</form></td><td><form>s (VFin VFut Sg P3)</form></td><td><form>s (VFin VCondit Sg P3)</form></td>
+</tr>
+<tr>
+<th rowspan="3">pluriel</th>
+<th>1.p</th>
+<td><form>s (VFin VPasse Pl P1)</form></td><td><form>s (VFin VFut Pl P1)</form></td><td><form>s (VFin VCondit Pl P1)</form></td>
+</tr>
+<tr>
+<th>2.p</th>
+<td><form>s (VFin VPasse Pl P2)</form></td><td><form>s (VFin VFut Pl P2)</form></td><td><form>s (VFin VCondit Pl P2)</form></td>
+</tr>
+<tr>
+<th>3.p</th>
+<td><form>s (VFin VPasse Pl P3)</form></td><td><form>s (VFin VFut Pl P3)</form></td><td><form>s (VFin VCondit Pl P3)</form></td>
+</tr>
+</table>
+
+
+
+
+
+</p>
+<p>
+
+			<table class="forms-table" rules="all" border="yes">
+<tr>
+<th>infinitif</th>
+<td><form>s (VInfin False)</form></td>
+</tr>
+<tr>
+<th>impératif sing.2.p</th>
+<td><form>s (VImper SgP2)</form></td>
+</tr>
+<tr>
+<th>impératif plur.1.p</th>
+<td><form>s (VImper PlP1)</form></td>
+</tr>
+<tr>
+<th>impératif plur.2.p</th>
+<td><form>s (VImper PlP2)</form></td>
+</tr>
+<tr>
+<th>participe passé</th>
+<td><form>s (VPart Masc Sg)</form></td>
+</tr>
+<tr>
+<th>participe présent</th>
+<td><form>s VGer</form></td>
+</tr>
+</table>
+</p>
+		</template>
+	</inflection>
+</inflection_template>
diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java b/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java
index a66d4159e..1d95d4b99 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java
@@ -35,7 +35,7 @@ public class Translator {
         new Language("bg-BG", "Bulgarian", "ParseBul", R.xml.inflection_bg, R.xml.cyrillic),
         new Language("cmn-Hans-CN", "Chinese", "ParseChi", R.xml.inflection_cmn, R.xml.qwerty),   
         new Language("fi-FI", "Finnish", "ParseFin", R.xml.inflection_fi, R.xml.qwerty),
-	new Language("fr-FR", "French", "ParseFre", 0, R.xml.qwerty),  
+	new Language("fr-FR", "French", "ParseFre", R.xml.inflection_fr, R.xml.qwerty),  
 	new Language("de-DE", "German", "ParseGer", 0, R.xml.qwerty), 
 	new Language("hi-IN", "Hindi", "ParseHin", 0, R.xml.qwerty), /// 
         new Language("sv-SE", "Swedish", "ParseSwe", R.xml.inflection_sv, R.xml.qwerty),