Update catalogs + Ukrainian translation

1 files changed, 1418 insertions, 1418 deletions

diff --git a/docs/installer/et.po b/docs/installer/et.po
index 6a460a4e..eb384af4 100644
--- a/docs/installer/et.po
+++ b/docs/installer/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Installer Help\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2013-07-07 10:48+0400\n"
+"POT-Creation-Date: 2013-10-09 20:39+0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Estonian <i18n-discuss@ml.mageia.org>\n"
@@ -86,6 +86,67 @@ msgstr ""
 "väljalaskes uut, klõpsake nupule <guibutton>Info väljalaske kohta</"
 "guibutton>."
 
+#. type: Attribute 'xml:lang' of: <section>
+#: en/add_supplemental_media.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+msgid "en"
+msgstr "et"
+
+#. type: Content of: <section><info><title>
+#: en/add_supplemental_media.xml:10
+msgid "Media Selection (Configure Supplemental Installation Media)"
+msgstr "Andmekandjate valik (täiendavate paigaldusandmekandjate seadistamine)"
+
+#.  papoteur 2013-04-13  - created 
+#.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
+#.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
+#. type: Content of: <section><mediaobject>
+#: en/add_supplemental_media.xml:18
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
+"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
+"add_supplemental_media-im1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
+"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
+"add_supplemental_media-im1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/add_supplemental_media.xml:24
+msgid ""
+"This screen gives you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source. The "
+"source selection determines which packages will be available for selection "
+"during the next steps."
+msgstr ""
+"Siin on näha juba tuvastatud hoidlad. Võite lisada ka teisi allikaid, kust "
+"tarkvarapakette hankida, näiteks plaadi pealt või internetist. Allikate "
+"valik määrab, milliseid tarkvarapakette saab järgmistel etappidel kasutada."
+
+#. type: Content of: <section><para>
+#: en/add_supplemental_media.xml:29
+msgid "For a network source, there are two steps to follow:"
+msgstr "Võrguallika korral tuleb lisaks ette võtta järgmised sammud:"
+
+#. type: Content of: <section><orderedlist><listitem><para>
+#: en/add_supplemental_media.xml:33
+msgid "Choosing and activation of the network, if not already up."
+msgstr "Valida ja aktiveerida võrk, kui see veel ei tööta."
+
+#. type: Content of: <section><orderedlist><listitem><para>
+#: en/add_supplemental_media.xml:37
+#, fuzzy
+msgid ""
+"Selecting a mirror or specifying a URL (very first entry). By selecting a "
+"mirror, you have access to the selection of all repositories managed by "
+"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
+"the URL, you can designate a specific repository or your own NFS "
+"installation."
+msgstr ""
+"Valida peegel või määrata URL (esimene kirje). Peegli valimisel saab "
+"kasutada kõiki Mageia määratud hoidlaid, sealhulgas mittevaba (non-free) ja "
+"piirangutega (tainted) tarkvara ja uuendusi sisaldavaid hoidlaid. URL-i "
+"määrates saab kasutada mõnda konkreetset hoidlat või omaenda NFS-allikat."
+
 #. type: Content of: <section><info><title>
 #: en/addUser.xml:4
 msgid "User and Superuser Management"
@@ -449,550 +510,665 @@ msgstr ""
 "DrakX soovitab, või rohkem."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:18
-msgid "DrakX, the Mageia Installer"
-msgstr "Mageia paigaldusprogramm DrakX"
+#: en/chooseDesktop.xml:5
+msgid "Desktop Selection"
+msgstr "Töölaua valimine"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/chooseDesktop.xml:11
 msgid ""
-"Whether you are new to GNU-Linux or an experienced user, the Mageia "
-"Installer is designed to help make your installation or upgrade as easy as "
-"possible."
+"Depending on your selection here, you may be offered further screens to fine "
+"tune your choice."
 msgstr ""
-"Sõltumata sellest, kas olete GNU-Linuxi maailmas uustulnuk või juba kogenud "
-"kasutaja, on Mageia paigaldusprogramm loodud nii, et paigaldamine või "
-"uuendamine oleks kõigile võimalikult lihtne."
+"Sõltuvalt siin langetatud valikutest võite näha täiendavaid ekraane, kus "
+"saab valikut täpsustada."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/chooseDesktop.xml:13
 msgid ""
-"The initial menu screen has various options, however the default one will "
-"start the installer, which will normally be all that you will need."
+"After the selection step(s), you will see a slide show during package "
+"installation. The slide show can be disabled by pressing the "
+"<guilabel>Details</guilabel> button"
 msgstr ""
-"Avamenüüs näete mitmeid valikuid, kuid vaikimisi valitu käivitab "
-"paigaldusprogrammi, mida tavaliselt ongi vaja."
+"Pärast valiku(te) langetamist näeb pakettide paigaldamise ajal "
+"slaidiseanssi. Sellest saab loobuda, kui klõpsata nupule "
+"<guilabel>Üksikasjad</guilabel>."
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
-msgid "Installation Welcome Screen"
-msgstr "Paigaldusprogrammi avaekraan"
+#. type: Content of: <section><mediaobject>
+#: en/chooseDesktop.xml:20
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
+"format=\"PNG\" ></imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-chooseDesktop.png\" "
+"format=\"PNG\" /> </imageobject>"
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#. type: Content of: <section><para>
+#: en/chooseDesktop.xml:26
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"Choose whether you prefer to use the <application>KDE</application> or "
+"<application>Gnome</application> desktop environment. Both come with a full "
+"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
+"you want to use neither or both, or if you want something other than the "
+"default software choices for these desktop environments. The "
+"<application>LXDE</application> desktop is lighter than the previous two, "
+"sporting less eye candy and fewer packages installed by default."
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"../dx-welcome.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"BId-drakx-intro-im1\"/> </imageobject>"
+"Siin saab valida, kas soovite kasutada <application>KDE</application> või "
+"<application>Gnome</application> töökeskkonda. Mõlemad pakuvad rakendusi ja "
+"tööriistu igale maitsele.  Valige <guilabel>Kohandatud</guilabel>, kui teile "
+"ei meeldi kumbki või kui soovite paigaldada midagi muud kui seda, mis "
+"paigaldatakse vaikimisi.  <application>LXDE</application> töölaud on näiteks "
+"väiksem kui eelmainitud, pakkudes vähem tilu-lilu ja ka vähemat arvu pakette."
 
-#. type: Content of: <section><section><figure>
-#: en/installer.xml:34 en/installer.xml:90
+#. type: Content of: <section><info><title>
+#: en/choosePackageGroups.xml:4
+msgid "Package Group Selection"
+msgstr "Paketigruppide valimine"
+
+#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. type: Content of: <section><mediaobject>
+#: en/choosePackageGroups.xml:10
 msgid ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
-"\"1\"/>"
+"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
+"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 msgstr ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
-"\"1\"/>"
+"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
+"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:47
+#: en/choosePackageGroups.xml:16
 msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"Packages have been sorted into groups, to make choosing what you need on "
+"your system a lot easier. The groups are fairly self explanatory, however "
+"more information about the content of each is available in tool-tips which "
+"become visible as the mouse is hovered over them."
 msgstr ""
-"Kui paigaldamise ajal tekib probleeme, võib olla vajalik kasutada "
-"spetsiaalseid paigaldusvõtmeid, mille kohta vaadake <xref linkend="
-"\"installationOptions\"/>."
+"Paketid on jaotatud gruppidesse, et vajaliku tarkvara valimine oma süsteemi "
+"tarbeks oleks hõlpsam. Gruppide nimed on üsna enesestmõistetavad, aga nende "
+"kohta pakutakse ka rohkem teavet, kui viite hiirekursori nime kohale."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:52
-msgid "The installation steps"
-msgstr "Paigaldamise etapid"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/choosePackageGroups.xml:23
+msgid "Workstation."
+msgstr "Tööjaam."
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/choosePackageGroups.xml:27
+msgid "Server."
+msgstr "Server."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/choosePackageGroups.xml:31
+msgid "Graphical Environment."
+msgstr "Graafiline keskkond."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/choosePackageGroups.xml:35
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"Individual Package Selection: You can use this option to manually add or "
+"remove packages."
 msgstr ""
-"Paigaldamine on jagatud mitmeks etapiks, mille loetelu näeb ekraani "
-"külgpaneelil."
+"Valik paketthaaval: selle valimisel saab pakette käsitsi lisada või "
+"eemaldada."
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#. type: Content of: <section><para>
+#: en/choosePackageGroups.xml:39
 msgid ""
-"Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
+"a minimal install."
 msgstr ""
-"Igal etapil kohtate üht või enamat ekraani, millel võib olla ka nupp "
-"<guibutton>Muud valikud</guibutton>, mis avab täiendavad ja harvemini "
-"vajalikud valikud."
+"Juhiseid minimaalse paigalduse tegemiseks annab <xref linkend=\"minimal-"
+"install\"></xref>."
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#. type: Content of: <section><info><title>
+#: en/choosePackagesTree.xml:4
+msgid "Choose Individual Packages"
+msgstr "Üksikpakettide valimine"
+
+#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. type: Content of: <section><mediaobject>
+#: en/choosePackagesTree.xml:11
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 msgstr ""
-"Enamikul ekraanidel on nupp <guibutton>Abi</guibutton>, mis selgitab antud "
-"etappi põhjalikumalt."
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-choosePackagesTree."
+"png\" format=\"PNG\" /> </imageobject>"
 
-#. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#. type: Content of: <section><para>
+#: en/choosePackagesTree.xml:17
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
-"partition has been formatted or updates have started to be installed, your "
-"computer is no longer in the same state and rebooting it could very well "
-"leave you with an unusable system. If in spite of this you are very sure "
-"rebooting is what you want, go to a text terminal by pressing the three keys "
-"<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press "
-"<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
+"Here you can add or remove any extra packages to customise your installation."
 msgstr ""
-"Kui soovite mingil hetkel paigaldamise katkestada, võite ka teha arvutile "
-"taaskäivituse, aga palun mõelge enne seda hoolikalt järele. Kui partitsioon "
-"on vormindatud või uuendusi on hakatud paigaldama, ei ole arvuti enam "
-"varasemas olekus ning taaskäivitamise tulemus võib olla mittetöötav masin. "
-"Kui te ikkagi olete kindel, et just taaskäivitus on õige samm, minge "
-"tekstiterminali, vajutades korraga kolme klahvi <guibutton>Alt Ctrl F2</"
-"guibutton>. Seejärel vajutage taaskäivitamiseks korraga klahve "
-"<guibutton>Alt Ctrl Delete</guibutton>."
-
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Paigaldamisvõtmed"
+"Siin saab oma paigaldust kohandada, lisades või eemaldades tarkvarapakette."
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:83
+#. type: Content of: <section><para>
+#: en/choosePackagesTree.xml:20
 msgid ""
-"If the installation fails then it may be necessary to try again by using one "
-"of the extra options available by hitting the <guibutton>F1 (Help)</"
-"guibutton> key see <xref linkend=\"dx-welcome\"></xref>"
+"After having made your choice, you can click on the <guibutton>floppy icon</"
+"guibutton> at the bottom of the page to save your choice of packages (saving "
+"to a USB key works, too). You can then use this file to install the same "
+"packages on another system, by pressing the same button during install and "
+"choosing to load it."
 msgstr ""
-"Kui paigaldamine ei õnnestu, võib olla vajalik seda uuesti proovida, "
-"kasutades mõnda lisavõtit, mille nägemiseks tuleb vajutada klahvi "
-"<guibutton>F1 (Abi)</guibutton>, vt ka <xref linkend=\"dx-welcome\"/>"
+"Kui olete vajalikud valikud langetanud, võite klõpsata lehekülje allosas "
+"<guibutton>disketiikoonile</guibutton>, mis lubab salvestada paketivaliku "
+"(seda saab mõistagi salvestada ka USB-pulgale). Hiljem võib sama faili "
+"kasutades paigaldada samasuguse paketivaliku mõnda teise süsteemi, klõpsates "
+"paigaldamise ajal sama nuppu ja faili laadides."
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr "See avab järgmise tekstipõhise abiekraani."
+#. type: Content of: <section><info><title>
+#: en/configureServices.xml:12
+msgid "Configure your Services"
+msgstr "Teenuste seadistamine"
 
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Paigaldamise abiekraan"
+#.  2012-12-25 marja - moved this section out of misc-params.xml 
+#.  2013-05-05 marja - added screenshot 
+#. type: Content of: <section><mediaobject>
+#: en/configureServices.xml:21
+msgid ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
+"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+"imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
+"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+"imagedata> </imageobject>"
 
-#. type: Content of: <section><section><figure><mediaobject>
-#: en/installer.xml:96
+#. type: Content of: <section><para>
+#: en/configureServices.xml:27
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
+"Here you can set which services should (not) start when you boot your system."
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"../dx-help.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"installer-im2\"/> </imageobject>"
+"Siin saab määrata, millised teenused käivitada või mitte käivitada koos "
+"süsteemi alglaadimisega."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
-msgid "Installation Problems and Possible Solutions"
-msgstr "Paigaldamisprobleemid ja nende võimalikud lahendused"
+#. type: Content of: <section><para>
+#: en/configureServices.xml:30
+msgid ""
+"There are four groups, click on the triangle before a group to expand it and "
+"see all services in it."
+msgstr ""
+"Teenustegruppe on neli. Nende ees olevale kolmnurgale klõpsates saab grupi "
+"avada ja uurida selles peituvaid teenuseid."
 
-#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
-msgid "No Graphical Interface"
-msgstr "Graafiline liides puudub"
+#. type: Content of: <section><para>
+#: en/configureServices.xml:34
+msgid "The setting DrakX chose are usually good."
+msgstr "Valikud, mille on langetanud DrakX, on tavaliselt mõistlikud ja head."
 
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#. type: Content of: <section><para>
+#: en/configureServices.xml:37
 msgid ""
