Beautify docbook files

6 files changed, 1976 insertions, 3805 deletions

diff --git a/tde-i18n-et/docs/tdeedu/klatin/adjectives.docbook b/tde-i18n-et/docs/tdeedu/klatin/adjectives.docbook
index 9e14f2e85ba..9e0bdf15dbe 100644
--- a/tde-i18n-et/docs/tdeedu/klatin/adjectives.docbook
+++ b/tde-i18n-et/docs/tdeedu/klatin/adjectives.docbook
@@ -1,181 +1,114 @@
 <!-- Please don't translate Latin words -->
 <!-- Please translate the following -->
 <sect1 id="adjectives">
-<title
->KLatini märkused - omadussõnad</title>
+<title>KLatini märkused - omadussõnad</title>
 
-<para
->Omadussõnad ehk adjektiivid on nimisõnu kirjeldavad sõnad, mistõttu nad ka ühilduvad nimisõnadega. Ühildumine tähendab siinkohal seda, et nad sobivad nimisõnaga kokku nii soos, arvus kui käändes. </para>
+<para>Omadussõnad ehk adjektiivid on nimisõnu kirjeldavad sõnad, mistõttu nad ka ühilduvad nimisõnadega. Ühildumine tähendab siinkohal seda, et nad sobivad nimisõnaga kokku nii soos, arvus kui käändes. </para>
 
 <table frame="none">
 <!--Please translate title-->
-<title
->1. ja 2. käändkonna omadussõnad (212)</title>
+<title>1. ja 2. käändkonna omadussõnad (212)</title>
 <tgroup cols="4" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
 <!-- Please translate SINGULAR and Like-->
-<entry
->AINSUS</entry>
-<entry
->Nagu Servus</entry>
-<entry
->Nagu Puella</entry>
-<entry
->Nagu Bellum</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>AINSUS</entry>
+<entry>Nagu Servus</entry>
+<entry>Nagu Puella</entry>
+<entry>Nagu Bellum</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate the first entry of each row-->
-<entry
->Nominatiiv</entry>
-<entry
->bon-us</entry>
-<entry
->bon-a</entry>
-<entry
->bon-um</entry>
-</row>
-<row>
-<entry
->Vokatiiv</entry>
-<entry
->bon-e</entry>
-<entry
->bon-a</entry>
-<entry
->bon-um</entry>
-</row>
-<row>
-<entry
->Akusatiiv</entry>
-<entry
->bon-um</entry>
-<entry
->bon-am</entry>
-<entry
->bon-um</entry>
-</row>
-<row>
-<entry
->Genitiiv</entry>
-<entry
->bon-i</entry>
-<entry
->bon-ae</entry>
-<entry
->bon-i</entry>
-</row>
-<row>
-<entry
->Daativ</entry>
-<entry
->bon-o</entry>
-<entry
->bon-ae</entry>
-<entry
->bon-o</entry>
-</row>
-<row>
-<entry
->Ablatiiv</entry>
-<entry
->bon-o</entry>
-<entry
->bon-a</entry>
-<entry
->bon-o</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>Nominatiiv</entry>
+<entry>bon-us</entry>
+<entry>bon-a</entry>
+<entry>bon-um</entry>
+</row>
+<row>
+<entry>Vokatiiv</entry>
+<entry>bon-e</entry>
+<entry>bon-a</entry>
+<entry>bon-um</entry>
+</row>
+<row>
+<entry>Akusatiiv</entry>
+<entry>bon-um</entry>
+<entry>bon-am</entry>
+<entry>bon-um</entry>
+</row>
+<row>
+<entry>Genitiiv</entry>
+<entry>bon-i</entry>
+<entry>bon-ae</entry>
+<entry>bon-i</entry>
+</row>
+<row>
+<entry>Daativ</entry>
+<entry>bon-o</entry>
+<entry>bon-ae</entry>
+<entry>bon-o</entry>
+</row>
+<row>
+<entry>Ablatiiv</entry>
+<entry>bon-o</entry>
+<entry>bon-a</entry>
+<entry>bon-o</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate the first entry of each row-->
-<entry
->MITMUS</entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-</row>
-<row>
-<entry
->Nominatiiv</entry>
-<entry
->bon-i</entry>
-<entry
->bon-ae</entry>
-<entry
->bon-a</entry>
-</row>
-<row>
-<entry
->Vokatiiv</entry>
-<entry
->bon-i</entry>
-<entry
->bon-ae</entry>
-<entry
->bon-a</entry>
-</row>
-<row>
-<entry
->Akusatiiv</entry>
-<entry
->bon-os</entry>
-<entry
->bon-as</entry>
-<entry
->bon-a</entry>
-</row>
-<row>
-<entry
->Genitiiv</entry>
-<entry
->bon-orum</entry>
-<entry
->bon-arum</entry>
-<entry
->bon-orum</entry>
-</row>
-<row>
-<entry
->Daativ</entry>
-<entry
->bon-is</entry>
-<entry
->bon-is</entry>
-<entry
->bon-is</entry>
-</row>
-<row>
-<entry
->Ablatiiv</entry>
-<entry
->bon-is</entry>
-<entry
->bon-is</entry>
-<entry
->bon-is</entry>
+<entry>MITMUS</entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+</row>
+<row>
+<entry>Nominatiiv</entry>
+<entry>bon-i</entry>
+<entry>bon-ae</entry>
+<entry>bon-a</entry>
+</row>
+<row>
+<entry>Vokatiiv</entry>
+<entry>bon-i</entry>
+<entry>bon-ae</entry>
+<entry>bon-a</entry>
+</row>
+<row>
+<entry>Akusatiiv</entry>
+<entry>bon-os</entry>
+<entry>bon-as</entry>
+<entry>bon-a</entry>
+</row>
+<row>
+<entry>Genitiiv</entry>
+<entry>bon-orum</entry>
+<entry>bon-arum</entry>
+<entry>bon-orum</entry>
+</row>
+<row>
+<entry>Daativ</entry>
+<entry>bon-is</entry>
+<entry>bon-is</entry>
+<entry>bon-is</entry>
+</row>
+<row>
+<entry>Ablatiiv</entry>
+<entry>bon-is</entry>
+<entry>bon-is</entry>
+<entry>bon-is</entry>
 </row>
 </tbody>
 </tgroup>
@@ -183,174 +116,109 @@
 
 <table frame="none">
 <!--Please translate the title-->
-<title
->3. käändkonna omadussõnad (333)</title>
+<title>3. käändkonna omadussõnad (333)</title>
 
 <tgroup cols="4" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
 <!-- Please translate SINGULAR and Like-->
-<entry
->AINSUS</entry>
-<entry
->Nagu Rex</entry>
-<entry
->Nagu Rex</entry>
-<entry
->Nagu Opus</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>AINSUS</entry>
+<entry>Nagu Rex</entry>
+<entry>Nagu Rex</entry>
+<entry>Nagu Opus</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate the first entry of each row-->
-<entry
->Nominatiiv</entry>
-<entry
->trist-is</entry>
-<entry
->trist-is</entry>
-<entry
->trist-e</entry>
-</row>
-<row>
-<entry
->Vokatiiv</entry>
-<entry
->trist-is</entry>
-<entry
->trist-is</entry>
-<entry
->trist-e</entry>
-</row>
-<row>
-<entry
->Akusatiiv</entry>
-<entry
->trist-em</entry>
-<entry
->trist-em</entry>
-<entry
->trist-e</entry>
-</row>
-<row>
-<entry
->Genitiiv</entry>
-<entry
->trist-i</entry>
-<entry
->trist-i</entry>
-<entry
->trist-is</entry>
-</row>
-<row>
-<entry
->Daativ</entry>
-<entry
->trist-is</entry>
-<entry
->trist-is</entry>
-<entry
->trist-i</entry>
-</row>
-<row>
-<entry
->Ablatiiv</entry>
-<entry
->trist-i</entry>
-<entry
->trist-i</entry>
-<entry
->trist-i</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>Nominatiiv</entry>
+<entry>trist-is</entry>
+<entry>trist-is</entry>
+<entry>trist-e</entry>
+</row>
+<row>
+<entry>Vokatiiv</entry>
+<entry>trist-is</entry>
+<entry>trist-is</entry>
+<entry>trist-e</entry>
+</row>
+<row>
+<entry>Akusatiiv</entry>
+<entry>trist-em</entry>
+<entry>trist-em</entry>
+<entry>trist-e</entry>
+</row>
+<row>
+<entry>Genitiiv</entry>
+<entry>trist-i</entry>
+<entry>trist-i</entry>
+<entry>trist-is</entry>
+</row>
+<row>
+<entry>Daativ</entry>
+<entry>trist-is</entry>
+<entry>trist-is</entry>
+<entry>trist-i</entry>
+</row>
+<row>
+<entry>Ablatiiv</entry>
+<entry>trist-i</entry>
+<entry>trist-i</entry>
+<entry>trist-i</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate the first entry of each row-->
-<entry
->MITMUS</entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-</row>
-<row>
-<entry
->Nominatiiv</entry>
-<entry
->trist-es</entry>
-<entry
->trist-es</entry>
-<entry
->trist-ia</entry>
-</row>
-<row>
-<entry
->Vokatiiv</entry>
-<entry
->trist-es</entry>
-<entry
->trist-es</entry>
-<entry
->trist-ia</entry>
-</row>
-<row>
-<entry
->Akusatiiv</entry>
-<entry
->trist-es</entry>
-<entry
->trist-es</entry>
-<entry
->trist-ia</entry>
-</row>
-<row>
-<entry
->Genitiiv</entry>
-<entry
->trist-ium</entry>
-<entry
->trist-ium</entry>
-<entry
->trist-ium</entry>
-</row>
-<row>
-<entry
->Daativ</entry>
-<entry
->trist-ibus</entry>
-<entry
->trist-ibus</entry>
-<entry
->trist-ibus</entry>
-</row>
-<row>
-<entry
->Ablatiiv</entry>
-<entry
->trist-ibus</entry>
-<entry
->trist-ibus</entry>
-<entry
->trist-ibus</entry>
+<entry>MITMUS</entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+</row>
+<row>
+<entry>Nominatiiv</entry>
+<entry>trist-es</entry>
+<entry>trist-es</entry>
+<entry>trist-ia</entry>
+</row>
+<row>
+<entry>Vokatiiv</entry>
+<entry>trist-es</entry>
+<entry>trist-es</entry>
+<entry>trist-ia</entry>
+</row>
+<row>
+<entry>Akusatiiv</entry>
+<entry>trist-es</entry>
+<entry>trist-es</entry>
+<entry>trist-ia</entry>
+</row>
+<row>
+<entry>Genitiiv</entry>
+<entry>trist-ium</entry>
+<entry>trist-ium</entry>
+<entry>trist-ium</entry>
+</row>
+<row>
+<entry>Daativ</entry>
+<entry>trist-ibus</entry>
+<entry>trist-ibus</entry>
+<entry>trist-ibus</entry>
+</row>
+<row>
+<entry>Ablatiiv</entry>
+<entry>trist-ibus</entry>
+<entry>trist-ibus</entry>
+<entry>trist-ibus</entry>
 </row>
 </tbody>
 </tgroup>
@@ -358,76 +226,47 @@
 
 <table frame="none">
 <!-- Please translate the title -->
-<title
->Omadussõnade võrdlemine</title>
+<title>Omadussõnade võrdlemine</title>
 <!-- Please translate -->
 <tgroup cols="4" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
-<entry
->Algvõrre</entry>
-<entry
->Keskvõrre</entry>
-<entry
->Ülivõrre</entry>
-<entry
->Märkused</entry>
+<entry>Algvõrre</entry>
+<entry>Keskvõrre</entry>
+<entry>Ülivõrre</entry>
+<entry>Märkused</entry>
 </row>
 <row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
-<entry
->Omadussõna algvorm</entry>
+<entry>Omadussõna algvorm</entry>
 <!--Please stop translating -->
-<entry
->Tüvi + ior,-ius</entry>
-<entry
->Tüvi + issimus,-a,-um</entry>
-<entry
-></entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
->Tüvi + rimus,-a,-um</entry>
-<entry
->Adjektiivid, mille lõpus on <emphasis
->-er</emphasis
->. Näide: acer-rimus,-a,-um</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
->Tüvi + limus,-a,-um</entry>
-<entry
->Adjektiivid, mille lõpus on <emphasis
->-ilis</emphasis
->. Näide: facil-limus,-a,-um</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
->Per/Prae + omadussõna</entry>
-<entry
-></entry>
+<entry>Tüvi + ior,-ius</entry>
+<entry>Tüvi + issimus,-a,-um</entry>
+<entry></entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry>Tüvi + rimus,-a,-um</entry>
+<entry>Adjektiivid, mille lõpus on <emphasis>-er</emphasis>. Näide: acer-rimus,-a,-um</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry>Tüvi + limus,-a,-um</entry>
+<entry>Adjektiivid, mille lõpus on <emphasis>-ilis</emphasis>. Näide: facil-limus,-a,-um</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry>Per/Prae + omadussõna</entry>
+<entry></entry>
 </row>
 </tbody>
 </tgroup>
diff --git a/tde-i18n-et/docs/tdeedu/klatin/index.docbook b/tde-i18n-et/docs/tdeedu/klatin/index.docbook
index b5c0f9ece2d..3a8074123b8 100644
--- a/tde-i18n-et/docs/tdeedu/klatin/index.docbook
+++ b/tde-i18n-et/docs/tdeedu/klatin/index.docbook
@@ -1,257 +1,155 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
- <!ENTITY klatin "<application
->KLatin</application
->">
+ <!ENTITY klatin "<application>KLatin</application>">
  <!ENTITY kappname "&klatin;">
  <!ENTITY package "tdeedu">
- <!ENTITY kvtml "<acronym
->KVTML</acronym
->">
+ <!ENTITY kvtml "<acronym>KVTML</acronym>">
  <!ENTITY numbers SYSTEM "numbers.docbook">
  <!ENTITY verbs SYSTEM "verbs.docbook">
  <!ENTITY adjectives SYSTEM "adjectives.docbook">
  <!ENTITY nouns SYSTEM "nouns.docbook">
  <!ENTITY pronouns SYSTEM "pronouns.docbook">
  <!ENTITY % addindex "IGNORE">
- <!ENTITY % Estonian  "INCLUDE"
-><!-- change language only here -->
+ <!ENTITY % Estonian  "INCLUDE"><!-- change language only here -->
 ]>
 
 <book lang="&language;">
 
 <bookinfo>
-<title
->&klatin;i käsiraamat</title>
+<title>&klatin;i käsiraamat</title>
 
 <authorgroup>
-<author
-><firstname
->George</firstname
-> <surname
->Wright</surname
-> <affiliation
-> <address
-><email
->[email protected]</email
-></address>
+<author><firstname>George</firstname> <surname>Wright</surname> <affiliation> <address><email>[email protected]</email></address>
 </affiliation>
 </author>
-<othercredit role="developer"
-><firstname
->Anne-Marie</firstname
-> <surname
->Mahfouf</surname
-> <affiliation
-> <address
-><email
->&Anne-Marie.Mahfouf.mail;</email
-></address>
+<othercredit role="developer"><firstname>Anne-Marie</firstname> <surname>Mahfouf</surname> <affiliation> <address><email>&Anne-Marie.Mahfouf.mail;</email></address>
 </affiliation>
-<contrib
->Abi dokumentatsiooni juures</contrib>
+<contrib>Abi dokumentatsiooni juures</contrib>
 </othercredit>
