Sync all translations

1 files changed, 63 insertions, 28 deletions

diff --git a/docs/docs/stable/installer/et/selectLanguage.xml b/docs/docs/stable/installer/et/selectLanguage.xml
index d63e74c5..398a5cad 100644
--- a/docs/docs/stable/installer/et/selectLanguage.xml
+++ b/docs/docs/stable/installer/et/selectLanguage.xml
@@ -1,4 +1,23 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="selectLanguage">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="selectLanguage"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -17,49 +36,65 @@
        code in figure, marja, 20120409 -->
 <!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
        up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
 <title xml:id="selectLanguage-ti1">Kasutatava keele valimine</title>
   </info>
 
-  <para condition="classical">Valige vajalik keel, laiendades nimekirja kõigepealt maailmajao järgi.
-<application>Mageia</application> kasutab langetatud valikut nii
-paigaldamise ajal kui ka paigaldatud süsteemis.</para>
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+    </listitem>
 
-  <para condition="live">Valige vajalik keel.  <application>Mageia</application> kasutab langetatud
-valikut nii paigaldamise ajal kui ka paigaldatud süsteemis.</para>
+    <listitem condition="live">
+      <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+    </listitem>
 
-  <para condition="classical">Kui teie süsteemi tuleks paigaldada mitu keelt kas teie enda või teiste
-kasutajate tarbeks, siis tuleks nupule <guibutton>Mitme keele
-valimine</guibutton> klõpsates need kõik kohe lisada. Pärast paigaldamist on
-uute keelte lisamine juba palju keerulisem.</para>
+    <listitem condition="classical">
+      <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
+extra language support after installation.</para>
+    </listitem>
+  </itemizedlist>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-selectLanguage.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata fileref="live-language.png"
-format=""/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <warning condition="classical">
-    <para>Isegi kui paigaldate mitu keelt, tuleb üks neist valida esimesel ekraanil
-eelistatud keeleks. See keel on märgitud ka mitme keele valimise ekraanil.</para>
-  </warning>
+  <important condition="classical">
+    <para>Even if you choose more than one language, you must first choose one as your
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+  </important>
 
   <itemizedlist>
     <listitem condition="classical">
-      <para>Kui klaviatuuri keel ei sobi kokku eelistatud keelega, oleks mõistlik
-paigaldada kohe ka klaviatuurile vastav keel.</para>
+      <para>If your keyboard language is not the same as your preferred language, then
+it is advisable to install the required language for your keyboard as well</para>
     </listitem>
 
     <listitem>
-      <para>Mageia toetab vaikimisi UTF-8 (Unicode).</para>
-
-      <para condition="classical">Selle võib keelata <emphasis role="bold">mitme keele valimise</emphasis>
-ekraanil, kui olete kindel, et see teie keelele kohe üldse ei sobi. UTF-8
-keelamine rakendub kõigile paigaldatavatele keeltele.</para>
+      <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
+languages.</para>
     </listitem>
 
     <listitem>
-      <para>Oma süsteemi keelt saab pärast paigaldamist muuta, valides Mageia
-juhtimiskeskus -> Süsteem -> Süsteemi lokaliseerimine.</para>
+      <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>