-"After the initial screen you did not reach the language selection screen. "
-"This can happen with some graphic cards and older systems. Try using low "
-"resolution by typing <code>vgalo</code> at the prompt."
+"If you highlight a service, some information about it is shown in the info "
+"box below."
 msgstr ""
-"Pärast avaekraani ei tulegi keele valiku ekraani ette. See võib juhtuda mõne "
-"graafikakaardi ja vanema süsteemi korral.  Proovige kasutada madalamat "
-"ekraanilahutust, kirjutades käsureale <code>vgalo</code>."
+"Teenuse peale klõpsates näeb allpool teabekastis mõningat teavet teenuse "
+"kohta."
 
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
-msgid ""
-"If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode.<emphasis></emphasis>"
+#. type: Content of: <section><para>
+#: en/configureServices.xml:41
+msgid "Only change things when you know very well what you are doing."
 msgstr ""
-"Kui riistvara on väga vana, ei pruugi graafiline paigaldamine üldse võimalik "
-"olla. Sel juhul võib proovida tekstipõhist paigaldamist. Selleks vajutage "
-"avaekraanil viibides klahvile ESC ja kinnitage valikut klahvi ENTER "
-"vajutamisega. Teie ette ilmub must ekraan sõnaga \"boot:\".  Kirjutage \"text"
-"\" ja vajutage ENTER. Nüüd saate jätkata tekstipõhise paigaldamisega."
-"<emphasis/>"
+"Muutke siin midagi ainult siis, kui olete kindel, et teate, mida teete."
 
-#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
-msgid "The Install Freezes"
-msgstr "Paigaldamine hangub"
+#. type: Content of: <section><info><title>
+#: en/configureTimezoneUTC.xml:12
+msgid "Configure your Timezone"
+msgstr "Ajavööndi seadistamine"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#.  2012-12-25 marja - moved this part out of misc-params.xml 
+#.  2013-05-05 marja - added screenshot 
+#. type: Content of: <section><mediaobject>
+#: en/configureTimezoneUTC.xml:20
 msgid ""
-"If the system appeared to freeze during the installation, this may be a "
-"problem with hardware detection. In this case the automatic detection of "
-"hardware may be bypassed and dealt with later. To try this, type "
-"<code>noauto</code> at the prompt. This option may also be combined with "
-"other options as necessary."
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
+"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
+"imagedata> </imageobject>"
 msgstr ""
-"Kui süsteem paistab paigaldamise käigus hanguvat, võib olla raskusi "
-"riistvara tuvastamisega. Sel juhul võib riistvara automaatse tuvastamise "
-"vahele jätta ja sellega hiljem tegelda. Selleks kirjutage käsureale "
-"<code>noauto</code>. Vajaduse korral võib seda võtit kasutada koos teiste "
-"võtmetega."
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
+"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
+"imagedata> </imageobject>"
 
-#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Kerneli võtmed"
+#. type: Content of: <section><para>
+#: en/configureTimezoneUTC.xml:26
+msgid ""
+"Choose your time zone by choosing your country or a city close to you in the "
+"same time zone."
+msgstr ""
+"Määrake ajavöönd kindlaks, valides oma riigi või linna, mis asub samas "
+"ajavööndis teie lähedal."
 
-#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#. type: Content of: <section><para>
+#: en/configureTimezoneUTC.xml:30
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
-"available RAM incorrectly. To specify this manually, you can use the "
-"<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
-"g. <code>mem=256M</code> would specify 256MB of RAM."
+"In next screen you can choose to set your hardware clock to local time or to "
+"GMT, also known as UTC."
 msgstr ""
-"Neid läheb väga harva vaja, kuid mõnel juhul võib riistvara teatada valesti "
-"saadaoleva mälu (RAM) suuruse. Selle käsitsi määramiseks tuleb kasutada "
-"parameetrit <code>mem=xxxM</code>, kus xxx on korrektne mälu suurus. Näiteks "
-"<code>mem=256M</code> määrab, et kasutada on 256 MB mälu."
+"Järgmisel ekraanil saab valida, kas riistvaraline kell on seatud kohalikule "
+"ajale või GMT-le ehk maailmaajale (UTC)."
+
+#. type: Content of: <section><note><para>
+#: en/configureTimezoneUTC.xml:35
+msgid ""
+"If you have more than one operating system on your computer, make sure they "
+"are all set to local time, or all to UTC/GMT."
+msgstr ""
+"Kui Teie arvutis on ka teisi operatsioonisüsteeme, kontrollige, et nad kõik "
+"oleksid lültiatud kas kohalikule ajale või siis UTC/GMT-le."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:23
-msgid "Install or Upgrade"
-msgstr "Paigaldamine või uuendamine"
+#: en/configureX_card_list.xml:11
+msgid "Choose an X Server (Configure your Graphic Card)"
+msgstr "X-serveri valimine (graafikakaardi seadistamine)"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:27
+#: en/configureX_card_list.xml:16
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
+"\"PNG\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
-msgid "Install"
-msgstr "Paigaldamine"
+#. type: Content of: <section><para>
+#: en/configureX_card_list.xml:21
+msgid ""
+"DrakX has a very comprehensive database of video cards and will usually "
+"correctly identify your video device."
+msgstr ""
+"DrakX sisaldab väga põhjalikku videokaartide andmebaasi ja suudab tavaliselt "
+"teie videoseadme korrektselt tuvastada."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:36
+#. type: Content of: <section><para>
+#: en/configureX_card_list.xml:24
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"If the installer has not correctly detected your graphic card and you know "
+"which one you have, you can select it from the tree by:"
 msgstr ""
-"Selle valimisel saab ette võtta uue <application>Mageia</application> "
-"paigaldamise."
+"Kui paigaldusprogramm siiski ei ole teie videokaarti õigesti tuvastanud ja "
+"te teate, milline kaart teil on, võite valida selle loetelust järgmiste "
+"parameetrite alusel:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
-msgid "Upgrade"
-msgstr "Uuendamine"
+#. type: Content of: <section><para><itemizedlist><listitem><para>
+#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+msgid "vendor"
+msgstr "tootja"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:43
+#. type: Content of: <section><para><itemizedlist><listitem><para>
+#: en/configureX_card_list.xml:31
+msgid "then the name of your card"
+msgstr "seejärel kaardi nimi"
+
+#. type: Content of: <section><para><itemizedlist><listitem><para>
+#: en/configureX_card_list.xml:35
+msgid "and the type of card"
+msgstr "ja lõpuks kaardi tüüp"
+
+#. type: Content of: <section><para>
+#: en/configureX_card_list.xml:39
 msgid ""