-<othercredit role="translator"
-> <firstname
->Marek</firstname
-> <surname
->Laane</surname
-> <affiliation
-><address
-><email
->[email protected]</email
-></address
-> </affiliation
-><contrib
->Tõlge eesti keelde</contrib
-></othercredit
-> 
+<othercredit role="translator"> <firstname>Marek</firstname> <surname>Laane</surname> <affiliation><address><email>[email protected]</email></address> </affiliation><contrib>Tõlge eesti keelde</contrib></othercredit> 
 </authorgroup>
 
 <copyright>
-<year
->2001-2004</year>
-<holder
->George Wright</holder>
+<year>2001-2004</year>
+<holder>George Wright</holder>
 </copyright>
 
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
-<date
->2006-02-24</date>
-<releaseinfo
->0.9</releaseinfo>
+<date>2006-02-24</date>
+<releaseinfo>0.9</releaseinfo>
 
 <abstract>
-<para
->&klatin; on &kde; rakendus ladina keele õppimise ja kordamise abistamiseks. </para>
+<para>&klatin; on &kde; rakendus ladina keele õppimise ja kordamise abistamiseks. </para>
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->tdeedu</keyword>
-<keyword
->KLatin</keyword>
-<keyword
->Ladina keel</keyword>
-<keyword
->haridus</keyword>
-<keyword
->keel</keyword>
-<keyword
->ladina keel</keyword>
+<keyword>KDE</keyword>
+<keyword>tdeedu</keyword>
+<keyword>KLatin</keyword>
+<keyword>Ladina keel</keyword>
+<keyword>haridus</keyword>
+<keyword>keel</keyword>
+<keyword>ladina keel</keyword>
 </keywordset>
 
 </bookinfo>
 
 <chapter id="introduction">
-<title
->Sissejuhatus</title>
-
-<para
->&klatin; on rakendus ladina keele õppimise ja kordamise abistamiseks. Keelega saab tutvust teha kolmes erinevas <quote
->sektsioonis</quote
->: sõnavara, grammatika ja verbide testimine. Lisatud on valik ülevaatelisi märkmeid, mida saab kasutada keele iseseisvaks omandamiseks. </para>
-<para
->Sõnavarasektsioonis laetakse &XML;-fail mitmesuguste sõnade ja nende tõlgetega inglise või sinu emakeelde. &klatin; palub sul ladinakeelsetele sõnadele tõlkevaste leida. Küsimusi esitatakse mitme vastusevariandiga. </para>
-<para
->Grammatika- ja verbisektsioonis palub &klatin; määrata nimi- või tegusõna konkreetse käände või pöörde, näiteks <quote
->ainsuse ablatiiv</quote
-> või <quote
->mitmuse indikatiivi 1. isik passiivis</quote
->. Siin variante ei anta. </para>
+<title>Sissejuhatus</title>
+
+<para>&klatin; on rakendus ladina keele õppimise ja kordamise abistamiseks. Keelega saab tutvust teha kolmes erinevas <quote>sektsioonis</quote>: sõnavara, grammatika ja verbide testimine. Lisatud on valik ülevaatelisi märkmeid, mida saab kasutada keele iseseisvaks omandamiseks. </para>
+<para>Sõnavarasektsioonis laetakse &XML;-fail mitmesuguste sõnade ja nende tõlgetega inglise või sinu emakeelde. &klatin; palub sul ladinakeelsetele sõnadele tõlkevaste leida. Küsimusi esitatakse mitme vastusevariandiga. </para>
+<para>Grammatika- ja verbisektsioonis palub &klatin; määrata nimi- või tegusõna konkreetse käände või pöörde, näiteks <quote>ainsuse ablatiiv</quote> või <quote>mitmuse indikatiivi 1. isik passiivis</quote>. Siin variante ei anta. </para>
 </chapter>
 
 <chapter id="using-klatin">
-<title
->&klatin;i kasutamine</title>
+<title>&klatin;i kasutamine</title>
 
-<para
->&klatin;i käivitamisel saab valida nelja võimaluse vahel. </para>
+<para>&klatin;i käivitamisel saab valida nelja võimaluse vahel. </para>
 
 <screenshot>
-<screeninfo
->&klatin;i peaaken pärast esmakäivitust</screeninfo>
+<screeninfo>&klatin;i peaaken pärast esmakäivitust</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="klatin1.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase
->&klatin;i peaaken</phrase>
+<phrase>&klatin;i peaaken</phrase>
 </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->Esimene, <guilabel
->Sõnavara</guilabel
-> alustab variantidega sõnavaratesti. </para>
+<para>Esimene, <guilabel>Sõnavara</guilabel> alustab variantidega sõnavaratesti. </para>
 
 <screenshot>
-<screeninfo
->&klatin;i sõnavarasektsioon</screeninfo>
+<screeninfo>&klatin;i sõnavarasektsioon</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="klatin2.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase
->&klatin;i sõnavara</phrase>
+<phrase>&klatin;i sõnavara</phrase>
 </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->Kui oled testi lõpetanud, ilmub aken tulemustega. </para>
+<para>Kui oled testi lõpetanud, ilmub aken tulemustega. </para>
 
 <screenshot>
-<screeninfo
->&klatin;i sõnavaratesti tulemused</screeninfo>
+<screeninfo>&klatin;i sõnavaratesti tulemused</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="results.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase
->&klatin;i tulemused</phrase>
+<phrase>&klatin;i tulemused</phrase>
 </textobject>
 </mediaobject>
 </screenshot>
 
-<para
-><guilabel
->Grammatika</guilabel
-> abil saab kontrollida nimisõnade käänamise oskust. </para>
+<para><guilabel>Grammatika</guilabel> abil saab kontrollida nimisõnade käänamise oskust. </para>
  
 <screenshot>
-<screeninfo
->&klatin;i grammatikasektsioon</screeninfo>
+<screeninfo>&klatin;i grammatikasektsioon</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="klatin3.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase
->&klatin;i grammatika</phrase>
+<phrase>&klatin;i grammatika</phrase>
 </textobject>
 </mediaobject>
 </screenshot>
 
-<para
-><guilabel
->Verbid</guilabel
-> on peaaegu samasugune, ainult et siin pannakse proovile oskus tegusõnu pöörata. </para>
+<para><guilabel>Verbid</guilabel> on peaaegu samasugune, ainult et siin pannakse proovile oskus tegusõnu pöörata. </para>
 
 <screenshot>
-<screeninfo
->&klatin;i verbide sektsioon</screeninfo>
+<screeninfo>&klatin;i verbide sektsioon</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="klatin4.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase
->&klatin;i verbid</phrase>
+<phrase>&klatin;i verbid</phrase>
 </textobject>
 </mediaobject>
-</screenshot
-> 
+</screenshot> 
  
-<para
-><guilabel
->Ülevaade</guilabel
-> laeb &konqueror;is &klatin;i ülevaatelised märkused. </para>
-
-<para
->Lisaks sellele saab samad sektsioonid käivitada ka menüüribalt menüüst <guilabel
->Sektsioon</guilabel
->. </para>
-
-<para
->&klatin;i seadistustedialoogi saab avada menüükäsuga <menuchoice
-><guimenu
->Seadistused</guimenu
-><guimenuitem
->&klatin;i seadistamine...</guimenuitem
-></menuchoice
-> Kaardil <guilabel
->Sõnavara</guilabel
-> saab määrata, kas testide baaskeeleks peaks olema ladina keel või on see hoopis sihtkeel. Samuti saab valida vaikefaili, millega sõnavara testida, ning sellegi, mitu küsimust ühe testiga esitatakse. </para>
+<para><guilabel>Ülevaade</guilabel> laeb &konqueror;is &klatin;i ülevaatelised märkused. </para>
+
+<para>Lisaks sellele saab samad sektsioonid käivitada ka menüüribalt menüüst <guilabel>Sektsioon</guilabel>. </para>
+
+<para>&klatin;i seadistustedialoogi saab avada menüükäsuga <menuchoice><guimenu>Seadistused</guimenu><guimenuitem>&klatin;i seadistamine...</guimenuitem></menuchoice> Kaardil <guilabel>Sõnavara</guilabel> saab määrata, kas testide baaskeeleks peaks olema ladina keel või on see hoopis sihtkeel. Samuti saab valida vaikefaili, millega sõnavara testida, ning sellegi, mitu küsimust ühe testiga esitatakse. </para>
 
 <screenshot>
-<screeninfo
->&klatin;i seadistustedialoog</screeninfo>
+<screeninfo>&klatin;i seadistustedialoog</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="klatin-configuration.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase
->&klatin;i seadistustedialoog</phrase>
+<phrase>&klatin;i seadistustedialoog</phrase>
 </textobject>
 </mediaobject>
 </screenshot>
@@ -259,132 +157,49 @@
 </chapter>
 
 <chapter id="klatin-mainwindow">
-<title
->&klatin;i peaaken</title>
-<para
->&klatin;i peaaken koosneb neljast valikunupust, millega saab valida sektsiooni, mille kallal soovid tööd alustada, ning menüüribast.</para>
-<para
->Vali loendis <guilabel
->Ülevaate sektsioonid</guilabel
-> vajalik sektsioon ja klõpsa selle käivitamiseks nupule <guibutton
->Alusta</guibutton
->.</para>
+<title>&klatin;i peaaken</title>
+<para>&klatin;i peaaken koosneb neljast valikunupust, millega saab valida sektsiooni, mille kallal soovid tööd alustada, ning menüüribast.</para>
+<para>Vali loendis <guilabel>Ülevaate sektsioonid</guilabel> vajalik sektsioon ja klõpsa selle käivitamiseks nupule <guibutton>Alusta</guibutton>.</para>
  
-<para
->Kui oled sektsiooniga ühele poole saanud, klõpsa nupule <guibutton
->Tagasi</guibutton
->, mis toob sind uuesti &klatin;i peaaknasse.</para>
+<para>Kui oled sektsiooniga ühele poole saanud, klõpsa nupule <guibutton>Tagasi</guibutton>, mis toob sind uuesti &klatin;i peaaknasse.</para>
 
 </chapter>
 
 <chapter id="commands">
-<title
->Käskude seletused</title>
+<title>Käskude seletused</title>
 <sect1 id="menu-file">
-<title
-><guimenu
->Fail</guimenu
->imenüü</title>
+<title><guimenu>Fail</guimenu>imenüü</title>
 
 <variablelist>
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->Q</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Fail</guimenu
-> <guimenuitem
->Välju</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->Lõpetab</action
-> &klatin;i töö</para
-></listitem>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo> </shortcut> <guimenu>Fail</guimenu> <guimenuitem>Välju</guimenuitem> </menuchoice></term>
+<listitem><para><action>Lõpetab</action> &klatin;i töö</para></listitem>
 </varlistentry>
 </variablelist>
 </sect1>
 
 <sect1 id="menu-section">
-<title
-><guimenu
->Sektsioon</guimenu
->imenüü</title>
+<title><guimenu>Sektsioon</guimenu>imenüü</title>
 <variablelist>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Sektsioon</guimenu
-> <guimenuitem
->Laadi sõnavara</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->Laeb</action
-> sõnavarasektsiooni</para
-></listitem>
+<term><menuchoice><guimenu>Sektsioon</guimenu> <guimenuitem>Laadi sõnavara</guimenuitem> </menuchoice></term>
+<listitem><para><action>Laeb</action> sõnavarasektsiooni</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Sektsioon</guimenu
-> <guimenuitem
->Laadi grammatika</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->Laeb</action
-> grammatikasektsiooni</para
-></listitem>
+<term><menuchoice><guimenu>Sektsioon</guimenu> <guimenuitem>Laadi grammatika</guimenuitem> </menuchoice></term>
+<listitem><para><action>Laeb</action> grammatikasektsiooni</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Sektsioon</guimenu
-> <guimenuitem
->Laadi verbid</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->Laeb</action
-> verbisektsiooni</para
-></listitem>
+<term><menuchoice><guimenu>Sektsioon</guimenu> <guimenuitem>Laadi verbid</guimenuitem> </menuchoice></term>
+<listitem><para><action>Laeb</action> verbisektsiooni</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Sektsioon</guimenu
-> <guimenuitem
->Laadi ülevaade</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->Laeb</action
-> ülevaatesektsiooni</para
-></listitem>
+<term><menuchoice><guimenu>Sektsioon</guimenu> <guimenuitem>Laadi ülevaade</guimenuitem> </menuchoice></term>
+<listitem><para><action>Laeb</action> ülevaatesektsiooni</para></listitem>
 </varlistentry>
 
 
@@ -392,59 +207,24 @@
 
 </sect1>
 <sect1 id="menu-settings">
-<title
->Menüü <guimenu
->Seadistused</guimenu
-></title>
+<title>Menüü <guimenu>Seadistused</guimenu></title>
 
 <variablelist>
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Seadistused</guimenu
-> <guimenuitem
->Kiirklahvide seadistamine...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->Võimaldab seadistada</action
-> mitmesuguste toimingute hõlbustamiseks mõeldud kiirklahve.</para>
+<term><menuchoice><guimenu>Seadistused</guimenu> <guimenuitem>Kiirklahvide seadistamine...</guimenuitem> </menuchoice></term>
+<listitem><para><action>Võimaldab seadistada</action> mitmesuguste toimingute hõlbustamiseks mõeldud kiirklahve.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Seadistused</guimenu
-> <guimenuitem
->Tööriistaribade seadistamine...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Pole veel kasutatav.</para>
+<term><menuchoice><guimenu>Seadistused</guimenu> <guimenuitem>Tööriistaribade seadistamine...</guimenuitem> </menuchoice></term>
+<listitem><para>Pole veel kasutatav.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Seadistused</guimenu
-> <guimenuitem
->&klatin;i seadistamine...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->Avab</action
-> &klatin;i seadistustedialoogi </para
-></listitem>
+<term><menuchoice><guimenu>Seadistused</guimenu> <guimenuitem>&klatin;i seadistamine...</guimenuitem> </menuchoice></term>
+<listitem><para><action>Avab</action> &klatin;i seadistustedialoogi </para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -452,206 +232,104 @@
 </sect1>
 
 <sect1 id="menu-help">
-<title
-><guimenu
->Abi</guimenu
->menüü</title>
+<title><guimenu>Abi</guimenu>menüü</title>
 &help.menu.documentation; </sect1>
 </chapter>
 
 <chapter id="translation">
-<title
->&klatin;ist tõlkijatele</title>
+<title>&klatin;ist tõlkijatele</title>
 
-<para
->Oma emakeelde on võimalik tõlkida ainult sõnavarafaile. Need kasutavad &kvtml;-vormingut, mis on kasutusel ka muudes rakendustes, näiteks &kwordquiz;. Viimane tuleb väga kasuks, võimaldades luua sõnavarafaile ja neid otse &klatin;isse laadida. </para>
-<para
->Allpool selgitatakse, kuidas tõlkida &klatin;i sõnavarafaile. Hetkel on need ainult inglise, poola ja saksa keeles. </para>
+<para>Oma emakeelde on võimalik tõlkida ainult sõnavarafaile. Need kasutavad &kvtml;-vormingut, mis on kasutusel ka muudes rakendustes, näiteks &kwordquiz;. Viimane tuleb väga kasuks, võimaldades luua sõnavarafaile ja neid otse &klatin;isse laadida. </para>
+<para>Allpool selgitatakse, kuidas tõlkida &klatin;i sõnavarafaile. Hetkel on need ainult inglise, poola ja saksa keeles. </para>
 <sect1 id="translate_vocab">
-<title
->Kuidas tõlkida &klatin;i sõnavarafaile</title>
+<title>Kuidas tõlkida &klatin;i sõnavarafaile</title>
 <procedure>
 <step>
