French inflection display in android

1 files changed, 252 insertions, 11 deletions

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>