-"If you have one or more <application>Mageia 2</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"If you cannot find your card in the vendor lists (because it's not yet in "
+"the database or it's an older card) you may find a suitable driver in the "
+"Xorg category"
 msgstr ""
-"Kui teie süsteemi on juba varem paigaldatud <application>Mageia 2</"
-"application>, võimaldab paigaldusprogramm seda uusimale väljalaskele "
-"uuendada."
+"Kui te ei leia oma kaarti tootjate nimekirjast (sest seda pole veel "
+"andmebaasis või on tegu väga vana kaardiga), võib siiski leida sobiva "
+"draiveri Xorg-i kategoorias."
 
-#. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:49
+#. type: Content of: <section><para>
+#: en/configureX_card_list.xml:43
 msgid ""
-"If during install you decide to stop the installation, it is possible to "
-"reboot, but please think twice before you do this. Once a partition has been "
-"formatted or updates have started to be installed, your computer isn't in "
-"the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"The Xorg listing provides more than 40 generic and open source video card "
+"drivers. If you still can't find a named driver for your card there is the "
+"option of using the vesa driver which provides basic capabilities."
 msgstr ""
-"Kui soovite mingil hetkel paigaldamise katkestada, võite ka teha arvutile "
-"taaskäivituse, aga palun mõelge enne seda hoolikalt järele. Kui partitsioon "
-"on vormindatud või uuendusi on hakatud paigaldama, ei ole arvuti enam "
-"varasemas olekus ning taaskäivitamise tulemus võib olla mittetöötav masin. "
-"Kui te ikkagi olete kindel, et just taaskäivitus on õige samm, minge "
-"tekstiterminali, vajutades korraga kolme klahvi <guibutton>Alt Ctrl F2</"
-"guibutton>. Seejärel vajutage taaskäivitamiseks korraga klahve "
-"<guibutton>Alt Ctrl Delete</guibutton>"
+"Xorg-i nimekiri pakub üle 40 üldise avatud lähtekoodiga videokaardi "
+"draiveri. Kui te ikkagi ei suuda oma kaardile sobivat draiverit siit leida, "
+"võite valida Vesa draiveri, mis pakub kõige elementaarsemaid võimalusi."
 
-#. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:60
+#. type: Content of: <section><para>
+#: en/configureX_card_list.xml:48
 msgid ""
-"If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"Be aware that if you select an incompatible driver you may only have access "
+"to the Commandline Interface."
 msgstr ""
-"Kui avastate, et olete unustanud mõne keele lisada, saab \"Paigaldamise või "
-"uuendamise\" ekraanilt naasta keelevaliku juurde, vajutades korraga klahve "
-"<guilabel>Alt Ctrl Home</guilabel>.  <emphasis>Ärge</emphasis> tehke seda "
-"hilisema paigalduse käigus."
+"Arvestage kindlasti, et kui valite sobimatu draiveri, võite saada kasutada "
+"ainult käsurida."
 
-#. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
-msgid "Keyboard"
-msgstr "Klaviatuur"
+#. type: Content of: <section><para>
+#: en/configureX_card_list.xml:51
+msgid ""
+"Some video card manufacturers provide proprietary drivers for Linux which "
+"may only be available in the Nonfree repository and in some cases only from "
+"the card manufacturers' websites."
+msgstr ""
+"Mõned videokaartide tootjad pakuvad Linuxile omanduslikke draivereid, mis "
+"võivad olla saadaval ainult Nonfree tarkvarahoidlas, mõnel juhul isegi "
+"kõigest tootja enda veebileheküljel."
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/configureX_card_list.xml:55
+#, fuzzy
 msgid ""
-"DrakX selects an appropriate keyboard for your language. If no suitable "
-"keyboard is found it will default to a US keyboard layout."
+"The Nonfree repository needs to be explicitly enabled to access them.  If "
+"you didn't select it previously, you should do this after your first reboot."
 msgstr ""
-"DrakX valib teie keelele sobiva klaviatuuri. Kui sobivat klaviatuuri ei "
-"leita, kasutatakse vaikimisi US klaviatuuripaigutust."
+"Nonfree hoidlad tuleb kasutamiseks spetsiaalselt lubada.  Seda saab teha "
+"pärast arvuti esimest taaskäivitamist."
+
+#. type: Content of: <section><info><title>
+#: en/configureX_chooser.xml:4
+msgid "Graphic Card and Monitor Configuration"
+msgstr "Graafikakaardi ja monitori seadistamine"
 
+#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/configureX_chooser.xml:11
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
+"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
+"imagedata> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><para>
+#: en/configureX_chooser.xml:18
+msgid ""
+"No matter which graphical environment (also known as desktop environment) "
+"you chose for this install of <application>Mageia</application>, they are "
+"all based on a graphical user interface system called <acronym>X Window "
+"System</acronym>, or simply <acronym>X</acronym>. So in order for "
+"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
+"any other graphical environment to work well, the following <acronym>X</"
+"acronym> settings need to be correct. Choose the correct settings if you can "
+"see that <application>DrakX</application> didn't make a choice, or if you "
+"think the choice is incorrect."
+msgstr ""
+"Sõltumata sellest, millise graafilise keskkonna ehk töökeskkonna olete "
+"otsustanud oma <application>Mageia</application> paigaldusele valida, "
+"kasutavad nad kõik graafilise kasutajaliidese süsteemi <acronym>X Window "
+"System</acronym>, lihtsamalt öeldes <acronym>X</acronym>. Niisiis peavad "
+"selleks, et <acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</"
+"acronym> või mis tahes töökeskkond korralikult töötaks, olema järgmised "
+"<acronym>X</acronym>'i seadistused korras. Valige õiged seadistused, kui "
+"näete, et <application>DrakX</application> ei ole midagi valinud, või kui "
+"arvate, et valik ei ole õige."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/configureX_chooser.xml:31
 msgid ""
-"Make sure that the selection is correct or choose another keyboard layout. "
-"If you don't know which layout your keyboard has, look in the specifications "
-"that came with your system, or ask the computer vendor. There may even be a "
-"label on the keyboard that identifies the layout. You can also look here: "
-"<link xlink:href=\"http://en.wikipedia.org/wiki/Keyboard_layout\">en."
-"wikipedia.org/wiki/Keyboard_layout</link>"
+"<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
+"from the list if needed."
 msgstr ""
-"Kontrollige, kas valik on õige, ja valige vajaduse korral mõni muu "
-"klaviatuuripaigutus. Kui te ei tea, millise paigutusega teie klaviatuur on, "
-"uurige süsteemi dokumentatsiooni või küsige järele tarnijalt. Klaviatuuri "
-"küljes võib isegi olla silt, mis ütleb, millise paigutusega on tegu. Samuti "
-"võib uurida veebilehekülge <link xlink:href=\"http://en.wikipedia.org/wiki/"
-"Keyboard_layout\">en.wikipedia.org/wiki/Keyboard_layout</link>"
+"<emphasis><guibutton>Graafikakaart</guibutton></emphasis>: valige vajaduse "
+"korral loetelust oma kaart."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/configureX_chooser.xml:37
 msgid ""
-"If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
+"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
+"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
+"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
+"horizontal and vertical refresh rates of your monitor."
 msgstr ""
-"Kui teie klaviatuuri nimekirjas ei ole, klõpsake täieliku loetelu nägemiseks "
-"<guibutton>Veel</guibutton> ja valige oma klaviatuur sealt."
+"<emphasis><guibutton>Monitor</guibutton></emphasis>: valida saab "
+"<guilabel>Plug'n Play</guilabel>, kui see sobib, või siis vajaliku monitori "
+"nimekirjast pealdise <guilabel>Tootja</guilabel> või <guilabel>Tavaline</"
+"guilabel> all. Valige <guilabel>Kohandatud</guilabel>, kui eelistate käsitsi "
+"paika panna oma monitori realaotus- ja ekraaniuuendussageduse."
 
-#. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:45
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/configureX_chooser.xml:45
+msgid "Incorrect refresh rates may damage your monitor"
+msgstr "Väärad sagedused võivad monitori kahjustada."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:51
 msgid ""
-"After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
-"you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
+"resolution and color depth of your monitor here."
 msgstr ""
-"Olles valinud klaviatuuri pärast nupule <guibutton>Veel</guibutton> "
-"klõpsamist, võite esimese dialoogi juurde naastes näha, nagu oleks valitud "
-"mõni sealne klaviatuur. Ärge laske ennast sellest häirida: arvestatakse "
-"ikkagi seda, millise klaviatuuri te tegelikult täisnimekirjas olete valinud."
+"<emphasis><guibutton>Ekraanilahutus</guibutton></emphasis>: siin saab "
+"määrata vajaliku monitori ekraanilahutuse ja värvisügavuse."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/configureX_chooser.xml:56
 msgid ""
-"If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
+"always appear during install. If the button is there, you can control your "
+"settings by pressing it. If you see a question asking you whether your "
+"settings are correct, you can answer \"yes\", and the settings will be kept. "
+"If you don't see anything, you'll return to the configuration screen and be "
+"able to reconfigure everything until the test is good. <emphasis>Make sure "
+"your settings are on the safe side if the test button isn't available</"
+"emphasis>"
 msgstr ""
-"Kui valite klaviatuuri, mis ei kasuta ladina tähti, näete lisadialoogi, mis "
-"palub määrata, kuidas eelistate lülituda ladina ja mitteladina "
-"klaviatuuripaigutuste vahel."
+"<emphasis><guibutton>Test</guibutton></emphasis>: testimisnuppu paigaldamise "
+"ajal alati ei näe. Kui see on näha, siis saab sellele vajutades kontrollida "
+"määratud seadistuste õigsust. Kui näete küsimust, kas seadistused on õiged, "
+"võite vastata \"jah\" ning seadistused salvestatakse. Kui te ei näe midagi, "
+"saate tagasi pöörduda seadistusekraanile ja seal seni parameetreid muuta, "
+"kuni test annab vajaliku tulemuse. <emphasis>Kui testimisnuppu pole, "
+"kontrollige eriti hoolikalt, et kõik seadistused oleksid korras.</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:67
+msgid ""
+"<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
+"enable or disable various options."
+msgstr ""
+"<emphasis><guibutton>Eelistused</guibutton></emphasis>: siin saab "
+"mitmesuguseid valikuid lubada või keelata."
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
-msgid "Configure your Services"
-msgstr "Teenuste seadistamine"
+#: en/configureX_monitor.xml:18
+msgid "Choosing your Monitor"
+msgstr "Monitori valimine"
+
+#. type: Content of: <section><para>
+#: en/configureX_monitor.xml:21
+msgid ""
+"DrakX has a very comprehensive database of monitors and will usually "
+"correctly identify yours."
+msgstr ""
+"DrakX sisaldab väga põhjalikku monitoride andmebaasi ja tuvastab tavaliselt "
+"teie monitori õigesti."
+
+#. type: Content of: <section><warning><para>
+#: en/configureX_monitor.xml:26
+msgid ""
+"<emphasis>Selecting a monitor with different characteristics could damage "
+"your monitor or video hardware. Please don't try something without knowing "
+"what you are doing.</emphasis> If in doubt you should consult your monitor "
+"documentation"
+msgstr ""
+"<emphasis>Teistsuguste parameetritega monitori valimine võib kahjustada "
+"monitori või videoriistvara. Palun ärge proovige lihtsalt huvi pärast "
+"midagi, kui te ei ole kindel, et teate täpselt, mida teete.</emphasis> "
+"Kahtluste korral uurige oma monitori dokumentatsiooni."
 
-#.  2012-12-25 marja - moved this section out of misc-params.xml 
-#.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureX_monitor.xml:34
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureX_monitor.xml:42
+msgid "<emphasis>Custom</emphasis>"
+msgstr "<emphasis>Kohandatud</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/configureX_monitor.xml:44
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"This option allows you to set two critical parameters, the vertical refresh "
+"rate and the horizontal sync rate. Vertical refresh determines how often the "
+"screen is refreshed and horizontal sync is the rate at which scan lines are "
+"displayed."
 msgstr ""
-"Siin saab määrata, millised teenused käivitada või mitte käivitada koos "
-"süsteemi alglaadimisega."
+"Selle valimine võimaldab paika panna kaks äärmiselt tähtsat parameetrit: "
+"realaotussageduse ja ekraaniuuendussageduse."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:30
+#: en/configureX_monitor.xml:49
 msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+"It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
+"type with a sync range that is beyond the capabilities of your monitor: you "
+"may damage your monitor. If in doubt, choose a conservative setting and "
+"consult your monitor documentation."
 msgstr ""
-"Teenustegruppe on neli. Nende ees olevale kolmnurgale klõpsates saab grupi "
-"avada ja uurida selles peituvaid teenuseid."
+"On <emphasis>VÄGA TÄHTIS</emphasis>, et te ei valiks sellise "
+"sünkroonimissagedusega monitori tüüpi, mis ületab teie monitori võimeid: sel "
+"moel võib monitorile tõsist kahju teha. Kui kahtlete, valige pigem "
+"tagasihoidlikum väärtus ja kindlasti uurige monitori dokumentatsiooni."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
-msgstr "Valikud, mille on langetanud DrakX, on tavaliselt mõistlikud ja head."
+#: en/configureX_monitor.xml:55
+msgid "<emphasis>Plug 'n Play</emphasis>"
+msgstr "<emphasis>Plug'n Play</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureX_monitor.xml:58
 msgid ""
-"If you highlight a service, some information about it is shown in the info "
-"box below."
+"This is the default option and tries to determine the monitor type from the "
+"monitor database."
 msgstr ""
-"Teenuse peale klõpsates näeb allpool teabekastis mõningat teavet teenuse "
-"kohta."
+"See on vaikimisi valik, mis üritab määrata monitori tüübi monitoride "
+"andmebaasi põhjal."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
-msgid "Only change things when you know very well what you are doing."
-msgstr ""
-"Muutke siin midagi ainult siis, kui olete kindel, et teate, mida teete."
-
-#. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:23
-msgid "Please choose a language to use"
-msgstr "Kasutatava keele valimine"
+#: en/configureX_monitor.xml:63
+msgid "<emphasis>Vendor</emphasis>"
+msgstr "<emphasis>Tootja</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:26
+#: en/configureX_monitor.xml:65
 msgid ""
-"Select your preferred language, by first expanding the list for your "
-"continent. <application>Mageia</application> will use this selection during "
-"the installation and for your installed system."
+"If the installer has not correctly detected your monitor and you know which "
+"one you have, you can select it from the tree by selecting:"
 msgstr ""
-"Valige vajalik keel, laiendades nimekirja kõigepealt maailmajao järgi.  "
-"<application>Mageia</application> kasutab langetatud valikut nii "
-"paigaldamise ajal kui ka paigaldatud süsteemis."
+"Kui paigaldusprogramm ei ole teie videokaarti õigesti tuvastanud ja te "
+"teate, milline kaart teil on, võite valida selle puust järgmiste "
+"parameetrite alusel:"
+
+#. type: Content of: <section><para><itemizedlist><listitem><para>
+#: en/configureX_monitor.xml:73
+msgid "the monitor manufacturers name"
+msgstr "monitori nimi"
+
+#. type: Content of: <section><para><itemizedlist><listitem><para>
+#: en/configureX_monitor.xml:77
+msgid "the monitor description"
+msgstr "monitori kirjeldus"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:30
+#: en/configureX_monitor.xml:82
+msgid "<emphasis>Generic</emphasis>"
+msgstr "<emphasis>Tavaline</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/configureX_monitor.xml:84
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"selecting this group displays nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the Vesa card driver "
+"when your video hardware cannot be determined automatically. Once again it "
+"may be wise to be conservative in your selections."
 msgstr ""
-"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."
+"Selles grupis on valida ligemale 30 seadistuse seast, näiteks 1024x768 @ "
+"60Hz, sealhulgas lamekuvarid (Flat panel), mida kasutavad eriti sülearvutid. "
+"See on sageli mõistlik monitori valimise grupp, kui teie videoriistvara ei "
+"suudetud automaatselt tuvastada ja peate kasutama Vesa draiverit. Ka siin "
+"tasub valides olla pigem konservatiivne."
+
+#. type: Content of: <section><info><title>
+#: en/diskdrake.xml:19
+msgid "Custom disk partitioning with DiskDrake"
+msgstr "Ketta kohandatud partitsioneerimine DiskDrake'i abil"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:36
+#: en/diskdrake.xml:26
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectLanguage.png\" align=\"center\" "
-"format=\"PNG\" > </imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
+"imagedata> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectLanguage.png\" "
-"format=\"PNG\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
+"imagedata> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:44
+#: en/diskdrake.xml:33
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"If you wish to use encryption on your <literal>/</literal> partition you "
+"must ensure that you have a separate <literal>/boot</literal> partition. The "
+"encryption option for the <literal>/boot</literal> partition must NOT be "
+"set, otherwise your system will be unbootable."
 msgstr ""
-"Isegi kui paigaldate mitu keelt, tuleb üks neist valida esimesel ekraanil "
-"eelistatud keeleks. See keel on märgitud ka mitme keele valimise ekraanil."
+"Kui soovite krüptida oma <literal>/</literal> partitsiooni, peab teil "
+"kindlasti olema ka eraldi <literal>/boot</literal> partitsioon. <literal>/"
+"boot</literal> partitsioonile EI TOHI määrata krüptimisvalikut, sest siis ei "
+"ole süsteemi võimalik üldse laadida."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:51
+#. type: Content of: <section><para>
+#: en/diskdrake.xml:39
 msgid ""
-"If your keyboard language is not the same as your preferred language, then "
-"it is advisable to install the language of your keyboard as well."
+"Adjust the layout of your disk(s) here. You can remove or create partitions, "
+"change the filesystem of a partition or change its size and even view what "
+"is in them before you start."
 msgstr ""
-"Kui klaviatuuri keel ei sobi kokku eelistatud keelega, oleks mõistlik "
-"paigaldada kohe ka klaviatuurile vastav keel."
+"Siin saab kohandada ketta või ketaste jagamist: eemaldada või luua "
+"partitsioone, muuta partitsiooni failisüsteemi või suurust ning isegi enne "
+"alustamist näha, mida partitsioon sisaldab."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:57
+#. type: Content of: <section><para>
+#: en/diskdrake.xml:42
 msgid ""
-"Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the "
-"\"multiple languages\" screen if you know that it is inappropriate for your "
-"language. Disabling UTF-8 applies to all installed languages."
+"There is a tab for every detected hard disk or other storage device, like an "
+"USB key. For example sda, sdb and sdc if there are three of them."
 msgstr ""
-"Mageia toetab vaikimisi UTF-8 (Unicode). Selle võib keelata \"mitme keele "
-"valimise\" ekraanil, kui olete kindel, et see teie keelele kohe üldse ei "
-"sobi. UTF-8 keelamine rakendub kõigile paigaldatavatele keeltele."
+"Igale leitud kõvakettale või muule salvestusseadmele, näiteks USB-pulgale, "
+"on omaette kaart. Need võivad olla näiteks sda, sdb ja sdc, kui teil juhtub "
+"olema kolm salvestusseadet."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:64
+#. type: Content of: <section><para>
+#: en/diskdrake.xml:45
 msgid ""
-"You can change the language of your system after installation in the Mageia "
-"Control Center -&gt; System -&gt; Manage localization for your system."
+"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
+"storage device"
 msgstr ""
-"Oma süsteemi keelt saab pärast paigaldamist muuta, valides Mageia "
-"juhtimiskeskus -&gt; Süsteem -&gt; Süsteemi lokaliseerimine."
-
-#. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
-msgid "Confirm hard disk to be formatted"
-msgstr "Kõvaketta vormindamise kinnitamine"
+"Kõigi valitud salvestusseadme partitsioonide kustutamiseks valige "
+"<guibutton>Kustuta kõik</guibutton>."
 
-#.  Made by marja on 2012 04 03 
-#.  test comment - johnr 
-#.  2012-04-24 marja - replaced "if you are not sure you selected the correct
-#.     hard disk." with "if you are not sure about your choice", because I'm sure I
-#.     saw this help screen when I had only one HD 
-#.  2013-05-05 marja added screenshot 
-#. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#. type: Content of: <section><para>
+#: en/diskdrake.xml:47
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-takeOverHdConfirm.png\" format=\"PNG"
-"\" align=\"center\" ></imagedata> </imageobject>"
+"For all other actions: click on the desired partition first. Then view it, "
+"or choose a filesystem and a mount point, resize it or wipe it."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-takeOverHdConfirm.png\" format=\"PNG"
-"\" align=\"center\" ></imagedata> </imageobject>"
+"Kõigi teiste toimingute jaoks klõpsake kõigepealt vajalikul partitsioonil. "
+"Siis saate seda uurida, valida failisüsteemi või haakepunkti, suurust muuta "
+"või ka kustutada."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:24
-msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
-"choice."
-msgstr ""
-"Klõpsake <guibutton>Tagasi</guibutton>, kui te ei ole oma valikus kindel."
+#: en/diskdrake.xml:49
+msgid "Continue until you adjusted everything to your wishes."
+msgstr "Jätkake, kuni kõik on nii, nagu soovite."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:27
-msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
-msgstr ""
-"Klõpsake <guibutton>Edasi</guibutton>, kui olete kindel ning soovite "
-"kustutada kõvakettal kõik partitsioonid, kõik operatsioonisüsteemid ja üldse "
-"kõik andmed."
+#: en/diskdrake.xml:51
+msgid "Click <guibutton>Done</guibutton> when you're ready."
+msgstr "Kui kõik on valmis, klõpsake nupule <guibutton>Tehtud</guibutton>."
 
 #. type: Content of: <section><info><title>
 #: en/doPartitionDisks.xml:25
@@ -1174,231 +1350,65 @@ msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
 
-#. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
-msgid "Desktop Selection"
-msgstr "Töölaua valimine"
-
-#. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
-msgid ""
-"Depending on your selection here, you may be offered further screens to fine "
-"tune your choice."
-msgstr ""
-"Sõltuvalt siin langetatud valikutest võite näha täiendavaid ekraane, kus "
-"saab valikut täpsustada."
-
-#. type: Content of: <section><para>
-#: en/chooseDesktop.xml:13
-msgid ""
-"After the selection step(s), you will see a slide show during package "
-"installation. The slide show can be disabled by pressing the "
-"<guilabel>Details</guilabel> button"
-msgstr ""
-"Pärast valiku(te) langetamist näeb pakettide paigaldamise ajal "
-"slaidiseanssi. Sellest saab loobuda, kui klõpsata nupule "
-"<guilabel>Üksikasjad</guilabel>."
-
-#. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-chooseDesktop.png\" "
-"format=\"PNG\" /> </imageobject>"
-
-#. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
-msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
-msgstr ""
-"Siin saab valida, kas soovite kasutada <application>KDE</application> või "
-"<application>Gnome</application> töökeskkonda. Mõlemad pakuvad rakendusi ja "
-"tööriistu igale maitsele.  Valige <guilabel>Kohandatud</guilabel>, kui teile "
-"ei meeldi kumbki või kui soovite paigaldada midagi muud kui seda, mis "
-"paigaldatakse vaikimisi.  <application>LXDE</application> töölaud on näiteks "
-"väiksem kui eelmainitud, pakkudes vähem tilu-lilu ja ka vähemat arvu pakette."
-
-#. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
-msgid "Package Group Selection"
-msgstr "Paketigruppide valimine"
-
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
-#. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
-
-#. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
-msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
-"your system a lot easier. The groups are fairly self explanatory, however "
-"more information about the content of each is available in tool-tips which "
-"become visible as the mouse is hovered over them."
-msgstr ""
-"Paketid on jaotatud gruppidesse, et vajaliku tarkvara valimine oma süsteemi "
-"tarbeks oleks hõlpsam. Gruppide nimed on üsna enesestmõistetavad, aga nende "
-"kohta pakutakse ka rohkem teavet, kui viite hiirekursori nime kohale."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
-msgid "Workstation."
-msgstr "Tööjaam."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
-msgid "Server."
-msgstr "Server."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
-msgid "Graphical Environment."
-msgstr "Graafiline keskkond."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
-msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
-msgstr ""
-"Valik paketthaaval: selle valimisel saab pakette käsitsi lisada või "
-"eemaldada."
-
-#. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
-msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
-"a minimal install."
-msgstr ""
-"Juhiseid minimaalse paigalduse tegemiseks annab <xref linkend=\"minimal-"
-"install\"></xref>."
-
-#. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
-msgid "Choose Individual Packages"
-msgstr "Üksikpakettide valimine"
-
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
-#. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-choosePackagesTree."
-"png\" format=\"PNG\" /> </imageobject>"
-
-#. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
-msgid ""
-"Here you can add or remove any extra packages to customise your installation."
-msgstr ""
-"Siin saab oma paigaldust kohandada, lisades või eemaldades tarkvarapakette."
-
-#. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
-msgid ""
-"After having made your choice, you can click on the <guibutton>floppy icon</"
-"guibutton> at the bottom of the page to save your choice of packages (saving "
-"to a USB key works, too). You can then use this file to install the same "
-"packages on another system, by pressing the same button during install and "
-"choosing to load it."
-msgstr ""
-"Kui olete vajalikud valikud langetanud, võite klõpsata lehekülje allosas "
-"<guibutton>disketiikoonile</guibutton>, mis lubab salvestada paketivaliku "
-"(seda saab mõistagi salvestada ka USB-pulgale). Hiljem võib sama faili "
-"kasutades paigaldada samasuguse paketivaliku mõnda teise süsteemi, klõpsates "
-"paigaldamise ajal sama nuppu ja faili laadides."
-
-#. type: Content of: <section><info><title>
-#: en/diskdrake.xml:19
-msgid "Custom disk partitioning with DiskDrake"
-msgstr "Ketta kohandatud partitsioneerimine DiskDrake'i abil"
+#. type: Content of: <article><info><title>
+#: en/DrakX.xml:3
+msgid "Installation with DrakX"
+msgstr "Paigaldamine DrakX'i abil"
 
-#. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:26
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+#. type: Content of: <article><info><cover><para><note>
+#: en/DrakX.xml:6
+msgid "<note>"
+msgstr "<note>"
 
-#. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:33
+#. type: Content of: <article><info><cover><para><note><para>
+#: en/DrakX.xml:7
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"No one will see all the installer screens that you see in this manual. Which "
+"screens you will see, depends on your hardware and the choices you make "
+"while installing."
 msgstr ""
-"Kui soovite krüptida oma <literal>/</literal> partitsiooni, peab teil "
-"kindlasti olema ka eraldi <literal>/boot</literal> partitsioon. <literal>/"
-"boot</literal> partitsioonile EI TOHI määrata krüptimisvalikut, sest siis ei "
-"ole süsteemi võimalik üldse laadida."
+"Keegi ei näe kõiki käsiraamatus toodud paigaldusprogrammi ekraane.  See, "
+"millised ekraanid on näha, sõltub teie riistvarast ja paigaldamise käigus "
+"langetatud valikutest."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:39
-msgid ""
-"Adjust the layout of your disk(s) here. You can remove or create partitions, "
-"change the filesystem of a partition or change its size and even view what "
-"is in them before you start."
-msgstr ""
-"Siin saab kohandada ketta või ketaste jagamist: eemaldada või luua "
-"partitsioone, muuta partitsiooni failisüsteemi või suurust ning isegi enne "
-"alustamist näha, mida partitsioon sisaldab."
+#. type: Content of: <article><info><cover><para>
+#: en/DrakX.xml:10
+msgid "</note>"
+msgstr "</note>"
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:42
+#. type: Content of: <article><info><cover><para>
+#: en/DrakX.xml:12
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"The texts and screenshots in this manual are available under the CC BY-SA "
+"3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
+"\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
 msgstr ""
-"Igale leitud kõvakettale või muule salvestusseadmele, näiteks USB-pulgale, "
-"on omaette kaart. Need võivad olla näiteks sda, sdb ja sdc, kui teil juhtub "
-"olema kolm salvestusseadet."
+"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>."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#. type: Content of: <article><info><cover><para>
+#: en/DrakX.xml:16
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"This manual was produced with the help of the <link ns6:href=\"http://www."
+"calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
+"neodoc.biz\">NeoDoc</link>."
 msgstr ""
-"Kõigi valitud salvestusseadme partitsioonide kustutamiseks valige "
-"<guibutton>Kustuta kõik</guibutton>."
+"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>."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:47
+#. type: Content of: <article><info><cover><para>
+#: en/DrakX.xml:18
 msgid ""
-"For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"It was written by volunteers in their free time. Please contact <link ns6:"
+"href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
+"link>, if you would like to help improve this manual."
 msgstr ""
-"Kõigi teiste toimingute jaoks klõpsake kõigepealt vajalikul partitsioonil. "
-"Siis saate seda uurida, valida failisüsteemi või haakepunkti, suurust muuta "
-"või ka kustutada."
-
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:49
-msgid "Continue until you adjusted everything to your wishes."
-msgstr "Jätkake, kuni kõik on nii, nagu soovite."
-
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:51
-msgid "Click <guibutton>Done</guibutton> when you're ready."
-msgstr "Kui kõik on valmis, klõpsake nupule <guibutton>Tehtud</guibutton>."
+"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>."
 
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:4
@@ -1530,6 +1540,231 @@ msgstr ""
 "guibutton>."
 
 #. type: Content of: <section><info><title>
+#: en/installer.xml:18
+msgid "DrakX, the Mageia Installer"
+msgstr "Mageia paigaldusprogramm DrakX"
+
+#. type: Content of: <section><para>
+#: en/installer.xml:21
+msgid ""
+"Whether you are new to GNU-Linux or an experienced user, the Mageia "
+"Installer is designed to help make your installation or upgrade as easy as "
+"possible."
+msgstr ""
+"Sõltumata sellest, kas olete GNU-Linuxi maailmas uustulnuk või juba kogenud "
+"kasutaja, on Mageia paigaldusprogramm loodud nii, et paigaldamine või "
+"uuendamine oleks kõigile võimalikult lihtne."
+
+#. type: Content of: <section><para>
+#: en/installer.xml:29
+msgid ""
+"The initial menu screen has various options, however the default one will "
+"start the installer, which will normally be all that you will need."
+msgstr ""
+"Avamenüüs näete mitmeid valikuid, kuid vaikimisi valitu käivitab "
+"paigaldusprogrammi, mida tavaliselt ongi vaja."
+
+#. type: Content of: <section><figure><info><title>
+#: en/installer.xml:35
+msgid "Installation Welcome Screen"
+msgstr "Paigaldusprogrammi avaekraan"
+
+#. type: Content of: <section><figure><mediaobject>
+#: en/installer.xml:39
+msgid ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
+"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"../dx-welcome.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"BId-drakx-intro-im1\"/> </imageobject>"
+
+#. type: Content of: <section><section><figure>
+#: en/installer.xml:34 en/installer.xml:90
+msgid ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><para>
+#: en/installer.xml:47
+msgid ""
+"If there are problems during install, then it may be necessary to use "
+"special installation options, see <xref linkend=\"installationOptions\"></"
+"xref>."
+msgstr ""
+"Kui paigaldamise ajal tekib probleeme, võib olla vajalik kasutada "
+"spetsiaalseid paigaldusvõtmeid, mille kohta vaadake <xref linkend="
+"\"installationOptions\"/>."
+
+#. type: Content of: <section><section><info><title>
+#: en/installer.xml:52
+msgid "The installation steps"
+msgstr "Paigaldamise etapid"
+
+#. type: Content of: <section><section><para>
+#: en/installer.xml:55
+msgid ""
+"The install process is divided into a number of steps, which can be followed "
+"on the side panel of the screen."
+msgstr ""
+"Paigaldamine on jagatud mitmeks etapiks, mille loetelu näeb ekraani "
+"külgpaneelil."
+
+#. type: Content of: <section><section><para>
+#: en/installer.xml:58
+msgid ""
+"Each step has one or more screens which may also have <guibutton>Advanced</"
+"guibutton> buttons with extra, less commonly required, options."
+msgstr ""
+"Igal etapil kohtate üht või enamat ekraani, millel võib olla ka nupp "
+"<guibutton>Muud valikud</guibutton>, mis avab täiendavad ja harvemini "
+"vajalikud valikud."
+
+#. type: Content of: <section><section><para>
+#: en/installer.xml:62
+msgid ""
+"Most screens have <guibutton>Help</guibutton> buttons which give further "
+"explanations about the current step."
+msgstr ""
+"Enamikul ekraanidel on nupp <guibutton>Abi</guibutton>, mis selgitab antud "
+"etappi põhjalikumalt."
+
+#. type: Content of: <section><section><note><para>
+#: en/installer.xml:66
+msgid ""
+"If somewhere during install you decide to stop the installation, it is "
+"possible to reboot, but please think twice before you do this.  Once a "
+"partition has been formatted or updates have started to be installed, your "
+"computer is no longer in the same state and rebooting it could very well "
+"leave you with an unusable system. If in spite of this you are very sure "
+"rebooting is what you want, go to a text terminal by pressing the three keys "
+"<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press "
+"<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
+msgstr ""
+"Kui soovite mingil hetkel paigaldamise katkestada, võite ka teha arvutile "
+"taaskäivituse, aga palun mõelge enne seda hoolikalt järele. Kui partitsioon "
+"on vormindatud või uuendusi on hakatud paigaldama, ei ole arvuti enam "
+"varasemas olekus ning taaskäivitamise tulemus võib olla mittetöötav masin. "
+"Kui te ikkagi olete kindel, et just taaskäivitus on õige samm, minge "
+"tekstiterminali, vajutades korraga kolme klahvi <guibutton>Alt Ctrl F2</"
+"guibutton>. Seejärel vajutage taaskäivitamiseks korraga klahve "
+"<guibutton>Alt Ctrl Delete</guibutton>."
+
+#. type: Content of: <section><section><info><title>
+#: en/installer.xml:80
+msgid "Installation options"
+msgstr "Paigaldamisvõtmed"
+
+#. type: Content of: <section><section><para>
+#: en/installer.xml:83
+msgid ""
+"If the installation fails then it may be necessary to try again by using one "
+"of the extra options available by hitting the <guibutton>F1 (Help)</"
+"guibutton> key see <xref linkend=\"dx-welcome\"></xref>"
+msgstr ""
+"Kui paigaldamine ei õnnestu, võib olla vajalik seda uuesti proovida, "
+"kasutades mõnda lisavõtit, mille nägemiseks tuleb vajutada klahvi "
+"<guibutton>F1 (Abi)</guibutton>, vt ka <xref linkend=\"dx-welcome\"/>"
+
+#. type: Content of: <section><section><para>
+#: en/installer.xml:87
+msgid "This will open the following text based help."
+msgstr "See avab järgmise tekstipõhise abiekraani."
+
+#. type: Content of: <section><section><figure><info><title>
+#: en/installer.xml:91
+msgid "Installation Help Screen"
+msgstr "Paigaldamise abiekraan"
+
+#. type: Content of: <section><section><figure><mediaobject>
+#: en/installer.xml:96
+msgid ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"../dx-help.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"installer-im2\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><info><title>
+#: en/installer.xml:105
+msgid "Installation Problems and Possible Solutions"
+msgstr "Paigaldamisprobleemid ja nende võimalikud lahendused"
+
+#. type: Content of: <section><section><section><section><info><title>
+#: en/installer.xml:111
+msgid "No Graphical Interface"
+msgstr "Graafiline liides puudub"
+
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:116
+msgid ""
+"After the initial screen you did not reach the language selection screen. "
+"This can happen with some graphic cards and older systems. Try using low "
+"resolution by typing <code>vgalo</code> at the prompt."
+msgstr ""
+"Pärast avaekraani ei tulegi keele valiku ekraani ette. See võib juhtuda mõne "
+"graafikakaardi ja vanema süsteemi korral.  Proovige kasutada madalamat "
+"ekraanilahutust, kirjutades käsureale <code>vgalo</code>."
+
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:123
+msgid ""
+"If the hardware is very old, a graphical installation may not be possible. "
+"In this case it is worth trying a text mode installation. To use this hit "
+"ESC at the first welcome screen and confirm with ENTER. You will be "
+"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
+"ENTER. Now continue with the installation in text mode.<emphasis></emphasis>"
+msgstr ""
+"Kui riistvara on väga vana, ei pruugi graafiline paigaldamine üldse võimalik "
+"olla. Sel juhul võib proovida tekstipõhist paigaldamist. Selleks vajutage "
+"avaekraanil viibides klahvile ESC ja kinnitage valikut klahvi ENTER "
+"vajutamisega. Teie ette ilmub must ekraan sõnaga \"boot:\".  Kirjutage \"text"
+"\" ja vajutage ENTER. Nüüd saate jätkata tekstipõhise paigaldamisega."
+"<emphasis/>"
+
+#. type: Content of: <section><section><section><section><info><title>
+#: en/installer.xml:135
+msgid "The Install Freezes"
+msgstr "Paigaldamine hangub"
+
+#. type: Content of: <section><section><section><section><para>
+#: en/installer.xml:138
+msgid ""
+"If the system appeared to freeze during the installation, this may be a "
+"problem with hardware detection. In this case the automatic detection of "
+"hardware may be bypassed and dealt with later. To try this, type "
+"<code>noauto</code> at the prompt. This option may also be combined with "
+"other options as necessary."
+msgstr ""
+"Kui süsteem paistab paigaldamise käigus hanguvat, võib olla raskusi "
+"riistvara tuvastamisega. Sel juhul võib riistvara automaatse tuvastamise "
+"vahele jätta ja sellega hiljem tegelda. Selleks kirjutage käsureale "
+"<code>noauto</code>. Vajaduse korral võib seda võtit kasutada koos teiste "
+"võtmetega."
+
+#. type: Content of: <section><section><section><section><info><title>
+#: en/installer.xml:147
+msgid "Kernel Options"
+msgstr "Kerneli võtmed"
+
+#. type: Content of: <section><section><section><section><para>
+#: en/installer.xml:150
+msgid ""
+"These will rarely be needed, but in some cases the hardware may report the "
+"available RAM incorrectly. To specify this manually, you can use the "
+"<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
+"g. <code>mem=256M</code> would specify 256MB of RAM."
+msgstr ""
+"Neid läheb väga harva vaja, kuid mõnel juhul võib riistvara teatada valesti "
+"saadaoleva mälu (RAM) suuruse. Selle käsitsi määramiseks tuleb kasutada "
+"parameetrit <code>mem=xxxM</code>, kus xxx on korrektne mälu suurus. Näiteks "
+"<code>mem=256M</code> määrab, et kasutada on 256 MB mälu."
+
+#. type: Content of: <section><info><title>
 #: en/installUpdates.xml:3
 msgid "Updates"
 msgstr "Uuendused"
@@ -1574,6 +1809,128 @@ msgid "Then press <guibutton>Next</guibutton> to continue"
 msgstr "Seejärel klõpsake jätkamiseks <guibutton>Edasi</guibutton>."
 
 #. type: Content of: <section><info><title>
+#: en/media_selection.xml:3
+msgid "Media Selection (Nonfree)"
+msgstr "Andmekandjate valik (mittevaba tarkvara)"
+
+#.  papoteur 2013-04-11  - created 
+#.  marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)
+#.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
+#. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
+#. type: Content of: <section><mediaobject>
+#: en/media_selection.xml:12
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><para>
+#: en/media_selection.xml:18
+msgid ""
+"Here you have the list of available repositories. Not all repositories are "
+"available, according to which media you use for installing. The repositories "
+"selection determines which packages will be available for selection during "
+"the next steps."
+msgstr ""
+"Siin näeb saadaolevate tarkvarahoidlate nimekirja. Sõltuvalt paigaldamiseks "
+"valitud andmekandjast võib saadaval olla ainult osa võimalikke hoidlaid. "
+"Hoidlate valik määrab selle, milliseid tarkvarapakette on järgmistel "
+"etappidel võimalik paigaldada."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/media_selection.xml:25
+msgid ""
+"The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
+"the base of the distribution."
+msgstr ""
+"Hoidlat <emphasis>Core</emphasis> (tuumiktarkvara) ei saa välja jätta, sest "
+"see sisaldab distributsiooni põhikomponente."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/media_selection.xml:30
+#, fuzzy
+msgid ""
+"The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
+"of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
+"software (hence the name - Nonfree). For example this repository includes "
+"nVidia and ATI graphics card proprietary drivers, firmware for various WiFi "
+"cards, etc."
+msgstr ""
+"Hoidla <emphasis>Non-free</emphasis> (mittevaba tarkvara) sidaldab pakette, "
+"mis on küll tasuta, nii et Mageia võib neid levitada, aga sisaldavad kinnise "
+"lähtekoodiga tarkvara (sellest ka nimi \"mittevaba\" ehk \"non-free\"). "
+"Näiteks sisaldab see hoidla nVidia ja ATI graafikakaartide omanduslikke "
+"draivereid, mitmesuguste WiFi-kaartide püsivara jms."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/media_selection.xml:38
+msgid ""
+"The <emphasis>Tainted</emphasis> repository includes packages released under "
+"a free license. The main criteria for placing packages in this repository is "
+"that they may infringe patents and copyright laws in some countries, e.g. "
+"Multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD, etc."
+msgstr ""
+"Hoidla <emphasis>Tainted</emphasis> (piirangutega tarkvara) sisaldab "
+"pakette, mis on avaldatud vaba litsentsi all. Peamine põhjus, miks osa "
+"tarkvarapakette paigutatakse sellesse hoidlasse, seisab selles, et need "
+"võivad rikkuda mõnes riigis kehtivaid patendi- ja autoriõiguseseadusi. "
+"Näiteks on siin mitmesuguste heli- ja videofailide esitamiseks vajalikud "
+"multimeediakoodekid, kommerts-video-DVD-de esitamiseks vajalikud paketid jms."
+
+#. type: Content of: <section><info><title>
+#: en/minimal-install.xml:3
+msgid "Minimal Install"
+msgstr "Minimaalne paigaldus"
+
+#. type: Content of: <section><para>
+#: en/minimal-install.xml:9
+msgid ""
+"You can choose a Minimal Installation by de-selecting everything in the "
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
+"xref>."
+msgstr ""
+"Kui paketigruppide ekraanil jätta kõik valimata, saab kasutada minimaalset "
+"paigaldust, vt. <xref linkend=\"choosePackageGroups\"></xref>."
+
+#. type: Content of: <section><para>
+#: en/minimal-install.xml:10
+msgid ""
+"Minimal Installation is intended for those with specific uses in mind for "
+"their <application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with Manual Package "
+"Selection, see <xref linkend=\"choosePackagesTree\"></xref>."
+msgstr ""
+"See on mõeldud neile, kel mõlgub <application>Mageia</application> jaoks "
+"meeles midagi erilist, näiteks server või spetsiaalne tööjaam. Tõenäoliselt "
+"oleks seda mõttekas kasutada koos pakettide ükshaaval valimisega, vt. <xref "
+"linkend=\"choosePackagesTree\"></xref>."
+
+#. type: Content of: <section><para>
+#: en/minimal-install.xml:14
+msgid ""
+"If you choose this installation class, then the related screen will offer "
+"you a few useful extras to install, such as documentation and X."
+msgstr ""
+"Kui valite niisuguse paigaldamise, saab järgmisel ekraanil üht-teist "
+"täpsustada, näiteks lasta paigaldada ka dokumentatsioon või X."
+
+#. type: Content of: <section><mediaobject>
+#: en/minimal-install.xml:19
+msgid ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
+"</imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
+"</imageobject>"
+
+#. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
 msgid "Summary of miscellaneous parameters"
 msgstr "Seadistuste kokkuvõte"
@@ -1794,10 +2151,11 @@ msgstr "<guilabel>Võrk</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:163
+#, fuzzy
 msgid ""
 "You can configure your network here, but for network cards with non-free "
 "drivers it is better to do that after reboot, in the <application>Mageia "
-"Control Center</application>, if you have not yet enabled the non-free media "
+"Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
 "Siin saab seadistada võrgu, kuid võrgukaartide korral, mis kasutavad "
@@ -1892,116 +2250,360 @@ msgstr ""
 "Pange tähele, et kõige lubamine (st tulemüür puudub) võib olla väga ohtlik."
 
 #. type: Content of: <section><info><title>
-#: en/configureTimezoneUTC.xml:12
-msgid "Configure your Timezone"
-msgstr "Ajavööndi seadistamine"
+#: en/securityLevel.xml:12
+msgid "Security Level"
+msgstr "Turbetase"
 
-#.  2012-12-25 marja - moved this part out of misc-params.xml 
+#.  2012-12-25 marja - moved this part out of misc-params.xml" 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureTimezoneUTC.xml:20
+#: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:26
+#: en/securityLevel.xml:24
+msgid "You can adjust your security level here."
+msgstr "Siin saab kohandada oma arvuti turbetaset."
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:27
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Leave the default settings as they are, if you don't know what to choose."
 msgstr ""
-"Määrake ajavöönd kindlaks, valides oma riigi või linna, mis asub samas "
-"ajavööndis teie lähedal."
+"Kui te ei ole kindel, ärge hakake siin midagi muutma, vaid jätke kehtima "
+"vaikimisi määratu."
 
 #. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:30
+#: en/securityLevel.xml:30
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"After install, it will always be possible to adjust your security settings "
+"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
 msgstr ""
-"Järgmisel ekraanil saab valida, kas riistvaraline kell on seatud kohalikule "
-"ajale või GMT-le ehk maailmaajale (UTC)."
+"Pärast paigaldamist on alati võimalik turvalisusega seotud seadistusi muuta "
+"Mageia juhtimiskeskuse sektsioonis <guilabel>Turvalisus</guilabel>."
 
-#. type: Content of: <section><note><para>
-#: en/configureTimezoneUTC.xml:35
+#. type: Content of: <section><info><title>
+#: en/selectCountry.xml:13
+msgid "Select your Country / Region"
+msgstr "Riigi / piirkonna valimine"
+
+#.  2012-12-25 marja - moved this section out of misc-params 
+#.  2013-05-05 marja - added screenshot 
+#. type: Content of: <section><mediaobject>
+#: en/selectCountry.xml:21
 msgid ""
-"If you have more than one operating system on your computer, make sure they "
-"are all set to local time, or all to UTC/GMT."
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
+"imageobject>"
 msgstr ""
-"Kui Teie arvutis on ka teisi operatsioonisüsteeme, kontrollige, et nad kõik "
-"oleksid lültiatud kas kohalikule ajale või siis UTC/GMT-le."
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
+"imageobject>"
 
-#. type: Content of: <section><info><title>
-#: en/resizeFATChoose.xml:17
+#. type: Content of: <section><para>
+#: en/selectCountry.xml:27
 msgid ""
-"Resize <application>Windows<superscript>®</superscript></application> "
-"partition"
+"Select your country or region. This is important for all kinds of settings, "
+"like the currency and wireless regulatory domain. Setting the wrong country "
+"can lead to not being able to use a Wireless network."
 msgstr ""
-"<application>Windows<superscript>®</superscript></application> partitsiooni "
-"suuruse muutmine"
+"Valige oma riik või piirkond. See on oluline paljudele muudele "
+"seadistustele, näiteks valuuta või juhtmeta side regulatsioonipiirkond. Vale "
+"riigi määramisel võib juhtuda, et Te ei saagi juhtmeta sidet kasutada."
 
 #. type: Content of: <section><para>
-#: en/resizeFATChoose.xml:21
+#: en/selectCountry.xml:32
+msgid ""
+"If your country isn't in the list, click the <guilabel>Other Countries</"
+"guilabel> button and choose your country / region there."
+msgstr ""
+"Kui teie riiki nimekirjas pole, klõpsake nupule <guilabel>Muud valikud</"
+"guilabel> ja valige oma riik / piirkond sealt."
+
+#. type: Content of: <section><note><para>
+#: en/selectCountry.xml:37
+msgid ""
+"If your country is only in the <guilabel>Other Countries</guilabel> list, "
+"after clicking <guibutton>OK</guibutton> it may seem a country from the "
+"first list was chosen. Please ignore this, DrakX will follow your real "
+"choice."
+msgstr ""
+"Kui teie riik esineb ainult <guilabel>muude valikute</guilabel> nimekirjas, "
+"siis võib pärast <guibutton>Olgu</guibutton> klõpsamist paista, nagu oleks "
+"valitud riik esimesest nimekirjast. Ärge laske ennast sellest häirida, DrakX "
+"arvestab teie tegeliku valikuga."
+
+#. type: Content of: <section><section><info><title>
+#: en/selectCountry.xml:46
+msgid "Input method"
+msgstr "Sisestusmeetod"
+
+#. type: Content of: <section><section><para>
+#: en/selectCountry.xml:49
+msgid ""
+"In the <guilabel>Other Countries</guilabel> screen you can also select an "
+"input method (at the bottom of the list). Input methods allow users to input "
+"multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
+"default input method in Mageia DVDs, Africa/India and Asia/no-India Live-"
+"CDs. For Asian and African locales, IBus will be set as default input method "
+"so users should not need to configure it manually. Other input methods(SCIM, "
+"GCIN, HIME, etc) also provide similar functions and can be installed if you "
+"added HTTP/FTP media before package selection."
+msgstr ""
+"<guilabel>Muude riikide</guilabel> ekraanil saab ka valida sisestusmeetodi "
+"(nimekirjast allpool). See võimaldab kasutajal sisestada keerukate "
+"märgisüsteemide märke (hiina, jaapani, korea jm kirjad). IBus on vaikimisi "
+"sisestusmeetod Mageia DVD-del ning Aafrika/India ja Aasia/Mitte-India LiveCD-"
+"del. Aasia ja Aafrika lokaatide korral määratakse IBus vaikimisi "
+"sisestusmeetodiks, nii et kasutaja ei pea seda ise käsitsi määrama.  Teised "
+"sisestusmeetodid (SCIM, GCIN, HIME jne) pakuvad sarnaseid võimalusi ning "
+"neid saab paigaldada, kui lisada enne paketivalikut HTTP või FTP andmekandja."
+
+#. type: Content of: <section><section><note><para>
+#: en/selectCountry.xml:61
 msgid ""
-"You have more than one <application>Windows<superscript>®</superscript></"
-"application> partition.  Choose which one should be made smaller to make "
-"space for installing <application>Mageia</application>."
+"If you missed the input method setup during installation, you can access it "
+"after you boot your installed system via \"Configure your Computer\" -&gt; "
+"\"System\", or by running localedrake as root."
 msgstr ""
-"Teil on mitu <application>Windows<superscript>®</superscript></application> "
-"partitsiooni.  Valige, millise peaks muutma väiksemaks, et teha ruumi "
-"<application>Mageia</application> paigaldusele."
+"Kui jätsite paigaldamise ajal sisestusmeetodi valimata, saab seda teha "
+"pärast paigaldatud süsteemi laadimist, valides \"Arvuti seadistamine\" -&gt; "
+"\"Süsteem\" või käivitades administraatorina localedrake'i."
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
-msgid "Setup SCSI"
-msgstr "SCSI seadistamine"
+#: en/selectInstallClass.xml:23
+msgid "Install or Upgrade"
+msgstr "Paigaldamine või uuendamine"
 
-#.  Made by marja on 2012 04 02 
-#.  NEEDS TO BE REVIEWED! 
-#.  JohnR - edited 2012-03-03 
-#.  SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-) 
-#.  barjac has re-reviewed and made some minor tweaks. Revisions incremented. 
-#.  marja 2012-04-24 added screenshot 
-#.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
-#.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/selectInstallClass.xml:27
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+"\"center\" format=\"PNG\"></imagedata> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-setupSCSI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"setupSCSI-im1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectInstallClass.xml:34
+msgid "Install"
+msgstr "Paigaldamine"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectInstallClass.xml:36
+msgid ""
+"Use this option for a fresh <application>Mageia</application> installation."
+msgstr ""
+"Selle valimisel saab ette võtta uue <application>Mageia</application> "
+"paigaldamise."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectInstallClass.xml:41
+msgid "Upgrade"
+msgstr "Uuendamine"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectInstallClass.xml:43
+msgid ""
+"If you have one or more <application>Mageia 2</application> installations on "
+"your system, the installer will allow you to upgrade one of them to the "
+"latest release."
+msgstr ""
+"Kui teie süsteemi on juba varem paigaldatud <application>Mageia 2</"
+"application>, võimaldab paigaldusprogramm seda uusimale väljalaskele "
+"uuendada."
+
+#. type: Content of: <section><note><para>
+#: en/selectInstallClass.xml:49
+msgid ""
+"If during install you decide to stop the installation, it is possible to "
+"reboot, but please think twice before you do this. Once a partition has been "
+"formatted or updates have started to be installed, your computer isn't in "
+"the same state anymore and rebooting it could very well leave you with an "
+"unusable system. If in spite of that you are very sure rebooting is what you "
+"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
+"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
+"guilabel> simultaneously to reboot."
+msgstr ""
+"Kui soovite mingil hetkel paigaldamise katkestada, võite ka teha arvutile "
+"taaskäivituse, aga palun mõelge enne seda hoolikalt järele. Kui partitsioon "
+"on vormindatud või uuendusi on hakatud paigaldama, ei ole arvuti enam "
+"varasemas olekus ning taaskäivitamise tulemus võib olla mittetöötav masin. "
+"Kui te ikkagi olete kindel, et just taaskäivitus on õige samm, minge "
+"tekstiterminali, vajutades korraga kolme klahvi <guibutton>Alt Ctrl F2</"
+"guibutton>. Seejärel vajutage taaskäivitamiseks korraga klahve "
+"<guibutton>Alt Ctrl Delete</guibutton>"
+
+#. type: Content of: <section><tip><para>
+#: en/selectInstallClass.xml:60
+msgid ""
+"If you have discovered that you forgot to select an additional language, you "
+"can return from the \"Install or Upgrade\" screen to the language choice "
+"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
+"emphasis> do this later in the install."
+msgstr ""
+"Kui avastate, et olete unustanud mõne keele lisada, saab \"Paigaldamise või "
+"uuendamise\" ekraanilt naasta keelevaliku juurde, vajutades korraga klahve "
+"<guilabel>Alt Ctrl Home</guilabel>.  <emphasis>Ärge</emphasis> tehke seda "
+"hilisema paigalduse käigus."
+
+#. type: Content of: <section><info><title>
+#: en/selectKeyboard.xml:14
+msgid "Keyboard"
+msgstr "Klaviatuur"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/selectKeyboard.xml:17
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX selects an appropriate keyboard for your language. If no suitable "
+"keyboard is found it will default to a US keyboard layout."
 msgstr ""
-"DrakX tuvastab tavaliselt kõvakettad korrektselt. Mõne vanema SCSI "
-"kontrolleri korral aga ei suudeta korrektselt tuvastada vajalikku draiverit "
-"ja seetõttu ka ketast ära tunda."
+"DrakX valib teie keelele sobiva klaviatuuri. Kui sobivat klaviatuuri ei "
+"leita, kasutatakse vaikimisi US klaviatuuripaigutust."
+
+#. type: Content of: <section><mediaobject>
+#: en/selectKeyboard.xml:22
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectKeyboard.xml:30
+msgid ""
+"Make sure that the selection is correct or choose another keyboard layout. "
+"If you don't know which layout your keyboard has, look in the specifications "
+"that came with your system, or ask the computer vendor. There may even be a "
+"label on the keyboard that identifies the layout. You can also look here: "
+"<link xlink:href=\"http://en.wikipedia.org/wiki/Keyboard_layout\">en."
+"wikipedia.org/wiki/Keyboard_layout</link>"
+msgstr ""
+"Kontrollige, kas valik on õige, ja valige vajaduse korral mõni muu "
+"klaviatuuripaigutus. Kui te ei tea, millise paigutusega teie klaviatuur on, "
+"uurige süsteemi dokumentatsiooni või küsige järele tarnijalt. Klaviatuuri "
+"küljes võib isegi olla silt, mis ütleb, millise paigutusega on tegu. Samuti "
+"võib uurida veebilehekülge <link xlink:href=\"http://en.wikipedia.org/wiki/"
+"Keyboard_layout\">en.wikipedia.org/wiki/Keyboard_layout</link>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectKeyboard.xml:40
+msgid ""
+"If your keyboard isn't in the list shown, click on <guibutton>More</"
+"guibutton> to get a full list, and select your keyboard there."
+msgstr ""
+"Kui teie klaviatuuri nimekirjas ei ole, klõpsake täieliku loetelu nägemiseks "
+"<guibutton>Veel</guibutton> ja valige oma klaviatuur sealt."
+
+#. type: Content of: <section><itemizedlist><listitem><para><warning><para>
+#: en/selectKeyboard.xml:45
+msgid ""
+"After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
+"you'll return to the first keyboard choice dialog and it will seem as though "
+"a keyboard from that screen was chosen. You can safely ignore this anomaly "
+"and continue the installation: Your keyboard is the one you chose from the "
+"full list."
+msgstr ""
+"Olles valinud klaviatuuri pärast nupule <guibutton>Veel</guibutton> "
+"klõpsamist, võite esimese dialoogi juurde naastes näha, nagu oleks valitud "
+"mõni sealne klaviatuur. Ärge laske ennast sellest häirida: arvestatakse "
+"ikkagi seda, millise klaviatuuri te tegelikult täisnimekirjas olete valinud."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectKeyboard.xml:55
+msgid ""
+"If you choose a keyboard based on non-Latin characters, you will see an "
+"extra dialog screen asking how you would prefer to switch between the Latin "
+"and non-Latin keyboard layouts"
+msgstr ""
+"Kui valite klaviatuuri, mis ei kasuta ladina tähti, näete lisadialoogi, mis "
+"palub määrata, kuidas eelistate lülituda ladina ja mitteladina "
+"klaviatuuripaigutuste vahel."
+
+#. type: Content of: <section><info><title>
+#: en/selectLanguage.xml:23
+msgid "Please choose a language to use"
+msgstr "Kasutatava keele valimine"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/selectLanguage.xml:26
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
-"you have."
+"Select your preferred language, by first expanding the list for your "
+"continent. <application>Mageia</application> will use this selection during "
+"the installation and for your installed system."
 msgstr ""
-"Kui nii peaks juhtuma, tuleb DrakX-ile käsitsi selgeks teha, millised SCSI "
-"seadmed teil on."
+"Valige vajalik keel, laiendades nimekirja kõigepealt maailmajao järgi.  "
+"<application>Mageia</application> kasutab langetatud valikut nii "
+"paigaldamise ajal kui ka paigaldatud süsteemis."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
-msgid "DrakX should then be able to configure the drive(s) correctly."
-msgstr "Seejärel peaks DrakX olema võimeline kettad korrektselt seadistama."
+#: en/selectLanguage.xml:30
+msgid ""
+"If it is likely that you will require several languages installed on your "
+"system, for yourself or other users, then you should use the "
+"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
+"difficult to add extra language support after installation."
+msgstr ""
+"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."
+
+#. type: Content of: <section><mediaobject>
+#: en/selectLanguage.xml:36
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-selectLanguage.png\" align=\"center\" "
+"format=\"PNG\" > </imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectLanguage.png\" "
+"format=\"PNG\" /> </imageobject>"
+
+#. type: Content of: <section><warning><para>
+#: en/selectLanguage.xml:44
+msgid ""
+"Even if you choose more than one language, you must first choose one of them "
+"as your preferred language in the first language screen. It will also be "
+"marked as chosen in the multiple languages screen ."
+msgstr ""
+"Isegi kui paigaldate mitu keelt, tuleb üks neist valida esimesel ekraanil "
+"eelistatud keeleks. See keel on märgitud ka mitme keele valimise ekraanil."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:51
+msgid ""
+"If your keyboard language is not the same as your preferred language, then "
+"it is advisable to install the language of your keyboard as well."
+msgstr ""
+"Kui klaviatuuri keel ei sobi kokku eelistatud keelega, oleks mõistlik "
+"paigaldada kohe ka klaviatuurile vastav keel."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:57
+msgid ""
+"Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the "
+"\"multiple languages\" screen if you know that it is inappropriate for your "
+"language. Disabling UTF-8 applies to all installed languages."
+msgstr ""
+"Mageia toetab vaikimisi UTF-8 (Unicode). Selle võib keelata \"mitme keele "
+"valimise\" ekraanil, kui olete kindel, et see teie keelele kohe üldse ei "
+"sobi. UTF-8 keelamine rakendub kõigile paigaldatavatele keeltele."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:64
+msgid ""
+"You can change the language of your system after installation in the Mageia "
+"Control Center -&gt; System -&gt; Manage localization for your system."
+msgstr ""
+"Oma süsteemi keelt saab pärast paigaldamist muuta, valides Mageia "
+"juhtimiskeskus -&gt; Süsteem -&gt; Süsteemi lokaliseerimine."
 
 #. type: Content of: <section><info><title>
 #: en/selectMouse.xml:4
@@ -2047,6 +2649,79 @@ msgstr ""
 "et seadistada nuppe, mis peaksid töötama kuue või rohkema nupuga hiirel."
 
 #. type: Content of: <section><info><title>
+#: en/setupBootloaderAddEntry.xml:5
+msgid "Add or Modify a Boot Menu Entry"
+msgstr "Alglaadimismenüü kirje lisamine või muutmine"
+
+#. type: Content of: <section><mediaobject>
+#: en/setupBootloaderAddEntry.xml:10
+msgid ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+"bootloaderConfiguration.png\" format=\"PNG\" align=\"center\" xml:id="
+"\"bootloaderConfiguration-im1\"></imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
+"bootloaderConfiguration.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"bootloaderConfiguration-im1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:17
+msgid ""
+"You can add an entry or modify the one you select first, by pressing the "
+"relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
+"and editing the screen that pops up on top of it."
+msgstr ""
+"Kirje saab lisada või valitut muuta, kui klõpsata <emphasis>alglaaduri "
+"seadistamise</emphasis> ekraanil vajalikule nupule ja sooritada muutused "
+"selle kohale ilmuvas ekraanis."
+
+#. type: Content of: <section><mediaobject>
+#: en/setupBootloaderAddEntry.xml:21
+msgid ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+"setupBootloaderAddEntry.png\" format=\"PNG\" align=\"center\" xml:id="
+"\"setupBootloaderAddEntry-im1\"></imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
+"setupBootloaderAddEntry.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setupBootloaderAddEntry-im1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:26
+msgid ""
+"Some things that can be done without any risk, are changing the label of an "
+"entry and ticking the box to make an entry the default one."
+msgstr ""
+"Mõningaid asju võib muuta vähese riskiga, näiteks kirje nimi ja märge "
+"kastikeses, millega see muudetakse vaikimisi kirjeks."
+
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:27
+msgid ""
+"You can add the proper version number of an entry, or rename it completely."
+msgstr ""
+"Kirje nimele võib lisada versiooninumbri, aga nime võib ka täielikult muuta."
+
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:28
+msgid ""
+"The default entry is the one the systems boots into if you don't make a "
+"choice while booting up."
+msgstr ""
+"Vaikimisi kirje on see, mille süsteem laadib, kui jätate alglaadimise ajal "
+"kasutamata võimaluse midagi valida."
+
+#. type: Content of: <section><warning><para>
+#: en/setupBootloaderAddEntry.xml:29
+msgid ""
+"Editing other things can leave you with an unbootable system. Please don't "
+"just try something without knowing what you are doing."
+msgstr ""
+"Teiste parameetrite muutmine võib kaasa tuua süsteemi, mida enam ei saagi "
+"laadida. Sestap ärge muutke siin midagi, mille muutmise vajalikkuses te "
+"täiesti kindel ei ole."
+
+#. type: Content of: <section><info><title>
 #: en/setupBootloader.xml:3
 msgid "Bootloader main options"
 msgstr "Alglaaduri põhiseadistused"
@@ -2215,781 +2890,106 @@ msgstr ""
 "guibutton> ja märkige ära kastike <guilabel>/tmp puhastatakse igal "
 "käivitumisel</guilabel>. See aitab ruumi mõnevõrra kokku hoida."
 
-#. type: Attribute 'xml:lang' of: <section>
-#: en/DrakX.xml:1 en/media_selection.xml:1 en/add_supplemental_media.xml:2
-msgid "en"
-msgstr "et"
-
-#. type: Content of: <article><info><title>
-#: en/DrakX.xml:3
-msgid "Installation with DrakX"
-msgstr "Paigaldamine DrakX'i abil"
-
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakX.xml:6
-msgid "<note>"
-msgstr "<note>"
-
-#. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakX.xml:7
-msgid ""
-"No one will see all the installer screens that you see in this manual. Which "
-"screens you will see, depends on your hardware and the choices you make "
-"while installing."
-msgstr ""
-"Keegi ei näe kõiki käsiraamatus toodud paigaldusprogrammi ekraane.  See, "
-"millised ekraanid on näha, sõltub teie riistvarast ja paigaldamise käigus "
-"langetatud valikutest."
-
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX.xml:10
-msgid "</note>"
-msgstr "</note>"
-
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX.xml:12
-msgid ""
-"The texts and screenshots in this manual are available under the CC BY-SA "
-"3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
-"\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
-msgstr ""
-"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>."
-
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX.xml:16
-msgid ""
-"This manual was produced with the help of the <link ns6:href=\"http://www."
-"calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
-"neodoc.biz\">NeoDoc</link>."
-msgstr ""
-"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>."
-
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX.xml:18
-msgid ""
-"It was written by volunteers in their free time. Please contact <link ns6:"
-"href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
-"link>, if you would like to help improve this manual."
-msgstr ""
-"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>."
-
-#. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:11
-msgid "Choose an X Server (Configure your Graphic Card)"
-msgstr "X-serveri valimine (graafikakaardi seadistamine)"
-
-#. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:16
-msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
-msgid ""
-"DrakX has a very comprehensive database of video cards and will usually "
-"correctly identify your video device."
-msgstr ""
-"DrakX sisaldab väga põhjalikku videokaartide andmebaasi ja suudab tavaliselt "
-"teie videoseadme korrektselt tuvastada."
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
-msgid ""
-"If the installer has not correctly detected your graphic card and you know "
-"which one you have, you can select it from the tree by:"
-msgstr ""
-"Kui paigaldusprogramm siiski ei ole teie videokaarti õigesti tuvastanud ja "
-"te teate, milline kaart teil on, võite valida selle loetelust järgmiste "
-"parameetrite alusel:"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
-msgid "vendor"
-msgstr "tootja"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
-msgid "then the name of your card"
-msgstr "seejärel kaardi nimi"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
-msgid "and the type of card"
-msgstr "ja lõpuks kaardi tüüp"
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
-msgid ""
-"If you cannot find your card in the vendor lists (because it's not yet in "
-"the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
-msgstr ""
-"Kui te ei leia oma kaarti tootjate nimekirjast (sest seda pole veel "
-"andmebaasis või on tegu väga vana kaardiga), võib siiski leida sobiva "
-"draiveri Xorg-i kategoorias."
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
-msgstr ""
-"Xorg-i nimekiri pakub üle 40 üldise avatud lähtekoodiga videokaardi "
-"draiveri. Kui te ikkagi ei suuda oma kaardile sobivat draiverit siit leida, "
-"võite valida Vesa draiveri, mis pakub kõige elementaarsemaid võimalusi."
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
-msgid ""
-"Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
-msgstr ""
-"Arvestage kindlasti, et kui valite sobimatu draiveri, võite saada kasutada "
-"ainult käsurida."
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:51
-msgid ""
-"Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
-msgstr ""
-"Mõned videokaartide tootjad pakuvad Linuxile omanduslikke draivereid, mis "
-"võivad olla saadaval ainult Nonfree tarkvarahoidlas, mõnel "
-"juhul isegi kõigest tootja enda veebileheküljel."
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
-msgid ""
-"The Nonfree repository need to be explicitly enabled to access them.  If you "
-"didn't select it previously, you should do this after your first reboot."
-msgstr ""
-"Nonfree hoidlad tuleb kasutamiseks spetsiaalselt lubada.  Seda "
-"saab teha pärast arvuti esimest taaskäivitamist."
-
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
-msgid "Choosing your Monitor"
-msgstr "Monitori valimine"
-
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
-msgid ""
-"DrakX has a very comprehensive database of monitors and will usually "
-"correctly identify yours."
-msgstr ""
-"DrakX sisaldab väga põhjalikku monitoride andmebaasi ja tuvastab tavaliselt "
-"teie monitori õigesti."
-
-#. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
-msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
-msgstr ""
-"<emphasis>Teistsuguste parameetritega monitori valimine võib kahjustada "
-"monitori või videoriistvara. Palun ärge proovige lihtsalt huvi pärast "
-"midagi, kui te ei ole kindel, et teate täpselt, mida teete.</emphasis> "
-"Kahtluste korral uurige oma monitori dokumentatsiooni."
-
-#. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
-msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
-msgid "<emphasis>Custom</emphasis>"
-msgstr "<emphasis>Kohandatud</emphasis>"
-
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
-msgid ""
-"This option allows you to set two critical parameters, the vertical refresh "
-"rate and the horizontal sync rate. Vertical refresh determines how often the "
-"screen is refreshed and horizontal sync is the rate at which scan lines are "
-"displayed."
-msgstr ""
-"Selle valimine võimaldab paika panna kaks äärmiselt tähtsat parameetrit: "
-"realaotussageduse ja ekraaniuuendussageduse."
-
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
-msgid ""
-"It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
-"type with a sync range that is beyond the capabilities of your monitor: you "
-"may damage your monitor. If in doubt, choose a conservative setting and "
-"consult your monitor documentation."
-msgstr ""
-"On <emphasis>VÄGA TÄHTIS</emphasis>, et te ei valiks sellise "
-"sünkroonimissagedusega monitori tüüpi, mis ületab teie monitori võimeid: sel "
-"moel võib monitorile tõsist kahju teha. Kui kahtlete, valige pigem "
-"tagasihoidlikum väärtus ja kindlasti uurige monitori dokumentatsiooni."
-
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
-msgid "<emphasis>Plug 'n Play</emphasis>"
-msgstr "<emphasis>Plug'n Play</emphasis>"
-
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
-msgid ""
-"This is the default option and tries to determine the monitor type from the "
-"monitor database."
-msgstr ""
-"See on vaikimisi valik, mis üritab määrata monitori tüübi monitoride "
-"andmebaasi põhjal."
-
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
-msgid "<emphasis>Vendor</emphasis>"
-msgstr "<emphasis>Tootja</emphasis>"
-
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
-msgid ""
-"If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
-msgstr ""
-"Kui paigaldusprogramm ei ole teie videokaarti õigesti tuvastanud ja te "
-"teate, milline kaart teil on, võite valida selle puust järgmiste "
-"parameetrite alusel:"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
-msgid "the monitor manufacturers name"
-msgstr "monitori nimi"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
-msgid "the monitor description"
-msgstr "monitori kirjeldus"
-
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
-msgid "<emphasis>Generic</emphasis>"
-msgstr "<emphasis>Tavaline</emphasis>"
-
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
-msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
-msgstr ""
-"Selles grupis on valida ligemale 30 seadistuse seast, näiteks 1024x768 @ "
-"60Hz, sealhulgas lamekuvarid (Flat panel), mida kasutavad eriti sülearvutid. "
-"See on sageli mõistlik monitori valimise grupp, kui teie videoriistvara ei "
-"suudetud automaatselt tuvastada ja peate kasutama Vesa draiverit. Ka siin "
-"tasub valides olla pigem konservatiivne."
-
-#. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:4
-msgid "Graphic Card and Monitor Configuration"
-msgstr "Graafikakaardi ja monitori seadistamine"
-
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
-msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
-msgid ""
-"No matter which graphical environment (also known as desktop environment) "
-"you chose for this install of <application>Mageia</application>, they are "
-"all based on a graphical user interface system called <acronym>X Window "
-"System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
-msgstr ""
-"Sõltumata sellest, millise graafilise keskkonna ehk töökeskkonna olete "
-"otsustanud oma <application>Mageia</application> paigaldusele valida, "
-"kasutavad nad kõik graafilise kasutajaliidese süsteemi <acronym>X Window "
-"System</acronym>, lihtsamalt öeldes <acronym>X</acronym>. Niisiis peavad "
-"selleks, et <acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</"
-"acronym> või mis tahes töökeskkond korralikult töötaks, olema järgmised "
-"<acronym>X</acronym>'i seadistused korras. Valige õiged seadistused, kui "
-"näete, et <application>DrakX</application> ei ole midagi valinud, või kui "
-"arvate, et valik ei ole õige."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
-msgid ""
-"<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
-"from the list if needed."
-msgstr ""
-"<emphasis><guibutton>Graafikakaart</guibutton></emphasis>: valige vajaduse "
-"korral loetelust oma kaart."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
-msgid ""
-"<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
-msgstr ""
-"<emphasis><guibutton>Monitor</guibutton></emphasis>: valida saab "
-"<guilabel>Plug'n Play</guilabel>, kui see sobib, või siis vajaliku monitori "
-"nimekirjast pealdise <guilabel>Tootja</guilabel> või <guilabel>Tavaline</"
-"guilabel> all. Valige <guilabel>Kohandatud</guilabel>, kui eelistate käsitsi "
-"paika panna oma monitori realaotus- ja ekraaniuuendussageduse."
-
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
-msgid "Incorrect refresh rates may damage your monitor"
-msgstr "Väärad sagedused võivad monitori kahjustada."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
-msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
-msgstr ""
-"<emphasis><guibutton>Ekraanilahutus</guibutton></emphasis>: siin saab "
-"määrata vajaliku monitori ekraanilahutuse ja värvisügavuse."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:56
-msgid ""
-"<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
-msgstr ""
-"<emphasis><guibutton>Test</guibutton></emphasis>: testimisnuppu paigaldamise "
-"ajal alati ei näe. Kui see on näha, siis saab sellele vajutades kontrollida "
-"määratud seadistuste õigsust. Kui näete küsimust, kas seadistused on õiged, "
-"võite vastata \"jah\" ning seadistused salvestatakse. Kui te ei näe midagi, "
-"saate tagasi pöörduda seadistusekraanile ja seal seni parameetreid muuta, "
-"kuni test annab vajaliku tulemuse. <emphasis>Kui testimisnuppu pole, "
-"kontrollige eriti hoolikalt, et kõik seadistused oleksid korras.</emphasis>"
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
-msgid ""
-"<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
-"enable or disable various options."
-msgstr ""
-"<emphasis><guibutton>Eelistused</guibutton></emphasis>: siin saab "
-"mitmesuguseid valikuid lubada või keelata."
-
-#. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
-msgid "Add or Modify a Boot Menu Entry"
-msgstr "Alglaadimismenüü kirje lisamine või muutmine"
-
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
-msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"bootloaderConfiguration-im1\"></imagedata> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" format=\"PNG\" revision=\"1\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
-
-#. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:17
-msgid ""
-"You can add an entry or modify the one you select first, by pressing the "
-"relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
-"and editing the screen that pops up on top of it."
-msgstr ""
-"Kirje saab lisada või valitut muuta, kui klõpsata <emphasis>alglaaduri "
-"seadistamise</emphasis> ekraanil vajalikule nupule ja sooritada muutused "
-"selle kohale ilmuvas ekraanis."
+#: en/setupSCSI.xml:11
+msgid "Setup SCSI"
+msgstr "SCSI seadistamine"
 
+#.  Made by marja on 2012 04 02 
+#.  NEEDS TO BE REVIEWED! 
+#.  JohnR - edited 2012-03-03 
+#.  SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-) 
+#.  barjac has re-reviewed and made some minor tweaks. Revisions incremented. 
+#.  marja 2012-04-24 added screenshot 
+#.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
+#.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:21
-msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"setupBootloaderAddEntry.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"setupBootloaderAddEntry-im1\"></imagedata> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"setupBootloaderAddEntry.png\" format=\"PNG\" revision=\"1\" xml:id="
-"\"setupBootloaderAddEntry-im1\"/> </imageobject>"
-
-#. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:26
-msgid ""
-"Some things that can be done without any risk, are changing the label of an "
-"entry and ticking the box to make an entry the default one."
-msgstr ""
-"Mõningaid asju võib muuta vähese riskiga, näiteks kirje nimi ja märge "
-"kastikeses, millega see muudetakse vaikimisi kirjeks."
-
-#. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:27
-msgid ""
-"You can add the proper version number of an entry, or rename it completely."
-msgstr ""
-"Kirje nimele võib lisada versiooninumbri, aga nime võib ka täielikult muuta."
-
-#. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:28
-msgid ""
-"The default entry is the one the systems boots into if you don't make a "
-"choice while booting up."
-msgstr ""
-"Vaikimisi kirje on see, mille süsteem laadib, kui jätate alglaadimise ajal "
-"kasutamata võimaluse midagi valida."
-
-#. type: Content of: <section><warning><para>
-#: en/setupBootloaderAddEntry.xml:29
-msgid ""
-"Editing other things can leave you with an unbootable system. Please don't "
-"just try something without knowing what you are doing."
-msgstr ""
-"Teiste parameetrite muutmine võib kaasa tuua süsteemi, mida enam ei saagi "
-"laadida. Sestap ärge muutke siin midagi, mille muutmise vajalikkuses te "
-"täiesti kindel ei ole."
-
-#. type: Content of: <section><info><title>
-#: en/minimal-install.xml:3
-msgid "Minimal Install"
-msgstr "Minimaalne paigaldus"
-
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:9
-msgid ""
-"You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
-"xref>."
-msgstr ""
-"Kui paketigruppide ekraanil jätta kõik valimata, saab kasutada minimaalset "
-"paigaldust, vt. <xref linkend=\"choosePackageGroups\"></xref>."
-
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:10
+#: en/setupSCSI.xml:26
 msgid ""
-"Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with Manual Package "
-"Selection, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
+"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
 msgstr ""
-"See on mõeldud neile, kel mõlgub <application>Mageia</application> jaoks "
-"meeles midagi erilist, näiteks server või spetsiaalne tööjaam. Tõenäoliselt "
-"oleks seda mõttekas kasutada koos pakettide ükshaaval valimisega, vt. <xref "
-"linkend=\"choosePackagesTree\"></xref>."
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-setupSCSI.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"setupSCSI-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:14
-msgid ""
-"If you choose this installation class, then the related screen will offer "
-"you a few useful extras to install, such as documentation and X."
-msgstr ""
-"Kui valite niisuguse paigaldamise, saab järgmisel ekraanil üht-teist "
-"täpsustada, näiteks lasta paigaldada ka dokumentatsioon või X."
-
-#. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:19
-msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
-
-#. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
-msgid "Security Level"
-msgstr "Turbetase"
-
-#.  2012-12-25 marja - moved this part out of misc-params.xml" 
-#.  2013-05-05 marja - added screenshot 
-#. type: Content of: <section><mediaobject>
-#: en/securityLevel.xml:19
+#: en/setupSCSI.xml:32
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"DrakX usually detects hard disks correctly. With some older SCSI controllers "
+"it may be unable to determine the correct drivers to use and subsequently "
+"fail to recognise the drive."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
-
-#. type: Content of: <section><para>
-#: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
-msgstr "Siin saab kohandada oma arvuti turbetaset."
+"DrakX tuvastab tavaliselt kõvakettad korrektselt. Mõne vanema SCSI "
+"kontrolleri korral aga ei suudeta korrektselt tuvastada vajalikku draiverit "
+"ja seetõttu ka ketast ära tunda."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/setupSCSI.xml:36
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
+"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"you have."
 msgstr ""
-"Kui te ei ole kindel, ärge hakake siin midagi muutma, vaid jätke kehtima "
-"vaikimisi määratu."
+"Kui nii peaks juhtuma, tuleb DrakX-ile käsitsi selgeks teha, millised SCSI "
+"seadmed teil on."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
-msgid ""
-"After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
-msgstr ""
-"Pärast paigaldamist on alati võimalik turvalisusega seotud seadistusi muuta "
-"Mageia juhtimiskeskuse sektsioonis <guilabel>Turvalisus</guilabel>."
+#: en/setupSCSI.xml:39
+msgid "DrakX should then be able to configure the drive(s) correctly."
+msgstr "Seejärel peaks DrakX olema võimeline kettad korrektselt seadistama."
 
 #. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
-msgid "Select your Country / Region"
-msgstr "Riigi / piirkonna valimine"
+#: en/takeOverHdConfirm.xml:4
+msgid "Confirm hard disk to be formatted"
+msgstr "Kõvaketta vormindamise kinnitamine"
 
-#.  2012-12-25 marja - moved this section out of misc-params 
-#.  2013-05-05 marja - added screenshot 
+#.  Made by marja on 2012 04 03 
+#.  test comment - johnr 
+#.  2012-04-24 marja - replaced "if you are not sure you selected the correct
+#.     hard disk." with "if you are not sure about your choice", because I'm sure I
+#.     saw this help screen when I had only one HD 
+#.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:21
-msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
-
-#. type: Content of: <section><para>
-#: en/selectCountry.xml:27
+#: en/takeOverHdConfirm.xml:19
 msgid ""
-"Select your country or region. This is important for all kinds of settings, "
-"like the currency and wireless regulatory domain. Setting the wrong country "
-"can lead to not being able to use a Wireless network."
+"<imageobject> <imagedata fileref=\"dx2-takeOverHdConfirm.png\" format=\"PNG"
+"\" align=\"center\" ></imagedata> </imageobject>"
 msgstr ""
-"Valige oma riik või piirkond. See on oluline paljudele muudele "
-"seadistustele, näiteks valuuta või juhtmeta side regulatsioonipiirkond. Vale "
-"riigi määramisel võib juhtuda, et Te ei saagi juhtmeta sidet kasutada."
+"<imageobject> <imagedata fileref=\"dx2-takeOverHdConfirm.png\" format=\"PNG"
+"\" align=\"center\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:32
-msgid ""
-"If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
-msgstr ""
-"Kui teie riiki nimekirjas pole, klõpsake nupule <guilabel>Muud valikud</"
-"guilabel> ja valige oma riik / piirkond sealt."
-
-#. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#: en/takeOverHdConfirm.xml:24
 msgid ""
-"If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"Click on <guibutton>Previous</guibutton> if you are not sure about your "
 "choice."
 msgstr ""
-"Kui teie riik esineb ainult <guilabel>muude valikute</guilabel> nimekirjas, "
-"siis võib pärast <guibutton>Olgu</guibutton> klõpsamist paista, nagu oleks "
-"valitud riik esimesest nimekirjast. Ärge laske ennast sellest häirida, DrakX "
-"arvestab teie tegeliku valikuga."
-
-#. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:46
-msgid "Input method"
-msgstr "Sisestusmeetod"
-
-#. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
-msgid ""
-"In the <guilabel>Other Countries</guilabel> screen you can also select an "
-"input method (at the bottom of the list). Input methods allow users to input "
-"multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
-"default input method in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method "
-"so users should not need to configure it manually. Other input methods(SCIM, "
-"GCIN, HIME, etc) also provide similar functions and can be installed if you "
-"added HTTP/FTP media before package selection."
-msgstr ""
-"<guilabel>Muude riikide</guilabel> ekraanil saab ka valida sisestusmeetodi "
-"(nimekirjast allpool). See võimaldab kasutajal sisestada keerukate "
-"märgisüsteemide märke (hiina, jaapani, korea jm kirjad). IBus on vaikimisi "
-"sisestusmeetod Mageia DVD-del ning Aafrika/India ja Aasia/Mitte-India LiveCD-"
-"del. Aasia ja Aafrika lokaatide korral määratakse IBus vaikimisi "
-"sisestusmeetodiks, nii et kasutaja ei pea seda ise käsitsi määrama.  Teised "
-"sisestusmeetodid (SCIM, GCIN, HIME jne) pakuvad sarnaseid võimalusi ning "
-"neid saab paigaldada, kui lisada enne paketivalikut HTTP või FTP andmekandja."
-
-#. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:61
-msgid ""
-"If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -&gt; "
-"\"System\", or by running localedrake as root."
-msgstr ""
-"Kui jätsite paigaldamise ajal sisestusmeetodi valimata, saab seda teha "
-"pärast paigaldatud süsteemi laadimist, valides \"Arvuti seadistamine\" -&gt; "
-"\"Süsteem\" või käivitades administraatorina localedrake'i."
-
-#. type: Content of: <section><info><title>
-#: en/media_selection.xml:3
-msgid "Media Selection (Nonfree)"
-msgstr "Andmekandjate valik (mittevaba tarkvara)"
-
-#.  papoteur 2013-04-11  - created 
-#.  marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)
-#.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
-#. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
-#. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
-msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><para>
-#: en/media_selection.xml:18
-msgid ""
-"Here you have the list of available repositories. Not all repositories are "
-"available, according to which media you use for installing. The repositories "
-"selection determines which packages will be available for selection during "
-"the next steps."
-msgstr ""
-"Siin näeb saadaolevate tarkvarahoidlate nimekirja. Sõltuvalt paigaldamiseks "
-"valitud andmekandjast võib saadaval olla ainult osa võimalikke hoidlaid. "
-"Hoidlate valik määrab selle, milliseid tarkvarapakette on järgmistel "
-"etappidel võimalik paigaldada."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
-msgid ""
-"The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
-"the base of the distribution."
-msgstr ""
-"Hoidlat <emphasis>Core</emphasis> (tuumiktarkvara) ei saa välja jätta, sest "
-"see sisaldab distributsiooni põhikomponente."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
-msgid ""
-"The <emphasis>Non-free</emphasis> repository includes packages that are free-"
-"of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
-"software (hence the name - Nonfree). For example this repository includes "
-"nVidia and ATI graphics card proprietary drivers, firmware for various WiFi "
-"cards, etc."
-msgstr ""
-"Hoidla <emphasis>Non-free</emphasis> (mittevaba tarkvara) sidaldab pakette, "
-"mis on küll tasuta, nii et Mageia võib neid levitada, aga sisaldavad kinnise "
-"lähtekoodiga tarkvara (sellest ka nimi \"mittevaba\" ehk \"non-free\"). "
-"Näiteks sisaldab see hoidla nVidia ja ATI graafikakaartide omanduslikke "
-"draivereid, mitmesuguste WiFi-kaartide püsivara jms."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
-msgid ""
-"The <emphasis>Tainted</emphasis> repository includes packages released under "
-"a free license. The main criteria for placing packages in this repository is "
-"that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
-msgstr ""
-"Hoidla <emphasis>Tainted</emphasis> (piirangutega tarkvara) sisaldab "
-"pakette, mis on avaldatud vaba litsentsi all. Peamine põhjus, miks osa "
-"tarkvarapakette paigutatakse sellesse hoidlasse, seisab selles, et need "
-"võivad rikkuda mõnes riigis kehtivaid patendi- ja autoriõiguseseadusi. "
-"Näiteks on siin mitmesuguste heli- ja videofailide esitamiseks vajalikud "
-"multimeediakoodekid, kommerts-video-DVD-de esitamiseks vajalikud paketid jms."
-
-#. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
-msgid "Media Selection (Configure Supplemental Installation Media)"
-msgstr "Andmekandjate valik (täiendavate paigaldusandmekandjate seadistamine)"
-
-#.  papoteur 2013-04-13  - created 
-#.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
-#.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
-#. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
-msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"Klõpsake <guibutton>Tagasi</guibutton>, kui te ei ole oma valikus kindel."
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/takeOverHdConfirm.xml:27
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
+"partition, every operating system and all data on that hard disk."
 msgstr ""
-"Siin on näha juba tuvastatud hoidlad. Võite lisada ka teisi allikaid, kust "
-"tarkvarapakette hankida, näiteks plaadi pealt või internetist. Allikate "
-"valik määrab, milliseid tarkvarapakette saab järgmistel etappidel kasutada."
-
-#. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
-msgid "For a network source, there are two steps to follow:"
-msgstr "Võrguallika korral tuleb lisaks ette võtta järgmised sammud:"
+"Klõpsake <guibutton>Edasi</guibutton>, kui olete kindel ning soovite "
+"kustutada kõvakettal kõik partitsioonid, kõik operatsioonisüsteemid ja üldse "
+"kõik andmed."
 
-#. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
-msgid "Choosing and activation of the network, if not already up."
-msgstr "Valida ja aktiveerida võrk, kui see veel ei tööta."
+#~ msgid ""
+#~ "Resize <application>Windows<superscript>®</superscript></application> "
+#~ "partition"
+#~ msgstr ""
+#~ "<application>Windows<superscript>®</superscript></application> "
+#~ "partitsiooni suuruse muutmine"
 
-#. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:37
-msgid ""
-"Selecting a mirror or specifying a URL (very first entry). By selecting a "
-"mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the non-free , the tainted repositories and the updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
-msgstr ""
-"Valida peegel või määrata URL (esimene kirje). Peegli valimisel saab "
-"kasutada kõiki Mageia määratud hoidlaid, sealhulgas mittevaba (non-free) ja "
-"piirangutega (tainted) tarkvara ja uuendusi sisaldavaid hoidlaid. URL-i "
-"määrates saab kasutada mõnda konkreetset hoidlat või omaenda NFS-allikat."
+#~ msgid ""
+#~ "You have more than one <application>Windows<superscript>®</superscript></"
+#~ "application> partition.  Choose which one should be made smaller to make "
+#~ "space for installing <application>Mageia</application>."
+#~ msgstr ""
+#~ "Teil on mitu <application>Windows<superscript>®</superscript></"
+#~ "application> partitsiooni.  Valige, millise peaks muutma väiksemaks, et "
+#~ "teha ruumi <application>Mageia</application> paigaldusele."
 
 #~ msgid "Choose hard disk to erase for <application>Mageia</application>"
 #~ msgstr ""