-<para
->Hangi &klatin;i uusim versioon CVS-ist või viimasest väljalaskest. Sõnad on kataloogis <filename class="directory"
->source_dir_of_tdeedu/klatin/klatin/data/vocab/en/</filename
-> failides <filename
->A.kvtml</filename
->, kus asuvad A-tähega algavad ladinakeelsed sõnad, <filename
->BC.kvtml</filename
->, kus asuvad B- ja C-tähega algavad ladinakeelsed sõnad ja nii edasi. </para>
+<para>Hangi &klatin;i uusim versioon CVS-ist või viimasest väljalaskest. Sõnad on kataloogis <filename class="directory">source_dir_of_tdeedu/klatin/klatin/data/vocab/en/</filename> failides <filename>A.kvtml</filename>, kus asuvad A-tähega algavad ladinakeelsed sõnad, <filename>BC.kvtml</filename>, kus asuvad B- ja C-tähega algavad ladinakeelsed sõnad ja nii edasi. </para>
 </step>
 
 <step>
-<para
->Loo kataloogis <filename class="directory"
->data/vocab/</filename
-> uus alamkataloog oma keelekoodi nimega (näiteks <filename class="directory"
->fr</filename
-> prantsuse või <filename class="directory"
->et</filename
-> eesti keele jaoks). Kopeeri sinna kõik ingliskeelsed sõnavarafailid ning fail <filename
->Makefile.am</filename
->. Redigeeri faili <filename
->Makefile.am</filename
->, asendades seal <quote
->en</quote
-> oma keele keelekoodiga. </para>
+<para>Loo kataloogis <filename class="directory">data/vocab/</filename> uus alamkataloog oma keelekoodi nimega (näiteks <filename class="directory">fr</filename> prantsuse või <filename class="directory">et</filename> eesti keele jaoks). Kopeeri sinna kõik ingliskeelsed sõnavarafailid ning fail <filename>Makefile.am</filename>. Redigeeri faili <filename>Makefile.am</filename>, asendades seal <quote>en</quote> oma keele keelekoodiga. </para>
 </step>
 
 <step>
-<para
->Redigeeri kataloogis <filename class="directory"
->data/vocab/<replaceable
->sinu_keele_kood</replaceable
-></filename
-> kõiki faile, tõlkides neis ingliskeelsed sõnad, &ie; sõnad, mis asuvad siltide <sgmltag class="starttag"
->t</sgmltag
-> ja <sgmltag class="starttag"
->/t</sgmltag
-> vahel. </para>
+<para>Redigeeri kataloogis <filename class="directory">data/vocab/<replaceable>sinu_keele_kood</replaceable></filename> kõiki faile, tõlkides neis ingliskeelsed sõnad, &ie; sõnad, mis asuvad siltide <sgmltag class="starttag">t</sgmltag> ja <sgmltag class="starttag">/t</sgmltag> vahel. </para>
 </step>
 <step>
-<para
->Palun saada need George'ile <email
->[email protected]</email
->. </para>
+<para>Palun saada need George'ile <email>[email protected]</email>. </para>
 </step>
 </procedure>
 </sect1>
 </chapter>
 
 <chapter id="developers">
-<title
->&klatin;ist arendajatele</title>
+<title>&klatin;ist arendajatele</title>
 <sect1 id="add_files">
-<title
->Uute sõnavarafailide loomine</title>
-<para
->&klatin;i sõnavara-andmebaasi laiendamine on äärmiselt lihtne. Vaata ainult faile ja kõik on ütlematagi selge! Kasutatakse &kvtml;-vormingut, mis on kasutusel ka muudes rakendustes, näiteks &kwordquiz;. Viimane tuleb väga kasuks, võimaldades luua sõnavarafaile ja neid otse &klatin;isse laadida. </para>
-<para
->Uued failid saab salvestada kataloogi, mille nimi sõltub kasutatavast keelest: <filename class="directory"
->.kde/share/apps/klatin/data/vocab/<replaceable
->keelekood</replaceable
->/</filename
->. Näiteks ingliskeelsed &kvtml;-failid paiknevad kataloogis <quote
->en</quote
->, saksakeelsed kataloogis <quote
->de</quote
-> ja nii edasi. Failid võib ka otse mulle saata, et ma saaksin need kaasa panna &klatin;i järgmise väljalaskega. </para>
+<title>Uute sõnavarafailide loomine</title>
+<para>&klatin;i sõnavara-andmebaasi laiendamine on äärmiselt lihtne. Vaata ainult faile ja kõik on ütlematagi selge! Kasutatakse &kvtml;-vormingut, mis on kasutusel ka muudes rakendustes, näiteks &kwordquiz;. Viimane tuleb väga kasuks, võimaldades luua sõnavarafaile ja neid otse &klatin;isse laadida. </para>
+<para>Uued failid saab salvestada kataloogi, mille nimi sõltub kasutatavast keelest: <filename class="directory">.kde/share/apps/klatin/data/vocab/<replaceable>keelekood</replaceable>/</filename>. Näiteks ingliskeelsed &kvtml;-failid paiknevad kataloogis <quote>en</quote>, saksakeelsed kataloogis <quote>de</quote> ja nii edasi. Failid võib ka otse mulle saata, et ma saaksin need kaasa panna &klatin;i järgmise väljalaskega. </para>
 </sect1>
 <!-- FIXME: They will still need specifically outlining -->
 </chapter>
 
 <chapter id="credits">
 
-<title
->Autorid ja litsents</title>
-
-<para
->&klatin; </para>
-<para
->Rakenduse autoriõigus 2001-2004: George Wright <email
->[email protected]</email
-> </para>
-<para
->Kaasautorid: <itemizedlist>
-
-<listitem
-><para
->&Neil.Stevens; <email
->&Neil.Stevens.mail;</email
-></para>
+<title>Autorid ja litsents</title>
+
+<para>&klatin; </para>
+<para>Rakenduse autoriõigus 2001-2004: George Wright <email>[email protected]</email> </para>
+<para>Kaasautorid: <itemizedlist>
+
+<listitem><para>&Neil.Stevens; <email>&Neil.Stevens.mail;</email></para>
 </listitem>
-<listitem
-><para
->&Anne-Marie.Mahfouf; <email
->&Anne-Marie.Mahfouf.mail;</email
-></para>
+<listitem><para>&Anne-Marie.Mahfouf; <email>&Anne-Marie.Mahfouf.mail;</email></para>
 </listitem>
-<listitem
-><para
->Mark Westcott <email
->[email protected]</email
-></para>
+<listitem><para>Mark Westcott <email>[email protected]</email></para>
 </listitem>
 
 </itemizedlist>
 </para>
 
-<para
->Dokumentatsiooni autoriõigus 2001-2004: George Wright <email
->[email protected]</email
-> </para>
+<para>Dokumentatsiooni autoriõigus 2001-2004: George Wright <email>[email protected]</email> </para>
 
-<para
->Tõlge eesti keelde: Marek Laane <email
->[email protected]</email
-></para
-> 
+<para>Tõlge eesti keelde: Marek Laane <email>[email protected]</email></para> 
 &underFDL; &underGPL; </chapter>
 
 <chapter id="klatin-index">
-<title
->&klatin;i märkused</title>
+<title>&klatin;i märkused</title>
 
-<para
->Tere tulemast &klatin;i märkuste sektsiooni. Selle eesmärk on anda sulle teatud ülevaade ladina keelest. </para>
+<para>Tere tulemast &klatin;i märkuste sektsiooni. Selle eesmärk on anda sulle teatud ülevaade ladina keelest. </para>
 
-<para
->Abi on võimalik leida mitmest erinevast sektsioonist: </para>
+<para>Abi on võimalik leida mitmest erinevast sektsioonist: </para>
 
 <itemizedlist>
-<listitem
-><para
-><link
-linkend="numbers"
->Ladina numbrid</link>
-</para
-></listitem>
-<listitem
-><para
-><link
-linkend="verbs"
->Ladina verbid</link>
-</para
-></listitem>
-<listitem
-><para
-><link
-linkend="nouns"
->Ladina nimisõnad</link>
-</para
-></listitem>
-<listitem
-><para
-><link
-linkend="adjectives"
->Ladina omadussõnad</link>
-</para
-></listitem>
-<listitem
-><para
-><link
-linkend="pronouns"
->Ladina asesõnad</link>
-</para
-></listitem>
+<listitem><para><link
+linkend="numbers">Ladina numbrid</link>
+</para></listitem>
+<listitem><para><link
+linkend="verbs">Ladina verbid</link>
+</para></listitem>
+<listitem><para><link
+linkend="nouns">Ladina nimisõnad</link>
+</para></listitem>
+<listitem><para><link
+linkend="adjectives">Ladina omadussõnad</link>
+</para></listitem>
+<listitem><para><link
+linkend="pronouns">Ladina asesõnad</link>
+</para></listitem>
 </itemizedlist>
 &numbers; &verbs; &nouns; &adjectives; &pronouns; </chapter>
 
 <appendix id="installation">
-<title
->Paigaldamine</title>
+<title>Paigaldamine</title>
 
 <sect1 id="getting-klatin">
-<title
->&klatin;i hankimine</title>
+<title>&klatin;i hankimine</title>
 &install.intro.documentation; </sect1>
 
 <sect1 id="compilation">
-<title
->Kompileerimine ja paigaldamine</title>
+<title>Kompileerimine ja paigaldamine</title>
 &install.compile.documentation; </sect1>
 
 </appendix>
diff --git a/tde-i18n-et/docs/tdeedu/klatin/nouns.docbook b/tde-i18n-et/docs/tdeedu/klatin/nouns.docbook
index 6e0d1513ee9..58e53ac8e1a 100644
--- a/tde-i18n-et/docs/tdeedu/klatin/nouns.docbook
+++ b/tde-i18n-et/docs/tdeedu/klatin/nouns.docbook
@@ -1,363 +1,198 @@
 <!-- Please don't translate Latin words -->
 <!-- Please translate -->
 <sect1 id="nouns">
-<title
->KLatini märkused - nimisõnad </title>
+<title>KLatini märkused - nimisõnad </title>
 
-<para
->Nagu verbid, on ka nimisõnad jagatud gruppidesse ehk <emphasis
->käändkondadesse</emphasis
-> (deklinatsioonid). Käändkondi on viis, sugusid kolm: mees-, nais ja kesksugu. </para>
-<para
->Nimisõna tüvi on selle muutumatu põhiosa. Nimisõna tüve leidmiseks võta selle ainsuse genitiiv ja eemalda lõpp. Näiteks sõna <emphasis
->puella</emphasis
-> tüvi on <emphasis
->puell</emphasis
->, sõna <emphasis
->rex</emphasis
-> tüvi aga <emphasis
->reg</emphasis
->, sest selle genitiiv on <emphasis
->reg-is</emphasis
->. </para>
+<para>Nagu verbid, on ka nimisõnad jagatud gruppidesse ehk <emphasis>käändkondadesse</emphasis> (deklinatsioonid). Käändkondi on viis, sugusid kolm: mees-, nais ja kesksugu. </para>
+<para>Nimisõna tüvi on selle muutumatu põhiosa. Nimisõna tüve leidmiseks võta selle ainsuse genitiiv ja eemalda lõpp. Näiteks sõna <emphasis>puella</emphasis> tüvi on <emphasis>puell</emphasis>, sõna <emphasis>rex</emphasis> tüvi aga <emphasis>reg</emphasis>, sest selle genitiiv on <emphasis>reg-is</emphasis>. </para>
 
 <sect2 id="listing">
-<title
->Ladina nimisõnad</title>
+<title>Ladina nimisõnad</title>
 
 <table frame="none">
-<title
->Nimisõnad</title>
+<title>Nimisõnad</title>
 <tgroup cols="9" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
 <!-- Please translate -->
-<entry
->AINSUS</entry>
-<entry
->1. (naissugu)</entry>
-<entry
->2. (meessugu)</entry>
-<entry
->2. (kesksugu)</entry>
-<entry
->3. (mees/naissugu)</entry>
-<entry
->3. (kesksugu)</entry>
-<entry
->4. (meessugu)</entry>
-<entry
->4. (kesksugu)</entry>
-<entry
->5. (naissugu)</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>AINSUS</entry>
+<entry>1. (naissugu)</entry>
+<entry>2. (meessugu)</entry>
+<entry>2. (kesksugu)</entry>
+<entry>3. (mees/naissugu)</entry>
+<entry>3. (kesksugu)</entry>
+<entry>4. (meessugu)</entry>
+<entry>4. (kesksugu)</entry>
+<entry>5. (naissugu)</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!--From now on please just translate first entry of each row-->
-<entry
->Nominatiiv</entry>
-<entry
->puell-a</entry>
-<entry
->serv-us</entry>
-<entry
->bell-um</entry>
-<entry
-><emphasis
->rex</emphasis
-></entry>
-<entry
->opus</entry>
-<entry
->grad-us</entry>
-<entry
->genu</entry>
-<entry
->res</entry>
-</row>
-<row>
-<entry
->Vokatiiv</entry>
-<entry
->puell-a</entry>
-<entry
->serv-e</entry>
-<entry
->bell-um</entry>
-<entry
-><emphasis
->rex</emphasis
-></entry>
-<entry
->opus</entry>
-<entry
->grad-us</entry>
-<entry
->genu</entry>
-<entry
->res</entry>
-</row>
-<row>
-<entry
->Akusatiiv</entry>
-<entry
->puell-am</entry>
-<entry
->serv-um</entry>
-<entry
->bell-um</entry>
-<entry
->reg-em</entry>
-<entry
->opus</entry>
-<entry
->grad-um</entry>
-<entry
->genu</entry>
-<entry
->re-m</entry>
-</row>
-<row>
-<entry
->Genitiiv</entry>
-<entry
->puell-ae</entry>
-<entry
->serv-i</entry>
-<entry
->bell-i</entry>
-<entry
->reg-is</entry>
-<entry
->oper-is</entry>
-<entry
->grad-us</entry>
-<entry
->gen-u</entry>
-<entry
->re-i</entry>
-</row>
-<row>
-<entry
->Daativ</entry>
-<entry
->puell-ae</entry>
-<entry
->serv-o</entry>
-<entry
->bell-o</entry>
-<entry
->reg-i</entry>
-<entry
->oper-i</entry>
-<entry
->grad-ui</entry>
-<entry
->gen-u</entry>
-<entry
->re-i</entry>
-</row>
-<row>
-<entry
->Ablatiiv</entry>
-<entry
->puell-a</entry>
-<entry
->serv-o</entry>
-<entry
->bell-o</entry>
-<entry
->reg-e</entry>
-<entry
->oper-e</entry>
-<entry
->grad-u</entry>
-<entry
->gen-u</entry>
-<entry
->re</entry>
+<entry>Nominatiiv</entry>
+<entry>puell-a</entry>
+<entry>serv-us</entry>
+<entry>bell-um</entry>
+<entry><emphasis>rex</emphasis></entry>
+<entry>opus</entry>
+<entry>grad-us</entry>
+<entry>genu</entry>
+<entry>res</entry>
+</row>
+<row>
+<entry>Vokatiiv</entry>
+<entry>puell-a</entry>
+<entry>serv-e</entry>
+<entry>bell-um</entry>
+<entry><emphasis>rex</emphasis></entry>
+<entry>opus</entry>
+<entry>grad-us</entry>
+<entry>genu</entry>
+<entry>res</entry>
+</row>
+<row>
+<entry>Akusatiiv</entry>
+<entry>puell-am</entry>
+<entry>serv-um</entry>
+<entry>bell-um</entry>
+<entry>reg-em</entry>
+<entry>opus</entry>
+<entry>grad-um</entry>
+<entry>genu</entry>
+<entry>re-m</entry>
+</row>
+<row>
+<entry>Genitiiv</entry>
+<entry>puell-ae</entry>
+<entry>serv-i</entry>
+<entry>bell-i</entry>
+<entry>reg-is</entry>
+<entry>oper-is</entry>
+<entry>grad-us</entry>
+<entry>gen-u</entry>
+<entry>re-i</entry>
+</row>
+<row>
+<entry>Daativ</entry>
+<entry>puell-ae</entry>
+<entry>serv-o</entry>
+<entry>bell-o</entry>
+<entry>reg-i</entry>
+<entry>oper-i</entry>
+<entry>grad-ui</entry>
+<entry>gen-u</entry>
+<entry>re-i</entry>
+</row>
+<row>
+<entry>Ablatiiv</entry>
+<entry>puell-a</entry>
+<entry>serv-o</entry>
+<entry>bell-o</entry>
+<entry>reg-e</entry>
+<entry>oper-e</entry>
+<entry>grad-u</entry>
+<entry>gen-u</entry>
+<entry>re</entry>
 </row>
 
 <row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row -->
