Update Estonian translation

3 files changed, 69 insertions, 25 deletions

diff --git a/docs/docs/stable/bootiso/et/NetInstall-cover.xml b/docs/docs/stable/bootiso/et/NetInstall-cover.xml
index fd2f86b2..a3a7a41d 100644
--- a/docs/docs/stable/bootiso/et/NetInstall-cover.xml
+++ b/docs/docs/stable/bootiso/et/NetInstall-cover.xml
@@ -1,39 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
-<book xmlns="http://docbook.org/ns/docbook" 
-      xmlns:xi="http://www.w3.org/2001/XInclude" 
-      xmlns:ns6="http://www.w3.org/1999/xlink" 
-      xmlns:ns5="http://www.w3.org/1998/Math/MathML" 
-      xmlns:ns4="http://www.w3.org/1999/xhtml" 
-      xmlns:ns3="http://www.w3.org/2000/svg" 
-      xmlns:ns="http://docbook.org/ns/docbook" 
-      version="5.0" xml:lang="et" xml:id="NetInstall">
-
+<book xmlns="http://docbook.org/ns/docbook"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xmlns:ns62="http://docbook.org/ns/transclusion"
+      xmlns:ns6="http://www.w3.org/1999/xlink"
+      xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+      xmlns:ns4="http://www.w3.org/1999/xhtml"
+      xmlns:ns3="http://www.w3.org/2000/svg"
+      xmlns:ns="http://docbook.org/ns/docbook"
+      version="5.0" xml:lang="et" xml:id="NetInstall-cover">
   <info>
-    <title>Paigaldamine väikese alglaadimistõmmise abil</title>
+    <title>Mageia võrgupaigaldus</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>mai 2018</date>
+
+        <revremark>Mageia 7</revremark>
+      </revision>
+    </revhistory>
+
     <cover>
       <para role="tagline">Tööriist Mageia paigaldamiseks võrguhoidlast</para>
+
       <mediaobject>
         <imageobject>
           <imagedata fileref="../mageia-2013.png"/>
         </imageobject>
       </mediaobject>
 
-	    <para>Käsiraamatu tekst ja ekraanipildid on litsenseeritud vastavalt CC BY-SA 3.0
+      <para>Käsiraamatu tekst ja ekraanipildid on litsenseeritud vastavalt CC BY-SA 3.0
 litsentsile <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-	    </para>
-	    <para>Käsiraamat on valmistatud <link ns6:href="http://www.calenco.com">Calenco
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Käsiraamat on valmistatud <link ns6:href="http://www.calenco.com">Calenco
 CMS</link>'i abil, mille on välja töötanud <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.
-	    </para>
-            <para>Käsiraamatu on kirjutanud ja tõlkinud vabatahtlikud oma vabast ajast. Kui
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>Käsiraamatu on kirjutanud ja tõlkinud vabatahtlikud oma vabast ajast. Kui
 soovite kaasa aidata käsiraamatu paremaks muutmisele, võtke ühendust <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskonnaga</link>.</para>
     </cover>
   </info>
+
   <article>
-  
-<xi:include href="bootIso.xml"></xi:include>
+    <title>Mageia paigaldamine väikese alglaadimistõmmise abil</title>
+
+    <xi:include href="netInstall-intro.xml"/>
+
+    <xi:include href="netInstall-stage1.xml"/>
 
-</article>
+    <xi:include href="netInstall-stage2.xml"/>
+  </article>
 </book>
diff --git a/docs/docs/stable/bootiso/et/NetInstall.xml b/docs/docs/stable/bootiso/et/NetInstall.xml
index 05107fc2..5bc41fe8 100644
--- a/docs/docs/stable/bootiso/et/NetInstall.xml
+++ b/docs/docs/stable/bootiso/et/NetInstall.xml
@@ -1,9 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<article xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="et" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns62="http://docbook.org/ns/transclusion"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!-- <xi:include href="drakx-intro.xml"/>
  -->
+<!-- 2018/??/?? apb: a) Bit of a re-word/format.
+  b) Disabled the XInclude for bootIso.xml, and included its contents directly within this NetInstall.xml instead. It does not seem practical to have NetInstall.xml acting as the header for
+  just bootIso.xml. As it was, there were basically two competing titles (one for NetInstall and one for bootIso), and this also resulted in an unnecessary extra nest level for bootIso sections.
+  c) I have also (via xi:include) bolted on the Classical Installer XML's (starting from Please Choose a Language) to Stage 2. This seems better than just pointing people to the documentation.
+  d) Update some PNG's to Mga6 and center-align all PNG's. Added a PNG each for NFS and 3rd-party. Uploaded a renamed set of PNG's (from Boot/boot-iso/imgx/x.png to netInstall-xx.png) and using those instead.
+  e) Made a couple of web-link pointers verbose (instead of see "here"). -->
+<!-- <xi:include href="bootIso.xml"/>
+ -->
+<!-- 2018/05/18 apb: Split the body into 3 parts: netInstall-intro.xml, netInstall-stage1.xml and netInstall-stage2.xml -->
 <info>
-    <title>Paigaldamine väikese alglaadimistõmmise abil</title>
+    <title>Mageia võrgupaigaldus</title>
+
+    <subtitle>Mageia paigaldamine väikese alglaadimistõmmise abil</subtitle>
 
     <cover>
       <para><note>
@@ -25,9 +43,18 @@ soovite kaasa aidata käsiraamatu paremaks muutmisele, võtke ühendust <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskonnaga</link>.</para>
     </cover>
   </info>
+
   
+
   
 
-  <xi:include href="bootIso.xml"/>
+  
+
+  
+
+  <xi:include href="netInstall-intro.xml"/>
+
+  <xi:include href="netInstall-stage1.xml"/>
 
+  <xi:include href="netInstall-stage2.xml"/>
 </article>
diff --git a/docs/docs/stable/bootiso/et/bootIso.xml b/docs/docs/stable/bootiso/et/bootIso.xml
index ec90528f..603d9269 100644
--- a/docs/docs/stable/bootiso/et/bootIso.xml
+++ b/docs/docs/stable/bootiso/et/bootIso.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="et" xml:id="SOME_UNIQUE_ID">
+<?xml version='1.0' encoding='utf-8'?><section version="5.0" xml:lang="et" xml:id="SOME_UNIQUE_ID" xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns6="http://www.w3.org/1999/xlink">
   <info>
     <title xml:id="bootIso-ti1">Paigaldamine väikese alglaadimistõmmise abil</title>
   </info>