-<entry
->MITMUS</entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-</row>
-<row>
-<entry
->Nominatiiv</entry>
-<entry
->puell-ae</entry>
-<entry
->serv-i</entry>
-<entry
->bell-a</entry>
-<entry
->reg-es</entry>
-<entry
->oper-a</entry>
-<entry
->grad-us</entry>
-<entry
->gen-ua</entry>
-<entry
->res</entry>
-</row>
-<row>
-<entry
->Vokatiiv</entry>
-<entry
->puell-ae</entry>
-<entry
->serv-i</entry>
-<entry
->bell-a</entry>
-<entry
->reg-es</entry>
-<entry
->oper-a</entry>
-<entry
->grad-us</entry>
-<entry
->gen-ua</entry>
-<entry
->res</entry>
-</row>
-<row>
-<entry
->Akusatiiv</entry>
-<entry
->puell-as</entry>
-<entry
->serv-os</entry>
-<entry
->bell-a</entry>
-<entry
->reg-es</entry>
-<entry
->oper-a</entry>
-<entry
->grad-us</entry>
-<entry
->gen-ua</entry>
-<entry
->res</entry>
-</row>
-<row>
-<entry
->Genitiiv</entry>
-<entry
->puell-arum</entry>
-<entry
->serv-orum</entry>
-<entry
->bell-orum</entry>
-<entry
->reg-um</entry>
-<entry
->oper-um</entry>
-<entry
->grad-uum</entry>
-<entry
->gen-uum</entry>
-<entry
->re-rum</entry>
-</row>
-<row>
-<entry
->Daativ</entry>
-<entry
->puell-is</entry>
-<entry
->serv-is</entry>
-<entry
->bell-is</entry>
-<entry
->reg-ibus</entry>
-<entry
->oper-ibus</entry>
-<entry
->grad-ibus</entry>
-<entry
->gen-ibus</entry>
-<entry
->re-bus</entry>
-</row>
-<row>
-<entry
->Ablatiiv</entry>
-<entry
->puell-is</entry>
-<entry
->serv-is</entry>
-<entry
->bell-is</entry>
-<entry
->reg-ibus</entry>
-<entry
->oper-ibus</entry>
-<entry
->grad-ibus</entry>
-<entry
->gen-ibus</entry>
-<entry
->re-bus</entry>
+<entry>MITMUS</entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+</row>
+<row>
+<entry>Nominatiiv</entry>
+<entry>puell-ae</entry>
+<entry>serv-i</entry>
+<entry>bell-a</entry>
+<entry>reg-es</entry>
+<entry>oper-a</entry>
+<entry>grad-us</entry>
+<entry>gen-ua</entry>
+<entry>res</entry>
+</row>
+<row>
+<entry>Vokatiiv</entry>
+<entry>puell-ae</entry>
+<entry>serv-i</entry>
+<entry>bell-a</entry>
+<entry>reg-es</entry>
+<entry>oper-a</entry>
+<entry>grad-us</entry>
+<entry>gen-ua</entry>
+<entry>res</entry>
+</row>
+<row>
+<entry>Akusatiiv</entry>
+<entry>puell-as</entry>
+<entry>serv-os</entry>
+<entry>bell-a</entry>
+<entry>reg-es</entry>
+<entry>oper-a</entry>
+<entry>grad-us</entry>
+<entry>gen-ua</entry>
+<entry>res</entry>
+</row>
+<row>
+<entry>Genitiiv</entry>
+<entry>puell-arum</entry>
+<entry>serv-orum</entry>
+<entry>bell-orum</entry>
+<entry>reg-um</entry>
+<entry>oper-um</entry>
+<entry>grad-uum</entry>
+<entry>gen-uum</entry>
+<entry>re-rum</entry>
+</row>
+<row>
+<entry>Daativ</entry>
+<entry>puell-is</entry>
+<entry>serv-is</entry>
+<entry>bell-is</entry>
+<entry>reg-ibus</entry>
+<entry>oper-ibus</entry>
+<entry>grad-ibus</entry>
+<entry>gen-ibus</entry>
+<entry>re-bus</entry>
+</row>
+<row>
+<entry>Ablatiiv</entry>
+<entry>puell-is</entry>
+<entry>serv-is</entry>
+<entry>bell-is</entry>
+<entry>reg-ibus</entry>
+<entry>oper-ibus</entry>
+<entry>grad-ibus</entry>
+<entry>gen-ibus</entry>
+<entry>re-bus</entry>
 </row>
 </tbody>
 </tgroup>
diff --git a/tde-i18n-et/docs/tdeedu/klatin/numbers.docbook b/tde-i18n-et/docs/tdeedu/klatin/numbers.docbook
index 205979bd049..8896e6309ba 100644
--- a/tde-i18n-et/docs/tdeedu/klatin/numbers.docbook
+++ b/tde-i18n-et/docs/tdeedu/klatin/numbers.docbook
@@ -1,337 +1,214 @@
 <!-- Please don't translate Latin words -->
 <!-- Please translate -->
 <sect1 id="numbers">
-<title
->KLatini märkused - numbrid </title>
+<title>KLatini märkused - numbrid </title>
 
-<para
->Roomlastel oli omalaadne numbrisüsteem, kus igal numbril oli ka omaette nimi. Selles osas toomegi ära mõned numbrid ja neile vastavad sümbolid. </para>
+<para>Roomlastel oli omalaadne numbrisüsteem, kus igal numbril oli ka omaette nimi. Selles osas toomegi ära mõned numbrid ja neile vastavad sümbolid. </para>
 <table frame="none">
-<title
->Numbrid</title>
+<title>Numbrid</title>
 <!-- translators: don't translate the following -->
 <tgroup cols="3" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
-<entry
->1</entry>
-<entry
->I</entry>
-<entry
->unus</entry>
+<entry>1</entry>
+<entry>I</entry>
+<entry>unus</entry>
 </row>
 <row>
-<entry
->2</entry>
-<entry
->II</entry>
-<entry
->duo</entry>
+<entry>2</entry>
+<entry>II</entry>
+<entry>duo</entry>
 </row>
 <row>
-<entry
->3</entry>
-<entry
->III</entry>
-<entry
->tres</entry>
+<entry>3</entry>
+<entry>III</entry>
+<entry>tres</entry>
 </row>
 <row>
-<entry
->4</entry>
-<entry
->IV</entry>
-<entry
->quattuor</entry>
+<entry>4</entry>
+<entry>IV</entry>
+<entry>quattuor</entry>
 </row>
 <row>
-<entry
->5</entry>
-<entry
->V</entry>
-<entry
->quinque</entry>
+<entry>5</entry>
+<entry>V</entry>
+<entry>quinque</entry>
 </row>
 <row>
-<entry
->6</entry>
-<entry
->VI</entry>
-<entry
->sex</entry>
+<entry>6</entry>
+<entry>VI</entry>
+<entry>sex</entry>
 </row>
 <row>
-<entry
->7</entry>
-<entry
->VII</entry>
-<entry
->septem</entry>
+<entry>7</entry>
+<entry>VII</entry>
+<entry>septem</entry>
 </row>
 <row>
-<entry
->8</entry>
-<entry
->VIII</entry>
-<entry
->octo</entry>
+<entry>8</entry>
+<entry>VIII</entry>
+<entry>octo</entry>
 </row>
 <row>
-<entry
->9</entry>
-<entry
->IX</entry>
-<entry
->novem</entry>
+<entry>9</entry>
+<entry>IX</entry>
+<entry>novem</entry>
 </row>
 <row>
-<entry
->10</entry>
-<entry
->X</entry>
-<entry
->decem</entry>
+<entry>10</entry>
+<entry>X</entry>
+<entry>decem</entry>
 </row>
 <row>
-<entry
->11</entry>
-<entry
->XI</entry>
-<entry
->undecim</entry>
+<entry>11</entry>
+<entry>XI</entry>
+<entry>undecim</entry>
 </row>
 <row>
-<entry
->12</entry>
-<entry
->XII</entry>
-<entry
->duodecim</entry>
+<entry>12</entry>
+<entry>XII</entry>
+<entry>duodecim</entry>
 </row>
 <row>
-<entry
->13</entry>
-<entry
->XIII</entry>
-<entry
->tredecim</entry>
+<entry>13</entry>
+<entry>XIII</entry>
+<entry>tredecim</entry>
 </row>
 <row>
-<entry
->14</entry>
-<entry
->XIV</entry>
-<entry
->quattuordecim</entry>
+<entry>14</entry>
+<entry>XIV</entry>
+<entry>quattuordecim</entry>
 </row>
 <row>
-<entry
->15</entry>
-<entry
->XV</entry>
-<entry
->quindecim</entry>
+<entry>15</entry>
+<entry>XV</entry>
+<entry>quindecim</entry>
 </row>
 <row>
-<entry
->16</entry>
-<entry
->XVI</entry>
-<entry
->sedecim</entry>
+<entry>16</entry>
+<entry>XVI</entry>
+<entry>sedecim</entry>
 </row>
 <row>
-<entry
->17</entry>
-<entry
->XVII</entry>
-<entry
->septendecim</entry>
+<entry>17</entry>
+<entry>XVII</entry>
+<entry>septendecim</entry>
 </row>
 <row>
-<entry
->18</entry>
-<entry
->XVIII</entry>
-<entry
->duodeviginti</entry>
+<entry>18</entry>
+<entry>XVIII</entry>
+<entry>duodeviginti</entry>
 </row>
 <row>
-<entry
->19</entry>
-<entry
->XIX</entry>
-<entry
->undeviginti</entry>
+<entry>19</entry>
+<entry>XIX</entry>
+<entry>undeviginti</entry>
 </row>
 <row>
-<entry
->20</entry>
-<entry
->XX</entry>
-<entry
->viginti</entry>
+<entry>20</entry>
+<entry>XX</entry>
+<entry>viginti</entry>
 </row>
 <row>
-<entry
->21</entry>
-<entry
->XXI</entry>
-<entry
->vigintiunus</entry>
+<entry>21</entry>
+<entry>XXI</entry>
+<entry>vigintiunus</entry>
 </row>
 <row>
-<entry
->22</entry>
-<entry
->XXII</entry>
-<entry
->vigintiduo</entry>
+<entry>22</entry>
+<entry>XXII</entry>
+<entry>vigintiduo</entry>
 </row>
 <row>
-<entry
->30</entry>
-<entry
->XXX</entry>
-<entry
->triginta</entry>
+<entry>30</entry>
+<entry>XXX</entry>
+<entry>triginta</entry>
 </row>
 <row>
-<entry
->40</entry>
-<entry
->XL</entry>
-<entry
->quadraginta</entry>
+<entry>40</entry>
+<entry>XL</entry>
+<entry>quadraginta</entry>
 </row>
 <row>
-<entry
->50</entry>
-<entry
->L</entry>
-<entry
->quinquaginta</entry>
+<entry>50</entry>
+<entry>L</entry>
+<entry>quinquaginta</entry>
 </row>
 <row>
-<entry
->6o</entry>
-<entry
->LX</entry>
-<entry
->sexaginta</entry>
+<entry>6o</entry>
+<entry>LX</entry>
+<entry>sexaginta</entry>
 </row>
 <row>
-<entry
->70</entry>
-<entry
->LXX</entry>
-<entry
->septuaginta</entry>
+<entry>70</entry>
+<entry>LXX</entry>
+<entry>septuaginta</entry>
 </row>
 <row>
-<entry
->80</entry>
-<entry
->LXXX</entry>
-<entry
->octoginta</entry>
-</row>
+<entry>80</entry>
+<entry>LXXX</entry>
+<entry>octoginta</entry>
+</row>
 <row>
-<entry
->90</entry>
-<entry
->XC</entry>
-<entry
->nonaginta</entry>
-</row>
+<entry>90</entry>
+<entry>XC</entry>
+<entry>nonaginta</entry>
+</row>
 <row>
-<entry
->100</entry>
-<entry
->C</entry>
-<entry
->centum</entry>
-</row>
+<entry>100</entry>
+<entry>C</entry>
+<entry>centum</entry>
+</row>
 <row>
-<entry
->200</entry>
-<entry
->CC</entry>
-<entry
->ducenti</entry>
-</row>
+<entry>200</entry>
+<entry>CC</entry>
+<entry>ducenti</entry>
+</row>
 <row>
-<entry
->300</entry>
-<entry
->CCC</entry>
-<entry
->trecenti</entry>
-</row>
+<entry>300</entry>
+<entry>CCC</entry>
+<entry>trecenti</entry>
+</row>
 <row>
-<entry
->400</entry>
-<entry
->CD</entry>
-<entry
->quadrigenti</entry>
-</row>
+<entry>400</entry>
+<entry>CD</entry>
+<entry>quadrigenti</entry>
+</row>
 <row>
-<entry
->500</entry>
-<entry
->D</entry>
-<entry
->quingenti</entry>
-</row>
+<entry>500</entry>
+<entry>D</entry>
+<entry>quingenti</entry>
+</row>
 <row>
-<entry
->600</entry>
-<entry
->DC</entry>
-<entry
->sescenti</entry>
-</row>
+<entry>600</entry>
+<entry>DC</entry>
+<entry>sescenti</entry>
+</row>
 <row>
-<entry
->700</entry>
-<entry
->DCC</entry>
-<entry
->septigenti</entry>
-</row>
+<entry>700</entry>
+<entry>DCC</entry>
+<entry>septigenti</entry>
+</row>
 <row>
-<entry
->800</entry>
-<entry
->DCCC</entry>
-<entry
->octigenti</entry>
-</row>
+<entry>800</entry>
+<entry>DCCC</entry>
+<entry>octigenti</entry>
+</row>
 <row>
-<entry
->900</entry>
-<entry
->CM</entry>
-<entry
->nongenti</entry>
-</row>
+<entry>900</entry>
+<entry>CM</entry>
+<entry>nongenti</entry>
+</row>
 <row>
-<entry
->1000</entry>
-<entry
->M</entry>
-<entry
->mille</entry>
-</row>
+<entry>1000</entry>
+<entry>M</entry>
+<entry>mille</entry>
+</row>
 <row>
-<entry
->2000</entry>
-<entry
->MM</entry>
-<entry
->duo milia</entry>
+<entry>2000</entry>
+<entry>MM</entry>
+<entry>duo milia</entry>
 </row>
 </tbody>
 </tgroup>
diff --git a/tde-i18n-et/docs/tdeedu/klatin/pronouns.docbook b/tde-i18n-et/docs/tdeedu/klatin/pronouns.docbook
index f88a201cbf1..1310675dd4d 100644
--- a/tde-i18n-et/docs/tdeedu/klatin/pronouns.docbook
+++ b/tde-i18n-et/docs/tdeedu/klatin/pronouns.docbook
@@ -1,105 +1,68 @@
 <!-- Please translate the following -->
 <sect1 id="pronouns">
-<title
->KLatini märkused - asesõnad </title>
-<para
->Toome siin ära mõned asesõnad. </para>
+<title>KLatini märkused - asesõnad </title>
+<para>Toome siin ära mõned asesõnad. </para>
 
 <table frame="none">
-<title
->Isiklikud asesõnad</title>
+<title>Isiklikud asesõnad</title>
 <!-- Please don't translate the following until next title -->
 <tgroup cols="2" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <!-- Translate the following two entries -->
 <row>
-<entry
-><emphasis
->Mina</emphasis
-></entry>
-<entry
-><emphasis
->Sina</emphasis
-></entry>
+<entry><emphasis>Mina</emphasis></entry>
+<entry><emphasis>Sina</emphasis></entry>
 </row>
 
 <row>
-<entry
->ego</entry>
-<entry
->tu</entry>
+<entry>ego</entry>
+<entry>tu</entry>
 </row>
 <row>
-<entry
->me</entry>
-<entry
->te</entry>
+<entry>me</entry>
+<entry>te</entry>
 </row>
 <row>
-<entry
->mei</entry>
-<entry
->tui</entry>
+<entry>mei</entry>
+<entry>tui</entry>
 </row>
 <row>
-<entry
->mihi</entry>
-<entry
->tibi</entry>
+<entry>mihi</entry>
+<entry>tibi</entry>
 </row>
 <row>
-<entry
->me</entry>
-<entry
->te</entry>
+<entry>me</entry>
+<entry>te</entry>
 </row>
 <row>
-<entry
-></entry>
-<entry
-></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <!-- Translate the following two entries -->
 <row>
-<entry
-><emphasis
->Meie</emphasis
-></entry>
-<entry
-><emphasis
->Teie</emphasis
-></entry>
+<entry><emphasis>Meie</emphasis></entry>
+<entry><emphasis>Teie</emphasis></entry>
 </row>
 <row>
-<entry
->nos</entry>
-<entry
->vos</entry>
+<entry>nos</entry>
+<entry>vos</entry>
 </row>
 <row>
-<entry
->nos</entry>
-<entry
->vos</entry>
+<entry>nos</entry>
+<entry>vos</entry>
 </row>
 <row>
-<entry
->nostri/nostrum</entry>
-<entry
->vestri/vestrum</entry>
+<entry>nostri/nostrum</entry>
+<entry>vestri/vestrum</entry>
 </row>
 <row>
-<entry
->nobis</entry>
-<entry
->vobis</entry>
+<entry>nobis</entry>
+<entry>vobis</entry>
 </row>
 <row>
-<entry
->nobis</entry>
-<entry
->vobis</entry>
+<entry>nobis</entry>
+<entry>vobis</entry>
 </row>
 </tbody>
 </tgroup>
@@ -107,128 +70,77 @@
  
 <table frame="none">
 <!-- Please translate title-->
-<title
->3. isiku personaalpronoomenid</title>
+<title>3. isiku personaalpronoomenid</title>
 <!-- Please don't translate the following until next title-->
 <tgroup cols="4" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <!-- Translate the following entry -->
 <row>
-<entry
-></entry>
-<entry
-><emphasis
->Tema (meessugu),</emphasis
-></entry>
-<entry
-><emphasis
->tema (naissugu),</emphasis
-></entry>
-<entry
-><emphasis
->tema/see (kesksugu)</emphasis
-></entry>
-</row>
-<row>
-<entry
->AINSUS</entry>
-<entry
->is</entry>
-<entry
->ea</entry>
-<entry
->id</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->eum</entry>
-<entry
->eum</entry>
-<entry
->id</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->eius</entry>
-<entry
->eius</entry>
-<entry
->eius</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ei</entry>
-<entry
->ei</entry>
-<entry
->ei</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->eo</entry>
-<entry
->ea</entry>
-<entry
->eo</entry>
-</row>
-<row>
-<entry
->MITMUS</entry>
-<entry
->ei</entry>
-<entry
->eae</entry>
-<entry
->ea</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->eos</entry>
-<entry
->eas</entry>
-<entry
->ea</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->eorum</entry>
-<entry
->earum</entry>
-<entry
->eorum</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->eis</entry>
-<entry
->eis</entry>
-<entry
->eis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->eis</entry>
-<entry
->eis</entry>
-<entry
->eis</entry>
+<entry></entry>
+<entry><emphasis>Tema (meessugu),</emphasis></entry>
+<entry><emphasis>tema (naissugu),</emphasis></entry>
+<entry><emphasis>tema/see (kesksugu)</emphasis></entry>
+</row>
+<row>
+<entry>AINSUS</entry>
+<entry>is</entry>
+<entry>ea</entry>
+<entry>id</entry>
+</row>
+<row>
+<entry></entry>
+<entry>eum</entry>
+<entry>eum</entry>
+<entry>id</entry>
+</row>
+<row>
+<entry></entry>
+<entry>eius</entry>
+<entry>eius</entry>
+<entry>eius</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ei</entry>
+<entry>ei</entry>
+<entry>ei</entry>
+</row>
+<row>
+<entry></entry>
+<entry>eo</entry>
+<entry>ea</entry>
+<entry>eo</entry>
+</row>
+<row>
+<entry>MITMUS</entry>
+<entry>ei</entry>
+<entry>eae</entry>
+<entry>ea</entry>
+</row>
+<row>
+<entry></entry>
+<entry>eos</entry>
+<entry>eas</entry>
+<entry>ea</entry>
+</row>
+<row>
+<entry></entry>
+<entry>eorum</entry>
+<entry>earum</entry>
+<entry>eorum</entry>
+</row>
+<row>
+<entry></entry>
+<entry>eis</entry>
+<entry>eis</entry>
+<entry>eis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>eis</entry>
+<entry>eis</entry>
+<entry>eis</entry>
 </row>
 </tbody>
 </tgroup>
@@ -236,285 +148,178 @@
  
 <table frame="none">
 <!-- Please translate the title-->
-<title
->Näitavad asesõnad</title>
+<title>Näitavad asesõnad</title>
 <!-- Please don't translate the following -->
 <tgroup cols="4" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <!-- Translate the following entry -->
 <row>
-<entry
-><emphasis
->See (siin)</emphasis
-></entry>
-</row>
-<row>
-<entry
->AINSUS</entry>
-<entry
->hic</entry>
-<entry
->haec</entry>
-<entry
->hoc</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->hunc</entry>
-<entry
->hanc</entry>
-<entry
->hoc</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->huius</entry>
-<entry
->huius</entry>
-<entry
->huius</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->huic</entry>
-<entry
->huic</entry>
-<entry
->huic</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->hoc</entry>
-<entry
->hac</entry>
-<entry
->hoc</entry>
-</row>
-<row>
-<entry
->MITMUS</entry>
-<entry
->hi</entry>
-<entry
->hae</entry>
-<entry
->haec</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->hos</entry>
-<entry
->has</entry>
-<entry
->heac</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->horum</entry>
-<entry
->harum</entry>
-<entry
->horum</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->his</entry>
-<entry
->his</entry>
-<entry
->his</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->his</entry>
-<entry
->his</entry>
-<entry
->his</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry><emphasis>See (siin)</emphasis></entry>
+</row>
+<row>
+<entry>AINSUS</entry>
+<entry>hic</entry>
+<entry>haec</entry>
+<entry>hoc</entry>
+</row>
+<row>
+<entry></entry>
+<entry>hunc</entry>
+<entry>hanc</entry>
+<entry>hoc</entry>
+</row>
+<row>
+<entry></entry>
+<entry>huius</entry>
+<entry>huius</entry>
+<entry>huius</entry>
+</row>
+<row>
+<entry></entry>
+<entry>huic</entry>
+<entry>huic</entry>
+<entry>huic</entry>
+</row>
+<row>
+<entry></entry>
+<entry>hoc</entry>
+<entry>hac</entry>
+<entry>hoc</entry>
+</row>
+<row>
+<entry>MITMUS</entry>
+<entry>hi</entry>
+<entry>hae</entry>
+<entry>haec</entry>
+</row>
+<row>
+<entry></entry>
+<entry>hos</entry>
+<entry>has</entry>
+<entry>heac</entry>
+</row>
+<row>
+<entry></entry>
+<entry>horum</entry>
+<entry>harum</entry>
+<entry>horum</entry>
+</row>
+<row>
+<entry></entry>
+<entry>his</entry>
+<entry>his</entry>
+<entry>his</entry>
+</row>
+<row>
+<entry></entry>
+<entry>his</entry>
+<entry>his</entry>
+<entry>his</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <!-- Translate the following entry -->
 <row>
-<entry
-><emphasis
->See (seal)</emphasis
-></entry>
-</row>
-<row>
-<entry
->AINSUS</entry>
-<entry
->ille</entry>
-<entry
->illa</entry>
-<entry
->illud</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->illum</entry>
-<entry
->illam</entry>
-<entry
->illud</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->illius</entry>
-<entry
->illius</entry>
-<entry
->illius</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->illi</entry>
-<entry
->illi</entry>
-<entry
->illi</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->illo</entry>
-<entry
->illa</entry>
-<entry
->illo</entry>
-</row>
-<row>
-<entry
->MITMUS</entry>
-<entry
->illi</entry>
-<entry
->illae</entry>
-<entry
->illa</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->illos</entry>
-<entry
->illas</entry>
-<entry
->illa</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->illorum</entry>
-<entry
->illarum</entry>
-<entry
->illorum</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->illis</entry>
-<entry
->illis</entry>
-<entry
->illis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->illis</entry>
-<entry
->illis</entry>
-<entry
->illis</entry>
+<entry><emphasis>See (seal)</emphasis></entry>
+</row>
+<row>
+<entry>AINSUS</entry>
+<entry>ille</entry>
+<entry>illa</entry>
+<entry>illud</entry>
+</row>
+<row>
+<entry></entry>
+<entry>illum</entry>
+<entry>illam</entry>
+<entry>illud</entry>
+</row>
+<row>
+<entry></entry>
+<entry>illius</entry>
+<entry>illius</entry>
+<entry>illius</entry>
+</row>
+<row>
+<entry></entry>
+<entry>illi</entry>
+<entry>illi</entry>
+<entry>illi</entry>
+</row>
+<row>
+<entry></entry>
+<entry>illo</entry>
+<entry>illa</entry>
+<entry>illo</entry>
+</row>
+<row>
+<entry>MITMUS</entry>
+<entry>illi</entry>
+<entry>illae</entry>
+<entry>illa</entry>
+</row>
+<row>
+<entry></entry>
+<entry>illos</entry>
+<entry>illas</entry>
+<entry>illa</entry>
+</row>
+<row>
+<entry></entry>
+<entry>illorum</entry>
+<entry>illarum</entry>
+<entry>illorum</entry>
+</row>
+<row>
+<entry></entry>
+<entry>illis</entry>
+<entry>illis</entry>
+<entry>illis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>illis</entry>
+<entry>illis</entry>
+<entry>illis</entry>
 </row>
 </tbody>
 </tgroup>
 </table>
 
 <table frame="none">
-<title
->Eitavad asesõnad</title>
+<title>Eitavad asesõnad</title>
 <!-- Please don't translate the following until next title -->
 <tgroup cols="2" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <!-- Translate the following two entries -->
 <row>
-<entry
-><emphasis
->Eikeski</emphasis
-></entry>
-<entry
-><emphasis
->Eimiski</emphasis
-></entry>
+<entry><emphasis>Eikeski</emphasis></entry>
+<entry><emphasis>Eimiski</emphasis></entry>
 </row>
 <row>
-<entry
->nemo</entry>
-<entry
->nihil</entry>
+<entry>nemo</entry>
+<entry>nihil</entry>
 </row>
 <row>
-<entry
->neminem</entry>
-<entry
->nihil/nil</entry>
+<entry>neminem</entry>
+<entry>nihil/nil</entry>
 </row>
 <row>
-<entry
->nullius/neminis</entry>
-<entry
->nullius rei</entry>
+<entry>nullius/neminis</entry>
+<entry>nullius rei</entry>
 </row>
 <row>
-<entry
->nemini/nulli</entry>
-<entry
->nulli rei</entry>
+<entry>nemini/nulli</entry>
+<entry>nulli rei</entry>
 </row>
 <row>
-<entry
->nullo/nemine</entry>
-<entry
->nulla re</entry>
+<entry>nullo/nemine</entry>
+<entry>nulla re</entry>
 </row>
 </tbody>
 </tgroup>
diff --git a/tde-i18n-et/docs/tdeedu/klatin/verbs.docbook b/tde-i18n-et/docs/tdeedu/klatin/verbs.docbook
index 08ee83cfae4..4728e4239d0 100644
--- a/tde-i18n-et/docs/tdeedu/klatin/verbs.docbook
+++ b/tde-i18n-et/docs/tdeedu/klatin/verbs.docbook
@@ -1,637 +1,368 @@
 <!-- Translators: please don't translate Latin words -->
 <sect1 id="verbs">
 <!-- Please translate -->
-<title
->KLatini märkused - tegusõnad </title>
+<title>KLatini märkused - tegusõnad </title>
 
-<para
->Tegusõnad on olemas igas keeles. Ladina keeles on verbid jagatud nelja rühma ehk <emphasis
->pöördkonda</emphasis
->. Need kujutavad endast ühesuguse tüvemoodustuse ja ühesuguste lõppudega verbirühmi. </para>
+<para>Tegusõnad on olemas igas keeles. Ladina keeles on verbid jagatud nelja rühma ehk <emphasis>pöördkonda</emphasis>. Need kujutavad endast ühesuguse tüvemoodustuse ja ühesuguste lõppudega verbirühmi. </para>
 
-<para
->Verbitüvi on tegusõna muutumatu põhiosa. Näiteks verbi <emphasis
->moneo</emphasis
-> tüvi on <emphasis
->mone</emphasis
->. Tüve leidmiseks võta tegusõna ainsuse esimese isiku lõpust ära 'o'. Verb <quote
->sum</quote
-> ('mina olen') kujutab endast täiesti ebareeglipärast tegusõna, millel ühtne tüvi puudub. </para>
+<para>Verbitüvi on tegusõna muutumatu põhiosa. Näiteks verbi <emphasis>moneo</emphasis> tüvi on <emphasis>mone</emphasis>. Tüve leidmiseks võta tegusõna ainsuse esimese isiku lõpust ära 'o'. Verb <quote>sum</quote> ('mina olen') kujutab endast täiesti ebareeglipärast tegusõna, millel ühtne tüvi puudub. </para>
 
 <table frame="none">
 <!-- Please translate the title-->
-<title
->Tegusõnad - aktiivi indikatiiv</title>
+<title>Tegusõnad - aktiivi indikatiiv</title>
 <tgroup cols="6" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
 <!-- Please translate -->
-<entry
->AEG</entry>
-<entry
->1.</entry>
-<entry
->2.</entry>
-<entry
->3.</entry>
-<entry
->4.</entry>
-<entry
->SUM - I</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>AEG</entry>
+<entry>1.</entry>
+<entry>2.</entry>
+<entry>3.</entry>
+<entry>4.</entry>
+<entry>SUM - I</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- translate only the first entry of each row if there is one -->
-<entry
->OLEVIK</entry>
-<entry
->am-o</entry>
-<entry
->mone-o</entry>
-<entry
->reg-o</entry>
-<entry
->audi-o</entry>
-<entry
->sum</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-s</entry>
-<entry
->mone-s</entry>
-<entry
->regi-s</entry>
-<entry
->audi-s</entry>
-<entry
->es</entry>
-</row>
-<row>
-<entry
->Mina armastan</entry>
-<entry
->ama-t</entry>
-<entry
->mone-t</entry>
-<entry
->regi-t</entry>
-<entry
->audi-t</entry>
-<entry
->est</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-mus</entry>
-<entry
->mone-mus</entry>
-<entry
->regi-mus</entry>
-<entry
->audi-mus</entry>
-<entry
->sumus</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-tis</entry>
-<entry
->mone-tis</entry>
-<entry
->regi-tis</entry>
-<entry
->audi-tis</entry>
-<entry
->estis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-nt</entry>
-<entry
->mone-nt</entry>
-<entry
->regu-nt</entry>
-<entry
->audi-unt</entry>
-<entry
->sunt</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>OLEVIK</entry>
+<entry>am-o</entry>
+<entry>mone-o</entry>
+<entry>reg-o</entry>
+<entry>audi-o</entry>
+<entry>sum</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-s</entry>
+<entry>mone-s</entry>
+<entry>regi-s</entry>
+<entry>audi-s</entry>
+<entry>es</entry>
+</row>
+<row>
+<entry>Mina armastan</entry>
+<entry>ama-t</entry>
+<entry>mone-t</entry>
+<entry>regi-t</entry>
+<entry>audi-t</entry>
+<entry>est</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-mus</entry>
+<entry>mone-mus</entry>
+<entry>regi-mus</entry>
+<entry>audi-mus</entry>
+<entry>sumus</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-tis</entry>
+<entry>mone-tis</entry>
+<entry>regi-tis</entry>
+<entry>audi-tis</entry>
+<entry>estis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-nt</entry>
+<entry>mone-nt</entry>
+<entry>regu-nt</entry>
+<entry>audi-unt</entry>
+<entry>sunt</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->TULEVIK</entry>
-<entry
->ama-bo</entry>
-<entry
->mone-bo</entry>
-<entry
->reg-am</entry>
-<entry
->audi-am</entry>
-<entry
->ero</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-bis</entry>
-<entry
->mone-bis</entry>
-<entry
->reg-es</entry>
-<entry
->audi-es</entry>
-<entry
->eris</entry>
-</row>
-<row>
-<entry
->Ma hakkan armastama</entry>
-<entry
->ama-bit</entry>
-<entry
->mone-bit</entry>
-<entry
->reg-et</entry>
-<entry
->audi-et</entry>
-<entry
->erit</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-bimus</entry>
-<entry
->mone-bimus</entry>
-<entry
->reg-emus</entry>
-<entry
->audi-emus</entry>
-<entry
->erimus</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-bitis</entry>
-<entry
->mone-bitis</entry>
-<entry
->reg-etis</entry>
-<entry
->audi-etis</entry>
-<entry
->eritis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-bunt</entry>
-<entry
->mone-bunt</entry>
-<entry
->reg-ent</entry>
-<entry
->audi-ent</entry>
-<entry
->erunt</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>TULEVIK</entry>
+<entry>ama-bo</entry>
+<entry>mone-bo</entry>
+<entry>reg-am</entry>
+<entry>audi-am</entry>
+<entry>ero</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-bis</entry>
+<entry>mone-bis</entry>
+<entry>reg-es</entry>
+<entry>audi-es</entry>
+<entry>eris</entry>
+</row>
+<row>
+<entry>Ma hakkan armastama</entry>
+<entry>ama-bit</entry>
+<entry>mone-bit</entry>
+<entry>reg-et</entry>
+<entry>audi-et</entry>
+<entry>erit</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-bimus</entry>
+<entry>mone-bimus</entry>
+<entry>reg-emus</entry>
+<entry>audi-emus</entry>
+<entry>erimus</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-bitis</entry>
+<entry>mone-bitis</entry>
+<entry>reg-etis</entry>
+<entry>audi-etis</entry>
+<entry>eritis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-bunt</entry>
+<entry>mone-bunt</entry>
+<entry>reg-ent</entry>
+<entry>audi-ent</entry>
+<entry>erunt</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->LIHTMINEVIK (imperfekt)</entry>
-<entry
->ama-bam</entry>
-<entry
->mone-bam</entry>
-<entry
->rege-bam</entry>
-<entry
->audi-bam</entry>
-<entry
->eram</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-bas</entry>
-<entry
->mone-bas</entry>
-<entry
->rege-bas</entry>
-<entry
->audi-bas</entry>
-<entry
->eras</entry>
-</row>
-<row>
-<entry
->Ma armastasin</entry>
-<entry
->ama-bat</entry>
-<entry
->mone-bat</entry>
-<entry
->rege-bat</entry>
-<entry
->audi-bat</entry>
-<entry
->erat</entry>
+<entry>LIHTMINEVIK (imperfekt)</entry>
+<entry>ama-bam</entry>
+<entry>mone-bam</entry>
+<entry>rege-bam</entry>
+<entry>audi-bam</entry>
+<entry>eram</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-bas</entry>
+<entry>mone-bas</entry>
+<entry>rege-bas</entry>
+<entry>audi-bas</entry>
+<entry>eras</entry>
+</row>
+<row>
+<entry>Ma armastasin</entry>
+<entry>ama-bat</entry>
+<entry>mone-bat</entry>
+<entry>rege-bat</entry>
+<entry>audi-bat</entry>
+<entry>erat</entry>
 </row>
 <row>
  
-<entry
->ama-bamus</entry>
-<entry
->mone-bamus</entry>
-<entry
->rege-bamus</entry>
-<entry
->audi-bamus</entry>
-<entry
->eramus</entry>
-</row>
-<row>
-<entry
->Ma hakkasin armastama</entry>
-<entry
->ama-batis</entry>
-<entry
->mone-batis</entry>
-<entry
->rege-batis</entry>
-<entry
->audi-batis</entry>
-<entry
->eratis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-bant</entry>
-<entry
->mone-bant</entry>
-<entry
->rege-bant</entry>
-<entry
->audi-bant</entry>
-<entry
->erant</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>ama-bamus</entry>
+<entry>mone-bamus</entry>
+<entry>rege-bamus</entry>
+<entry>audi-bamus</entry>
+<entry>eramus</entry>
+</row>
+<row>
+<entry>Ma hakkasin armastama</entry>
+<entry>ama-batis</entry>
+<entry>mone-batis</entry>
+<entry>rege-batis</entry>
+<entry>audi-batis</entry>
+<entry>eratis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-bant</entry>
+<entry>mone-bant</entry>
+<entry>rege-bant</entry>
+<entry>audi-bant</entry>
+<entry>erant</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->TÄISMINEVIK (perfekt)</entry>
-<entry
->amav-i</entry>
-<entry
->monu-i</entry>
-<entry
->rex-i</entry>
-<entry
->audiv-i</entry>
-<entry
->fu-i</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-isti</entry>
-<entry
->monu-isti</entry>
-<entry
->rex-isti</entry>
-<entry
->audiv-isti</entry>
-<entry
->fu-isti</entry>
-</row>
-<row>
-<entry
->Ma olen armastanud</entry>
-<entry
->amav-it</entry>
-<entry
->monu-it</entry>
-<entry
->rex-it</entry>
-<entry
->audiv-it</entry>
-<entry
->fu-it</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-imus</entry>
-<entry
->monu-imus</entry>
-<entry
->rex-imus</entry>
-<entry
->audiv-imus</entry>
-<entry
->fu-imus</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-istis</entry>
-<entry
->monu-istis</entry>
-<entry
->rex-istis</entry>
-<entry
->audiv-istis</entry>
-<entry
->fu-istis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-erunt</entry>
-<entry
->monu-erunt</entry>
-<entry
->rex-erunt</entry>
-<entry
->audiv-erunt</entry>
-<entry
->fu-erunt</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>TÄISMINEVIK (perfekt)</entry>
+<entry>amav-i</entry>
+<entry>monu-i</entry>
+<entry>rex-i</entry>
+<entry>audiv-i</entry>
+<entry>fu-i</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-isti</entry>
+<entry>monu-isti</entry>
+<entry>rex-isti</entry>
+<entry>audiv-isti</entry>
+<entry>fu-isti</entry>
+</row>
+<row>
+<entry>Ma olen armastanud</entry>
+<entry>amav-it</entry>
+<entry>monu-it</entry>
+<entry>rex-it</entry>
+<entry>audiv-it</entry>
+<entry>fu-it</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-imus</entry>
+<entry>monu-imus</entry>
+<entry>rex-imus</entry>
+<entry>audiv-imus</entry>
+<entry>fu-imus</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-istis</entry>
+<entry>monu-istis</entry>
+<entry>rex-istis</entry>
+<entry>audiv-istis</entry>
+<entry>fu-istis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-erunt</entry>
+<entry>monu-erunt</entry>
+<entry>rex-erunt</entry>
+<entry>audiv-erunt</entry>
+<entry>fu-erunt</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->TEINE TULEVIK</entry>
-<entry
->amav-ero</entry>
-<entry
->monu-ero</entry>
-<entry
->rex-ero</entry>
-<entry
->audiv-ero</entry>
-<entry
->fu-ero</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-eris</entry>
-<entry
->monu-eris</entry>
-<entry
->rex-eris</entry>
-<entry
->audiv-eris</entry>
-<entry
->fu-eris</entry>
-</row>
-<row>
-<entry
->Ma hakkan olema armastanud</entry>
-<entry
->amav-erit</entry>
-<entry
->monu-erit</entry>
-<entry
->rex-erit</entry>
-<entry
->audiv-erit</entry>
-<entry
->fu-erit</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-erimus</entry>
-<entry
->monu-erimu</entry>
-<entry
->rex-erimus</entry>
-<entry
->audiv-erimus</entry>
-<entry
->fu-erimus</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-eritis</entry>
-<entry
->monu-eritis</entry>
-<entry
->rex-eritis</entry>
-<entry
->audiv-eritis</entry>
-<entry
->fu-eritis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-erint</entry>
-<entry
->monu-erint</entry>
-<entry
->rex-erint</entry>
-<entry
->audiv-erint</entry>
-<entry
->fu-erint</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>TEINE TULEVIK</entry>
+<entry>amav-ero</entry>
+<entry>monu-ero</entry>
+<entry>rex-ero</entry>
+<entry>audiv-ero</entry>
+<entry>fu-ero</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-eris</entry>
+<entry>monu-eris</entry>
+<entry>rex-eris</entry>
+<entry>audiv-eris</entry>
+<entry>fu-eris</entry>
+</row>
+<row>
+<entry>Ma hakkan olema armastanud</entry>
+<entry>amav-erit</entry>
+<entry>monu-erit</entry>
+<entry>rex-erit</entry>
+<entry>audiv-erit</entry>
+<entry>fu-erit</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-erimus</entry>
+<entry>monu-erimu</entry>
+<entry>rex-erimus</entry>
+<entry>audiv-erimus</entry>
+<entry>fu-erimus</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-eritis</entry>
+<entry>monu-eritis</entry>
+<entry>rex-eritis</entry>
+<entry>audiv-eritis</entry>
+<entry>fu-eritis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-erint</entry>
+<entry>monu-erint</entry>
+<entry>rex-erint</entry>
+<entry>audiv-erint</entry>
+<entry>fu-erint</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->ENNEMINEVIK</entry>
-<entry
->amav-eram</entry>
-<entry
->monu-eram</entry>
-<entry
->rex-eram</entry>
-<entry
->audiv-eram</entry>
-<entry
->fu-eram</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-eras</entry>
-<entry
->monu-eras</entry>
-<entry
->rex-eras</entry>
-<entry
->audiv-eras</entry>
-<entry
->fu-eras</entry>
-</row>
-<row>
-<entry
->Ma olin armastanud</entry>
-<entry
->amav-erat</entry>
-<entry
->monu-erat</entry>
-<entry
->rex-erat</entry>
-<entry
->audiv-erat</entry>
-<entry
->fu-erat</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-eramus</entry>
-<entry
->monu-eramus</entry>
-<entry
->rex-eramus</entry>
-<entry
->audiv-eramus</entry>
-<entry
->fu-eramus</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-eratis</entry>
-<entry
->monu-eratis</entry>
-<entry
->rex-eratis</entry>
-<entry
->audiv-eratis</entry>
-<entry
->fu-eratis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-erant</entry>
-<entry
->monu-erant</entry>
-<entry
->rex-erant</entry>
-<entry
->audiv-erant</entry>
-<entry
->fu-erant</entry>
+<entry>ENNEMINEVIK</entry>
+<entry>amav-eram</entry>
+<entry>monu-eram</entry>
+<entry>rex-eram</entry>
+<entry>audiv-eram</entry>
+<entry>fu-eram</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-eras</entry>
+<entry>monu-eras</entry>
+<entry>rex-eras</entry>
+<entry>audiv-eras</entry>
+<entry>fu-eras</entry>
+</row>
+<row>
+<entry>Ma olin armastanud</entry>
+<entry>amav-erat</entry>
+<entry>monu-erat</entry>
+<entry>rex-erat</entry>
+<entry>audiv-erat</entry>
+<entry>fu-erat</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-eramus</entry>
+<entry>monu-eramus</entry>
+<entry>rex-eramus</entry>
+<entry>audiv-eramus</entry>
+<entry>fu-eramus</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-eratis</entry>
+<entry>monu-eratis</entry>
+<entry>rex-eratis</entry>
+<entry>audiv-eratis</entry>
+<entry>fu-eratis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-erant</entry>
+<entry>monu-erant</entry>
+<entry>rex-erant</entry>
+<entry>audiv-erant</entry>
+<entry>fu-erant</entry>
 </row>
 </tbody>
 </tgroup>
@@ -640,421 +371,246 @@
 
 <table frame="none">
 <!-- Please translate the title-->
-<title
->Tegusõnad - aktiivi subjunktiiv</title>
+<title>Tegusõnad - aktiivi subjunktiiv</title>
 <tgroup cols="6" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
 <!-- Please translate -->
-<entry
->AEG</entry>
-<entry
->1.</entry>
-<entry
->2.</entry>
-<entry
->3.</entry>
-<entry
->4.</entry>
-<entry
->SUM - I</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>AEG</entry>
+<entry>1.</entry>
+<entry>2.</entry>
+<entry>3.</entry>
+<entry>4.</entry>
+<entry>SUM - I</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- translate only the first entry of each row if there is one -->
-<entry
->OLEVIK</entry>
-<entry
->ame-m</entry>
-<entry
->monea-m</entry>
-<entry
->rega-m</entry>
-<entry
->audi-o</entry>
-<entry
->sim</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ame-s</entry>
-<entry
->monea-s</entry>
-<entry
->rega-s</entry>
-<entry
->audi-s</entry>
-<entry
->sis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ame-t</entry>
-<entry
->monea-t</entry>
-<entry
->rega-t</entry>
-<entry
->audi-t</entry>
-<entry
->sit</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ame-mus</entry>
-<entry
->monea-mus</entry>
-<entry
->rega-mus</entry>
-<entry
->audi-mus</entry>
-<entry
->simus</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ame-tis</entry>
-<entry
->monea-tis</entry>
-<entry
->rega-tis</entry>
-<entry
->audi-tis</entry>
-<entry
->sitis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ame-nt</entry>
-<entry
->monea-nt</entry>
-<entry
->rega-nt</entry>
-<entry
->audi-unt</entry>
-<entry
->sint</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>OLEVIK</entry>
+<entry>ame-m</entry>
+<entry>monea-m</entry>
+<entry>rega-m</entry>
+<entry>audi-o</entry>
+<entry>sim</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ame-s</entry>
+<entry>monea-s</entry>
+<entry>rega-s</entry>
+<entry>audi-s</entry>
+<entry>sis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ame-t</entry>
+<entry>monea-t</entry>
+<entry>rega-t</entry>
+<entry>audi-t</entry>
+<entry>sit</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ame-mus</entry>
+<entry>monea-mus</entry>
+<entry>rega-mus</entry>
+<entry>audi-mus</entry>
+<entry>simus</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ame-tis</entry>
+<entry>monea-tis</entry>
+<entry>rega-tis</entry>
+<entry>audi-tis</entry>
+<entry>sitis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ame-nt</entry>
+<entry>monea-nt</entry>
+<entry>rega-nt</entry>
+<entry>audi-unt</entry>
+<entry>sint</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->LIHTMINEVIK (imperfekt)</entry>
-<entry
->ama-rem</entry>
-<entry
->mone-rem</entry>
-<entry
->rege-rem</entry>
-<entry
->audi-rem</entry>
-<entry
->essem</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-res</entry>
-<entry
->mone-res</entry>
-<entry
->rege-res</entry>
-<entry
->audi-res</entry>
-<entry
->esset</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-ret</entry>
-<entry
->mone-ret</entry>
-<entry
->rege-ret</entry>
-<entry
->audi-ret</entry>
-<entry
->esset</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-remus</entry>
-<entry
->mone-remus</entry>
-<entry
->rege-remus</entry>
-<entry
->audi-remus</entry>
-<entry
->essemus</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-retis</entry>
-<entry
->mone-retis</entry>
-<entry
->rege-retis</entry>
-<entry
->audi-retis</entry>
-<entry
->essetis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-rent</entry>
-<entry
->mone-rent</entry>
-<entry
->rege-rent</entry>
-<entry
->audi-rent</entry>
-<entry
->essent</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>LIHTMINEVIK (imperfekt)</entry>
+<entry>ama-rem</entry>
+<entry>mone-rem</entry>
+<entry>rege-rem</entry>
+<entry>audi-rem</entry>
+<entry>essem</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-res</entry>
+<entry>mone-res</entry>
+<entry>rege-res</entry>
+<entry>audi-res</entry>
+<entry>esset</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-ret</entry>
+<entry>mone-ret</entry>
+<entry>rege-ret</entry>
+<entry>audi-ret</entry>
+<entry>esset</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-remus</entry>
+<entry>mone-remus</entry>
+<entry>rege-remus</entry>
+<entry>audi-remus</entry>
+<entry>essemus</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-retis</entry>
+<entry>mone-retis</entry>
+<entry>rege-retis</entry>
+<entry>audi-retis</entry>
+<entry>essetis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-rent</entry>
+<entry>mone-rent</entry>
+<entry>rege-rent</entry>
+<entry>audi-rent</entry>
+<entry>essent</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->TÄISMINEVIK (perfekt)</entry>
-<entry
->amav-erim</entry>
-<entry
->monu-erim</entry>
-<entry
->rex-erim</entry>
-<entry
->audiv-erim</entry>
-<entry
->fu-erim</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-eris</entry>
-<entry
->monu-eris</entry>
-<entry
->rex-eris</entry>
-<entry
->audiv-eris</entry>
-<entry
->fu-eris</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-erit</entry>
-<entry
->monu-erit</entry>
-<entry
->rex-erit</entry>
-<entry
->audiv-erit</entry>
-<entry
->fu-erit</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-erimus</entry>
-<entry
->monu-erimu</entry>
-<entry
->rex-erimus</entry>
-<entry
->audiv-erimus</entry>
-<entry
->fu-erimus</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-eritis</entry>
-<entry
->monu-eritis</entry>
-<entry
->rex-eritis</entry>
-<entry
->audiv-eritis</entry>
-<entry
->fu-eritis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-erint</entry>
-<entry
->monu-erint</entry>
-<entry
->rex-erint</entry>
-<entry
->audiv-erint</entry>
-<entry
->fu-erint</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>TÄISMINEVIK (perfekt)</entry>
+<entry>amav-erim</entry>
+<entry>monu-erim</entry>
+<entry>rex-erim</entry>
+<entry>audiv-erim</entry>
+<entry>fu-erim</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-eris</entry>
+<entry>monu-eris</entry>
+<entry>rex-eris</entry>
+<entry>audiv-eris</entry>
+<entry>fu-eris</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-erit</entry>
+<entry>monu-erit</entry>
+<entry>rex-erit</entry>
+<entry>audiv-erit</entry>
+<entry>fu-erit</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-erimus</entry>
+<entry>monu-erimu</entry>
+<entry>rex-erimus</entry>
+<entry>audiv-erimus</entry>
+<entry>fu-erimus</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-eritis</entry>
+<entry>monu-eritis</entry>
+<entry>rex-eritis</entry>
+<entry>audiv-eritis</entry>
+<entry>fu-eritis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-erint</entry>
+<entry>monu-erint</entry>
+<entry>rex-erint</entry>
+<entry>audiv-erint</entry>
+<entry>fu-erint</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->ENNEMINEVIK</entry>
-<entry
->amav-issem</entry>
-<entry
->monu-issem</entry>
-<entry
->rex-issem</entry>
-<entry
->audiv-issem</entry>
-<entry
->fu-issem</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-isses</entry>
-<entry
->monu-isses</entry>
-<entry
->rex-isses</entry>
-<entry
->audiv-isses</entry>
-<entry
->fu-isses</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-isset</entry>
-<entry
->monu-isset</entry>
-<entry
->rex-isset</entry>
-<entry
->audiv-isset</entry>
-<entry
->fu-isset</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-issemus</entry>
-<entry
->monu-issemus</entry>
-<entry
->rex-issemus</entry>
-<entry
->audiv-issemus</entry>
-<entry
->fu-issemus</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-issetis</entry>
-<entry
->monu-issetis</entry>
-<entry
->rex-issetis</entry>
-<entry
->audiv-issetis</entry>
-<entry
->fu-issetis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-issent</entry>
-<entry
->monu-issent</entry>
-<entry
->rex-issent</entry>
-<entry
->audiv-issent</entry>
-<entry
->fu-issent</entry>
+<entry>ENNEMINEVIK</entry>
+<entry>amav-issem</entry>
+<entry>monu-issem</entry>
+<entry>rex-issem</entry>
+<entry>audiv-issem</entry>
+<entry>fu-issem</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-isses</entry>
+<entry>monu-isses</entry>
+<entry>rex-isses</entry>
+<entry>audiv-isses</entry>
+<entry>fu-isses</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-isset</entry>
+<entry>monu-isset</entry>
+<entry>rex-isset</entry>
+<entry>audiv-isset</entry>
+<entry>fu-isset</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-issemus</entry>
+<entry>monu-issemus</entry>
+<entry>rex-issemus</entry>
+<entry>audiv-issemus</entry>
+<entry>fu-issemus</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-issetis</entry>
+<entry>monu-issetis</entry>
+<entry>rex-issetis</entry>
+<entry>audiv-issetis</entry>
+<entry>fu-issetis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-issent</entry>
+<entry>monu-issent</entry>
+<entry>rex-issent</entry>
+<entry>audiv-issent</entry>
+<entry>fu-issent</entry>
 </row>
 </tbody>
 </tgroup>
@@ -1062,139 +618,84 @@
 
 <table frame="none">
 <!-- Please translate the title-->
-<title
->Tegusõnad - aktiivi imperatiiv</title>
+<title>Tegusõnad - aktiivi imperatiiv</title>
 <tgroup cols="6" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
 <!-- Please translate -->
-<entry
->AEG</entry>
-<entry
->1.</entry>
-<entry
->2.</entry>
-<entry
->3.</entry>
-<entry
->4.</entry>
-<entry
->SUM - I</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>AEG</entry>
+<entry>1.</entry>
+<entry>2.</entry>
+<entry>3.</entry>
+<entry>4.</entry>
+<entry>SUM - I</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- translate only the first entry of each row if there is one -->
-<entry
->OLEVIK</entry>
-<entry
->am-a</entry>
-<entry
->monu-e</entry>
-<entry
->reg-e</entry>
-<entry
->aud-i</entry>
-<entry
->es</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->am-ate</entry>
-<entry
->mon-ete</entry>
-<entry
->reg-ite</entry>
-<entry
->aud-ite</entry>
-<entry
->este</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>OLEVIK</entry>
+<entry>am-a</entry>
+<entry>monu-e</entry>
+<entry>reg-e</entry>
+<entry>aud-i</entry>
+<entry>es</entry>
+</row>
+<row>
+<entry></entry>
+<entry>am-ate</entry>
+<entry>mon-ete</entry>
+<entry>reg-ite</entry>
+<entry>aud-ite</entry>
+<entry>este</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->TULEVIK</entry>
-<entry
->am-ato</entry>
-<entry
->mon-eto</entry>
-<entry
->reg-ito</entry>
-<entry
->aud-ito</entry>
-<entry
->esto</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->am-ato</entry>
-<entry
->mon-eto</entry>
-<entry
->reg-ito</entry>
-<entry
->aud-ito</entry>
-<entry
->esto</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->am-atote</entry>
-<entry
->mon-etote</entry>
-<entry
->reg-itote</entry>
-<entry
->aud-itote</entry>
-<entry
->estote</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->am-anto</entry>
-<entry
->mon-ento</entry>
-<entry
->reg-unto</entry>
-<entry
->aud-iunto</entry>
-<entry
->sunto</entry>
+<entry>TULEVIK</entry>
+<entry>am-ato</entry>
+<entry>mon-eto</entry>
+<entry>reg-ito</entry>
+<entry>aud-ito</entry>
+<entry>esto</entry>
+</row>
+<row>
+<entry></entry>
+<entry>am-ato</entry>
+<entry>mon-eto</entry>
+<entry>reg-ito</entry>
+<entry>aud-ito</entry>
+<entry>esto</entry>
+</row>
+<row>
+<entry></entry>
+<entry>am-atote</entry>
+<entry>mon-etote</entry>
+<entry>reg-itote</entry>
+<entry>aud-itote</entry>
+<entry>estote</entry>
+</row>
+<row>
+<entry></entry>
+<entry>am-anto</entry>
+<entry>mon-ento</entry>
+<entry>reg-unto</entry>
+<entry>aud-iunto</entry>
+<entry>sunto</entry>
 </row>
 </tbody>
 </tgroup>
@@ -1202,70 +703,44 @@
 
 <table frame="none">
 <!-- Please translate the title-->
-<title
->Tegusõnad - aktiivi gerundium</title>
+<title>Tegusõnad - aktiivi gerundium</title>
 <tgroup cols="5" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
-<entry
-></entry>
-<entry
->1.</entry>
-<entry
->2.</entry>
-<entry
->3.</entry>
-<entry
->4.</entry>
-</row>
-<row>
-<entry
->Akusatiiv</entry>
-<entry
->(ad) am-andum</entry>
-<entry
->(ad) mon-endum</entry>
-<entry
->(ad) reg-endum</entry>
-<entry
->(ad) aud-iendum</entry>
-</row>
-<row>
-<entry
->Genitiiv</entry>
-<entry
->am-andi</entry>
-<entry
->mon-endi</entry>
-<entry
->reg-endi</entry>
-<entry
->aud-iendi</entry>
-</row>
-<row>
-<entry
->Daativ</entry>
-<entry
->am-ando</entry>
-<entry
->mon-endo</entry>
-<entry
->reg-endo</entry>
-<entry
->aud-iendo</entry>
-</row>
-<row>
-<entry
->Ablatiiv</entry>
-<entry
->am-ando</entry>
-<entry
->mon-endo</entry>
-<entry
->reg-endo</entry>
-<entry
->aud-iendo</entry>
+<entry></entry>
+<entry>1.</entry>
+<entry>2.</entry>
+<entry>3.</entry>
+<entry>4.</entry>
+</row>
+<row>
+<entry>Akusatiiv</entry>
+<entry>(ad) am-andum</entry>
+<entry>(ad) mon-endum</entry>
+<entry>(ad) reg-endum</entry>
+<entry>(ad) aud-iendum</entry>
+</row>
+<row>
+<entry>Genitiiv</entry>
+<entry>am-andi</entry>
+<entry>mon-endi</entry>
+<entry>reg-endi</entry>
+<entry>aud-iendi</entry>
+</row>
+<row>
+<entry>Daativ</entry>
+<entry>am-ando</entry>
+<entry>mon-endo</entry>
+<entry>reg-endo</entry>
+<entry>aud-iendo</entry>
+</row>
+<row>
+<entry>Ablatiiv</entry>
+<entry>am-ando</entry>
+<entry>mon-endo</entry>
+<entry>reg-endo</entry>
+<entry>aud-iendo</entry>
 </row>
 </tbody>
 </tgroup>
@@ -1273,80 +748,49 @@
 
 <table frame="none">
 <!-- Please translate the title-->
-<title
->Tegusõnad - aktiivi infinitiiv</title>
+<title>Tegusõnad - aktiivi infinitiiv</title>
 <tgroup cols="6" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
-<entry
->AEG</entry>
-<entry
->1.</entry>
-<entry
->2.</entry>
-<entry
->3.</entry>
-<entry
->4.</entry>
-<entry
->SUM - I</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-</row>
-<row>
-<entry
->OLEVIK</entry>
-<entry
->am-are</entry>
-<entry
->mon-ere</entry>
-<entry
->reg-ere</entry>
-<entry
->aud-ire</entry>
-<entry
->esse</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-</row>
-<row>
-<entry
->TÄISMINEVIK (perfekt)</entry>
-<entry
->amav-isse</entry>
-<entry
->monu-isse</entry>
-<entry
->rex-isse</entry>
-<entry
->audiv-isse</entry>
-<entry
->fu-isse</entry>
+<entry>AEG</entry>
+<entry>1.</entry>
+<entry>2.</entry>
+<entry>3.</entry>
+<entry>4.</entry>
+<entry>SUM - I</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+</row>
+<row>
+<entry>OLEVIK</entry>
+<entry>am-are</entry>
+<entry>mon-ere</entry>
+<entry>reg-ere</entry>
+<entry>aud-ire</entry>
+<entry>esse</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+</row>
+<row>
+<entry>TÄISMINEVIK (perfekt)</entry>
+<entry>amav-isse</entry>
+<entry>monu-isse</entry>
+<entry>rex-isse</entry>
+<entry>audiv-isse</entry>
+<entry>fu-isse</entry>
 </row>
 </tbody>
 </tgroup>
@@ -1354,80 +798,49 @@
 
 <table frame="none">
 <!-- Please translate the title-->
-<title
->Tegusõnad - aktiivi partitsiip</title>
+<title>Tegusõnad - aktiivi partitsiip</title>
 <tgroup cols="6" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
-<entry
->AEG</entry>
-<entry
->1.</entry>
-<entry
->2.</entry>
-<entry
->3.</entry>
-<entry
->4.</entry>
-<entry
->SUM - I</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-</row>
-<row>
-<entry
->OLEVIK</entry>
-<entry
->am-ans,-antis</entry>
-<entry
->mon-ens,-entis</entry>
-<entry
->reg-ens,-entis</entry>
-<entry
->aud-iens,-ientis</entry>
-<entry
-></entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-</row>
-<row>
-<entry
->TULEVIK</entry>
-<entry
->amat-urus,-a,-um</entry>
-<entry
->monit-urus,-a,-um</entry>
-<entry
->rect-urus,-a,-um</entry>
-<entry
->audit-urus,-a,-um</entry>
-<entry
->futurus,-a,-um</entry>
+<entry>AEG</entry>
+<entry>1.</entry>
+<entry>2.</entry>
+<entry>3.</entry>
+<entry>4.</entry>
+<entry>SUM - I</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+</row>
+<row>
+<entry>OLEVIK</entry>
+<entry>am-ans,-antis</entry>
+<entry>mon-ens,-entis</entry>
+<entry>reg-ens,-entis</entry>
+<entry>aud-iens,-ientis</entry>
+<entry></entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+</row>
+<row>
+<entry>TULEVIK</entry>
+<entry>amat-urus,-a,-um</entry>
+<entry>monit-urus,-a,-um</entry>
+<entry>rect-urus,-a,-um</entry>
+<entry>audit-urus,-a,-um</entry>
+<entry>futurus,-a,-um</entry>
 </row>
 </tbody>
 </tgroup>
@@ -1435,545 +848,323 @@
 
 <table frame="none">
 <!-- Please translate the title-->
-<title
->Tegusõnad - passiivi indikatiiv</title>
+<title>Tegusõnad - passiivi indikatiiv</title>
 <tgroup align="center" cols="5" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
 <!-- Please translate -->
-<entry
->AEG</entry>
-<entry
->1.</entry>
-<entry
->2.</entry>
-<entry
->3.</entry>
-<entry
->4.</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>AEG</entry>
+<entry>1.</entry>
+<entry>2.</entry>
+<entry>3.</entry>
+<entry>4.</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->OLEVIK</entry>
-<entry
->am-or</entry>
-<entry
->mone-or</entry>
-<entry
->reg-or</entry>
-<entry
->audi-or</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-ris</entry>
-<entry
->mone-ris</entry>
-<entry
->reg-eris</entry>
-<entry
->audi-eris</entry>
-</row>
-<row>
-<entry
->Mind armastatakse</entry>
-<entry
->ama-tur</entry>
-<entry
->mone-tur</entry>
-<entry
->regi-tur</entry>
-<entry
->audi-tur</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-mur</entry>
-<entry
->mone-mur</entry>
-<entry
->regi-mur</entry>
-<entry
->audi-mur</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-mini</entry>
-<entry
->mone-mini</entry>
-<entry
->regi-mini</entry>
-<entry
->audi-mini</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-ntur</entry>
-<entry
->mone-ntur</entry>
-<entry
->regu-ntur</entry>
-<entry
->audiu-unt</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>OLEVIK</entry>
+<entry>am-or</entry>
+<entry>mone-or</entry>
+<entry>reg-or</entry>
+<entry>audi-or</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-ris</entry>
+<entry>mone-ris</entry>
+<entry>reg-eris</entry>
+<entry>audi-eris</entry>
+</row>
+<row>
+<entry>Mind armastatakse</entry>
+<entry>ama-tur</entry>
+<entry>mone-tur</entry>
+<entry>regi-tur</entry>
+<entry>audi-tur</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-mur</entry>
+<entry>mone-mur</entry>
+<entry>regi-mur</entry>
+<entry>audi-mur</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-mini</entry>
+<entry>mone-mini</entry>
+<entry>regi-mini</entry>
+<entry>audi-mini</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-ntur</entry>
+<entry>mone-ntur</entry>
+<entry>regu-ntur</entry>
+<entry>audiu-unt</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->TULEVIK</entry>
-<entry
->ama-bor</entry>
-<entry
->mone-bor</entry>
-<entry
->reg-ar</entry>
-<entry
->audi-ar</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-beris</entry>
-<entry
->mone-beris</entry>
-<entry
->reg-eris</entry>
-<entry
->audi-eris</entry>
-</row>
-<row>
-<entry
->Mind hakatakse armastama</entry>
-<entry
->ama-bitur</entry>
-<entry
->mone-bitur</entry>
-<entry
->reg-etur</entry>
-<entry
->audi-etur</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-bimur</entry>
-<entry
->mone-bimur</entry>
-<entry
->reg-emur</entry>
-<entry
->audi-emur</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-bimini</entry>
-<entry
->mone-bimini</entry>
-<entry
->reg-emini</entry>
-<entry
->audi-emini</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-buntur</entry>
-<entry
->mone-buntur</entry>
-<entry
->reg-entur</entry>
-<entry
->audi-entur</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>TULEVIK</entry>
+<entry>ama-bor</entry>
+<entry>mone-bor</entry>
+<entry>reg-ar</entry>
+<entry>audi-ar</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-beris</entry>
+<entry>mone-beris</entry>
+<entry>reg-eris</entry>
+<entry>audi-eris</entry>
+</row>
+<row>
+<entry>Mind hakatakse armastama</entry>
+<entry>ama-bitur</entry>
+<entry>mone-bitur</entry>
+<entry>reg-etur</entry>
+<entry>audi-etur</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-bimur</entry>
+<entry>mone-bimur</entry>
+<entry>reg-emur</entry>
+<entry>audi-emur</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-bimini</entry>
+<entry>mone-bimini</entry>
+<entry>reg-emini</entry>
+<entry>audi-emini</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-buntur</entry>
+<entry>mone-buntur</entry>
+<entry>reg-entur</entry>
+<entry>audi-entur</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->LIHTMINEVIK (imperfekt)</entry>
-<entry
->ama-bar</entry>
-<entry
->mone-bar</entry>
-<entry
->rege-bar</entry>
-<entry
->audie-bar</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-baris</entry>
-<entry
->mone-baris</entry>
-<entry
->rege-baris</entry>
-<entry
->audie-baris</entry>
-</row>
-<row>
-<entry
->Mind armastati</entry>
-<entry
->ama-batur</entry>
-<entry
->mone-batur</entry>
-<entry
->rege-batur</entry>
-<entry
->audie-batur</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-bamur</entry>
-<entry
->mone-bamur</entry>
-<entry
->rege-bamur</entry>
-<entry
->audie-bamur</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-bamini</entry>
-<entry
->mone-bamini</entry>
-<entry
->rege-bamini</entry>
-<entry
->audie-bamini</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-bantur</entry>
-<entry
->mone-bantur</entry>
-<entry
->rege-bantur</entry>
-<entry
->audie-bantur</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>LIHTMINEVIK (imperfekt)</entry>
+<entry>ama-bar</entry>
+<entry>mone-bar</entry>
+<entry>rege-bar</entry>
+<entry>audie-bar</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-baris</entry>
+<entry>mone-baris</entry>
+<entry>rege-baris</entry>
+<entry>audie-baris</entry>
+</row>
+<row>
+<entry>Mind armastati</entry>
+<entry>ama-batur</entry>
+<entry>mone-batur</entry>
+<entry>rege-batur</entry>
+<entry>audie-batur</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-bamur</entry>
+<entry>mone-bamur</entry>
+<entry>rege-bamur</entry>
+<entry>audie-bamur</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-bamini</entry>
+<entry>mone-bamini</entry>
+<entry>rege-bamini</entry>
+<entry>audie-bamini</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-bantur</entry>
+<entry>mone-bantur</entry>
+<entry>rege-bantur</entry>
+<entry>audie-bantur</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->TÄISMINEVIK (perfekt)</entry>
-<entry
->amatus sum</entry>
-<entry
->monitus sum</entry>
-<entry
->rectus sum</entry>
-<entry
->auditus sum</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amatus es</entry>
-<entry
->monitus es</entry>
-<entry
->rectus es</entry>
-<entry
->auditus es</entry>
-</row>
-<row>
-<entry
->Mind on armastatud</entry>
-<entry
->amatus est</entry>
-<entry
->monitus est</entry>
-<entry
->rectus est</entry>
-<entry
->auditus est</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amati sumus</entry>
-<entry
->moniti sumus</entry>
-<entry
->recti sumus</entry>
-<entry
->auditi sumus</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amati estis</entry>
-<entry
->moniti estis</entry>
-<entry
->recti estis</entry>
-<entry
->auditi estis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amati sunt</entry>
-<entry
->moniti sunt</entry>
-<entry
->recti sunt</entry>
-<entry
->auditi sunt</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>TÄISMINEVIK (perfekt)</entry>
+<entry>amatus sum</entry>
+<entry>monitus sum</entry>
+<entry>rectus sum</entry>
+<entry>auditus sum</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amatus es</entry>
+<entry>monitus es</entry>
+<entry>rectus es</entry>
+<entry>auditus es</entry>
+</row>
+<row>
+<entry>Mind on armastatud</entry>
+<entry>amatus est</entry>
+<entry>monitus est</entry>
+<entry>rectus est</entry>
+<entry>auditus est</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amati sumus</entry>
+<entry>moniti sumus</entry>
+<entry>recti sumus</entry>
+<entry>auditi sumus</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amati estis</entry>
+<entry>moniti estis</entry>
+<entry>recti estis</entry>
+<entry>auditi estis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amati sunt</entry>
+<entry>moniti sunt</entry>
+<entry>recti sunt</entry>
+<entry>auditi sunt</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->TEINE TULEVIK</entry>
-<entry
->amatus ero</entry>
-<entry
->monitus ero</entry>
-<entry
->rectus ero</entry>
-<entry
->auditus ero</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amatus eris</entry>
-<entry
->monitus eris</entry>
-<entry
->rectus eris</entry>
-<entry
->auditus eris</entry>
-</row>
-<row>
-<entry
->Ma hakkan olema oldud armastatud</entry>
-<entry
->amatus erit</entry>
-<entry
->monitus erit</entry>
-<entry
->rectus erit</entry>
-<entry
->auditus erit</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amati erimus</entry>
-<entry
->moniti erimus</entry>
-<entry
->recti erimus</entry>
-<entry
->auditi erimus</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amati eritis</entry>
-<entry
->moniti eritis</entry>
-<entry
->recti eritis</entry>
-<entry
->auditi eritis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amati erunt</entry>
-<entry
->moniti erunt</entry>
-<entry
->recti erunt</entry>
-<entry
->auditi erunt</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>TEINE TULEVIK</entry>
+<entry>amatus ero</entry>
+<entry>monitus ero</entry>
+<entry>rectus ero</entry>
+<entry>auditus ero</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amatus eris</entry>
+<entry>monitus eris</entry>
+<entry>rectus eris</entry>
+<entry>auditus eris</entry>
+</row>
+<row>
+<entry>Ma hakkan olema oldud armastatud</entry>
+<entry>amatus erit</entry>
+<entry>monitus erit</entry>
+<entry>rectus erit</entry>
+<entry>auditus erit</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amati erimus</entry>
+<entry>moniti erimus</entry>
+<entry>recti erimus</entry>
+<entry>auditi erimus</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amati eritis</entry>
+<entry>moniti eritis</entry>
+<entry>recti eritis</entry>
+<entry>auditi eritis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amati erunt</entry>
+<entry>moniti erunt</entry>
+<entry>recti erunt</entry>
+<entry>auditi erunt</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->ENNEMINEVIK</entry>
-<entry
->amatus eram</entry>
-<entry
->monitus eram</entry>
-<entry
->rectus eram</entry>
-<entry
->auditus eram</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amatus eras</entry>
-<entry
->monitus eras</entry>
-<entry
->rectus eras</entry>
-<entry
->auditus eras</entry>
-</row>
-<row>
-<entry
->Ma olen olnud armastatud</entry>
-<entry
->amatus erat</entry>
-<entry
->monitus erat</entry>
-<entry
->rectus erat</entry>
-<entry
->auditus erat</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amati eramus</entry>
-<entry
->moniti eramus</entry>
-<entry
->recti eramus</entry>
-<entry
->auditi eramus</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amati eratis</entry>
-<entry
->moniti eratis</entry>
-<entry
->recti eratis</entry>
-<entry
->auditi eratis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amati erant</entry>
-<entry
->moniti erant</entry>
-<entry
->recti erant</entry>
-<entry
->auditi erant</entry>
+<entry>ENNEMINEVIK</entry>
+<entry>amatus eram</entry>
+<entry>monitus eram</entry>
+<entry>rectus eram</entry>
+<entry>auditus eram</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amatus eras</entry>
+<entry>monitus eras</entry>
+<entry>rectus eras</entry>
+<entry>auditus eras</entry>
+</row>
+<row>
+<entry>Ma olen olnud armastatud</entry>
+<entry>amatus erat</entry>
+<entry>monitus erat</entry>
+<entry>rectus erat</entry>
+<entry>auditus erat</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amati eramus</entry>
+<entry>moniti eramus</entry>
+<entry>recti eramus</entry>
+<entry>auditi eramus</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amati eratis</entry>
+<entry>moniti eratis</entry>
+<entry>recti eratis</entry>
+<entry>auditi eratis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amati erant</entry>
+<entry>moniti erant</entry>
+<entry>recti erant</entry>
+<entry>auditi erant</entry>
 </row>
 </tbody>
 </tgroup>
@@ -1981,40 +1172,27 @@
 
 <table frame="none">
 <!-- Please translate the title-->
-<title
->Tegusõnad - passiivi gerundiiv</title>
+<title>Tegusõnad - passiivi gerundiiv</title>
 <tgroup cols="4" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
-<entry
->1.</entry>
-<entry
->2.</entry>
-<entry
->3.</entry>
-<entry
->4.</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-</row>
-<row>
-<entry
->am-andus,-a,-um</entry>
-<entry
->mon-endus,-a,-um</entry>
-<entry
->reg-endus,-a,-um</entry>
-<entry
->aud-iendus,-a,-um</entry>
+<entry>1.</entry>
+<entry>2.</entry>
+<entry>3.</entry>
+<entry>4.</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+</row>
+<row>
+<entry>am-andus,-a,-um</entry>
+<entry>mon-endus,-a,-um</entry>
+<entry>reg-endus,-a,-um</entry>
+<entry>aud-iendus,-a,-um</entry>
 </row>
 </tbody>
 </tgroup>
@@ -2022,106 +1200,65 @@
 
 <table frame="none">
 <!-- Please translate the title-->
-<title
->Tegusõnad - passiivi infinitiiv</title>
+<title>Tegusõnad - passiivi infinitiiv</title>
 <tgroup cols="5" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
-<entry
->AEG</entry>
-<entry
->1.</entry>
-<entry
->2.</entry>
-<entry
->3.</entry>
-<entry
->4.</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-</row>
-<row>
-<entry
->OLEVIK</entry>
-<entry
->am-ari</entry>
-<entry
->mon-eri</entry>
-<entry
->reg-i</entry>
-<entry
->aud-iri</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-</row>
-<row>
-<entry
->TÄISMINEVIK (perfekt)</entry>
-<entry
->amat-um,-am,-um esse</entry>
-<entry
->monit-um,-am,-um esse</entry>
-<entry
->rect-um,-am,-um esse</entry>
-<entry
->audit-um,-am,-um esse</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amat-os,-as,-a esse</entry>
-<entry
->monit-os,-as,-a esse</entry>
-<entry
->rect-os,-as,-a esse</entry>
-<entry
->audit-os,-as,-a esse</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-</row>
-<row>
-<entry
->TULEVIK</entry>
-<entry
->amat-um iri</entry>
-<entry
->monit-um iri</entry>
-<entry
->rect-um iri</entry>
-<entry
->audit-um iri</entry>
+<entry>AEG</entry>
+<entry>1.</entry>
+<entry>2.</entry>
+<entry>3.</entry>
+<entry>4.</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+</row>
+<row>
+<entry>OLEVIK</entry>
+<entry>am-ari</entry>
+<entry>mon-eri</entry>
+<entry>reg-i</entry>
+<entry>aud-iri</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+</row>
+<row>
+<entry>TÄISMINEVIK (perfekt)</entry>
+<entry>amat-um,-am,-um esse</entry>
+<entry>monit-um,-am,-um esse</entry>
+<entry>rect-um,-am,-um esse</entry>
+<entry>audit-um,-am,-um esse</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amat-os,-as,-a esse</entry>
+<entry>monit-os,-as,-a esse</entry>
+<entry>rect-os,-as,-a esse</entry>
+<entry>audit-os,-as,-a esse</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+</row>
+<row>
+<entry>TULEVIK</entry>
+<entry>amat-um iri</entry>
+<entry>monit-um iri</entry>
+<entry>rect-um iri</entry>
+<entry>audit-um iri</entry>
 </row>
 </tbody>
 </tgroup>