aboutsummaryrefslogtreecommitdiffstats
path: root/docs/docs/stable/installer/et
diff options
context:
space:
mode:
authorYuri Chornoivan <yurchor@ukr.net>2019-01-15 12:23:28 +0200
committerYuri Chornoivan <yurchor@ukr.net>2019-01-15 12:23:28 +0200
commit5e96bdad29e368040c17aab7422c14f5f3afed5d (patch)
treead2c3709e3c945dfe296d5104ed971dae7eb8a86 /docs/docs/stable/installer/et
parentb814028edad98984fa4d53e668789c7c20be8d53 (diff)
downloadtools-5e96bdad29e368040c17aab7422c14f5f3afed5d.tar
tools-5e96bdad29e368040c17aab7422c14f5f3afed5d.tar.gz
tools-5e96bdad29e368040c17aab7422c14f5f3afed5d.tar.bz2
tools-5e96bdad29e368040c17aab7422c14f5f3afed5d.tar.xz
tools-5e96bdad29e368040c17aab7422c14f5f3afed5d.zip
Sync all translations
Diffstat (limited to 'docs/docs/stable/installer/et')
-rw-r--r--docs/docs/stable/installer/et/DrakLive-cover.xml114
-rw-r--r--docs/docs/stable/installer/et/DrakLive.xml45
-rw-r--r--docs/docs/stable/installer/et/DrakX-cover.xml174
-rw-r--r--docs/docs/stable/installer/et/DrakX-inline.xml138
-rw-r--r--docs/docs/stable/installer/et/DrakX.xml116
-rw-r--r--docs/docs/stable/installer/et/SelectAndUseISOs2.xml285
-rw-r--r--docs/docs/stable/installer/et/acceptLicense.xml38
-rw-r--r--docs/docs/stable/installer/et/addUser.xml122
-rw-r--r--docs/docs/stable/installer/et/add_supplemental_media.xml45
-rw-r--r--docs/docs/stable/installer/et/ask_mntpoint_s.xml87
-rw-r--r--docs/docs/stable/installer/et/bestTime.xml33
-rw-r--r--docs/docs/stable/installer/et/bootLive.xml203
-rw-r--r--docs/docs/stable/installer/et/chooseDesktop.xml61
-rw-r--r--docs/docs/stable/installer/et/choosePackageGroups.xml5
-rw-r--r--docs/docs/stable/installer/et/choosePackagesTree.xml18
-rw-r--r--docs/docs/stable/installer/et/configureServices.xml21
-rw-r--r--docs/docs/stable/installer/et/configureTimezoneUTC.xml20
-rw-r--r--docs/docs/stable/installer/et/configureX_card_list.xml60
-rw-r--r--docs/docs/stable/installer/et/configureX_chooser.xml106
-rw-r--r--docs/docs/stable/installer/et/configureX_monitor.xml97
-rw-r--r--docs/docs/stable/installer/et/diskPartitioning.xml16
-rw-r--r--docs/docs/stable/installer/et/diskdrake.xml127
-rw-r--r--docs/docs/stable/installer/et/doPartitionDisks.xml300
-rw-r--r--docs/docs/stable/installer/et/exitInstall.xml19
-rw-r--r--docs/docs/stable/installer/et/firewall.xml38
-rw-r--r--docs/docs/stable/installer/et/formatPartitions.xml47
-rw-r--r--docs/docs/stable/installer/et/graphicalConfiguration.xml22
-rw-r--r--docs/docs/stable/installer/et/installUpdates.xml42
-rw-r--r--docs/docs/stable/installer/et/installer.xml326
-rw-r--r--docs/docs/stable/installer/et/locale.xml14
-rw-r--r--docs/docs/stable/installer/et/login.xml28
-rw-r--r--docs/docs/stable/installer/et/media_selection.xml29
-rw-r--r--docs/docs/stable/installer/et/minimal-install.xml56
-rw-r--r--docs/docs/stable/installer/et/misc-params.xml142
-rw-r--r--docs/docs/stable/installer/et/reboot.xml22
-rw-r--r--docs/docs/stable/installer/et/securityLevel.xml36
-rw-r--r--docs/docs/stable/installer/et/selectCountry.xml53
-rw-r--r--docs/docs/stable/installer/et/selectInstallClass.xml84
-rw-r--r--docs/docs/stable/installer/et/selectKeyboard.xml47
-rw-r--r--docs/docs/stable/installer/et/selectKeyboardLive.xml33
-rw-r--r--docs/docs/stable/installer/et/selectLanguage.xml91
-rw-r--r--docs/docs/stable/installer/et/selectMouse.xml30
-rw-r--r--docs/docs/stable/installer/et/setupBootloader.xml280
-rw-r--r--docs/docs/stable/installer/et/setupSCSI.xml28
-rw-r--r--docs/docs/stable/installer/et/software.xml22
-rw-r--r--docs/docs/stable/installer/et/soundConfig.xml57
-rw-r--r--docs/docs/stable/installer/et/takeOverHdConfirm.xml41
-rw-r--r--docs/docs/stable/installer/et/testing.xml45
-rw-r--r--docs/docs/stable/installer/et/uninstall-Mageia.xml43
-rw-r--r--docs/docs/stable/installer/et/unused.xml34
50 files changed, 2526 insertions, 1414 deletions
diff --git a/docs/docs/stable/installer/et/DrakLive-cover.xml b/docs/docs/stable/installer/et/DrakLive-cover.xml
index 12834226..ee14f3d5 100644
--- a/docs/docs/stable/installer/et/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/et/DrakLive-cover.xml
@@ -1,76 +1,104 @@
-<?xml version='1.0' encoding='utf-8'?>
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="et" xml:id="DrakLive-installer"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xhtml"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
+
+
<info>
- <title>Paigaldamine Live-andmekandjalt</title>
- <publisher> <publishername>Mageia.org</publishername> </publisher>
- <revhistory>
- <revision>
- <date>Jaanuar 2015</date>
+ <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>Paigaldamine Live-andmekandjalt</title>
+
+ <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+ <revhistory>
+ <revision>
+ <date>March 2016</date>
+
<revremark>Mageia 5</revremark>
- </revision>
- </revhistory>
+ </revision>
+ </revhistory>
+
<cover>
- <para role="tagline">Mageia ametlik dokumentatsioon</para>
+ <para role="tagline">Mageia ametlik dokumentatsioon</para>
+
<mediaobject>
<imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
- <para>Käsiraamatu tekst ja ekraanipildid on litsenseeritud vastavalt CC BY-SA 3.0
+
+ <para>Käsiraamatu tekst ja ekraanipildid on litsenseeritud vastavalt CC BY-SA 3.0
litsentsile <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
- </para>
- <para>Käsiraamat on valmistatud <link ns6:href="http://www.calenco.com">Calenco
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+ <para>Käsiraamat on valmistatud <link ns6:href="http://www.calenco.com">Calenco
CMS</link>'i abil, mille on välja töötanud <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.
- </para>
- <para>Käsiraamatu on kirjutanud ja tõlkinud vabatahtlikud oma vabast ajast. Kui
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+ <para>Käsiraamatu on kirjutanud ja tõlkinud vabatahtlikud oma vabast ajast. Kui
soovite kaasa aidata käsiraamatu paremaks muutmisele, võtke ühendust <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskonnaga</link>.</para>
+ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskonnaga</link>.</para>
</cover>
</info>
+
<article>
<title>Paigaldamine Live-andmekandjalt</title>
- <para><note>
- <para>Keegi ei näe kõiki käsiraamatus toodud paigaldusprogrammi ekraane. See,
+
+ <para><note>
+ <para>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.</para>
- </note></para>
- <xi:include href="SelectAndUseISOs2.xml"/>
+ </note></para>
+
+ <xi:include href="SelectAndUseISOs2.xml"/>
+
+ <xi:include href="bootLive.xml"/>
+
+ <xi:include href="selectLanguage.xml"/>
- <xi:include href="bootLive.xml"/>
+ <xi:include href="acceptLicense.xml"/>
- <xi:include href="selectLanguage.xml"/>
+ <xi:include href="configureTimezoneUTC.xml"/>
- <xi:include href="acceptLicense.xml"/>
+ <xi:include href="bestTime.xml"/>
- <xi:include href="configureTimezoneUTC.xml"/>
+ <xi:include href="selectKeyboardLive.xml"/>
- <xi:include href="bestTime.xml"/>
+ <xi:include href="testing.xml"/>
- <xi:include href="selectKeyboardLive.xml"/>
+ <xi:include href="diskPartitioning.xml"/>
- <xi:include href="testing.xml"/>
+
- <xi:include href="doPartitionDisks.xml"/>
+ <!-- <xi:include href="doPartitionDisks.xml"/>
- <xi:include href="ask_mntpoint_s.xml"/>
- <xi:include href="takeOverHdConfirm.xml"/>
+ <xi:include href="ask_mntpoint_s.xml"/>
- <xi:include href="diskdrake.xml"/>
+ <xi:include href="takeOverHdConfirm.xml"/>
- <xi:include href="formatPartitions.xml"/>
+ <xi:include href="diskdrake.xml"/>
- <xi:include href="unused.xml"/>
+ <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
- <xi:include href="setupBootloader.xml"/>
+ <xi:include href="setupBootloader.xml"/>
- <xi:include href="setupBootloaderAddEntry.xml"/>
+
- <xi:include href="reboot.xml"/>
+ <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
- <xi:include href="addUser.xml"/>
+ <xi:include href="addUser.xml"/>
- <xi:include href="login.xml"/>
+ <xi:include href="login.xml"/>
- <xi:include href="uninstall-Mageia.xml"/>
- </article>
-</book> \ No newline at end of file
+ <xi:include href="uninstall-Mageia.xml"/>
+ </article>
+</book>
diff --git a/docs/docs/stable/installer/et/DrakLive.xml b/docs/docs/stable/installer/et/DrakLive.xml
index 15ab000b..9cfd737d 100644
--- a/docs/docs/stable/installer/et/DrakLive.xml
+++ b/docs/docs/stable/installer/et/DrakLive.xml
@@ -1,6 +1,21 @@
-<?xml version='1.0' encoding='utf-8'?><article xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="et" xml:id="Quick-Startup"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xhtml"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
+
+
<info>
- <title>Paigaldamine Live-andmekandjalt</title>
+ <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>Paigaldamine Live-andmekandjalt</title>
<cover>
<para><note>
@@ -17,9 +32,9 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
CMS</link>'i abil, mille on välja töötanud <link
ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
- <para>Käsiraamatu on kirjutanud ja tõlkinud vabatahtlikud oma vabast ajast. Kui
-soovite kaasa aidata käsiraamatu paremaks muutmisele, võtke ühendust <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskonnaga</link>.</para>
+ <para>It was written by volunteers in their free time. Please contact the <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
+Team</link>, if you would like to help improve this manual.</para>
</cover>
</info>
@@ -39,7 +54,12 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskon
<xi:include href="testing.xml"/>
- <xi:include href="doPartitionDisks.xml"/>
+ <xi:include href="diskPartitioning.xml"/>
+
+
+
+ <!-- <xi:include href="doPartitionDisks.xml"/>
+
<xi:include href="ask_mntpoint_s.xml"/>
@@ -49,17 +69,18 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskon
<xi:include href="formatPartitions.xml"/>
- <xi:include href="unused.xml"/>
-
- <xi:include href="setupBootloader.xml"/>
+ <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
- <xi:include href="setupBootloaderAddEntry.xml"/>
+
- <xi:include href="reboot.xml"/>
+ <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
<xi:include href="addUser.xml"/>
<xi:include href="login.xml"/>
<xi:include href="uninstall-Mageia.xml"/>
-</article> \ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/et/DrakX-cover.xml b/docs/docs/stable/installer/et/DrakX-cover.xml
index f82a001e..5eba518a 100644
--- a/docs/docs/stable/installer/et/DrakX-cover.xml
+++ b/docs/docs/stable/installer/et/DrakX-cover.xml
@@ -1,115 +1,154 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="et" xml:id="Quick-Startup"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:ns62="http://docbook.org/ns/transclusion"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xhtml"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
<info>
<title>Paigaldamine DrakX'i abil</title>
- <publisher> <publishername>Mageia.org</publishername> </publisher>
- <revhistory>
- <revision>
- <date>Veebruar 2014</date>
+
+ <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+ <revhistory>
+ <revision>
+ <date>Veebruar 2014</date>
+
<revremark>Mageia 4</revremark>
- </revision>
- </revhistory>
+ </revision>
+ </revhistory>
+
<cover>
- <para role="tagline">Mageia ametlik dokumentatsioon</para>
+ <para role="tagline">Mageia ametlik dokumentatsioon</para>
+
<mediaobject>
<imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
- <para>Käsiraamatu tekst ja ekraanipildid on litsenseeritud vastavalt CC BY-SA 3.0
+
+ <para>Käsiraamatu tekst ja ekraanipildid on litsenseeritud vastavalt CC BY-SA 3.0
litsentsile <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
- </para>
- <para>Käsiraamat on valmistatud <link ns6:href="http://www.calenco.com">Calenco
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+ <para>Käsiraamat on valmistatud <link ns6:href="http://www.calenco.com">Calenco
CMS</link>'i abil, mille on välja töötanud <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.
- </para>
- <para>Käsiraamatu on kirjutanud ja tõlkinud vabatahtlikud oma vabast ajast. Kui
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+ <para>Käsiraamatu on kirjutanud ja tõlkinud vabatahtlikud oma vabast ajast. Kui
soovite kaasa aidata käsiraamatu paremaks muutmisele, võtke ühendust <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskonnaga</link>.</para>
+ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskonnaga</link>.</para>
</cover>
</info>
+
<article>
-
+
+
+
+
+
-<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+
+
+ <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
<!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
<title>Paigaldamine DrakX'i abil</title>
- <para><note>
- <para>Keegi ei näe kõiki käsiraamatus toodud paigaldusprogrammi ekraane. See,
+
+ <para><note>
+ <para>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.</para>
- </note></para>
-
-
+ </note></para>
- <!-- <xi:include href="drakx-intro.xml"/>
+
+
+ <!-- <xi:include href="drakx-intro.xml"/>
-->
<xi:include href="SelectAndUseISOs2.xml"/>
- <xi:include href="installer.xml"/>
+ <xi:include href="installer.xml"/>
- <xi:include href="selectLanguage.xml"/>
+ <xi:include href="selectLanguage.xml"/>
- <xi:include href="acceptLicense.xml"/>
+ <xi:include href="acceptLicense.xml"/>
- <xi:include href="setupSCSI.xml"/>
+ <xi:include href="setupSCSI.xml"/>
- <xi:include href="selectInstallClass.xml"/>
+ <xi:include href="selectInstallClass.xml"/>
- <xi:include href="selectKeyboard.xml"/>
+ <xi:include href="selectKeyboard.xml"/>
- <xi:include href="doPartitionDisks.xml"/>
+
-
+
- <!-- <xi:include href="resizeFATChoose.xml"/>
+
+ <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
- <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
-<xi:include href="takeOverHdConfirm.xml"/>
+ <xi:include href="ask_mntpoint_s.xml"/>
+
+ <xi:include href="takeOverHdChoose.xml"/>
+
+ <xi:include href="takeOverHdConfirm.xml"/>
<xi:include href="diskdrake.xml"/>
- <xi:include href="formatPartitions.xml"/>
+ <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
-<xi:include href="add_supplemental_media.xml"/>
-<xi:include href="media_selection.xml"/>
+ <xi:include href="media_selection.xml"/>
-<xi:include href="chooseDesktop.xml"/>
+ <xi:include href="chooseDesktop.xml"/>
-<xi:include href="choosePackageGroups.xml"/>
+ <xi:include href="choosePackageGroups.xml"/>
-<xi:include href="minimal-install.xml"/>
+ <xi:include href="minimal-install.xml"/>
-<xi:include href="choosePackagesTree.xml"/>
+ <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
-
+ <xi:include href="software.xml"/>
+
+
- <!-- <xi:include href="setRootPassword.xml">
+ <!-- <xi:include href="setRootPassword.xml">
</xi:include> -->
<xi:include href="addUser.xml"/>
- <xi:include href="configureX_chooser.xml"/>
+ <xi:include href="graphicalConfiguration.xml"/>
- <xi:include href="configureX_card_list.xml"/>
+
- <xi:include href="configureX_monitor.xml"/>
+ <!-- <xi:include href="configureX_card_list.xml"/>
- <xi:include href="setupBootloader.xml"/>
- <xi:include href="setupBootloaderAddEntry.xml"/>
+ <xi:include href="configureX_chooser.xml"/>
-
+ <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+
- <!-- <xi:include href="setupYabootGeneral.xml">
+
+
+ <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
</xi:include>
<xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -117,29 +156,32 @@ langetatud valikutest.</para>
<xi:include href="summary.xml"></xi:include> -->
<xi:include href="misc-params.xml"/>
-<xi:include href="configureTimezoneUTC.xml"/>
-
-<xi:include href="selectCountry.xml"/>
+ <xi:include href="locale.xml"/>
-<xi:include href="configureServices.xml"/>
+
+
+ <!-- <xi:include href="configureTimezoneUTC.xml"/>
-<xi:include href="selectMouse.xml"/>
-<xi:include href="soundConfig.xml"/>
+ <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
- <xi:include href="securityLevel.xml"/>
+ <xi:include href="selectMouse.xml"/>
- <xi:include href="firewall.xml"/>
+ <xi:include href="soundConfig.xml"/>
+ <xi:include href="securityLevel.xml"/>
-
+ <xi:include href="firewall.xml"/>
- <!-- <xi:include href="configureNetwork.xml">
+
+
+ <!-- <xi:include href="configureNetwork.xml">
</xi:include> -->
<xi:include href="installUpdates.xml"/>
- <xi:include href="exitInstall.xml"/>
-
- <xi:include href="uninstall-Mageia.xml"/>
+ <xi:include href="exitInstall.xml"/>
+
+ <xi:include href="uninstall-Mageia.xml"/>
</article>
</book>
diff --git a/docs/docs/stable/installer/et/DrakX-inline.xml b/docs/docs/stable/installer/et/DrakX-inline.xml
new file mode 100644
index 00000000..b73cb5c9
--- /dev/null
+++ b/docs/docs/stable/installer/et/DrakX-inline.xml
@@ -0,0 +1,138 @@
+<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="Quick-Startup">
+ <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+ <title>Paigaldamine DrakX'i abil</title>
+
+ <cover>
+ <para><note>
+ <para>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.</para>
+ </note></para>
+
+ <para xml:id="CC_BY-SA">Käsiraamatu tekst ja ekraanipildid on litsenseeritud vastavalt CC BY-SA 3.0
+litsentsile <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+ <para>Käsiraamat on valmistatud <link ns6:href="http://www.calenco.com">Calenco
+CMS</link>'i abil, mille on välja töötanud <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+ <para>Käsiraamatu on kirjutanud ja tõlkinud vabatahtlikud oma vabast ajast. Kui
+soovite kaasa aidata käsiraamatu paremaks muutmisele, võtke ühendust <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskonnaga</link>.</para>
+ </cover>
+ </info>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <xi:include href="SelectAndUseISOs2.xml"/>
+
+ <xi:include href="installer.xml"/>
+
+ <xi:include href="selectLanguage.xml"/>
+
+ <xi:include href="acceptLicense.xml"/>
+
+ <xi:include href="setupSCSI.xml"/>
+
+ <xi:include href="selectInstallClass.xml"/>
+
+ <xi:include href="selectKeyboard.xml"/>
+
+ <xi:include href="doPartitionDisks.xml"/>
+
+
+
+ <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+ <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+ <xi:include href="takeOverHdConfirm.xml"/>
+
+ <xi:include href="diskdrake.xml"/>
+
+ <xi:include href="formatPartitions.xml"/>
+
+ <xi:include href="add_supplemental_media.xml"/>
+
+ <xi:include href="media_selection.xml"/>
+
+ <xi:include href="chooseDesktop.xml"/>
+
+ <xi:include href="choosePackageGroups.xml"/>
+
+ <xi:include href="minimal-install.xml"/>
+
+ <xi:include href="choosePackagesTree.xml"/>
+
+
+
+ <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+ <xi:include href="configureX_chooser.xml"/>
+
+ <xi:include href="configureX_card_list.xml"/>
+
+ <xi:include href="configureX_monitor.xml"/>
+
+ <xi:include href="setupBootloader.xml"/>
+
+ <xi:include href="setupBootloaderAddEntry.xml"/>
+
+
+
+ <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+
+ <xi:include href="setupYabootAddEntry.xml"></xi:include>
+
+ <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+ <xi:include href="configureTimezoneUTC.xml"/>
+
+ <xi:include href="selectCountry.xml"/>
+
+ <xi:include href="configureServices.xml"/>
+
+ <xi:include href="selectMouse.xml"/>
+
+ <xi:include href="soundConfig.xml"/>
+
+ <xi:include href="securityLevel.xml"/>
+
+
+
+ <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+ <xi:include href="exitInstall.xml"/>
+
+ <xi:include href="uninstall-Mageia.xml"/>
+</article> \ No newline at end of file
diff --git a/docs/docs/stable/installer/et/DrakX.xml b/docs/docs/stable/installer/et/DrakX.xml
index 63041419..7dd6941f 100644
--- a/docs/docs/stable/installer/et/DrakX.xml
+++ b/docs/docs/stable/installer/et/DrakX.xml
@@ -1,15 +1,53 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<article xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="Quick-Startup">
- <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="et" xml:id="Quick-Startup"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:ns62="http://docbook.org/ns/transclusion"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xhtml"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+ <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
<!--2013-12-08 add soundConfig.xml -->
<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
-<!-- <xi:include href="drakx-intro.xml"/>
- -->
-<info>
- <title>Paigaldamine DrakX'i abil</title>
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+ Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+ b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>Paigaldamine DrakX'i abil</title>
<cover>
<para><note>
@@ -34,18 +72,6 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskon
-
-
-
-
-
-
-
-
-
-
-
-
<xi:include href="SelectAndUseISOs2.xml"/>
<xi:include href="installer.xml"/>
@@ -60,23 +86,28 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskon
<xi:include href="selectKeyboard.xml"/>
- <xi:include href="doPartitionDisks.xml"/>
+
+
+
<!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
- <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
+ <xi:include href="ask_mntpoint_s.xml"/>
+
+ <xi:include href="takeOverHdChoose.xml"/>
- <xi:include href="takeOverHdConfirm.xml"/>
+ <xi:include href="takeOverHdConfirm.xml"/>
<xi:include href="diskdrake.xml"/>
- <xi:include href="formatPartitions.xml"/>
+ <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
- <xi:include href="add_supplemental_media.xml"/>
<xi:include href="media_selection.xml"/>
@@ -86,7 +117,10 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskon
<xi:include href="minimal-install.xml"/>
- <xi:include href="choosePackagesTree.xml"/>
+ <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+ <xi:include href="software.xml"/>
@@ -94,19 +128,25 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskon
</xi:include> -->
<xi:include href="addUser.xml"/>
- <xi:include href="configureX_chooser.xml"/>
+ <xi:include href="graphicalConfiguration.xml"/>
- <xi:include href="configureX_card_list.xml"/>
+
- <xi:include href="configureX_monitor.xml"/>
+ <!-- <xi:include href="configureX_chooser.xml"/>
- <xi:include href="setupBootloader.xml"/>
+
+ <xi:include href="configureX_card_list.xml"/>
- <xi:include href="setupBootloaderAddEntry.xml"/>
+ <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
- <!-- <xi:include href="setupYabootGeneral.xml">
+
+
+ <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
</xi:include>
<xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -114,11 +154,15 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskon
<xi:include href="summary.xml"></xi:include> -->
<xi:include href="misc-params.xml"/>
- <xi:include href="configureTimezoneUTC.xml"/>
+ <xi:include href="locale.xml"/>
+
+
+
+ <!-- <xi:include href="configureTimezoneUTC.xml"/>
- <xi:include href="selectCountry.xml"/>
- <xi:include href="configureServices.xml"/>
+ <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
<xi:include href="selectMouse.xml"/>
@@ -137,4 +181,4 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskon
<xi:include href="exitInstall.xml"/>
<xi:include href="uninstall-Mageia.xml"/>
-</article> \ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/et/SelectAndUseISOs2.xml b/docs/docs/stable/installer/et/SelectAndUseISOs2.xml
index d5239aeb..2970b3a7 100644
--- a/docs/docs/stable/installer/et/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/et/SelectAndUseISOs2.xml
@@ -1,37 +1,73 @@
<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="et" xml:id="Select-and-use-ISOs">
+
+
+
+
+
+
<info>
<!-- Made by Lebarhon 2014 03 26
Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+ a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+ b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+ c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
<title xml:id="Select-and-use-ISOs-ti1">ISO-tõmmise valimine ja kasutamine</title>
</info>
<section>
<title>Sissejuhatus</title>
<para>Mageiat levitatakse ISO-tõmmiste kaudu. Siin leiab abi valimaks just sellist
tõmmist, mis vastab teie vajadustele.</para>
- <para>Andmekandjaid on kaht tüüpi:</para>
+ <para>There are three types of installation media:</para>
<itemizedlist>
<listitem>
- <para>Klassikaline paigaldusandmekandja. See annab maksimaalse paindlikkuse ja
-lubab luua kohandatud paigalduse, eriti just valida, millist töökeskkonda
-kasutama hakata.</para>
+ <para><emphasis role="bold">Classical installer:</emphasis> Booting with this
+media provides you with the maximum flexibility when choosing what to
+install, and for configuring your system. In particular, you have a choice
+of which Desktop environment to install.</para>
</listitem>
<listitem>
- <para>Live-andmekandja: sel juhul saab andmekandja pealt käivitada toimiva Mageia
-süsteemi ilma seda paigaldamata, et näiteks näha, mida üldse
-pakutakse. Paigaldamine on lihtsam, aga ka valikuid on vähem.</para>
+ <para><emphasis role="bold">LIVE media:</emphasis> This option allows you to try
+out Mageia without having to actually install it, or make any changes to
+your computer. However, the Live media also includes an Installer, which can
+be started when booting the media, or after booting into the Live operating
+system itself.</para>
+ <note>
+ <para>The Live Installer is simpler compared to the Classical Installer - but you
+have fewer configuration options.</para>
+ </note>
+ <important>
+ <para>Live ISOs can only be used to create <quote>clean</quote> installations,
+they cannot be used to upgrade previously installed Mageia releases.</para>
+ </important>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">Net Install</emphasis>: These are minimal ISO's
+containing no more than that which is needed to start the DrakX installer
+and find <literal>DrakX-installer-stage2</literal> and other packages that
+are needed to continue and complete the install. These packages may be on
+the PC hard disk, on a local drive, on a local network or on the Internet.</para>
+ <para>Need andmekandjad on väga väikesed (alla 100 MB) ja abiks siis, kui
+internetiühenduse maht on liiga väike terve DVD allalaadimiseks, arvuti on
+ilma DVD-seadmeta või ei saa arvutit käivitada USB-pulga pealt.</para>
</listitem>
</itemizedlist>
- <para>Üksikasjadest kõneldakse järgmistes osades.</para>
+ <para>More details are given in the next sections.</para>
</section>
<section>
<title>Andmekandjad</title>
<section>
<title>Määratlus</title>
- <para>Me nimetame siinkohal andmekandjaks ISO-tõmmisefaili, mis võimaldab
-paigaldada ja/või uuendada Mageiat, ning ühtlasi ka igasugust füüsilist
-seadet, millele ISO-tõmmis on kopeeritud (DVD, USB-pulk jne.).</para>
+ <para>Here, a medium (plural: media) is an ISO image file that allows you to
+install and/or update Mageia and, by extension, any physical medium (DVD,
+USB stick, ...) the ISO file is copied to.</para>
<para>Mageia ISO-tõmmised leiab <link
ns4:href="http://www.mageia.org/en/downloads/">siit</link>.</para>
</section>
@@ -41,24 +77,25 @@ ns4:href="http://www.mageia.org/en/downloads/">siit</link>.</para>
<title>Ühised omadused</title>
<itemizedlist>
<listitem>
- <para>Kasutavad traditsioonilist paigaldusprogrammi drakx.</para>
+ <para>These ISOs use the Classical installer called DrakX</para>
</listitem>
<listitem>
- <para>Saab teha nii puhta paigalduse kui ka uuendada varasematelt väljalasetelt.</para>
+ <para>They are used for performing clean installs or to upgrade a previously
+installed version of Mageia</para>
</listitem>
<listitem>
- <para>Eri andmekandjad 32- ja 64-bitisele arhitektuurile.</para>
+ <para>Different media for 32 and 64-bit architectures</para>
</listitem>
<listitem>
- <para>Tervitusekraanil on saada mõned tööriistad: päästesüsteem, mälu testimine,
-riistvara tuvastamise tööriist.</para>
+ <para>Some tools are available in the Installer <quote>Welcome</quote> screen:
+<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware
+Detection Tool</emphasis></para>
</listitem>
<listitem>
- <para>Iga DVD sisaldab paljusid saadaolevaid töökeskkondi ja keeli.</para>
+ <para>Each DVD contains many available desktop environments and languages</para>
</listitem>
<listitem>
- <para>Paigaldamise käigus lastakse valida, kas kasutada mittevaba tarkvara või
-mitte.</para>
+ <para>You'll be given the choice during the installation to add non-free software</para>
</listitem>
</itemizedlist>
</section>
@@ -69,21 +106,20 @@ mitte.</para>
<title>Ühised omadused</title>
<itemizedlist>
<listitem>
- <para>Saab tarvitada distributsiooni tundmaõppimiseks ilma seda kohe kõvakettale
-paigaldamata, aga soovi korral siiski ka Mageia paigaldamiseks.</para>
+ <para>Can be used to preview the Mageia operating system without having to install
+it</para>
</listitem>
<listitem>
- <para>Iga ISO sisaldab ainult üht töökeskkonda (Plasma, GNOME või Xfce).</para>
+ <para>The Live media also includes an Installer.</para>
</listitem>
<listitem>
- <para>Eri andmekandjad 32- ja 64-bitisele arhitektuurile.</para>
+ <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</para>
</listitem>
<listitem>
- <para><emphasis role="bold">LiveISO-sid saab kasutada ainult puhta paigalduse,
-mitte aga uuendamise jaoks varasemalt versioonilt.</emphasis></para>
+ <para>Different media for 32 and 64-bit architectures</para>
</listitem>
<listitem>
- <para>Sisaldavad mittevaba tarkvara.</para>
+ <para>They contain non-free software</para>
</listitem>
</itemizedlist>
</section>
@@ -91,13 +127,13 @@ mitte aga uuendamise jaoks varasemalt versioonilt.</emphasis></para>
<title>Plasma LiveDVD</title>
<itemizedlist>
<listitem>
- <para>Ainult Plasma töökeskkond.</para>
+ <para>Plasma desktop environment only</para>
</listitem>
<listitem>
- <para>Sisaldab kõiki keeli.</para>
+ <para>All available languages are present</para>
</listitem>
<listitem>
- <para>Ainult 64-bitine arhitektuur.</para>
+ <para>64-bit architecture only</para>
</listitem>
</itemizedlist>
</section>
@@ -105,13 +141,13 @@ mitte aga uuendamise jaoks varasemalt versioonilt.</emphasis></para>
<title>GNOME LiveDVD</title>
<itemizedlist>
<listitem>
- <para>Ainult GNOME töökeskkond.</para>
+ <para>GNOME desktop environment only</para>
</listitem>
<listitem>
- <para>Sisaldab kõiki keeli.</para>
+ <para>All available languages are present</para>
</listitem>
<listitem>
- <para>Ainult 64-bitine arhitektuur.</para>
+ <para>64-bit architecture only</para>
</listitem>
</itemizedlist>
</section>
@@ -119,13 +155,13 @@ mitte aga uuendamise jaoks varasemalt versioonilt.</emphasis></para>
<title>Xfce LiveDVD</title>
<itemizedlist>
<listitem>
- <para>Ainult Xfce töökeskkond.</para>
+ <para>Xfce desktop environment only</para>
</listitem>
<listitem>
- <para>Sisaldab kõiki keeli.</para>
+ <para>All available languages are present</para>
</listitem>
<listitem>
- <para>32- või 64-bitine arhitektuur.</para>
+ <para>32 or 64-bit architectures</para>
</listitem>
</itemizedlist>
</section>
@@ -136,22 +172,10 @@ mitte aga uuendamise jaoks varasemalt versioonilt.</emphasis></para>
<title>Ühised omadused</title>
<itemizedlist>
<listitem>
- <para>Need on väikesed tõmmised, mis sisaldavad vaid tarkvara, mida on vaja
-paigaldusprogrammi drakx käivitamiseks ning drakx-installer-stage2 ja veel
-mõningate pakettide leidmiseks, et siis jätkata paigaldamisega. Need paketid
-võivad asuda arvuti kõvakettal, mõnel muul kohalikul kettal, kohalikus
-võrgus või internetis.</para>
- </listitem>
- <listitem>
- <para>Need andmekandjad on väga väikesed (alla 100 MB) ja abiks siis, kui
-internetiühenduse maht on liiga väike terve DVD allalaadimiseks, arvuti on
-ilma DVD-seadmeta või ei saa arvutit käivitada USB-pulga pealt.</para>
- </listitem>
- <listitem>
- <para>Eri andmekandjad 32- ja 64-bitisele arhitektuurile.</para>
+ <para>Different media for 32 and 64-bit architectures</para>
</listitem>
<listitem>
- <para>Esimesed sammud on ainult inglise keeles.</para>
+ <para>First steps are English language only</para>
</listitem>
</itemizedlist>
</section>
@@ -159,8 +183,8 @@ ilma DVD-seadmeta või ei saa arvutit käivitada USB-pulga pealt.</para>
<title>netinstall.iso</title>
<itemizedlist>
<listitem>
- <para>Sisaldab ainult vaba tarkvara neile, kes ei ole nõus mittevaba tarkvara
-kasutama.</para>
+ <para>Contains only free software, for those who prefer to not use non-free
+software</para>
</listitem>
</itemizedlist>
</section>
@@ -168,8 +192,7 @@ kasutama.</para>
<title>netinstall-nonfree.iso</title>
<itemizedlist>
<listitem>
- <para>Sisaldab mittevaba tarkvara (peamiselt draiverid, koodekid jms.) neile, kes
-seda vajavad.</para>
+ <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
</listitem>
</itemizedlist>
</section>
@@ -179,71 +202,89 @@ seda vajavad.</para>
<title>Andmekandja allalaadimine ja kontrollimine</title>
<section>
<title>Allalaadimine</title>
- <para>Kui olete sobiva ISO-faili valinud, saab selle alla laadida kas HTTP või
-BitTorrenti vahendusel. Mõlemal juhul annab aken mõningat teavet, näiteks
-kasutatava peegelsaidi ja võimaluse kohta seda vahetada, kui ribalaius on
-liiga väike. HTTP valimise korral peaks pilt olema umbes selline:</para>
+ <para>Once you have chosen your ISO file, you can download it using either http or
+BitTorrent. In both cases, you are provided with some information, such as
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+ <para>If http is chosen you will also see some information regarding checksums.</para>
+
+ <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
<mediaobject>
-<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
- <para>md5sum ja sha1sum on tööriistad ISO terviklikkuse kontrollimiseks. Kasutada
-tuleks ainult üht neist. Hoidke üks neist varuks <link
-linkend="integrity">edasiseks kasutamiseks</link>. Seejärel ilmub selline
-aken:</para>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+ <para>In the meantime, a window to download the actual ISO will open:</para>
<mediaobject>
-<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
- <para>Valige faili salvestamine ja klõpsake OK.</para>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+ <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
</section>
<section>
<title xml:id="integrity">Allalaaditud andmekandja terviklikkuse kontrollimine</title>
- <para>Mõlemad kontrollsummad on kuueteistkümnendarvud, mis arvutatakse kindla
-algoritmiga allalaaditava faili põhjal. Kui paluda algoritmil arv uuesti
-leida allalaaditud faili põhjal, saab tulemuseks kas sama arvu, mis
-tähendab, et allalaaditud fail on korras, või siis mõne muu arvu, mis
-tähendab, et see ei ole korras. Viimasel juhul tuleks fail uuesti alla
-laadida või püüda see BitTorrenti abil parandada.</para>
+ <para>The checksums referred to earlier, are digital fingerprints generated by an
+algorithm from the file to be downloaded. You may compare the checksum of
+your downloaded ISO against that of the original source ISO. If the
+checksums do not match, it means that the actual data on the ISO's do not
+match, and if that is the case, then you should retry the download or
+attempt a repair using BitTorrent.</para>
<para>Alla laaditud ISO-tõmmise kontrollsumma genereerimiseks avage konsool
(selleks ei pea olema administraator) ja kirjutage:</para>
<itemizedlist>
<listitem>
- <para>- md5sum kasutamiseks: <userinput>md5sum
-tõmmisefail.iso/asukoht</userinput>.</para>
+ <para>To use the md5sum, type: <command>md5sum
+path/to/the/image/file.iso</command></para>
</listitem>
<listitem>
- <para>- sha1sum kasutamiseks: <userinput>sha1sum
-tõmmisefail.iso/asukoht</userinput>.</para>
+ <para>To use the sha1sum, type: <command>sha1sum
+path/to/the/image/file.iso</command></para>
+ </listitem>
+
+ <listitem>
+ <para>To use the sha512sum, type: <command>sha512sum
+path/to/the/image/file.iso</command></para>
</listitem>
</itemizedlist>
- <para> Näide:</para>
+ <para>Näide:</para>
<mediaobject>
-<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
- <para>ja võrrelge arvutis saadud arvu (võimalik, et peate natuke ootama) Mageia
-allalaadimissaidil näidatuga.</para>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+ <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
</section>
</section>
<section>
<title>ISO kirjutamine</title>
- <para>Kontrollitud ISO võib nüüd kirjutada CD-le, DVD-le või USB-pulgale. See ei
-ole tavaline kopeerimine, vaid eesmärk on luua käivitatav andmekandja.</para>
+ <para>The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a
+USB stick. This is not a standard copy operation, as a bootable medium will
+actually be created.</para>
<section>
<title>ISO kirjutamine CD-le või DVD-le</title>
- <para>Kasutage soovikohast kirjutamisprogrammi, aga kontrollige kindlasti, et
-seade oleks määratud <emphasis role="bold">kirjutama tõmmist</emphasis>,
-mitte aga <emphasis role="bold">andmeid</emphasis> või <emphasis
-role="bold">faile</emphasis>. Rohkem teavet leiab <link
-ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">Mageia
-wikist</link>.</para>
+ <para>Whichever software you use, ensure that the option to burn an<emphasis>
+image</emphasis> is used. Burn <emphasis>data</emphasis> or
+<emphasis>files</emphasis> is NOT correct. See the <link
+ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
+wiki</link> for more information.</para>
</section>
<section>
<title>ISO kirjutamine USB-pulgale</title>
- <para>Kõik Mageia ISO-d on hübriidsed, mis tähendab, et neid saab kirjutada ka
-USB-pulgale, mis on käivitatav ja mille pealt saab süsteemi paigaldada.</para>
+ <para>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+and then use that to boot and install the system.</para>
<warning>
- <para>Tõmmise kirjutamine USB-pulgale hävitab kõik varasemad failisüsteemid
-seadmes, kõik andmed lähevad kaotsi ja partitsiooni suurus väheneb tõmmise
-suurusele.</para>
+ <para>Dumping an image onto a flash device destroys any previous file-system on
+the device and all existing data will be lost.</para>
</warning>
- <para>Algse mahu taastamiseks tuleb USB-pulk uuesti partitsioneerida ja
-vormindada.</para>
+ <note>
+ <para>Also, the only partition on the flash device will then just be the Mageia
+ISO partition.</para>
+ <para>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+then only show up as 4GB. This is because the remaining 4GB is no longer
+formatted - hence not currently available for use. To recover the original
+capacity, you must reformat and repartition the USB stick.</para>
+ </note>
<section>
<title>Graafilise tööriista kasutamine Mageias</title>
<para>Kasutada võib mõnda graafilist tööriista, näiteks <link
@@ -254,8 +295,8 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
<para>Võite proovida järgmisi programme:</para>
<itemizedlist>
<listitem>
- <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> valikuga
-"ISO image";</para>
+ <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
+"ISO image" option</para>
</listitem>
<listitem>
<para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
@@ -264,7 +305,7 @@ Disk Imager</link></para>
</itemizedlist>
</section>
<section>
- <title>Käsurea kasutamine GNU/Linuxi süsteemis</title>
+ <title>Using the Command line within a GNU/Linux system</title>
<warning>
<para>Käsitsi toimetamine on potentsiaalselt *ohtlik*. Kui seadme ID valesti anda,
võib ketta partitsiooni sootuks üle kirjutada.</para>
@@ -274,26 +315,28 @@ võib ketta partitsiooni sootuks üle kirjutada.</para>
<para>Avage konsool</para>
</listitem>
<listitem>
- <para>Võtke administraatori õigused käsuga <userinput>su -</userinput> (ärge
-unustage kriipsukest lõpus)</para>
+ <para>Become a <emphasis>root</emphasis> (Administrator) user with the command
+<command>su -</command> (don't forget the <command>-</command> )</para>
<mediaobject>
-<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Root.png"/> </imageobject></mediaobject>
</listitem>
<listitem>
- <para>Ühendage USB-pulk (ärge haakige seda, see tähendab ärge avage ühtegi
-rakendust või failihaldurit, mis seda lugeda võiks)</para>
+ <para>Plug in your USB stick - but do not mount it (this also means do not open
+any application or file manager that could access or read it)</para>
</listitem>
<listitem>
- <para>Sisestage käsk <userinput>fdisk -l</userinput></para>
+ <para>Enter the command <command>fdisk -l</command></para>
<mediaobject>
-<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
</listitem>
<listitem>
- <para>Leidke oma USB-pulga seadmenimi (suuruse järgi); näiteks toodud pildil on
-selleks <code>/dev/sdb</code>, mis on 8 GB suurune USB-pulk.</para>
- <para>Teine võimalus on leida seadme nimi käsuga <code>dmesg</code>: lõpus näeb
-seadme nime, mille alguses seisab <emphasis>sd</emphasis>, antud juhul
-<emphasis>sdd</emphasis>; samuti on näha, et suurus on 2GB:</para>
+ <para>Find the device name for your USB stick (by its size), for example
+<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick.</para>
+ <para>Alternatively, you can find the device name with the command
+<command>dmesg</command>. Towards the end of the following example, you can
+see the device name starting with <filename>sd</filename>, and in this case,
+<filename>sdd</filename> is the actual device. You can also see that its
+size is 2GB:</para>
<para><screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
@@ -314,22 +357,22 @@ seadme nime, mille alguses seisab <emphasis>sd</emphasis>, antud juhul
[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para>
</listitem>
<listitem>
- <para>Sisestage käsk <emphasis role="bold"># <userinput>dd if=ISO-faili/asukoht
-of=/dev/sdX bs=1M</userinput></emphasis></para>
- <para>kus X on teie seadme nimi, nt: /dev/sdd</para>
- <para>Näide: <emphasis role="bold"># <userinput>dd
-if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/sdd
-bs=1M</userinput></emphasis></para>
+ <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+ <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+ <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
<tip>
- <para>Võib-olla tasub teada sedagi, et <emphasis role="bold">if</emphasis>
-tähendab<emphasis role="bold">i</emphasis>nput <emphasis
-role="bold">f</emphasis>ile'i ehk eesti keeli sisendfaili ja <emphasis
-role="bold">of</emphasis> omakorda <emphasis role="bold">o</emphasis>utput
-<emphasis role="bold">f</emphasis>ile'i ehk väljundfaili.</para>
+ <para>It might be helpful to know that <emphasis role="bold">if</emphasis> stands
+for <emphasis role="bold">i</emphasis>nput <emphasis
+role="bold">f</emphasis>ile and <emphasis role="bold">of</emphasis> stands
+for <emphasis role="bold">o</emphasis>utput <emphasis
+role="bold">f</emphasis>ile</para>
</tip>
</listitem>
<listitem>
- <para>Sisestage käsk: # <userinput>sync</userinput></para>
+ <para>Enter the command: <command>sync</command></para>
</listitem>
<listitem>
<para>See ongi kõik: nüüd võib USB-pulga välja võtta.</para>
@@ -338,4 +381,4 @@ role="bold">of</emphasis> omakorda <emphasis role="bold">o</emphasis>utput
</section>
</section>
</section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/et/acceptLicense.xml b/docs/docs/stable/installer/et/acceptLicense.xml
index 81477d9f..47ad4725 100644
--- a/docs/docs/stable/installer/et/acceptLicense.xml
+++ b/docs/docs/stable/installer/et/acceptLicense.xml
@@ -17,6 +17,12 @@
+
+
+
+
+
+
<info>
<!-- Made by marja on 2012 03 27 -->
<!-- NEEDS TO BE REVIEWED! -->
@@ -31,6 +37,9 @@
<!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not
sure what is causing the corruption -->
<!-- JohnR 2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
<title xml:id="acceptLicense-ti1">Litsents ja väljalaskemärkmed</title>
</info>
@@ -46,17 +55,26 @@ align="center" condition="live"/> </imageobject></mediaobject>
<title xml:id="license-ti1">Litsentsileping</title>
</info>
- <para>Enne <application>Mageia</application> paigaldamist lugege palun hoolikalt
-läbi litsentsi tingimused.</para>
+ <itemizedlist>
+ <listitem>
+ <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+ </listitem>
- <para>Need tingimused kehtivad kogu <application>Mageia</application>
-distributsioonile ja enne jätkamist tuleb nendega nõustuda.</para>
+ <listitem>
+ <para>These terms and conditions apply to the entire Mageia distribution and must
+be accepted before you can continue.</para>
+ </listitem>
- <para>Jätkamiseks valige lihtsalt <guilabel>Nõustun</guilabel> ja klõpsake siis
-<guibutton>Edasi</guibutton>.</para>
+ <listitem>
+ <para>To proceed, simply select <emphasis>Accept</emphasis> and then click on
+<emphasis>Next</emphasis></para>
+ </listitem>
+ </itemizedlist>
- <para>Kui te aga ei ole tingimustega nõus, siis täname teid huvi eest. Klõps
-nupule <guibutton>Välju</guibutton> taaskäivitab arvuti.</para>
+ <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
<!-- if you want two sections in a file, both need to be nested in a third section -
@@ -74,7 +92,7 @@ Release Notes</para>
- <para>Olulist teavet käesolerva <application>Mageia</application> väljalaske kohta
-näeb, kui klõpsata nupule <guibutton>Väljalaskemärkmed</guibutton>.</para>
+ <para>Important information about this particular Mageia release can be viewed by
+clicking on the <emphasis>Release Notes</emphasis> button.</para>
</section>
</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/et/addUser.xml b/docs/docs/stable/installer/et/addUser.xml
index 87f8f2fe..fbb246cc 100644
--- a/docs/docs/stable/installer/et/addUser.xml
+++ b/docs/docs/stable/installer/et/addUser.xml
@@ -1,36 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xlink"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
<info>
- <title xml:id="addUser-ti1">Kasutajate ja administraatori haldamine</title>
+ <title xml:id="addUser-ti1">User Management</title>
</info>
+
+
+
+
+
+
+
+
<mediaobject>
<!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+ Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
<section xml:id="root-password">
<info>
<title xml:id="root-password-ti2">Administraatori (root) parooli määramine</title>
</info>
- <para>Kõigi <application>Mageia</application> paigalduste korral on soovitatav
-määrata administraatori (Linuxis kasutatakse selle kohta tavaliselt
-väljendit <emphasis role="bold">superuser</emphasis> või
-<emphasis>root</emphasis>) parool. Parooli ülemisse kasti kirjutades muutub
-kilbi värv punasest kollaseks ja roheliseks vastavalt sellele, kui tugevaks
-parooli hinnatakse. Roheline kilp tähendab, et parool on tugev ja
-kindel. Sama parool tuleb kirjutada teist korda kohe allpool olevasse kasti:
-sellega kontrollitakse, et parool sai esimesse kasti õigesti kirjutatud,
-neid kahte omavahel võrreldes.</para>
+ <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password in Linux. As you type a password into the
+top box a shield will change from red-to-yellow-to-green depending on the
+strength of the password. A green shield shows you are using a strong
+password. You need to repeat the same password in the box underneath, to
+check that the first entry was not mistyped.</para>
<note xml:id="givePassword">
- <para>Kõik paroolid on tõstutundlikud, see tähendab arvestavad väike- ja
-suurtähti. Parooli tugevuse huvides on mõistlik kasutada tähtede (nii suur-
-kui ka väiketähtede) kõrval ka numbreid ja muid märke.</para>
+ <para>All passwords are case-sensitive. It is best to use a mixture of letters
+(upper and lower case), numbers and other characters in a password.</para>
</note>
</section>
@@ -39,44 +55,46 @@ kui ka väiketähtede) kõrval ka numbreid ja muid märke.</para>
<title xml:id="enterUser-ti3">Kasutaja lisamine</title>
</info>
- <para>Siin saab lisada kasutaja. Kasutajal on vähem õigusi kui administraatoril
-(<emphasis role="bold">root</emphasis>), kuid siiski piisavalt internetis
-liikumiseks, kontoritöörakenduste kasutamiseks, mängimiseks ja kõigeks
-muuks, mida tavaline kasutaja oma arvutis teeb</para>
+ <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
<itemizedlist>
<listitem>
- <para><guibutton>Ikoon</guibutton>: sellele nupule klõpsates saab muuta kasutaja
-ikooni.</para>
- </listitem>
+ <para><emphasis role="bold">Icon</emphasis></para>
- <listitem>
- <para><guilabel>Pärisnimi</guilabel>: siin saab kirja panna kasutaja tegeliku
-nime.</para>
+ <para>Click on this button if you want to change the user's icon</para>
</listitem>
<listitem>
- <para><guilabel>Kasutajatunnus</guilabel>: siin saab kirja panna kasutajanime või
-lasta DrakXil pakkuda pärisnimest tuletatud variandi. <emphasis
-role="bold">Kasutajatunnus on tõstutundlik.</emphasis></para>
+ <para><emphasis role="bold">Real Name</emphasis></para>
+
+ <para>Insert the user's real name into this text box</para>
</listitem>
<listitem>
- <para><guilabel>Parool</guilabel>: siin saab kirja panna kasutaja
-parooli. Tekstikasti lõpus on kilp, mis näitab parooli tugevust (vt ka <xref
-linkend="givePassword"/>).</para>
+ <para><emphasis role="bold">Login Name</emphasis></para>
+
+ <para>Enter the user login name or let DrakX use a version of the user's real
+name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
</listitem>
<listitem>
- <para><guilabel>Parool (uuesti)</guilabel>: siia tuleb parool teist korda
-kirjutada, mille järel Drakx kontrollib, kas see ikka sobib kokku sellega,
-mille sisestasid esimesel korral.</para>
+ <para><emphasis role="bold">Password</emphasis></para>
+
+ <para>Type in the user password. There is a shield at the end of the text box that
+indicates the strength of the password. (See also <xref
+linkend="givePassword"/>)</para>
+
+ <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
</listitem>
</itemizedlist>
<note>
- <para>Kõigi Mageia paigaldamise ajal lisatud kasutajate kodukataloog on nii
-lugemis- kui ka kirjutuskaitstud (umask=0027).</para>
+ <para>Any users added while installing Mageia, will have a home directory that is
+both read and write protected (umask=0027)</para>
<para>Kõik vajalikud kasutajad saab lisada juba paigaldamise ajal
<emphasis>kokkuvõtte</emphasis> etapil. Valige seal <emphasis>Kasutajate
@@ -86,33 +104,31 @@ haldamine</emphasis>.</para>
</note>
</section>
- <section xml:id="addUserAdvanced" condition="classical">
+ <section condition="classical" xml:id="addUserAdvanced">
<info>
- <title xml:id="addUserAdvanced-ti3">Põhjalikum kasutajate haldamine</title>
+ <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
</info>
- <para>Nupule <guibutton>Muud valikud</guibutton> klõpsates ilmub ekraan, kus saab
-muuta lisatava kasutaja mõningaid seadistusi.</para>
+ <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
<itemizedlist>
<listitem>
- <para><guilabel>Shell</guilabel>: selles rippmenüüs saab muuta shelli, mida
-kasutab eelmisel ekraanil lisatud kasutaja. Valikuteks on <emphasis
-role="bold">Bash</emphasis>, <emphasis role="bold">Dash</emphasis> ja
-<emphasis role="bold">Sh</emphasis>.</para>
+ <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
+shell available to any user you added in the previous screen. Options are
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
</listitem>
<listitem>
- <para><guilabel>Kasutaja ID</guilabel>: siin saab määrata eelmisel ekraanil
-lisatud <emphasis role="bold">kasutaja ID</emphasis>. See on arv. Kui te ei
-tea, milleks see hea on, ärge siia midagi kirjutage.</para>
+ <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
+added in the previous screen. If you are unsure what the purpose of this is,
+then leave it blank.</para>
</listitem>
<listitem>
- <para><guilabel>Grupi ID</guilabel>: siin saab määrata <emphasis role="bold">grupi
-ID</emphasis>. Kui te ei tea, milleks see hea on, ärge ka siia midagi
-kirjutage.</para>
+ <para><emphasis>Group ID</emphasis>: This lets you set the group ID. Again, if
+unsure, leave it blank.</para>
</listitem>
</itemizedlist>
</section>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/et/add_supplemental_media.xml b/docs/docs/stable/installer/et/add_supplemental_media.xml
index 8335c59c..edfa1598 100644
--- a/docs/docs/stable/installer/et/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/et/add_supplemental_media.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="et">
<info>
- <title xml:id="add_supplemental_media-ti1">Andmekandjate valik (täiendavate paigaldusandmekandjate seadistamine)</title>
+ <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
</info>
@@ -9,44 +9,49 @@
+
+
+
+
<mediaobject>
<!-- 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 -->
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
<imageobject> <imagedata format="PNG"
fileref="dx2-add_supplemental_media.png"
xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
</imageobject></mediaobject>
- <para>Siin on näha juba tuvastatud tarkvarahoidlad. 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.</para>
+ <para>This screen shows you the list of already recognised 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 during the
+subsequent steps.</para>
<para>Võrguallika korral tuleb lisaks ette võtta järgmised sammud:</para>
<orderedlist>
<listitem>
- <para>Valida ja aktiveerida võrk, kui see veel ei tööta.</para>
+ <para>Choosing and activating the network, if not already up.</para>
</listitem>
<listitem>
- <para>Valida peegel või määrata URL (esimene kirje). Peegli valimisel saab
-kasutada kõiki Mageia määratud hoidlaid, sealhulgas mittevaba (<emphasis
-role="bold">nonfree</emphasis>) ja piirangutega (<emphasis
-role="bold">tainted</emphasis>) tarkvara ja uuendusi (<emphasis
-role="bold">updates</emphasis>) sisaldavaid hoidlaid. URL-i määrates saab
-kasutada mõnda konkreetset hoidlat või omaenda NFS-allikat.</para>
+ <para>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 <emphasis>Nonfree</emphasis>, the
+<emphasis>Tainted</emphasis> repositories and the
+<emphasis>Updates</emphasis>. With the URL, you can designate a specific
+repository or your own NFS installation.</para>
</listitem>
</orderedlist>
<note>
- <para>Kui uuendate 64-bitist paigaldust, milles võib leiduda mõningaid 32-bitiseid
-rakendusi, on soovitatav sellel ekraanil lisada võrgupeegel, märkides
-selleks ära mõni pakutud võrguprotokoll. 64-bitise DVD ISO-tõmmis sisaldab
-ainult 64-bitiseid ja arhitektuurist sõltumatuid tarkvarapakette, mistõttu
-selle abil ei saa uuendada 32-bitiseid rakendusi. Kuid pärast võrgupeegli
-lisamist leiab paigaldusprogramm ise sealt üles vajalikud 32-bitised
-tarkvarapaketid.</para>
+ <para>If you are updating a 64-bit installation which may contain some 32-bit
+packages, it is advised to use this screen to add an online mirror by
+selecting one of the Network protocols here. The 64-bit DVD ISO only
+contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be
+able to update the 32-bit packages. However, after adding an online mirror,
+the installer will find the needed 32-bit packages there.</para>
</note>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/et/ask_mntpoint_s.xml b/docs/docs/stable/installer/et/ask_mntpoint_s.xml
index 79e9ed3c..69e7b9d3 100644
--- a/docs/docs/stable/installer/et/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/et/ask_mntpoint_s.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="ask_mntpoint_s" version="5.0" xml:lang="et">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="ask_mntpoint_s"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xlink"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
<info>
<title xml:id="ask_mntpoint_s-ti1">Haakepunktide valimine</title>
</info>
@@ -21,6 +28,10 @@
+
+
+
+
<mediaobject>
<!-- Made by marja on 2012 03 28 -->
<!-- NEEDS TO BE REVIEWED! -->
@@ -33,43 +44,35 @@
write "it's type". And you're right about the redundant part, too, I removed it-->
<!-- And JohnR says the Americans are WRONG! :-)) -->
<!-- 2012-04-19 Language proofreading done -->
-<imageobject condition="classical"> <imagedata format="PNG"
-xml:id="chooseMountPoints-im1" align="center"
-fileref="dx2-chooseMountpoints.png" revision="1"/> </imageobject>
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-chooseMountpoints.png" align="center"
-xml:id="live-chooseMountPoints-im1" revision="1"/> </imageobject></mediaobject>
-
- <para>Siin näeb Linuxi partitsioone, mis arvutist leiti. Kui te pole
-<application>DrakX</application>i ettepanekutega nõus, võite haakepunkte
-muuta.</para>
-
- <note>
- <para>Kui te ka midagi muudate, kontrollige alati, et teil jääks alles
-juurpartitsioon (<emphasis role="bold"><literal>/)</literal></emphasis>.</para>
- </note>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
+
+ <para>Here you see the Linux partitions that have been found on your computer. If
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
<itemizedlist>
<listitem>
- <para>Kõiki partitsioone näidatakse kujul <emphasis role="bold">"Seade" ("Suurus",
-"Haakepunkt", "Tüüp")</emphasis>.</para>
+ <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
</listitem>
<listitem>
- <para><emphasis role="bold">Seade</emphasis> koosneb järgmistest
-elementidest:<emphasis role="bold">kõvaketas</emphasis>, [<emphasis
-role="bold">kõvaketta nimi</emphasis> (täht)], <emphasis
-role="bold">partitsiooni number</emphasis> (näiteks <emphasis
-role="bold">sda5</emphasis>).</para>
- </listitem>
-
- <listitem>
- <para>Kui partitsioone on palju, saab neile haakepunkte valida rippmenüüst
-(näiteks <emphasis role="bold">/</emphasis>, <emphasis
-role="bold"><literal>/home</literal></emphasis> ja <emphasis
-role="bold">/var</emphasis>). Võib ka luua oma haakepunkte, näiteks
-<emphasis role="bold"><literal>/video</literal></emphasis> partitsioonile,
-kuhu soovite salvestada filme, või <emphasis role="bold">Andmed</emphasis>.</para>
+ <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
</listitem>
<listitem>
@@ -79,13 +82,17 @@ jätta.</para>
</itemizedlist>
<warning>
- <para>Kui te pole kindel, mida valida, klõpsake <emphasis
-role="bold">Tagasi</emphasis> ning märkige <guilabel>Ketta jagamine oma
-tahtmist mööda</guilabel>. Ilmuval ekraanil saab partitsioonile klõpsates
-näha selle tüüpi ja suurust.</para>
+ <para>If you make any changes here, ensure you still have a <filename>/</filename>
+(root) partition.</para>
</warning>
- <para>Kui olete kindel, et haakepunktid on paigas, klõpsake
-<guibutton>Edasi</guibutton> ja valige, kas soovite vormindada ainult
-partitsioonid, mida DrakX soovitab, või rohkem.</para>
-</section> \ No newline at end of file
+ <tip>
+ <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+ </tip>
+
+ <para>If you are sure the mount points are correct, click on
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
+</section>
diff --git a/docs/docs/stable/installer/et/bestTime.xml b/docs/docs/stable/installer/et/bestTime.xml
index 0a43b2f0..102d1e5f 100644
--- a/docs/docs/stable/installer/et/bestTime.xml
+++ b/docs/docs/stable/installer/et/bestTime.xml
@@ -1,22 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="et" xml:id="bestTime"
- xmlns="http://docbook.org/ns/docbook"
- xmlns:ns6="http://www.w3.org/1999/xlink"
- xmlns:ns5="http://www.w3.org/1999/xhtml"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1998/Math/MathML"
- xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="et" xml:id="bestTime">
+
+
<info>
- <title xml:id="bestTime-ti1">Kellaaja seadistamine</title>
+ <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
</info>
-
<mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-bestTime.png"
-format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
-
- <para>Siin tuleb valida, kas arvuti sisemine kell on seatud kohalikule ajale või
-UTC ehk standardajale.</para>
-
- <para>Muude valikute kaadril leiab rohkem võimalusi kellaaega täpsemalt
-seadistada.</para>
-</section>
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+ <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+ <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/et/bootLive.xml b/docs/docs/stable/installer/et/bootLive.xml
index ce9ec21b..2368b8ee 100644
--- a/docs/docs/stable/installer/et/bootLive.xml
+++ b/docs/docs/stable/installer/et/bootLive.xml
@@ -1,27 +1,176 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="et"><info><title xml:id="bootLive-ti1">Mageia laadimine Live-süsteemina</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Käivitamine andmekandjalt</title></info><section><info><title xml:id="bootLive11-ti1">Kettalt</title></info><para>Algkäivituse võib teha otse andmekandjalt, millele olete kirjutanud oma
-tõmmise (CD-ROM, DVD-ROM vms). Tavaliselt tuleb andmekandja lihtsalt asetada
-CD/DVD-seadmesse ning alglaadur käivitab arvuti taaskäivitamise järel
-paigaldamise automaatselt. Kui seda ei juhtu, võib olla vajalik BIOS ümber
-seadistada või vajutada vastavat klahvi, mis võimaldab valida lisaseadme,
-millest arvuti käivitada.</para><para>Sõltuvalt teie riistvarast ja selle kehtivast seadistusest näete üht kahest
-alltoodud ekraanist.</para></section><section><info><title xml:id="bootLive12-ti1">USB-pulgalt</title></info><para>Algkäivituse saab teha USB-pulgalt, millele kirjutasite
-ISO-tõmmise. Sõltuvalt BIOS-e seadistusest võib arvuti otse käivituda
-USB-pulgalt, mis on masinaga ühendatud. Kui seda ei juhtu, võib olla vajalik
-BIOS ümber seadistada või vajutada vastavat klahvi, mis võimaldab valida
-lisaseadme, millest arvuti käivitada. </para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">BIOS-e/CSM-i/Pärandrežiimis</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Esimene ekraan BIOS-e režiimis algkäivitusel</para></caption></mediaobject><para>Keskel asuvas menüüs saab valida kolme võimaluse vahel:</para><itemizedlist><listitem><para>Mageia laadimine: see tähendab, et Mageia 5 käivitatakse ühendatud
-andmekandjalt (CD/DVD või USB-pulk) ilma midagi kettale kirjutamata, mis
-ühtlasi tähendab, et kõik võib olla väga aeglane. Kui käivitamine on läbi,
-võite ka süsteemi kõvakettale paigaldada.</para></listitem><listitem><para>Mageia paigaldamine: sel juhul paigaldatakse Mageia kohe kõvakettale.</para></listitem><listitem><para>Alglaadimine kõvakettalt: sel juhul käivitatakse süsteem kõvakettal, nagu
-seda tehakse ka siis, kui andmekandjat (CD/DVD või USB-pulk) pole masinaga
-ühendatud (Mageia 5 puhul see ei toimi).</para></listitem></itemizedlist><para>Allservas asuvas menüüs leiab alglaadimisvalikud:</para><itemizedlist><listitem><para>F1 - Abi. Selgitab valikuid "splash", "apm", "acpi" ja "Ide".</para></listitem><listitem><para>F2 - keel. Ekraanil nähtava keele valimine.</para></listitem><listitem><para>F3 - ekraanilahutus. Valida on tekst, 640x400, 800x600, 1024x728.</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom või Muu. Tavaliselt sooritatakse paigaldamine ühendatud
-paigaldusandmekandjalt. Siin saab valida ka muu allika, näiteks FTP- või
-NFS-serveri. Kui paigaldus sooritatakse SLP-serveriga võrgus, tuleb selle
-korral valida serveril saada olev paigaldusandmekandja.</para></listitem><listitem><para>F6 - draiver. Jah või Ei. Süsteem on teadlik draiveriuuendusega lisaketta
-olemasolust ning nõuab selle paigaldamise käigus selle ühendamist.</para></listitem><listitem><para>F6 - kerneli võtmed. Siin saab määrata konkreetseid võtmeid, mida vajavad
-teie riistvara ja kasutatavad draiverid.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">UEFI režiimis</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>Esimene ekraan UEFI süsteemi käivitamisel kettalt</para></caption></mediaobject><para>Siin on ainult kaks valikut: Mageia käivitamine live-režiimis (esimene
-valik) või paigaldamine (teine valik).</para><para>Kui olete süsteemi laadinud USB-pulgalt, näeb veel kaht rida, mis on muidu
-samasugused nagu kaks esimest, ainult et lisatud on "USB". Siis tuleb valida
-üks neist.</para><para>Kõigil juhtudel on esimesteks sammudeks ühtmoodi keele, ajavööndi ja
-klaviatuuri valimine, seejärel aga lähevad asjad lahku <link
-linkend="testing">Live-režiimi lisasammude</link> tõttu.</para></section></section> \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <info>
+ <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">Mageia laadimine Live-süsteemina</title>
+ </info>
+
+ <section xml:id="bootLive-1">
+ <info>
+ <title xml:id="bootLive1-ti1">Käivitamine andmekandjalt</title>
+ </info>
+
+ <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
+the USB device in or place the DVD in the drive and restart the computer.</para>
+
+ <para>If the computer does not automatically boot from the USB or DVD you may need
+to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
+accessing the boot device menu to select a device from which the computer
+will boot.</para>
+
+ <tip>
+ <para>To access the BIOS or boot menu when the computer is starting, you can try
+pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
+<keycap>Esc</keycap> for the BIOS, or <keycap>Esc</keycap>,
+<keycap>F8</keycap>, <keycap>F10</keycap> or <keycap>F11</keycap> for the
+boot device menu. These (fairly common) keys are just a selection of
+possible options though.</para>
+ </tip>
+
+ <note>
+ <para>The actual screen that you will first see when booting from the Live media
+will depend on whether your computer motherboard is of the Legacy (BIOS) or
+UEFI type.</para>
+ </note>
+ </section>
+
+ <section xml:id="biosmode">
+ <info>
+ <title xml:id="biosmode-ti1">BIOS-e/CSM-i/Pärandrežiimis</title>
+ </info>
+
+ <mediaobject>
+ <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+ <caption>
+ <para>Esimene ekraan BIOS-e režiimis algkäivitusel</para>
+ </caption>
+ </mediaobject>
+
+ <itemizedlist>
+ <title>Menu</title>
+
+ <listitem>
+ <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+ <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+ <para>Once the boot is done, you can proceed to the installation.</para>
+
+ <itemizedlist>
+ <listitem>
+ <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+ <para>Boot the Mageia Live system using non-free video drivers</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+ <para>This option will install Mageia to a hard disk.</para>
+
+ <itemizedlist>
+ <listitem>
+ <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+ <para>Install Mageia using non-free video drivers</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para><emphasis role="bold">Memory Test</emphasis></para>
+
+ <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+ <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+ </listitem>
+ </itemizedlist>
+ </section>
+
+ <section xml:id="uefimode">
+ <info>
+ <title xml:id="uefimode-ti1">UEFI režiimis</title>
+ </info>
+
+ <mediaobject condition="live">
+ <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+ <caption>
+ <para>First screen while booting in UEFI mode</para>
+ </caption>
+ </mediaobject>
+
+ <itemizedlist>
+ <title>Menu</title>
+
+ <listitem>
+ <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+ <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS). Once the
+boot is done, you can proceed to the installation</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+ <para>This option will install Mageia to a hard disk.</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+ <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+ </listitem>
+ </itemizedlist>
+
+ <note>
+ <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+ </note>
+ </section>
+</section>
diff --git a/docs/docs/stable/installer/et/chooseDesktop.xml b/docs/docs/stable/installer/et/chooseDesktop.xml
index c68212d4..b4aebbba 100644
--- a/docs/docs/stable/installer/et/chooseDesktop.xml
+++ b/docs/docs/stable/installer/et/chooseDesktop.xml
@@ -1,27 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="chooseDesktop">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="chooseDesktop"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xlink"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
+
+
+
+
<!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
<info>
- <title xml:id="chooseDesktop-ti1">Töölaua valimine</title>
+ <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">Töölaua valimine</title>
</info>
- <para>Sõltuvalt siin langetatud valikutest võite näha täiendavaid ekraane, kus
-saab valikut täpsustada.</para>
+
+
+ <para>Some choices made here will open other screens with related options.</para>
- <para>Pärast valiku(te) langetamist näeb pakettide paigaldamise ajal
-slaidiseanssi. Sellest saab loobuda, kui klõpsata nupule
-<guilabel>Üksikasjad</guilabel>.</para>
+ <para>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
<mediaobject>
-<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png"
-align="center"/> </imageobject></mediaobject>
-
- <para>Siin saab valida, kas soovite kasutada <application>KDE</application>
-<emphasis role="bold">Plasma</emphasis> 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.</para>
-</section> \ No newline at end of file
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+ <itemizedlist>
+ <listitem>
+ <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+ </listitem>
+
+ <listitem>
+ <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+ </listitem>
+ </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/et/choosePackageGroups.xml b/docs/docs/stable/installer/et/choosePackageGroups.xml
index 78126c5d..50b1e89d 100644
--- a/docs/docs/stable/installer/et/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/et/choosePackageGroups.xml
@@ -1,12 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="choosePackageGroups">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
<info>
<title xml:id="choosePackageGroups-ti1">Paketigruppide valimine</title>
</info>
+
+
<mediaobject>
<!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
<imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
align="center"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/et/choosePackagesTree.xml b/docs/docs/stable/installer/et/choosePackagesTree.xml
index 1092f285..54fae7c0 100644
--- a/docs/docs/stable/installer/et/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/et/choosePackagesTree.xml
@@ -1,20 +1,26 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" version="5.0" xml:lang="et">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="et">
<info>
<title xml:id="choosePackagesTree-ti1">Üksikpakettide valimine</title>
</info>
+
+
+
+
<mediaobject>
<!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
<imageobject> <imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
align="center"/> </imageobject></mediaobject>
<para>Siin saab oma paigaldust kohandada, lisades või eemaldades tarkvarapakette.</para>
- <para>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.</para>
+ <para>After having made your choice, you can click on the
+<emphasis>floppy</emphasis> icon 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.</para>
</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/et/configureServices.xml b/docs/docs/stable/installer/et/configureServices.xml
index fc26630c..45fbecfe 100644
--- a/docs/docs/stable/installer/et/configureServices.xml
+++ b/docs/docs/stable/installer/et/configureServices.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="configureServices">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="et" xml:id="configureServices">
<info>
<title xml:id="configureServices-ti1">Teenuste seadistamine</title>
</info>
@@ -7,21 +7,32 @@
+
+
+
+
<mediaobject>
<!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
<!-- 2013-05-05 marja - added screenshot -->
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
<imageobject> <imagedata format="PNG" fileref="dx2-configureServices.png"
xml:id="configureServices-im1" align="center" revision="1"/> </imageobject></mediaobject>
<para xml:id="configureServices-pa1" revision="1">Siin saab määrata, millised teenused käivitada või mitte käivitada koos
süsteemi alglaadimisega.</para>
- <para xml:id="configureServices-pa2" revision="1">Kolmnurgal klõpsates saab avada kõiki vastavaid teenusi sisaldava grupi.</para>
-
- <para xml:id="configureServices-pa3" revision="1">Valikud, mille on langetanud DrakX, on tavaliselt mõistlikud ja head.</para>
+ <itemizedlist>
+ <listitem>
+ <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+ </listitem>
- <para xml:id="configureServices-pa4" revision="1">Teenuse peale klõpsates näeb allpool teabekastis mõningat teavet teenuse
+ <listitem>
+ <para xml:id="configureServices-pa4" revision="1">Teenuse peale klõpsates näeb allpool teabekastis mõningat teavet teenuse
kohta.</para>
+ </listitem>
+ </itemizedlist>
<para xml:id="configureServices-pa5" revision="1">Muutke siin midagi ainult siis, kui olete kindel, et teate, mida teete.</para>
</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/et/configureTimezoneUTC.xml b/docs/docs/stable/installer/et/configureTimezoneUTC.xml
index 63781310..1b51e5f6 100644
--- a/docs/docs/stable/installer/et/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/et/configureTimezoneUTC.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureTimezoneUTC" version="5.0" xml:lang="et">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="et">
<info>
<title xml:id="configureTimezoneUTC-ti6">Ajavööndi seadistamine</title>
</info>
@@ -7,17 +7,27 @@
+
+
+
+
<mediaobject>
<!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
<!-- 2013-05-05 marja - added screenshot -->
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
<imageobject condition="classical"> <imagedata format="PNG"
xml:id="configureTimezoneUTC-im1" align="center"
fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
-<imageobject> <imagedata format="PNG" fileref="live-timeZone.png"
-condition="live"/> </imageobject></mediaobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
- <para xml:id="configureTimezoneUTC-pa1" revision="1">Määrake ajavöönd kindlaks, valides oma riigi või linna, mis asub samas
-ajavööndis teie lähedal.</para>
+ <itemizedlist>
+ <listitem>
+ <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your timezone by choosing your country, or a city close to you in the
+same timezone.</para>
+ </listitem>
+ </itemizedlist>
<para xml:id="configureTimezoneUTC-pa2" revision="1">Järgmisel ekraanil saab valida, kas riistvaraline kell on seatud kohalikule
ajale või GMT-le ehk maailmaajale (UTC).</para>
diff --git a/docs/docs/stable/installer/et/configureX_card_list.xml b/docs/docs/stable/installer/et/configureX_card_list.xml
index 265de3af..17f32719 100644
--- a/docs/docs/stable/installer/et/configureX_card_list.xml
+++ b/docs/docs/stable/installer/et/configureX_card_list.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_card_list" version="5.0" xml:lang="et">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="configureX_card_list"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns2="http://www.w3.org/1999/xlink"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
+
+
@@ -15,13 +26,15 @@
<!-- tproof -->
<!-- lproof -->
<!-- Done corrections accordind to tmb remarks. Papoteur -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
<title xml:id="configureX_card_list-ti1">X-serveri valimine (graafikakaardi seadistamine)</title>
</info>
<mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_card_list-im1"
-align="center" fileref="dx2-configureX_card_list.png" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
<para>DrakX sisaldab väga põhjalikku videokaartide andmebaasi ja suudab tavaliselt
teie videoseadme korrektselt tuvastada.</para>
@@ -30,33 +43,34 @@ teie videoseadme korrektselt tuvastada.</para>
te teate, milline kaart teil on, võite valida selle loetelust järgmiste
parameetrite alusel: <itemizedlist>
<listitem>
- <para>tootja</para>
+ <para>Vendor</para>
</listitem>
<listitem>
- <para>seejärel kaardi nimi</para>
+ <para>then the make of your card</para>
</listitem>
<listitem>
- <para>ja lõpuks kaardi tüüp</para>
+ <para>and the model of card</para>
</listitem>
</itemizedlist></para>
- <para>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. <emphasis role="bold">Xorg</emphasis>-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
-<emphasis role="bold">Vesa</emphasis> draiveri, mis pakub kõige
-elementaarsemaid võimalusi.</para>
-
- <para>Arvestage kindlasti, et kui valite sobimatu draiveri, võite saada kasutada
-ainult <emphasis role="bold">käsurida</emphasis>.</para>
+ <para>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
+<emphasis>Xorg</emphasis> category, which provides more than 40 generic and
+open source video card drivers. If you still can't find a specific driver
+for your card there is the option of using the VESA driver which provides
+basic capabilities.</para>
- <para>Mõned videokaartide tootjad pakuvad Linuxile omanduslikke draivereid, mis
-võivad olla saadaval ainult <emphasis role="bold">Nonfree</emphasis>
-tarkvarahoidlas, mõnel juhul isegi kõigest tootja enda veebileheküljel.</para>
+ <caution>
+ <para>Be aware that if you select an incompatible driver you may only have access
+to the <emphasis>Command Line Interface</emphasis></para>
+ </caution>
- <para><emphasis role="bold">Nonfree</emphasis> hoidlad tuleb kasutamiseks
-spetsiaalselt lubada. Seda saab teha pärast arvuti esimest taaskäivitamist.</para>
-</section> \ No newline at end of file
+ <para>Some video card manufacturers provide proprietary drivers for Linux which
+may only be available in the <emphasis>Nonfree</emphasis> repository and in
+some cases only from the card manufacturers' websites. The
+<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to
+access them. If you didn't enable it previously, you should do this after
+your first reboot.</para>
+</section>
diff --git a/docs/docs/stable/installer/et/configureX_chooser.xml b/docs/docs/stable/installer/et/configureX_chooser.xml
index 9afd74b5..3f9c36f5 100644
--- a/docs/docs/stable/installer/et/configureX_chooser.xml
+++ b/docs/docs/stable/installer/et/configureX_chooser.xml
@@ -1,64 +1,92 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_chooser" version="5.0" xml:lang="et">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="configureX_chooser"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xlink"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
<info>
<title xml:id="configureX_chooser-ti1">Graafikakaardi ja monitori seadistamine</title>
</info>
+
+
+
+
+
+
+
+
<mediaobject>
<!-- 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-->
-<imageobject> <imagedata format="PNG" xml:id="configureX_chooser-im1"
-fileref="dx2-configureX_chooser.png" align="center" revision="1"/>
-</imageobject></mediaobject>
-
- <para revision="1" xml:id="configureX_chooser-pa1">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 DrakX ei ole midagi valinud, või kui arvate, et
-valik ei ole õige.</para>
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
+
+ <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+ <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
<itemizedlist>
<listitem>
- <para xml:id="configureX_chooser-pa2" revision="1"><emphasis><guibutton>Graafikakaart</guibutton></emphasis>: valige vajaduse
-korral loetelust oma kaart.</para>
+ <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+
+ <para>If you need to, you can select a specific card from this expandable
+list. See <xref linkend="configureX_card_list"/>.</para>
</listitem>
<listitem>
- <para xml:id="configureX_chooser-pa3" revision="1"><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.</para>
-
- <warning>
- <para xml:id="configureX_chooser-pa3a" revision="1">Väärad sagedused võivad monitori kahjustada.</para>
- </warning>
+ <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
+
+ <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
</listitem>
<listitem>
- <para xml:id="configureX_chooser-pa4" revision="1"><emphasis><guibutton>Ekraanilahutus</guibutton></emphasis>: siin saab
-määrata vajaliku monitori ekraanilahutuse ja värvisügavuse.</para>
+ <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
+
+ <para>The resolution and color depth of your monitor can be set here.</para>
</listitem>
<listitem>
- <para xml:id="configureX_chooser-pa5" revision="1"><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 <emphasis role="bold">jah</emphasis> ning seadistused
-salvestatakse. Kui te ei näe midagi, saate tagasi pöörduda
-seadistusekraanile ja seal seni parameetreid muuta, kuni test annab vajaliku
-tulemuse. Kui testimisnuppu pole, kontrollige eriti hoolikalt, et kõik
-seadistused oleksid korras.</para>
+ <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
+
+ <para>The test button does not always appear during install. If the option is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, 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 result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
</listitem>
<listitem>
- <para xml:id="configureX_chooser-pa6" revision="1"><emphasis><guibutton>Eelistused</guibutton></emphasis>: siin saab
-mitmesuguseid valikuid lubada või keelata.</para>
+ <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+
+ <para>Here you can choose to enable or disable various options.</para>
</listitem>
</itemizedlist>
-</section> \ No newline at end of file
+
+ <warning>
+ <para revision="1" xml:id="configureX_chooser-pa3a">There is a risk of damaging a monitor if you choose refresh rates that are
+outside the frequency range of that monitor. This applies to older CRT
+displays: modern monitors will reject an unsupported frequency and normally
+enter standby mode.</para>
+ </warning>
+</section>
diff --git a/docs/docs/stable/installer/et/configureX_monitor.xml b/docs/docs/stable/installer/et/configureX_monitor.xml
index 6222a4e3..72cc034b 100644
--- a/docs/docs/stable/installer/et/configureX_monitor.xml
+++ b/docs/docs/stable/installer/et/configureX_monitor.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_monitor" version="5.0" xml:lang="et">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="configureX_monitor"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns2="http://www.w3.org/1999/xlink"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
+
+
@@ -12,63 +23,83 @@
<!-- Further text JohnR 2012-08-30 -->
<!-- tproof -->
<!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
<title xml:id="configureX_monitor-ti1">Monitori valimine</title>
</info>
- <para xml:id="configureX_monitor-pa1" revision="1">DrakX sisaldab väga põhjalikku monitoride andmebaasi ja tuvastab tavaliselt
+ <para revision="1" xml:id="configureX_monitor-pa1">DrakX sisaldab väga põhjalikku monitoride andmebaasi ja tuvastab tavaliselt
teie monitori õigesti.</para>
<warning>
- <para xml:id="configureX_monitor-pa1w" revision="1"><emphasis role="bold">Teistsuguste parameetritega monitori valimine võib
+ <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis role="bold">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.</para>
</warning>
<mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_monitor-im1"
-fileref="dx2-configureX_monitor.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
+format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
- <para xml:id="configureX_monitor-pa2" revision="1"><emphasis>Kohandatud</emphasis></para>
+ <variablelist spacing="compact">
+ <varlistentry>
+ <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
- <para revision="1" xml:id="configureX_monitor-pa3">Selle valimine võimaldab paika panna kaks äärmiselt tähtsat parameetrit:
-realaotussageduse ja ekraaniuuendussageduse.</para>
+ <listitem>
+ <para revision="1" xml:id="configureX_monitor-pa3">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.</para>
- <para revision="1" xml:id="configureX_monitor-pa4">On <emphasis>VÄGA TÄHTIS</emphasis>, et te ei valiks sellise
+ <para revision="1" xml:id="configureX_monitor-pa4">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.</para>
+ </listitem>
+ </varlistentry>
- <para xml:id="configureX_monitor-pa5" revision="1"><emphasis>Plug'n Play</emphasis></para>
-
- <para xml:id="configureX_monitor-pa6" revision="1">See on vaikimisi valik, mis üritab määrata monitori tüübi monitoride
-andmebaasi põhjal.</para>
-
- <para xml:id="configureX_monitor-pa7" revision="1"><emphasis>Tootja</emphasis></para>
+ <varlistentry>
+ <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
- <para xml:id="configureX_monitor-pa8" revision="1">Kui paigaldusprogramm ei ole teie videokaarti õigesti tuvastanud ja te
-teate, milline kaart teil on, võite valida selle puust järgmiste
-parameetrite alusel: <itemizedlist>
<listitem>
- <para>tootja</para>
+ <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
</listitem>
+ </varlistentry>
- <listitem>
- <para>monitori nimi</para>
- </listitem>
+ <varlistentry>
+ <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
<listitem>
- <para>monitori kirjeldus</para>
+ <para revision="1" xml:id="configureX_monitor-pa8">Kui paigaldusprogramm ei ole teie videokaarti õigesti tuvastanud ja te
+teate, milline kaart teil on, võite valida selle puust järgmiste
+parameetrite alusel:</para>
</listitem>
- </itemizedlist></para>
+ </varlistentry>
+ </variablelist>
- <para xml:id="configureX_monitor-pa9" revision="1"><emphasis>Tavaline</emphasis></para>
+ <itemizedlist>
+ <listitem>
+ <para>Manufacturer</para>
+ </listitem>
- <para xml:id="configureX_monitor-pa10" revision="1">Selles grupis on valida ligemale 30 seadistuse seast, näiteks 1024x768 @
-60Hz, sealhulgas lamekuvarid, mida kasutavad eriti sülearvutid. See on
-sageli mõistlik monitori valimise grupp, kui teie videoriistvara ei suudetud
-automaatselt tuvastada ja peate kasutama <emphasis
-role="bold">Vesa</emphasis> draiverit. Ka siin tasub valides olla pigem
-konservatiivne.</para>
-</section> \ No newline at end of file
+ <listitem>
+ <para>Monitor model</para>
+ </listitem>
+ </itemizedlist>
+
+ <variablelist spacing="compact">
+ <varlistentry>
+ <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+
+ <listitem>
+ <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list 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.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+</section>
diff --git a/docs/docs/stable/installer/et/diskPartitioning.xml b/docs/docs/stable/installer/et/diskPartitioning.xml
new file mode 100644
index 00000000..08258016
--- /dev/null
+++ b/docs/docs/stable/installer/et/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="et" version="5.0" xml:lang="et">
+
+
+ <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+ <xi:include href="doPartitionDisks.xml"/>
+
+ <xi:include href="ask_mntpoint_s.xml"/>
+
+ <xi:include href="takeOverHdConfirm.xml"/>
+
+ <xi:include href="diskdrake.xml"/>
+
+ <xi:include href="formatPartitions.xml"/>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/et/diskdrake.xml b/docs/docs/stable/installer/et/diskdrake.xml
index 02fd7269..b33724ca 100644
--- a/docs/docs/stable/installer/et/diskdrake.xml
+++ b/docs/docs/stable/installer/et/diskdrake.xml
@@ -1,65 +1,108 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="diskdrake">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xreflabel="DiskDrake" xml:id="diskdrake"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1999/xhtml"
+ xmlns:ns2="http://www.w3.org/1999/xlink"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
+
+
+
+
+
+
<info>
<!-- Lebarhon 2016 12 16 updated for Mageia 6
Lebarhon 20170902 added SC-->
-<title xml:id="diskdrake-ti1">Ketta kohandatud partitsioneerimine DiskDrake'i abil</title>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
</info>
<mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
- <warning>
- <para revision="3" xml:id="diskdrake-pa1">Kui soovite krüptida oma <emphasis role="bold">/</emphasis> partitsiooni,
-peab teil kindlasti olema ka eraldi <emphasis
-role="bold">/boot</emphasis>partitsioon. <emphasis
-role="bold">/boot</emphasis> partitsioonile EI TOHI määrata
-krüptimisvalikut, sest siis ei ole süsteemi võimalik üldse laadida.</para>
- </warning>
+ <itemizedlist>
+ <listitem>
+ <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+ </listitem>
+
+ <listitem>
+ <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+ </listitem>
- <para xml:id="diskdrake-pa3" revision="2">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.</para>
+ <listitem>
+ <para revision="1" xml:id="diskdrake-pa6">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. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+ </listitem>
- <para xml:id="diskdrake-pa4" revision="1">Igale leitud kõvakettale või muule salvestusseadmele (näiteks USB-pulgale)
-on omaette kaart. Siinsel pildil on näha kaks seadet: <emphasis
-role="bold">sda</emphasis> ja <emphasis role="bold">sdb</emphasis>.</para>
+ <listitem>
+ <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+ </listitem>
+ </itemizedlist>
- <para xml:id="diskdrake-pa5" revision="1">Kõigi valitud salvestusseadme partitsioonide kustutamiseks valige
-<guibutton>Kustuta kõik</guibutton>.</para>
+ <warning>
+ <orderedlist>
+ <listitem>
+ <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+ </listitem>
- <para xml:id="diskdrake-pa6" revision="1">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. <guibutton>Ekspertrežiim</guibutton> pakub
-rohkem võimalusi, näiteks nime lisamine või partitsiooni tüübi valimine.</para>
+ <listitem>
+ <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+ </listitem>
+ </orderedlist>
+ </warning>
- <para xml:id="diskdrake-pa6a" revision="1">Jätkake, kuni kõik on nii, nagu soovite.</para>
+ <important>
+ <itemizedlist>
+ <listitem>
+ <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+ </listitem>
- <para xml:id="diskdrake-pa7" revision="1">Kui kõik on valmis, klõpsake nupule <guibutton>Tehtud</guibutton>.</para>
+ <listitem>
+ <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+ </listitem>
+ </itemizedlist>
+ </important>
- <note>
- <para>Kui paigaldate Mageia UEFI süsteemi, kontrollige, kas ESP (EFI süsteemne
-partitsioon) on ikka olemas ja korrektselt haagitud asukohta /boot/EFI (vt
-tagapool).</para>
+ <figure>
+ <title>EFI System Partition</title>
- <para><mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake2.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></para>
- </note>
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
- <note>
- <para>Kui paigaldate Mageia pärand/GPT süsteemi, kontrollige, kas korrektse
-tüübiga BIOS-e alglaadimispartitsioon on ikka olemas.</para>
+ <figure>
+ <title>BIOS boot partition</title>
- <mediaobject>
+<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
- </note>
-</section> \ No newline at end of file
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/et/doPartitionDisks.xml b/docs/docs/stable/installer/et/doPartitionDisks.xml
index 3f5d7dba..799f711e 100644
--- a/docs/docs/stable/installer/et/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/et/doPartitionDisks.xml
@@ -1,174 +1,214 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="doPartitionDisks">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="doPartitionDisks"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1999/xhtml"
+ xmlns:ns="http://docbook.org/ns/docbook">
- <info>
- <!---->
-<!-- lebarhon 20161216 updated for Mageia 6
+
+
+
+
+
+
+
+
+
+ <info>
+ <!--lebarhon 20161216 updated for Mageia 6
+
lebarhon 20170209 added SC-->
-<title xml:id="doPartitionDisks-ti1">Partitsioneerimine</title>
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC,
+ but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
</info>
- <para xml:id="doPartitionDisks-pa1" revision="1">Sellel ekraanil näete oma kõvaketta või -ketaste sisu ning lahendusi, mida
-DrakXi partitsioneerimisnõustaja pakub <application>Mageia</application>
-paigaldamiseks.</para>
+ <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
- <para xml:id="doPartitionDisks-pa2" revision="1">Pakutavad valikud sõltuvad teie kõvaketaste konkreetsest ülesehitusest ja
-sisust.</para>
+ <para revision="1" xml:id="doPartitionDisks-pa2">The actual options available from those shown below will vary according to
+the layout and content of your particular hard drive(s).</para>
<mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
- <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist>
- <listitem>
- <para revision="1" xml:id="doPartitionDisks-pa4">Olemasolevate partitsioonide kasutamine</para>
+ <itemizedlist>
+ <title>Main Options</title>
+
+ <listitem>
+ <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
- <para xml:id="doPartitionDisks-pa5" revision="1">Kui see on näha, leiti olemasolevad Linuxiga ühilduvad partitsioonid ning
+ <para revision="1" xml:id="doPartitionDisks-pa5">Kui see on näha, leiti olemasolevad Linuxiga ühilduvad partitsioonid ning
neid võib kasutada paigaldamiseks.</para>
- </listitem>
+ </listitem>
- <listitem>
- <para xml:id="doPartitionDisks-pa6" revision="1">Vaba ruumi kasutamine</para>
+ <listitem>
+ <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
- <para xml:id="doPartitionDisks-pa7" revision="1">Kui kõvakettal on kasutamata ruumi, siis selle valikuga saab selle eraldada
+ <para revision="1" xml:id="doPartitionDisks-pa7">Kui kõvakettal on kasutamata ruumi, siis selle valikuga saab selle eraldada
uuele Mageia paigaldusele.</para>
- </listitem>
+ </listitem>
- <listitem>
- <para xml:id="doPartitionDisks-pa8" revision="1">Vaba ruumi kasutamine Windowsi partitsioonil</para>
+ <listitem>
+ <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
- <para xml:id="doPartitionDisks-pa9" revision="1">Kui olemasoleval Windowsi partitsioonil on vaba ruumi, võib
-paigaldusprogramm seda kasutada.</para>
+ <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
- <para xml:id="doPartitionDisks-pa10" revision="2">See võib olla väga mõistlik valik oma uuele Mageia paigaldusele ruumi
-leidmiseks, kuid samal ajal on see riskantne, mistõttu tuleks kindlasti teha
-kõigist olulistest failidest varukoopia!</para>
+ <para>With this option, the installer displays the remaining Windows partition in
+light blue and the proposed Mageia partition in dark blue with their
+intended sizes just underneath. You have the option to modify these sizes by
+clicking and dragging the gap between both partitions. See the following
+screenshot:</para>
+ </listitem>
+ <listitem>
+ <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></para>
+
+ <para revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
+
+ <warning>
+ <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+ </warning>
+
+ <important>
<para revision="3" xml:id="doPartitionDisks-pa11">Pange tähele, et sellega kaasneb Windowsi partitsiooni suuruse
vähendamine. Partitsioon peab olema "puhas", see tähendab Windows peab olema
viimasel korral korrektselt suletud. Samuti peab partitsioon olema
defragmenteeritud, ehkki see ei garanteeri veel, et kõik failid on alalt,
mida Mageia paigaldamiseks kasutatakse, tõepoolest eemaldatud. Sellepärast
ongi äärmiselt soovitatav kõik vähegi olulised failid eelnevalt varundada.</para>
+ </important>
+ </listitem>
- <para>Selle valiku korral näitab paigaldusprogramm alles jäävat Windowsi
-partitsiooni helesinisena ja tulevast Mageia partitsiooni tumesinisena ning
-nende all näeb kavandatud suurusi. Ühtlasi on teil võimalus neid suurusi
-muuta, klõpsates partitsioonide vahel asuvale tühialale ja seda
-lohistades. Seda näitab allolev pilt.</para>
-
- <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks2.png" align="center"/> </imageobject></mediaobject>
- </listitem>
- </itemizedlist> <itemizedlist>
- <listitem>
- <para xml:id="doPartitionDisks-pa12" revision="1">Kogu ketta tühjendamine ja kasutamine</para>
-
- <para xml:id="doPartitionDisks-pa13" revision="1">Selle valimisel kasutatakse kogu ketast ainult Mageia jaoks.</para>
+ <listitem>
+ <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
- <para xml:id="doPartitionDisks-pa14" revision="1">Tähelepanu! Sellega kustutatakse valitud kõvakettalt KÕIK andmed. Olge
-ettevaatlik!</para>
-
- <para xml:id="doPartitionDisks-pa15" revision="1">Kui kavatsete kasutada osa kettast millegi muu tarbeks või on teil juba
-kettal andmeid, mida te ei soovi kaotada, ärge seda võimalust valige.</para>
- </listitem>
- </itemizedlist><itemizedlist>
- <listitem>
- <para xml:id="doPartitionDisks-pa16" revision="1">Ketta jagamine oma tahtmist mööda</para>
-
- <para xml:id="doPartitionDisks-pa17" revision="1">See valik annab täieliku kontrolli määrata, kuidas ja kuhu Mageia kõvakettal
+ <para revision="1" xml:id="doPartitionDisks-pa17">See valik annab täieliku kontrolli määrata, kuidas ja kuhu Mageia kõvakettal
või -ketastel paigaldatakse.</para>
- </listitem>
- </itemizedlist></para>
-
- <para><emphasis role="bold">Partitsiooni suurus:</emphasis></para>
-
- <para>Kui te ei vali võimalust <emphasis role="bold">Ketta jagamine oma tahtmist
-mööda</emphasis>, siis jagab paigaldusprogramm saadaoleva ruumi ära
-järgmiste reeglite kohaselt:</para>
-
- <para><itemizedlist>
- <listitem>
- <para>Kui kokku on saadaval alla 50 GB, luuakse ainult üks partitsioon<emphasis
-role="bold"> /</emphasis> jaoks ning /home jaoks eraldi partitsiooni ei
-looda.</para>
- </listitem>
-
- <listitem>
- <para>Kui kokku on saadaval üle 50 GB, luuakse kolm partitsiooni</para>
-
- <itemizedlist>
- <listitem>
- <para>6/19 saadaolevast koguruumist eraldatakse <emphasis role="bold">/</emphasis>
-jaoks maksimaalse suurusega 50 GB</para>
- </listitem>
-
- <listitem>
- <para>1/19 eraldatakse saalealaks maksimaalse suurusega 4 GB</para>
- </listitem>
-
- <listitem>
- <para>ülejäänu (vähemalt 12/19) eraldatakse <emphasis role="bold">/home</emphasis>
-jaoks</para>
- </listitem>
- </itemizedlist>
- </listitem>
- </itemizedlist></para>
+ </listitem>
+ </itemizedlist>
- <para>See tähendab, et kui ruumi on 160 GB või rohkem, loob paigaldusprogramm kolm
-partitsiooni: 50 GB <emphasis role="bold">/</emphasis> jaoks, 4 GB <emphasis
-role="bold">saaleala</emphasis> jaoks ja ülejäänu <emphasis
-role="bold">/home</emphasis> jaoks.</para>
+ <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+ <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root) partition.</para>
+ </listitem>
+
+ <listitem>
+ <para>Kui kokku on saadaval üle 50 GB, luuakse kolm partitsiooni</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+ </listitem>
+
+ <listitem>
+ <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+ </listitem>
+
+ <listitem>
+ <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ </itemizedlist>
+
+ <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>50 GB for <filename>/</filename></para>
+ </listitem>
+
+ <listitem>
+ <para>4 GB for <filename>swap</filename></para>
+ </listitem>
+
+ <listitem>
+ <para>and the remainder for <filename>/home</filename></para>
+ </listitem>
+ </itemizedlist>
<note>
- <para>Kui kasutate UEFI süsteemi, tuvastatakse automaatselt ESP (EFI süsteemne
-partitsioon) või see luuakse, kui seda pole, ja haagitakse asukohas
-/boot/EFI. Valik <emphasis role="bold">Ketta jagamine oma tahtmist
-mööda</emphasis> on ainuke, mis lubab kontrollida, kas seda on õigesti
-tehtud.</para>
+ <para>If you are using a UEFI system, the ESP (EFI System Partition) will be
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+ <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+ <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
</note>
- <note>
- <para>Kui kasutate pärandsüsteemi (tuntud ka kui CSM või BIOS) GPT-kettaga, tuleb
-luua BIOS-e alglaadimispartitsioon, kui seda veel ei ole. See on umbes 1 MiB
-suurune partitsioon ilma haakepunktita. Selle loomiseks valige "<xref
-linkend="diskdrake"/>" ja looge see nagu iga teine partitsioon, ainult et
-valige failisüsteemiks BIOS boot partition.</para>
-
- <mediaobject>
+ <mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
- <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
-</imageobject></mediaobject>
- </note>
+ <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+
+ <important>
+ <para>Some newer drives are now using 4096 byte logical sectors, instead of the
+previous standard of 512. Due to lack of available hardware, the
+partitioning tool used in the installer has not been tested with such a
+drive.</para>
- <warning>
- <para>Mõned uuemad kettad kasutavad nüüd 4096-baidiseid loogilisi sektoreid
-varasema standardi, 512-baidiste sektorite asemel. Sobiva riistvara
-puudumise tõttu ei ole paigaldusprogrammis kasutatavat
-partitsioneerimistööriista niisuguste ketastega testitud. Samuti on mõnes
-SSD-seadmes nüüdseks kasutusel kustutusblokk suurusega üle 1 MB. Seepärast
-soovitame juhul, kui Teil peaks olema niisugune seade, selle eelnevalt
-partitsioneerida, kasutades mõnda muud partitsioneerimistööriista, näiteks
-<emphasis role="bold">gparted</emphasis>.</para>
+ <para>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
+settings:</para>
- <para><emphasis role="bold">Align to</emphasis> = MiB</para>
+ <itemizedlist>
+ <listitem>
+ <para><emphasis>Align to</emphasis> = MiB</para>
+ </listitem>
- <para><emphasis role="bold">Free space preceding (MiB)</emphasis> = 2</para>
+ <listitem>
+ <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+ </listitem>
+ </itemizedlist>
<para>Samuti kontrollige, et kõigi loodud partitsioonide suurus megabaitides oleks
paarisarv.</para>
- </warning>
-</section> \ No newline at end of file
+ </important>
+</section>
diff --git a/docs/docs/stable/installer/et/exitInstall.xml b/docs/docs/stable/installer/et/exitInstall.xml
index 91520b81..1e68c389 100644
--- a/docs/docs/stable/installer/et/exitInstall.xml
+++ b/docs/docs/stable/installer/et/exitInstall.xml
@@ -5,23 +5,28 @@
+
+
+
+
<mediaobject>
<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
<imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
- <para xml:id="exitInstall-pa1" revision="2">Olete lõpetanud <application>Mageia</application> paigaldamise ja
-seadistamise ning nüüd on turvaline eemaldada paigaldusandmekandja ja arvuti
-taaskäivitada.</para>
+ <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
- <para xml:id="exitInstall-pa2" revision="2">Pärast taaskäivitamist saab alglaaduri ekraanil valida käivitatava
-operatsioonisüsteemi, kui teil peaks neid arvutis üle ühe olema.</para>
+ <para xml:id="exitInstall-pa2" revision="2">After rebooting, you can use the bootloader screen to choose which operating
+system to start (if there are more than one on your computer).</para>
<para xml:id="exitInstall-pa3" revision="1">Kui te ei kohandanud alglaaduri seadistusi, valitakse ja käivitatakse
automaatselt teie uus Mageia.</para>
<para xml:id="exitInstall-pa4" revision="1">Tundke rõõmu ja nautige!</para>
- <para xml:id="exitInstall-pa5" revision="1">Külastage veebilehte www.mageia.org, kui teil on küsimusi või kui soovite
-anda oma panuse Mageia edusse.</para>
+ <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/et/firewall.xml b/docs/docs/stable/installer/et/firewall.xml
index ce68766d..cb9bb13c 100644
--- a/docs/docs/stable/installer/et/firewall.xml
+++ b/docs/docs/stable/installer/et/firewall.xml
@@ -1,30 +1,36 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="et">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="et" xreflabel="Firewall">
+
+
+
+
<info>
- <title xml:id="firewall-ti1">Tulemüür</title>
+ <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">Tulemüür</title>
</info>
<para xml:id="firewall-pa1" revision="1">Siin saab paika panna mõned lihtsad tulemüüri reeglid, mis määravad kndlaks,
millist laadi teavet internetist sihtsüsteem vastu võtab. See omakorda
võimaldab süsteemi vastavatele teenustele ligi pääseda ka internetist.</para>
- <para>Vaikimisi ei ole ükski nupp märgitud, mis tähendab, et võrgust ei ole
-kättesaadav ükski süsteemi teenus. Nupul <emphasis role="bold">Kõik
-(tulemüür puudub)</emphasis> on eriline tähendus: see võimaldab ligipääsu
-masina kõigile teenustele. Paigaldamise ajal ei ole seda küll väga mõtet
-valida, sest nii on tulemuseks täiesti kaitsmata süsteem. Seda võimalust on
-mõnikord mõistlik valida juba töötavas süsteemis Mageia juhtimiskeskuses
-(kus kasutatakse graafiliselt samasugust liidest) kõigi tulemüüri reeglite
-ajutiseks tühistamiseks näiteks testimise või silumise eesmärgil.</para>
+ <para>In the default setting (no button is checked), no service of the system is
+accessible from the network. The <emphasis>Everything (no
+firewall)</emphasis> option enables access to all services of the machine -
+an option that does not make much sense in the context of the installer
+since it would create a totally unprotected system. Its veritable use is in
+the context of the Mageia Control Center (which uses the same GUI layout)
+for temporarily disabling the entire set of firewall rules for testing and
+debugging purposes.</para>
- <para>Kõigi muude märkekastide juures olev tekst peaks enda eest rääkima. Näiteks
-on mõtet märkida <emphasis role="bold">CUPS-i server</emphasis>, kui
-soovite, et masinaga ühendatud printerid oleksid kättesaadavad ka võrgust.</para>
+ <para>All other options are more or less self-explanatory. As an example, you will
+enable the CUPS server if you want printers on your machine to be accessible
+from the network.</para>
<para><emphasis role="bold">Muud valikud</emphasis></para>
- <para>Nupule <emphasis role="bold">Muud valikud</emphasis> klõpsates avaneb aken,
-kus saab lubada terve rea teenuseid, kui kirjutada need tühikutega
-eraldatult järgmiselt</para>
+ <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable
+a series of services by typing a list of <quote>couples</quote> (blank
+separated)</para>
<para><emphasis>&lt;pordi-number>/&lt;protokoll></emphasis></para>
diff --git a/docs/docs/stable/installer/et/formatPartitions.xml b/docs/docs/stable/installer/et/formatPartitions.xml
index 6a8e383f..9fe4f6a0 100644
--- a/docs/docs/stable/installer/et/formatPartitions.xml
+++ b/docs/docs/stable/installer/et/formatPartitions.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="formatPartitions" version="5.0" xml:lang="et">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="formatPartitions"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xlink"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
<info>
<title xml:id="formatPartitions-ti1">Vormindamine</title>
</info>
@@ -11,33 +18,37 @@
+
+
<mediaobject>
<!-- Made by marja on 2012 03 29 -->
<!-- NEEDS TO BE REVIEWED! -->
<!-- marja 2012-04-24 added screenshot -->
<!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-formatPartitions.png" xml:id="formatPartitions-im1"
-align="center" revision="1"/> </imageobject> <imageobject condition="live">
-<imagedata format="PNG" xml:id="live-formatPartitions-im1" align="center"
-fileref="live-formatPartitions.png" revision="1"/> </imageobject></mediaobject>
-
- <para xml:id="formatPartitions-pa1" revision="2">Siin saab valida, millised partitsioonid vormindada. Kõik andmed
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
+
+ <para revision="2" xml:id="formatPartitions-pa1">Siin saab valida, millised partitsioonid vormindada. Kõik andmed
partitsioonidel, mis <emphasis>ei ole</emphasis> vormindamiseks märgitud,
säilivad.</para>
- <para xml:id="formatPartitions-pa2" revision="1">Üldjuhul on vaja vormindada vähemalt partitsioonid, mille DrakX on valinud.</para>
+ <para revision="1" xml:id="formatPartitions-pa2">Usually, at least the partitions that DrakX selected need to be formatted.</para>
- <para xml:id="formatPartitions-pa3" revision="1">Kui klõpsata <guibutton>Muud valikud</guibutton>, saab valida partitsioonid,
-millel kontrollitakse niinimetatud <emphasis>riknenud plokke.</emphasis></para>
+ <para revision="1" xml:id="formatPartitions-pa3">Click on <emphasis>Advanced</emphasis> to choose the partitions you want to
+check for so-called <emphasis>bad blocks</emphasis></para>
<tip>
- <para xml:id="formatPartitions-pa4" revision="1">Kui te pole kindel, et olete langetanud õige valiku, klõpsake
-<guibutton>Tagasi</guibutton>, veel kord <guibutton>Tagasi</guibutton> ja
-siis <guibutton>Kohandatud</guibutton>, et jõuda tagasi peaekraanile. Seal
-saate uurida, mis partitsioonidel leidub.</para>
+ <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
</tip>
- <para xml:id="formatPartitions-pa5" revision="1">Kui olete oma valikus kindel, klõpsake jätkamiseks
-<guibutton>Edasi</guibutton>.</para>
-</section> \ No newline at end of file
+ <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selections, click on
+<emphasis>Next</emphasis> to continue.</para>
+</section>
diff --git a/docs/docs/stable/installer/et/graphicalConfiguration.xml b/docs/docs/stable/installer/et/graphicalConfiguration.xml
new file mode 100644
index 00000000..438275c0
--- /dev/null
+++ b/docs/docs/stable/installer/et/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="graphicalConfiguration"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xlink"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
+ <info>
+ <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+ </info>
+
+ <xi:include href="configureX_chooser.xml"/>
+
+ <xi:include href="configureX_card_list.xml"/>
+
+ <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/et/installUpdates.xml b/docs/docs/stable/installer/et/installUpdates.xml
index 3c67f569..f8a3c26d 100644
--- a/docs/docs/stable/installer/et/installUpdates.xml
+++ b/docs/docs/stable/installer/et/installUpdates.xml
@@ -1,7 +1,5 @@
<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="et">
- <info>
- <title xml:id="installUpdates-ti1">Uuendused</title>
- </info>
+
@@ -11,20 +9,38 @@
- <mediaobject>
-<!-- Made by marja on 2012 03 30 -->
+
+
+ <info>
+ <!-- Made by marja on 2012 03 30 -->
<!-- NEEDS TO BE REVIEWED! -->
-<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
<!-- marja, 2012-04-24 added screenshot -->
-<imageobject> <imagedata format="PNG" fileref="dx2-installUpdates.png"
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">Uuendused</title>
+ </info>
+
+ <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
- <para xml:id="installUpdates-pa1" revision="1">Võimalik, et pärast <application>Mageia</application> väljalaske ilmumist on
-mõningaid pakette uuendatud või parandatud.</para>
+ <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+ <itemizedlist>
+ <listitem>
+ <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+ </listitem>
- <para xml:id="installUpdates-pa2" revision="1">Valige <guilabel>Jah</guilabel>, kui soovite sellised paketid alla laadida
-ja paigaldada, või <guilabel>Ei</guilabel>, kui te seda praegu ei soovi või
-kui teil puudub parajasti internetiühendus.</para>
+ <listitem>
+ <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
+aren't connected to the Internet</para>
+ </listitem>
- <para xml:id="installUpdates-pa3" revision="1">Seejärel klõpsake jätkamiseks <guibutton>Edasi</guibutton>.</para>
+ <listitem>
+ <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+ </listitem>
+ </itemizedlist>
</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/et/installer.xml b/docs/docs/stable/installer/et/installer.xml
index 1da5ac64..35c9610b 100644
--- a/docs/docs/stable/installer/et/installer.xml
+++ b/docs/docs/stable/installer/et/installer.xml
@@ -6,163 +6,164 @@
xmlns:ns3="http://www.w3.org/1999/xhtml"
xmlns:ns2="http://www.w3.org/1999/xlink"
xmlns:ns="http://docbook.org/ns/docbook">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
<info>
- <title xml:id="installer-ti1">Mageia paigaldusprogramm DrakX</title>
+ <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+ Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+ So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">Mageia paigaldusprogramm DrakX</title>
</info>
<para>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.</para>
- <para>Avamenüüs näete mitmeid valikuid, kuid vaikimisi valitu käivitab
-paigaldusprogrammi, mida tavaliselt ongi vaja.</para>
+ <section>
+ <title>Paigaldamise etapid</title>
+
+ <itemizedlist>
+ <listitem>
+ <para>The install process is divided into a number of steps - the status of which
+is indicated in a panel to the left of the screen.</para>
+ </listitem>
+
+ <listitem>
+ <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
+options.</para>
+ </listitem>
+
+ <listitem>
+ <para>Most screens have <emphasis>Help</emphasis> buttons for further details
+about the particular step.</para>
+ </listitem>
+ </itemizedlist>
+
+ <caution>
+ <para>If at some point during the install you decide to abort 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.</para>
+
+ <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+ </caution>
+ </section>
<section>
<title>Paigaldusprogrammi avaekraan</title>
- <section>
- <title>Mageia DVD kasutamine</title>
+ <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
+
+ <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
- <para>Siin on näha Mageia DVD vaikimisi tervitusekraanid: esimest näeb UEFI
-süsteemi, teist pärandsüsteemi korral.</para>
+ <section>
+ <title>Legacy (BIOS) Systems</title>
<mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
- <para>Sellel ekraanil pääseb valikute juurde, kui vajutada tähte <emphasis
-role="bold">e</emphasis>, mis avab redigeerimisrežiimi. Nähtavale ekraanile
-tagasipääsemiseks vajutage klahvi <emphasis role="bold">Esc</emphasis>, et
-väljuda salvestamata, või klahvi <emphasis role="bold">Ctrl</emphasis> või
-<emphasis role="bold">F10</emphasis>, et väljuda tehtud valikuid
-salvestades.</para>
+ <itemizedlist>
+ <title>Menu</title>
- <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome.png"/> </imageobject></mediaobject>
-
- <para>Sellel ekraanil on võimalik määrata mõned isiklikud eelistused (pange
-tähele, et valikud <emphasis role="bold">F1</emphasis> kuni <emphasis
-role="bold">F6</emphasis> on kasutusel ainult pärandsüsteemis):<itemizedlist>
- <listitem>
- <para>Kõigi <emphasis role="bold">F2</emphasis> kuni <emphasis
-role="bold">F6</emphasis> valikute korral näeb asjakohast abi, kui vajutada
-<emphasis role="bold">F1</emphasis></para>
- </listitem>
- </itemizedlist></para>
-
- <para><itemizedlist>
- <listitem>
- <para><emphasis role="bold">F2</emphasis> vajutamisel kasutab paigaldusprogramm
-paigaldamisel valitavat keelt.</para>
-
- <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
-
- <para>Valige nooleklahvidega liikudes keel ja vajutage klahvile <emphasis
-role="bold">Enter</emphasis>.</para>
- </listitem>
-
- <listitem>
- <para>Muuta ekraanilahutust klahvile<emphasis role="bold"> F3</emphasis> vajutades
-(ainult pärandsüsteemis)</para>
-
- <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
- </listitem>
-
- <listitem>
- <para>Kui paigaldamisel peaks tekkima raskusi, võib üritada muuta vaikeseadistusi,
-valides <emphasis role="bold">F6</emphasis> <emphasis role="bold">Kernel
-Options</emphasis> (UEFI sõsteemi korral vajutage <emphasis
-role="bold">e</emphasis>).</para>
-
- <itemizedlist>
- <listitem>
- <para>Vaikimisi: vaikimisi võtmeid ei muudeta.</para>
- </listitem>
-
- <listitem>
- <para>Ohutud sätted: jõudlusele eelistatakse ohutust.</para>
- </listitem>
-
- <listitem>
- <para>Ilma ACPI-ta: toitehalduse valikuid ei arvestata.</para>
- </listitem>
- </itemizedlist>
-
- <itemizedlist>
- <listitem>
- <para>Ilma kohaliku APIC-ta: see puudutab CPU katkestusi. Valige see siis, kui
-seda nõutakse.</para>
- </listitem>
- </itemizedlist>
-
- <para>Mõnda neist valikutest valides muutuvad vaikimisi võtmed, mida näeb real
-<guilabel>Alglaadimise sätted</guilabel>.</para>
-
- <note>
- <para>Mõne Mageia väljalaske puhul võib juhtuda, et klahviga <emphasis
-role="bold">F6</emphasis> valitud kirjeid ei näe real <guilabel>Alglaadimise
-sätted</guilabel>, aga neid siiski arvestatakse.</para>
- </note>
-
- <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
- </listitem>
-
- <listitem>
- <para>Klahvile <emphasis role="bold">F1</emphasis> vajutades ilmub uus aken
-saadaolevate võtmetega. Valige neist vajalik ja vajutage klahvile <emphasis
-role="bold">Enter</emphasis> üksikasjade nägemiseks või klahvile <emphasis
-role="bold">Esc</emphasis> tervitusekraani juurde naasmiseks.</para>
-
- <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
-
- <para>Siin on näidatud võtme splash üksikasjaliku kirjelduse aken. Vajutage
-klahvile <emphasis role="bold">Esc</emphasis> või valige <guilabel>Tagasi
-alglaadimise sätete juurde</guilabel>, et minna tagasi võtmete
-loendisse. Võtmeid saab lisada käsitsi reale <guilabel>Alglaadimise
-sätted</guilabel>.</para>
-
- <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
-
- <note>
- <para>Abi tõlgitakse keelde, mis on valitud klahviga <emphasis
-role="bold">F2</emphasis>.</para>
- </note>
-
- <para>Täpsemat teavet kerneli võtmete kohta tavapärases ja UEFI süsteemis leiab
-meie Wiki-lehelt <link
-ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
- </listitem>
- </itemizedlist></para>
+ <listitem>
+ <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+ <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis role="bold">Rescue System</emphasis></para>
+
+ <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis role="bold">Memory Test</emphasis></para>
+
+ <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis role="bold">F2: Language</emphasis></para>
+
+ <para>Press F2 for alternative languages.</para>
+ </listitem>
+ </itemizedlist>
</section>
- </section>
- <section>
- <title>Paigaldamise etapid</title>
+ <section>
+ <title>UEFI Systems</title>
+
+ <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
+
+ <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
- <para>Paigaldamine on jagatud mitmeks etapiks, mille loetelu näeb ekraani
-külgpaneelil vasakul.</para>
-
- <para>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.</para>
-
- <para>Enamikul ekraanidel on nupp <guibutton>Abi</guibutton>, mis selgitab antud
-etappi põhjalikumalt.</para>
-
- <note>
- <para>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>.</para>
- </note>
+ <itemizedlist>
+ <title>Menu</title>
+
+ <listitem>
+ <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+ </section>
</section>
<section>
@@ -173,19 +174,20 @@ F2</guibutton>. Seejärel vajutage taaskäivitamiseks korraga klahve
<itemizedlist>
<listitem>
- <para>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>.</para>
+ <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
</listitem>
<listitem>
- <para>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 <emphasis role="bold">ESC</emphasis> ja
-kinnitage valikut klahvi <emphasis role="bold">ENTER</emphasis>
-vajutamisega. Teie ette ilmub must ekraan sõnaga "boot:". Kirjutage "text"
-ja vajutage <emphasis role="bold">ENTER</emphasis>. Nüüd saate jätkata
-tekstipõhise paigaldamisega.</para>
+ <para>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 press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
</listitem>
</itemizedlist>
</section>
@@ -193,30 +195,30 @@ tekstipõhise paigaldamisega.</para>
<section>
<title>Paigaldamine hangub</title>
- <para>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.</para>
+ <para>If the system appeared to freeze during the installation, this may be a
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
</section>
<section>
<title>RAM-i probleem</title>
- <para>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.</para>
+ <para>This will rarely be needed, but in some cases the hardware may report the
+available RAM incorrectly. To specify this manually, you can use the
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
</section>
<section>
<title>Dünaamilised partitsioonid</title>
- <para>Kui olete valinud oma kõvaketta vorminguks Microsoft Windowsi all <emphasis
-role="bold">dynamic</emphasis> tavalise <emphasis
-role="bold">basic</emphasis> asemel, siis arvestage, et Mageiat ei saa
-sellisele kettale paigaldada. Kuidas tavalisele kettavormingule tagasi
-minna, saab lugeda Microsofti dokumentatsioonist: <link
+ <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
</section>
</section>
diff --git a/docs/docs/stable/installer/et/locale.xml b/docs/docs/stable/installer/et/locale.xml
new file mode 100644
index 00000000..bb7bd9a7
--- /dev/null
+++ b/docs/docs/stable/installer/et/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns:m="http://www.w3.org/1998/Math/MathML"
+ xmlns:html="http://www.w3.org/1999/xhtml"
+ xmlns:db="http://docbook.org/ns/docbook">
+ <title>Locale</title>
+
+ <xi:include href="configureTimezoneUTC.xml"/>
+
+ <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/et/login.xml b/docs/docs/stable/installer/et/login.xml
index c4cc6632..069d524d 100644
--- a/docs/docs/stable/installer/et/login.xml
+++ b/docs/docs/stable/installer/et/login.xml
@@ -1,6 +1,22 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="et"><info><title xml:id="label-to-adapt-ti1">Sisselogimisekraan</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
-fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM-i sisselogimisekraan</para></caption></mediaobject><para>Lõpuks ilmub sisselogimisekraan.</para><para>Kirjutage oma kasutajanimi ja parool ning mõne hetke pärast ilmub teie ette
-juba KDE või GNOME töölaud vastavalt sellele, millist live-andmekandjat te
-kasutate. Nüüd võite oma vastset Mageiat kasutama hakata.</para><para>Rohkem teavet leiab <link
-linkend="https://wiki.mageia.org/en/Category:Documentation">Mageia
-wikist</link>.</para></section> \ No newline at end of file
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="et">
+
+ <info>
+ <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+ </info>
+ <mediaobject condition="live">
+ <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+ <caption>
+ <para>SDDM login screen</para>
+ </caption>
+ </mediaobject>
+ <para>Finally, you will come to the desktop login screen.</para>
+ <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+ <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/et/media_selection.xml b/docs/docs/stable/installer/et/media_selection.xml
index 4568298d..791de056 100644
--- a/docs/docs/stable/installer/et/media_selection.xml
+++ b/docs/docs/stable/installer/et/media_selection.xml
@@ -1,6 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="media_selection" version="5.0" xml:lang="et">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="media_selection"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xlink"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
<info>
- <title xml:id="media_selection-ti1">Andmekandjate valik (mittevaba tarkvara)</title>
+ <title xml:id="media_selection-ti1">Nonfree Media</title>
</info>
@@ -11,14 +18,16 @@
+
+
<mediaobject>
<!-- 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)-->
-<imageobject> <imagedata format="PNG" xml:id="media_selection-im1"
-align="center" revision="1" fileref="dx2-media_selection.png"/>
-</imageobject></mediaobject>
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
+<imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
+format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
<para>Siin näeb saadaolevate tarkvarahoidlate nimekirja. Sõltuvalt paigaldamiseks
valitud andmekandjast võib saadaval olla ainult osa võimalikke
@@ -32,11 +41,11 @@ see sisaldab distributsiooni põhikomponente.</para>
</listitem>
<listitem>
- <para>Hoidla <emphasis>Nonfree</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.</para>
+ <para>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 AMD graphics card proprietary drivers,
+firmware for various WiFi cards, etc.</para>
</listitem>
<listitem>
diff --git a/docs/docs/stable/installer/et/minimal-install.xml b/docs/docs/stable/installer/et/minimal-install.xml
index 944ded00..371b03b7 100644
--- a/docs/docs/stable/installer/et/minimal-install.xml
+++ b/docs/docs/stable/installer/et/minimal-install.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" version="5.0" xml:lang="et">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="et">
<!--2012-12-26 marja - exported this section from choosePackages.xml to
start a new page-->
<!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
<info>
<title xml:id="minimal-install-ti1">Minimaalne paigaldus</title>
</info>
@@ -10,29 +13,44 @@
- <para>Kui paketigruppide ekraanil jätta kõik valimata, saab kasutada minimaalset
-paigaldust, vt. <xref linkend="choosePackageGroups"/></para>
-
- <para>Soovi korral võite samal ekraanil ära märkida valiku <emphasis
-role="bold">Valik paketthaaval</emphasis>.</para>
-
- <para>Minimaalne paigaldus 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 <emphasis role="bold">pakettide ükshaaval</emphasis> valimisega,
-vt. <xref linkend="choosePackagesTree"/>.</para>
+
- <para>Kui valite niisuguse paigaldamise, saab järgmisel ekraanil üht-teist
-täpsustada, näiteks lasta paigaldada ka dokumentatsioon või X.</para>
+
- <para>Kui märkida <emphasis role="bold">X'iga</emphasis>, paigaldatakse ka
-kergekaaluline töökeskkond IceWM.</para>
+
- <para>Baasdokumentatsioon tähendab man- ja info-lehekülgi. See sisaldab <link
+ <para>Minimal Installation is intended for those with specific uses in mind for
+Mageia, such as a server or a specialised workstation. You will probably use
+this option combined with the <emphasis>Individual package
+selection</emphasis> option to fine-tune your installation. See <xref
+linkend="choosePackagesTree"/>.</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting
+everything in the <emphasis>Package Group Selection</emphasis> screen, see
+<xref linkend="choosePackageGroups"/>.</para>
+
+ <para>If desired, you can additionally tick the <emphasis>Individual package
+selection</emphasis> option in the same screen.</para>
+ </listitem>
+
+ <listitem>
+ <para>If you choose this installation method, then the relevant screen (see
+screenshot below) will offer you a few useful extras to install, such as
+documentation and <quote>X</quote>.</para>
+
+ <para>If the <emphasis>With X</emphasis> option is selected, then IceWM (a
+lightweight desktop environment) will also be included.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>The basic documentation is provided in the form of <quote>man</quote> and
+<quote>info</quote> pages. It contains the man pages from the <link
xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
-Projecti</link> manuaalilehekülgi ja paketi <link
+Project</link> and the <link
xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
-coreutils</link> info-lehekülgi.</para>
+coreutils</link> info pages.</para>
<mediaobject>
<imageobject> <imagedata format="PNG" xml:id="minimal-install-im1"
diff --git a/docs/docs/stable/installer/et/misc-params.xml b/docs/docs/stable/installer/et/misc-params.xml
index dacf2312..25e158e2 100644
--- a/docs/docs/stable/installer/et/misc-params.xml
+++ b/docs/docs/stable/installer/et/misc-params.xml
@@ -1,17 +1,34 @@
<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="misc-params">
<info>
- <title xml:id="misc-params-ti1">Seadistuste kokkuvõte</title>
+ <title xml:id="misc-params-ti1">Configuration Summary</title>
</info>
+
+
+
+
+
+
+
+
+
+
<mediaobject>
<!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject>
-
- <para xml:id="misc-params-pa1" revision="1">DrakX langetab teie süsteemi seadistamisel mõistlikud otsused vastavalt Teie
-valikutele ja tuvastatud riistvarale. Siin saab neid seadistusi üle vaadata
-ja vajaduse korral muuta, klõpsates <guibutton>Seadista</guibutton>.</para>
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
+
+ <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
+the choices you made and on the hardware detected. You can check the
+settings here and change them if you want by pressing
+<emphasis>Configure</emphasis>.</para>
<note>
<para>Rusikareeglina on soovitatav kasutada vaikimisi seadistusi - välja arvatud
@@ -25,7 +42,7 @@ mõnel erandjuhul:<itemizedlist>
</listitem>
<listitem>
- <para>veel midagi, millest on üksikasjalikumalt juttu allpool</para>
+ <para>some other factor mentioned in the detailed sections below is an issue</para>
</listitem>
</itemizedlist></para>
</note>
@@ -37,47 +54,47 @@ mõnel erandjuhul:<itemizedlist>
<itemizedlist>
<listitem>
- <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Ajavöönd</guilabel></para>
+ <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
- <para xml:id="misc-params-system-pa2a" revision="1">DrakX määrab vastavalt valitud keelele ajavööndi. Soovi korral saab seda
-muuta. Vt ka <xref linkend="configureTimezoneUTC"/></para>
+ <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
+can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
</listitem>
<listitem>
- <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Riik / Piirkond</guilabel></para>
+ <para revision="1" xml:id="misc-params-system-pa3"><emphasis role="bold">Country / Region</emphasis></para>
<para xml:id="misc-params-system-pa3a" revision="1">Kui Te ei viibi valitud riigis, on väga oluline see siin õigeks
parandada. Vt <xref linkend="selectCountry"/></para>
</listitem>
<listitem>
- <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Alglaadur</guilabel></para>
+ <para revision="1" xml:id="misc-params-system-pa4"><emphasis role="bold">Bootloader</emphasis></para>
- <para xml:id="misc-params-system-pa4a" revision="2">DrakX langetab tavaliselt alglaaduri osas hea ja õige valiku.</para>
+ <para xml:id="misc-params-system-pa4a" revision="2">DrakX proposal for the bootloader setting</para>
- <para xml:id="misc-params-system-pa4b" revision="2">Kui Te just väga täpselt ei tea, kuidas Grub2 seadistada, ei tasu siin
-midagi muuta.</para>
+ <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
- <para xml:id="misc-params-system-pa4c" revision="2">Täpsemalt kõneleb sellest <xref linkend="setupBootloader"/></para>
- </listitem>
+
+ <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
<listitem>
- <para xml:id="misc-params-system-pa5" revision="1"><guilabel>Kasutajate haldamine</guilabel></para>
+ <para xml:id="misc-params-system-pa5" revision="1"><emphasis role="bold">User management</emphasis></para>
- <para xml:id="misc-params-system-pa5a" revision="2">Siin saab lisada uusi kasutajaid. Nad kõik saavad oma isikliku
-<literal>/home</literal> kataloogi.</para>
+ <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
</listitem>
<listitem>
- <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Teenused</guilabel></para>
+ <para xml:id="misc-params-system-pa6" revision="1"><emphasis role="bold">Services</emphasis></para>
<para xml:id="misc-params-system-pa6a" revision="1">Süsteemi teenused tähendavad väikseid programme, mis töötavad taustal
(deemonid). See tööriist võimaldab teatavaid ülesandeid lubada või keelata.</para>
- <para xml:id="misc-params-system-pa6b" revision="1">Enne millegi muutmist tuleks hoolikalt mõelda - eksimuse korral ei pruugi
-arvuti enam korralikult töötada.</para>
-
- <para>Täpsemalt kõneleb sellest <xref linkend="configureServices"/></para>
+ <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
</listitem>
</itemizedlist>
</section>
@@ -89,7 +106,7 @@ arvuti enam korralikult töötada.</para>
<itemizedlist>
<listitem>
- <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Klaviatuur</guilabel></para>
+ <para xml:id="misc-params-hardware-pa1" revision="1"><emphasis role="bold">Keyboard</emphasis></para>
<para xml:id="misc-params-hardware-pa1a" revision="1">Siin saab määrata või muuta klaviatuuripaigutust, mis sõltub valitud
asukohast, keelest ja klaviatuuritüübist.</para>
@@ -101,27 +118,32 @@ pidage meeles, et muutuvad ka paroolid.</para>
</listitem>
<listitem>
- <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Hiir</guilabel></para>
+ <para xml:id="misc-params-hardware-pa2" revision="1"><emphasis role="bold">Mouse</emphasis></para>
<para xml:id="misc-params-hardware-pa2a" revision="1">Siin saab lisada või seadistada mitmesuguseid osutusseadmeid: hiiri,
puuteplaate jms.</para>
</listitem>
<listitem>
- <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Helikaart</guilabel></para>
+ <para xml:id="misc-params-hardware-pa3" revision="1"><emphasis role="bold">Sound card</emphasis></para>
- <para xml:id="misc-params-hardware-pa3a" revision="1">Paigaldusprogramm kasutab vaikimisi draiverit, kui see on olemas. Võimalus
-valida teist draiverit antakse ainult siis, kui helikaardile on olemas mitu
-draiverit, aga ükski neist ei ole vaikimisi draiver.</para>
+ <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+ <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
</listitem>
<listitem>
- <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Graafiline kasutajaliides</guilabel></para>
+ <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
- <para xml:id="misc-params-hardware-pa4a" revision="1">Siin saab seadistada graafikakaarte ja monitore.</para>
+ <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
- <para xml:id="misc-params-hardware-pa4b" revision="1">Täpsemalt kõneleb sellest <xref linkend="configureX_chooser"/>.</para>
- </listitem>
+
+ <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
</itemizedlist>
<mediaobject>
@@ -136,12 +158,12 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me
<itemizedlist>
<listitem>
- <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Võrk</guilabel></para>
+ <para xml:id="misc-params-network-pa1" revision="1"><emphasis role="bold">Network</emphasis></para>
- <para xml:id="misc-params-network-pa2" revision="1">Siin saab seadistada võrgu, kuid võrgukaartide korral, mis kasutavad
-mittevabu draivereid, on seda parem teha pärast taaskäivitust
-<application>Mageia juhtimiskeskuses</application>, kui Te pole veel lubanud
-mittevaba tarkvara hoidlate kasutamist.</para>
+ <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
+repositories.</para>
<warning>
<para xml:id="misc-params-network-pa3" revision="1">Võrgukaardi lisamisel ärge unustage seadistamast tulemüüri, et ka lisatud
@@ -150,13 +172,14 @@ kaarti jälgitaks.</para>
</listitem>
<listitem>
- <para xml:id="misc-params-network-pa4" revision="1"><guilabel>Puhverserverid</guilabel></para>
+ <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
- <para xml:id="misc-params-network-pa4a" revision="1">Puhverserver on omamoodi vahendaja Teie arvuti ja interneti vahel. Siin saab
-panna arvuti kasutama puhverservereid.</para>
+ <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
+Internet. This section allows you to configure your computer to utilize a
+proxy service.</para>
- <para xml:id="misc-params-network-pa4b" revision="1">Vajalike parameetrite täpsustamiseks võib olla vajalik pidada nõu oma
-süsteemiadministraatoriga.</para>
+ <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
</listitem>
</itemizedlist>
</section>
@@ -168,26 +191,31 @@ süsteemiadministraatoriga.</para>
<itemizedlist>
<listitem>
- <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Turbetase</guilabel></para>
+ <para revision="1" xml:id="misc-params-security-pa1"><emphasis role="bold">Security Level</emphasis></para>
- <para xml:id="misc-params-security-pa1a" revision="1">Siin saab määrata oma arvuti turbetaseme. Enamasti peaks normaalseks
-kasutamiseks kõlbama vaikimisi seadistused (valik Standardne).</para>
-
- <para xml:id="misc-params-security-pa1b" revision="1">Valige tase, mis paistab Teie vajadusi kõige paremini rahuldavat.</para>
+ <para xml:id="misc-params-security-pa1a" revision="1">The Security level for your computer, in most cases the default setting
+(Standard) is adequate for general use. Select the option which best suits
+your usage.</para>
</listitem>
<listitem>
- <para xml:id="misc-params-security-pa2" revision="1"><guilabel>Tulemüür</guilabel></para>
+ <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+
+ <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
+your computer. The safe and secure default is to allow ZERO inbound
+connections. This does not stop you connecting outbound and using your
+computer normally.</para>
- <para revision="1" xml:id="misc-params-security-pa2a">Tulemüür on mõeldud tõkkeks Teie tähtsate andmete ja internetis luuravate
-röövloomade vahel, kes üritavad neid varastada või rikkuda.</para>
+ <para revision="1">Please be aware that the Internet is a high risk network where there are
+continuous attempts to probe and attack systems. Even seemingly
+<quote>safe</quote> connections such as ICMP (for ping) have been used as
+covert data channels for exfiltrating data by malicious persons.</para>
- <para xml:id="misc-params-security-pa2b" revision="1">Valige teenused, millel lubate oma süsteemile ligi pääseda. Valik sõltub
-mõistagi sellest, milleks Te oma arvutit kasutada soovite. Täpsemat teavet
-vt <xref linkend="firewall"/>.</para>
+ <para revision="1">For more information, see <xref linkend="firewall"/>.</para>
<warning>
- <para xml:id="misc-params-security-pa2c" revision="1">Pange tähele, et kõige lubamine (st tulemüür puudub) võib olla väga ohtlik.</para>
+ <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
</warning>
</listitem>
</itemizedlist>
diff --git a/docs/docs/stable/installer/et/reboot.xml b/docs/docs/stable/installer/et/reboot.xml
index f4828839..0c55273e 100644
--- a/docs/docs/stable/installer/et/reboot.xml
+++ b/docs/docs/stable/installer/et/reboot.xml
@@ -1,18 +1,24 @@
<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="et" xml:id="reboot">
<!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
<info>
<title xml:id="reboot-ti1">Taaskäivitamine</title>
</info>
- <para>Kui alglaadur on paigaldatud, palutakse teil arvuti seisata, Live-CD
-eemaldada ja arvuti taaskäivitada. Klõpsake nupule <emphasis
-role="bold"><guibutton>Lõpeta</guibutton></emphasis> ja talitage, nagu
-nõutud - ning <emphasis role="bold">just sellises järjekorras!</emphasis></para>
+
+ <para>Once the bootloader has been installed, you will be prompted to halt your
+computer, remove the live DVD/USB stick and restart the computer.</para>
+ <important>
+ <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+ </important>
<mediaobject>
-<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
- <para>Taaskäivitamise järel näete allalaadimise edenemisribasid. Need annavad
-märku, et parajasti laaditakse alla tarkvaraallikaid (vt täpsemalt
-tarkvarahalduse osast).</para>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+ <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+ <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
<mediaobject condition="live">
<imageobject> <imagedata format="PNG" xml:id="reboot-im1"
fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/et/securityLevel.xml b/docs/docs/stable/installer/et/securityLevel.xml
index 6a4fcfe6..526ced1a 100644
--- a/docs/docs/stable/installer/et/securityLevel.xml
+++ b/docs/docs/stable/installer/et/securityLevel.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="securityLevel">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="securityLevel"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1999/xhtml"
+ xmlns:ns2="http://www.w3.org/1999/xlink"
+ xmlns:ns="http://docbook.org/ns/docbook">
<info>
<title xml:id="securityLevel-ti1">Turbetase</title>
</info>
@@ -7,26 +14,31 @@
+
+
<mediaobject>
<!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
<!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata format="PNG" xml:id="securityLevel-im1"
-align="center" fileref="dx2-securityLevel.png" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
<para><emphasis role="bold">Palun valige sobiv turbetase</emphasis></para>
- <para xml:id="securityLevel-pa1" revision="1"><emphasis role="bold">Standardne</emphasis> on vaikevalik ja soovitatav
-tavalisele kasutajale. <emphasis role="bold">Turvaline</emphasis> loob väga
-kaitstud süsteemi, mida on vaja näiteks avaliku serveri ülesseadmisel.</para>
+ <para revision="1" xml:id="securityLevel-pa1"><emphasis>Standard</emphasis> is the default, and recommended setting for
+the average user.</para>
+
+ <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
+instance if the system is to be used as a public server.</para>
<para><emphasis role="bold">Turbeadministraator</emphasis></para>
- <para xml:id="securityLevel-pa2" revision="1">Siin saab määrata e-posti aadressi, millele süsteem saadab
+ <para revision="1" xml:id="securityLevel-pa2">Siin saab määrata e-posti aadressi, millele süsteem saadab
<emphasis>turbehoiatusi</emphasis>, kui avastatakse olukord, mis nõiab
süsteemiadministraatori teavitamist.</para>
- <para>Hea ja hõlpus viis on kirjutada siia &lt;kasutaja>@localhost - kus
-&lt;kasutaja> on selle kasutaja kasutajanimi, kes neid teateid saama peab.</para>
+ <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
<note>
<para>Süsteem läkitab niisugused teated teele <emphasis role="bold">Unixi
@@ -35,6 +47,6 @@ tähendab, et kasutaja peab ühtlasi olema seadistatud niisuguseid teateid
saama!</para>
</note>
- <para revision="2" xml:id="securityLevel-pa3">Pärast paigaldamist on alati võimalik turvalisusega seotud seadistusi muuta
-Mageia juhtimiskeskuse sektsioonis <guilabel>Turvalisus</guilabel>.</para>
-</section> \ No newline at end of file
+ <para revision="2" xml:id="securityLevel-pa3">It will always be possible to adjust your security settings post-install in
+the <emphasis>Security</emphasis> section of the Mageia Control Center.</para>
+</section>
diff --git a/docs/docs/stable/installer/et/selectCountry.xml b/docs/docs/stable/installer/et/selectCountry.xml
index e0ef83fd..7d411ead 100644
--- a/docs/docs/stable/installer/et/selectCountry.xml
+++ b/docs/docs/stable/installer/et/selectCountry.xml
@@ -1,27 +1,38 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="et">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="et">
<info>
<title xml:id="selectCountry-ti1">Riigi / piirkonna valimine</title>
</info>
+
+
+
+
<mediaobject>
<!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
<imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
- <para revision="2" xml:id="selectCountry-pa1">Valige oma riik või piirkond. See on oluline paljudele muudele
-seadistustele, näiteks vääring või juhtmeta side regulatsioonipiirkond. Vale
-riigi määramisel võib juhtuda, et te ei saagi juhtmeta võrku kasutada.</para>
+ <itemizedlist>
+ <listitem>
+ <para revision="2" xml:id="selectCountry-pa1">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 being unable to use a Wireless network.</para>
+ </listitem>
- <para revision="1" xml:id="selectCountry-pa2">Kui teie riiki nimekirjas pole, klõpsake nupule <guilabel>Muud
-valikud</guilabel> ja valige oma riik / piirkond sealt.</para>
+ <listitem>
+ <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <emphasis>Other
+Countries</emphasis> option and choose your country / region there.</para>
+ </listitem>
+ </itemizedlist>
<note>
- <para revision="1" xml:id="selectCountry-pa3">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.</para>
+ <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
</note>
<section xml:id="inputMethod">
@@ -29,19 +40,19 @@ arvestab teie tegeliku valikuga.</para>
<title xml:id="inputMethod-ti7">Sisestusmeetod</title>
</info>
- <para xml:id="selectCountry-pa4" revision="1"><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, 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.</para>
+ <para xml:id="selectCountry-pa4" revision="1">In the <emphasis>Other Countries</emphasis> 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, 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.</para>
<note>
- <para xml:id="selectCountry-pa5" revision="1">Kui jätsite paigaldamise ajal sisestusmeetodi valimata, saab seda teha
-pärast paigaldatud süsteemi laadimist, valides <emphasis role="bold">Arvuti
-seadistamine</emphasis> -> <emphasis role="bold">Süsteem</emphasis> või
-käivitades administraatorina localedrake'i.</para>
+ <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
+post-install via <menuchoice> <guimenu>Configure your Computer</guimenu>
+<guimenuitem>System</guimenuitem> </menuchoice>, or by running
+<command>localedrake</command> as <emphasis>root</emphasis>.</para>
</note>
</section>
</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/et/selectInstallClass.xml b/docs/docs/stable/installer/et/selectInstallClass.xml
index 803de53c..bec46864 100644
--- a/docs/docs/stable/installer/et/selectInstallClass.xml
+++ b/docs/docs/stable/installer/et/selectInstallClass.xml
@@ -1,4 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="selectInstallClass">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="selectInstallClass"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xhtml"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
+
+
+
+
+
+
@@ -16,56 +31,49 @@
"you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
<!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
<!-- 2013-05-05 marja, corrected typo in screenshot name, removed -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
<title xml:id="selectInstallClass-ti1">Paigaldamine või uuendamine</title>
</info>
<mediaobject>
-<imageobject> <imagedata format="PNG" align="center"
-fileref="dx2-selectInstallClass.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
- <itemizedlist>
+ <itemizedlist spacing="compact">
<listitem>
- <para>Paigaldamine</para>
+ <para><emphasis role="bold">Install</emphasis></para>
- <para>Selle valimisel saab ette võtta <application>Mageia</application> värske
-paigalduse. Sellega vormindatakse juurpartitsioon (/), kuid eraldi asuv
-/home partitsioon on võimalik alles hoida.</para>
+ <para>Use this option to perform a fresh installation of Mageia. This will format
+the <literal>root</literal> partition (<filename>/</filename>), but can
+preserve a pre-existing <filename>/home</filename> partition (a dedicated
+/home partition, rather than being incorporated within the root (/)
+partition itself).</para>
</listitem>
<listitem>
- <para>Uuendamine</para>
-
- <para>Selle valimisel saab ette võtta olemasoleva
-<application>Mageia</application> paigalduse uuendamise.</para>
-
- <warning>
- <para>Põhjalikult testitud on uuendamine ainult selliselt varasemalt Mageia
-versioonilt, mis oli <emphasis>veel toetatud</emphasis> ajal, mil ilmus
-praegune paigaldusprogrammi versioon. Kui soovite uuendada Mageia
-versioonilt, mille ametlik toetamine oli lõppenud juba enne praeguse
-paigaldusprogrammi ilmumist, siis on mõistlikum võtta ette pigem uus
-paigaldus (selle juures tasub mõistagi jätta alles oma
-<literal>/home</literal>-partitsioon).</para>
- </warning>
+ <para><emphasis role="bold">Upgrade</emphasis></para>
+
+ <para>Use this option to upgrade an existing installation of Mageia.</para>
</listitem>
</itemizedlist>
- <note>
- <para>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 <guilabel>Alt Ctrl
-F2</guilabel>. Seejärel vajutage taaskäivitamiseks korraga klahve
-<guilabel>Alt Ctrl Delete</guilabel></para>
- </note>
+ <important>
+ <para>Only upgrading from a previous Mageia version that was <emphasis>still
+supported</emphasis> when this Installer's version was released, has been
+thoroughly tested. If you want to upgrade a Mageia version that has reached
+its <quote>End Of Life</quote> then it is better to do a
+<quote>clean</quote> install instead, while preserving your
+<filename>/home</filename> partition.</para>
+ </important>
<tip>
- <para>Kui avastate, et olete unustanud mõne keele lisada, saab <emphasis
-role="bold">Paigaldamise või uuendamise</emphasis> ekraanilt naasta
-keelevaliku juurde, vajutades korraga klahve <guilabel>Alt Ctrl
-Home</guilabel>. <emphasis role="bold">Ärge</emphasis> tehke seda hilisema
-paigalduse käigus.</para>
+ <para>If you have discovered that you forgot to select an additional language, you
+can return from the <emphasis>Install or Upgrade</emphasis> screen to the
+language choice screen by pressing <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis
+role="bold"> NOT</emphasis> do this later in the install.</para>
</tip>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/et/selectKeyboard.xml b/docs/docs/stable/installer/et/selectKeyboard.xml
index 9dfd0283..ec319086 100644
--- a/docs/docs/stable/installer/et/selectKeyboard.xml
+++ b/docs/docs/stable/installer/et/selectKeyboard.xml
@@ -1,4 +1,17 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectKeyboard" version="5.0" xml:lang="et">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="selectKeyboard"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
+
+
+
+
@@ -6,19 +19,22 @@
<info>
<!-- Started by marja on 2012 03 31 -->
<!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
<title xml:id="selectKeyboard-ti1">Klaviatuur</title>
</info>
- <para xml:id="selectKeyboard-pa1" revision="1">DrakX valib teie keelele sobiva klaviatuuri. Kui sobivat klaviatuuri ei
+ <para revision="1" xml:id="selectKeyboard-pa1">DrakX valib teie keelele sobiva klaviatuuri. Kui sobivat klaviatuuri ei
leita, kasutatakse vaikimisi US klaviatuuripaigutust.</para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-selectKeyboard.png" align="center"/>
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
</imageobject></mediaobject>
<itemizedlist>
<listitem>
- <para xml:id="selectKeyboard-pa2" revision="1">Kontrollige, kas valik on õige, ja valige vajaduse korral mõni muu
+ <para revision="1" xml:id="selectKeyboard-pa2">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
@@ -27,21 +43,22 @@ xlink:href="http://en.wikipedia.org/wiki/Keyboard_layout">en.wikipedia.org/wiki/
</listitem>
<listitem>
- <para xml:id="selectKeyboard-pa3" revision="1">Kui teie klaviatuuri nimekirjas ei ole, klõpsake täieliku loetelu nägemiseks
-<guibutton>Veel</guibutton> ja valige oma klaviatuur sealt.</para>
-
- <para revision="1"><warning>
- <para revision="1" xml:id="selectKeyboard-pa5">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.</para>
- </warning></para>
+ <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+ <para revision="1"><note>
+ <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+ </note></para>
</listitem>
<listitem>
- <para xml:id="selectKeyboard-pa4" revision="1">Kui valite klaviatuuri, mis ei kasuta ladina tähti, näete lisadialoogi, mis
+ <para revision="1" xml:id="selectKeyboard-pa4">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.</para>
</listitem>
</itemizedlist>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/et/selectKeyboardLive.xml b/docs/docs/stable/installer/et/selectKeyboardLive.xml
index 75cbb2c1..635dcebe 100644
--- a/docs/docs/stable/installer/et/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/et/selectKeyboardLive.xml
@@ -1,14 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="selectKeyboardLive">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="selectKeyboardLive"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
+
+
<info>
- <title xml:id="selectKeyboardLive-ti1">Klaviatuuri valimine</title>
+ <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
</info>
<mediaobject>
-<imageobject> <imagedata xml:id="selectKeyboardLive-im1" revision="1"
-align="center" format="PNG" fileref="live-selectKeyboard.png"/>
-</imageobject></mediaobject>
-
- <para>Teil palutakse määrata klaviatuuripaigutus, mida soovite Mageias
-kasutada. Vaikimisi valitu vastab keelele ja ajavööndile, mille varem
-valisite.</para>
-</section> \ No newline at end of file
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+ <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
+
+ <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/et/selectLanguage.xml b/docs/docs/stable/installer/et/selectLanguage.xml
index d63e74c5..398a5cad 100644
--- a/docs/docs/stable/installer/et/selectLanguage.xml
+++ b/docs/docs/stable/installer/et/selectLanguage.xml
@@ -1,4 +1,23 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="selectLanguage">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="selectLanguage"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
+
+
+
+
+
+
+
+
+
+
@@ -17,49 +36,65 @@
code in figure, marja, 20120409 -->
<!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
<title xml:id="selectLanguage-ti1">Kasutatava keele valimine</title>
</info>
- <para condition="classical">Valige vajalik keel, laiendades nimekirja kõigepealt maailmajao järgi.
-<application>Mageia</application> kasutab langetatud valikut nii
-paigaldamise ajal kui ka paigaldatud süsteemis.</para>
+ <itemizedlist>
+ <listitem condition="classical">
+ <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+ </listitem>
- <para condition="live">Valige vajalik keel. <application>Mageia</application> kasutab langetatud
-valikut nii paigaldamise ajal kui ka paigaldatud süsteemis.</para>
+ <listitem condition="live">
+ <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+ </listitem>
- <para condition="classical">Kui teie süsteemi tuleks paigaldada mitu keelt kas teie enda või teiste
-kasutajate tarbeks, siis tuleks nupule <guibutton>Mitme keele
-valimine</guibutton> klõpsates need kõik kohe lisada. Pärast paigaldamist on
-uute keelte lisamine juba palju keerulisem.</para>
+ <listitem condition="classical">
+ <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
+extra language support after installation.</para>
+ </listitem>
+ </itemizedlist>
<mediaobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-selectLanguage.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata fileref="live-language.png"
-format=""/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
- <warning condition="classical">
- <para>Isegi kui paigaldate mitu keelt, tuleb üks neist valida esimesel ekraanil
-eelistatud keeleks. See keel on märgitud ka mitme keele valimise ekraanil.</para>
- </warning>
+ <important condition="classical">
+ <para>Even if you choose more than one language, you must first choose one as your
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+ </important>
<itemizedlist>
<listitem condition="classical">
- <para>Kui klaviatuuri keel ei sobi kokku eelistatud keelega, oleks mõistlik
-paigaldada kohe ka klaviatuurile vastav keel.</para>
+ <para>If your keyboard language is not the same as your preferred language, then
+it is advisable to install the required language for your keyboard as well</para>
</listitem>
<listitem>
- <para>Mageia toetab vaikimisi UTF-8 (Unicode).</para>
-
- <para condition="classical">Selle võib keelata <emphasis role="bold">mitme keele valimise</emphasis>
-ekraanil, kui olete kindel, et see teie keelele kohe üldse ei sobi. UTF-8
-keelamine rakendub kõigile paigaldatavatele keeltele.</para>
+ <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
+languages.</para>
</listitem>
<listitem>
- <para>Oma süsteemi keelt saab pärast paigaldamist muuta, valides Mageia
-juhtimiskeskus -> Süsteem -> Süsteemi lokaliseerimine.</para>
+ <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
</listitem>
</itemizedlist>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/et/selectMouse.xml b/docs/docs/stable/installer/et/selectMouse.xml
index 6fe43ba7..f84a98e2 100644
--- a/docs/docs/stable/installer/et/selectMouse.xml
+++ b/docs/docs/stable/installer/et/selectMouse.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectMouse" version="5.0" xml:lang="et">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="selectMouse"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xlink"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
<info>
<title xml:id="selectMouse-ti1">Hiire valimine</title>
</info>
@@ -7,24 +13,28 @@
+
+
+
-
-
- <mediaobject>
+
+ <mediaobject>
<!-- Made by marja on 2012 04 11 -->
<!-- NEEDS TO BE REVIEWED! -->
<!-- adding some "real" text now that we know the page shows up in the right place-->
<!-- marja 2012-04-24 adding screenshot -->
+<!--2018/02/15 apb: Text and typography.-->
<imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
-format="PNG" /> </imageobject></mediaobject>
+format="PNG"/> </imageobject></mediaobject>
<para revision="2" xml:id="selectMouse-pa1">Kui te ei ole rahul oma hiire tööga, saate siit valida mõne teise.</para>
- <para revision="2" xml:id="selectMouse-pa2">Tavaliselt on mõistlik valik <guilabel>Universaalne</guilabel> -
-<guilabel>Suvaline PS/2 ja USB hiir</guilabel>.</para>
+ <para revision="2" xml:id="selectMouse-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
- <para revision="2" xml:id="selectMouse-pa3">Valige <guilabel>Universaalne</guilabel> - <guilabel>Evdev jõuga</guilabel>,
-et seadistada nuppe, mis peaksid töötama kuue või rohkema nupuga hiirel.</para>
+ <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
</section>
diff --git a/docs/docs/stable/installer/et/setupBootloader.xml b/docs/docs/stable/installer/et/setupBootloader.xml
index 041ade09..35df273c 100644
--- a/docs/docs/stable/installer/et/setupBootloader.xml
+++ b/docs/docs/stable/installer/et/setupBootloader.xml
@@ -1,154 +1,198 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="et" xml:id="setupBootloader">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="et" xml:id="setupBootloader">
+
+
+
+
<info>
- <!---->
-<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
-
+ <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<title xml:id="setupBootloader-ti1">Alglaaduri põhiseadistused</title>
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
</info>
<section>
- <title>Alglaaduri liides</title>
- <para>Vaikimisi kasutab Mageia üht kahest võimalusest:</para>
+ <title>Grub2</title>
<itemizedlist>
+ <title>Grub2 on Legacy MBR/GPT systems</title>
<listitem>
- <para>Grub2 (graafilise menüüga või ilma selleta) pärand/MBR või pärand/GPT
-süsteemi korral</para>
+ <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+bootloader for a Legacy/MBR or Legacy/GPT system.</para>
</listitem>
<listitem>
- <para>Grub2-efi UEFI süsteemi korral</para>
+ <para>By default, a new bootloader will be written into either the MBR (Master
+Boot Record) of your first hard drive or in the BIOS boot partition.</para>
</listitem>
</itemizedlist>
- <tip>
- <para>Mageia graafiline menüü näeb kena välja :)</para>
- </tip>
- <section>
- <title>Grub2 pärand/MBR ja pärand/GPT süsteemis</title>
- <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
-fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
- <para>Ärge muutke <emphasis role="bold">Alglaadimisseadet</emphasis>, kui te pole
-täiesti kindel, et teate, mida teete.</para>
- </section>
- <section>
- <title>Grub2-efi UEFI süsteemis</title>
- <para>UEFI süsteemi korral on kasutajaliides pisut teistsugune, sest te ei saa
-valida graafilise menüü <emphasis role="bold">kasutamist</emphasis> või
-<emphasis role="bold">kasutamata jätmist</emphasis>.</para>
- <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader2.png"/> </imageobject></mediaobject>
- <para>Kui Mageia on ainuke süsteem, mis on teie arvutisse paigaldatud, loob
-paigaldusprogramm ESP (EFI süsteemse partitsiooni) alglaaduri (Grub2-efi)
-tarbeks. Kui arvutisse on juba paigaldatud UEFI operatsioonisüsteeme
-(näiteks Windows 8), tuvastab Mageia paigaldusprogramm Windowsi loodud ESP
-ja lisab sellele Grub2-efi. ESP-sid võib küll põhimõtteliselt olla ka mitu,
-aga väga soovitatav on siiski kasutada ainult üht sõltumata sellest, kui
-palju on arvutis operatsioonisüsteeme.</para>
- <para>Ärge muutke <emphasis role="bold">Alglaadimisseadet</emphasis>, kui te pole
-täiesti kindel, et teate, mida teete.</para>
- </section>
- </section>
- <section>
- <title xml:id="setupMageiaBootloader">Mageia alglaaduri kasutamine</title>
- <para>Vaikimisi kirjutab Mageia sõltuvalt süsteemist uue:</para>
<itemizedlist>
+ <title>Grub2-efi on UEFI systems</title>
<listitem>
- <para>Grub2 alglaaduri kas Teie esimese kõvaketta MBR-i (Master Boot Record) või
-BIOS-e alglaadepartisioonile</para>
+ <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
</listitem>
<listitem>
- <para>Grub2-efi alglaaduri ESP-le</para>
+ <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+ <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
- <para>Kui arvutisse peaks olema paigaldatud teisigi operatsioonisüsteeme, püüab
-Mageia lisada need oma alglaadimismenüüsse. Kui Te seda ei soovi, klõpsake
-<guibutton>Järgmine</guibutton> ja eemaldage märge kastikesest <emphasis
-role="bold">Võõraste operatsioonisüsteemide otsimine</emphasis></para>
- <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader3.png"
-align="center"/> </imageobject></mediaobject>
- </section>
- <section>
- <title>Olemasoleva alglaaduri kasutamine</title>
- <para>Täpne protseduur, kuidas lisada Mageia süsteem olemasolevale alglaadurile,
-väljub käesoleva abiteksti raamest, kuid enamasti tähendab see asjakohase
-alglaaduri paigaldamise programmi käivitamist, mis tuvastab ja lisab selle
-automaatselt. Uurige selle kohta lähemalt vastava operatsioonisüsteemi
-dokumentatsiooni.</para>
- </section>
- <section>
- <title xml:id="setupChainLoading">Ahellaadimise kasutamine</title>
- <para>Kui Te ei soovi alglaaditavat Mageiat, vaid tahate seda laadida mõnest
-teisest operatsioonisüsteemist, siis klõpsake
-<guibutton>Järgmine</guibutton>, seejärel <guibutton>Muu</guibutton> ja
-märkige ära kastike <guilabel>ESP-i ega MBR-i ei puudutata</guilabel>.</para>
- <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
- <para>Näete hoiatust, et alglaadur puudub. Eirake seda ja klõpsake
-<guibutton>Olgu</guibutton>.</para>
- <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"/>
-</imageobject></mediaobject>
</section>
<section>
- <title>Valikud</title>
+ <info>
+ <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+ </info>
<section>
- <title>Esimene kaart</title>
- <para><itemizedlist><listitem><para><guilabel>Ooteaeg alglaadimisel</guilabel>: selles kastis saab panna paika,
-kui mitu sekundit oodatakse, enne kui käivitatakse vaikimisi
-operatsioonisüsteem.</para></listitem><listitem><para><guilabel>Turvalisus</guilabel>: siin saab määrata alglaaduri
-parooli. Sellisel juhul küsitakse alglaadimise ajal kasutajanime ja parooli,
-kui soovite valida mõnda alglaadimiskirjet või seadistusi
-muuta. Kasutajanimeks on <emphasis role="bold">root</emphasis>, parooli
-saate siin ise määrata.</para></listitem><listitem><para><guilabel>Parool</guilabel>: selles kastis saab parooli kindlaks määrata.</para></listitem><listitem><para><guilabel>Parool (uuesti)</guilabel>: siia tuleb parool teist korda
-kirjutada, mille järel Drakx kontrollib, kas see ikka sobib kokku sellega,
-mille sisestasite esimesel korral.</para></listitem><listitem><para><guilabel>Edasijõudnuile</guilabel></para><itemizedlist><listitem><para><guilabel>ACPI lubamine:</guilabel> ACPI (täiustatud konfiguratsiooni- ja
-toiteliides) on toitehalduse standard. See võib säästa energiat, lülitades
-välja kasutamata seadmed. Sama meetodit kasutas varem APM. Selle valimata
-jätmine võib aga olla kasulik, kui Teie arvuti ei toeta ACPI-t või Te
-arvate, et ACPI võib põhjustada mingeid probleeme (näiteks suvalisi
-taaskäivitusi või süsteemi hangumisi).</para></listitem><listitem><para><guilabel>SMP lubamine</guilabel>: see valik lülitab sisse või välja
-sümmeetrilise mitmiktöötluse mitme tuumaga protsessorite korral.</para></listitem><listitem><para><guilabel>APIC lubamine</guilabel>: selle lubamine või keelamine annab
-operatsioonisüsteemile või võtab sellelt ligipääsu täiustatud
-programmeeritavale katkestuste kontrollerile. APIC-seadmed võimaldavad
-keerulisemaid prioriteedi määramise mudeleid ja täiustatud IRQ
-(katkestusnõuded) haldamist.</para></listitem><listitem><para><guilabel>Kohaliku APIC lubamine</guilabel>: siin saab lubada või keelata
-kohaliku APIC, mis haldab kõiki konkreetse protsessori väliseid katkestusi
-SMP-süsteemis.</para></listitem></itemizedlist></listitem></itemizedlist></para>
+ <title>Alglaaduri põhiseadistused</title>
+ <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+ <itemizedlist>
+ <listitem>
+ <para><emphasis role="bold">Bootloader to use</emphasis></para>
+ <para>This feature is only available to Legacy MBR/BIOS systems. Users of UEFI
+systems will not see this option here.</para>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">Boot device</emphasis></para>
+ <para>Don't change this unless you really know what you are doing</para>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+ <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">Security</emphasis></para>
+ <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">Password</emphasis></para>
+ <para>Choose a password for the bootloader (optional)</para>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">Password (again)</emphasis></para>
+ <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+ </listitem>
+ </itemizedlist>
+ <para><emphasis>Advanced</emphasis></para>
+ <itemizedlist>
+ <listitem>
+ <para><emphasis>Enable ACPI</emphasis></para>
+ <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
+could be useful if, for example, your computer does not support ACPI or if
+you think the ACPI implementation might cause some problems (for instance
+random reboots or system lockups).</para>
+ </listitem>
+ <listitem>
+ <para><emphasis>Enable SMP</emphasis></para>
+ <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+ </listitem>
+ <listitem>
+ <para><emphasis>Enable APIC</emphasis></para>
+ <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request) management.</para>
+ </listitem>
+ <listitem>
+ <para><emphasis>Enable Local APIC</emphasis></para>
+ <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+ </listitem>
+ </itemizedlist>
</section>
<section>
- <title>Järgmine kaart</title>
+ <title>Bootloader Configuration</title>
+ <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
- <para><guilabel>Vaikimisi:</guilabel> vaikimisi käivitatav operatsioonisüsteem.</para>
+ <para><emphasis role="bold">Default</emphasis></para>
+ <para>The operating system to started up by default</para>
</listitem>
<listitem>
- <para><guilabel>Lisaargumendid:</guilabel> siin saab edastada kernelile vajalikku
-teavet või lasta kernelil alglaadimise ajal anda rohkem teavet.</para>
+ <para><emphasis role="bold">Append</emphasis></para>
+ <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
</listitem>
<listitem>
- <para><guilabel>Võõraste operatsioonisüsteemide otsimine</guilabel>: vt eespool
-osa <link linkend="setupMageiaBootloader">Mageia alglaaduri
-kasutamine</link>.</para>
+ <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+ <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
</listitem>
+ </itemizedlist>
+ <para><emphasis>Advanced</emphasis></para>
+ <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+ <itemizedlist>
<listitem>
- <para><guilabel>Edasijõudnuile</guilabel><itemizedlist><listitem><para><guilabel>Videorežiim:</guilabel> siin saab määrata ekraani suuruse ja
-värvisügavuse, mida alglaadur kasutab. Allapoole kolmnurgale klõpsates saab
-vaiida muute suuruse ja värvisügavuse valikute seast.</para></listitem><listitem><para><emphasis role="bold">ESP-i ega MBR-i ei puudutata</emphasis>: vt eespool
-osa <link linkend="setupChainLoading">Ahellaadimise kasutamine</link></para></listitem></itemizedlist></para>
+ <para><emphasis>Video mode</emphasis></para>
+ <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+ </listitem>
+ <listitem>
+ <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+ <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+ <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+ </section>
+ </section>
+ <section>
+ <title>Other Options</title>
+ <section>
+ <title>Olemasoleva alglaaduri kasutamine</title>
+ <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
+ </section>
+ <section>
+ <title>Installing Without a Bootloader</title>
+ <para>While you can opt to install Mageia without a bootloader (see section 2.1
+Advanced), this is not recommended unless you absolutely know what you are
+doing, as without some form of bootloader your operating system will be
+unable to start.</para>
+ </section>
+ <section>
+ <title>Alglaadimismenüü kirje lisamine või muutmine</title>
+ <para>To do this you need to manually edit
+<filename>/boot/grub2/custom.cfg</filename> or use the software
+<application>grub-customizer</application> tool instead (available in the
+Mageia repositories).</para>
+ <note>
+ <para>For more information, see: <link
+ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+ </note>
</section>
</section>
</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/et/setupSCSI.xml b/docs/docs/stable/installer/et/setupSCSI.xml
index ec01c4ea..1fe2828c 100644
--- a/docs/docs/stable/installer/et/setupSCSI.xml
+++ b/docs/docs/stable/installer/et/setupSCSI.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupSCSI" version="5.0" xml:lang="et">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="setupSCSI"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xlink"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
<info>
<title xml:id="setupSCSI-ti1">SCSI seadistamine</title>
</info>
@@ -17,6 +24,10 @@
+
+
+
+
<mediaobject>
<!-- Made by marja on 2012 04 02 -->
<!-- NEEDS TO BE REVIEWED! -->
@@ -26,15 +37,16 @@
<!-- 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 -->
-<imageobject> <imagedata format="PNG" fileref="dx2-setupSCSI.png"
-align="center" xml:id="setupSCSI-im1" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
<para revision="3.1" xml:id="setupSCSI-pa1">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.</para>
- <para revision="2" xml:id="setupSCSI-pa2">Kui nii peaks juhtuma, tuleb DrakX-ile käsitsi selgeks teha, millised SCSI
-seadmed teil on.</para>
-
- <para xml:id="setupSCSI-pa3" revision="3">Seejärel peaks DrakX olema võimeline kettad korrektselt seadistama.</para>
-</section> \ No newline at end of file
+ <para revision="2" xml:id="setupSCSI-pa2">If your device is not recognised, you will need to manually tell DrakX which
+SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+correctly.</para>
+</section>
diff --git a/docs/docs/stable/installer/et/software.xml b/docs/docs/stable/installer/et/software.xml
new file mode 100644
index 00000000..9ddd8eff
--- /dev/null
+++ b/docs/docs/stable/installer/et/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="et" xreflabel="Software">
+
+
+ <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+ <section>
+ <title>Media Selection</title>
+
+ <xi:include href="add_supplemental_media.xml"/>
+
+ <xi:include href="media_selection.xml"/>
+ </section>
+
+ <xi:include href="chooseDesktop.xml"/>
+
+ <xi:include href="choosePackageGroups.xml"/>
+
+ <xi:include href="minimal-install.xml"/>
+
+ <xi:include href="choosePackagesTree.xml"/>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/et/soundConfig.xml b/docs/docs/stable/installer/et/soundConfig.xml
index 1f1aa7d5..21e5c41f 100644
--- a/docs/docs/stable/installer/et/soundConfig.xml
+++ b/docs/docs/stable/installer/et/soundConfig.xml
@@ -1,40 +1,47 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="et">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="soundConfig"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1999/xhtml"
+ xmlns:ns2="http://www.w3.org/1999/xlink"
+ xmlns:ns="http://docbook.org/ns/docbook">
<info>
<title xml:id="soundConfig-ti1">Heli seadistamine</title>
</info>
- <mediaobject>
-<!-- Lebarhon 20170209 updated SC-->
-<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png"
-xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject>
-
- <para>Siin näeb draiveri nime, mille paigaldusprogramm on välja valinud teie
-helikaardile ja millest saab vaikimisi draiver.</para>
+
- <para>Vaikimisi draiver peaks töötama probleemideta. Kui siiski esineb pärast
-paigaldamist probleeme heliga, andke käsk <command>draksound</command> või
-käivitage sama tööriist Mageia juhtimiskeskuses, valides seal külgpaneelil
-<guilabel>Riistvara</guilabel> ning klõpsates ilmuvas aknas ülal paremal
-asuvale ikoonile <guilabel>Heli seadistamine</guilabel>.</para>
+
- <para>Seejärel klõpsake <emphasis role="bold">draksoundi</emphasis> ehk <emphasis
-role="bold">Heli seadistamise</emphasis> tööriistas nupule
-<guibutton>Probleemi otsimine</guibutton>, kust leiab mitmeid häid
-soovitusi, kuidas hädast üle saada.</para>
+ <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+ <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+ <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
<section xml:id="soundConfig-Advanced">
<info>
<title xml:id="soundConfig-Advanced-ti1">Muud valikud</title>
</info>
- <para>Klõpsamisest nupule <emphasis role="bold"><guibutton>Muud
-valikud</guibutton></emphasis> võib paigaldamise ajal abi olla, kui
-vaikimisi draiverit ei ole, küll on aga saada mitu draiverit ning te arvate,
-et paigaldusprogramm on valinud neist vale.</para>
-
- <para>Sellisel juhul saate valida mõne muu draiveri, kui klõpsate nupule <emphasis
-role="bold"><guibutton>Suvalise draiveri valimine</guibutton></emphasis>.</para>
+ <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
</section>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/et/takeOverHdConfirm.xml b/docs/docs/stable/installer/et/takeOverHdConfirm.xml
index fe6654a0..9b30241f 100644
--- a/docs/docs/stable/installer/et/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/et/takeOverHdConfirm.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="takeOverHdConfirm" version="5.0" xml:lang="et">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="takeOverHdConfirm"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xlink"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
<info>
<title xml:id="takeOverHdConfirm-ti1">Kõvaketta vormindamise kinnitamine</title>
</info>
@@ -11,6 +18,10 @@
+
+
+
+
<mediaobject>
<!-- Made by marja on 2012 04 03 -->
<!-- test comment - johnr -->
@@ -18,14 +29,24 @@
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 -->
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-takeOverHdConfirm.png" align="center"/> </imageobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-takeOverHdConfirm.png" align="center"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
- <para xml:id="takeOverHdConfirm-pa1" revision="1">Klõpsake <guibutton>Tagasi</guibutton>, kui te ei ole oma valikus kindel.</para>
+ <itemizedlist>
+ <listitem>
+ <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
+choice.</para>
+ </listitem>
- <para xml:id="takeOverHdConfirm-pa2" revision="1">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.</para>
-</section> \ No newline at end of file
+ <listitem>
+ <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK
+to erase <emphasis role="bold">every</emphasis> partition, <emphasis
+role="bold">every</emphasis> operating system and <emphasis role="bold">all
+data</emphasis> that might be on that hard disk.</para>
+ </listitem>
+ </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/et/testing.xml b/docs/docs/stable/installer/et/testing.xml
index c500c65d..0c78f6ca 100644
--- a/docs/docs/stable/installer/et/testing.xml
+++ b/docs/docs/stable/installer/et/testing.xml
@@ -5,8 +5,11 @@
xmlns:ns4="http://www.w3.org/2000/svg"
xmlns:ns3="http://www.w3.org/1998/Math/MathML"
xmlns:ns="http://docbook.org/ns/docbook">
+
+
<info>
- <title xml:id="testing-ti1">Mageia proovimine Live-süsteemina</title>
+ <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Mageia proovimine Live-süsteemina</title>
</info>
<section xml:id="testing-1">
@@ -14,21 +17,20 @@
<title xml:id="testing1-ti1">Live-režiim</title>
</info>
+ <para>This is the screen you will see if you selected the <emphasis
+role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+
<mediaobject>
<imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
- <para>See ekraan ilmub, kui valida "Mageia laadimine". Kui seda ei juhtu, jõuate
-sammu <link linkend="doPartitionDisks">Partitsioneerimine</link> juurde.</para>
-
<section>
<info>
<title xml:id="testing2-ti1">Riistvara järeleproovimine</title>
</info>
- <para>Üks Live-režiimi eesmärke on järele proovida, kas Mageia suudab riistvara
-korrektselt hallata. Sel juhul saab näiteks Mageia juhtimiskeskuse riistvara
-sektsioonis kontrollida, kas ikka kõigil seadmetel on draiver olemas. Järele
-saab proovida enamiku seadmeid:</para>
+ <para>One of the aims of using the Live mode is to test that your hardware is
+correctly managed by Mageia. You can check if all devices have a driver in
+the Hardware section of the Mageia Control Center:</para>
<itemizedlist>
<listitem>
@@ -36,11 +38,7 @@ saab proovida enamiku seadmeid:</para>
</listitem>
<listitem>
- <para>videokaart: kui nägite eelmist ekraani, on sellega kõik korras</para>
- </listitem>
-
- <listitem>
- <para>veebikaamera</para>
+ <para>graphics card: if you see the previous screen, it's already OK.</para>
</listitem>
<listitem>
@@ -48,7 +46,7 @@ saab proovida enamiku seadmeid:</para>
</listitem>
<listitem>
- <para>printer: seda saab seadistada ja testlehekülje välja trükkida</para>
+ <para>printer: configure your printer/s and print a test page</para>
</listitem>
<listitem>
@@ -56,10 +54,13 @@ saab proovida enamiku seadmeid:</para>
</listitem>
</itemizedlist>
- <para>Kui kõik on korras, võib paigaldamisega jätkata. Kui mitte, siis saab
-lihtsalt väljuda.</para>
+ <para>If everything is satisfactory, you can proceed with the installation. If
+not, you can use the <emphasis>Quit</emphasis> button to exit.</para>
- <remark>Siin langetatud seadistamisvalikud jäetakse paigaldamise käigus meelde.</remark>
+ <note>
+ <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+ </note>
</section>
<section>
@@ -67,14 +68,14 @@ lihtsalt väljuda.</para>
<title xml:id="testing3-ti1">Paigaldamise käivitamine</title>
</info>
+ <para>To launch the installation of the Live DVD to a hard disk or SSD drive,
+simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live
+desktop. You will then see this screen, followed by the <link
+linkend="doPartitionDisks">Partitioning</link> step.</para>
+
<mediaobject>
<imageobject> <imagedata fileref="live-liveMode-install.png"/>
</imageobject></mediaobject>
-
- <para>Mageia LiveCD või LiveDVD paigaldamiseks kõvakettale või SSD-kettale
-klõpsake lihtsalt ikoonile "Paigaldamine kõvakettale". Ilmub näidatav ekraan
-ja seejärel samm <link linkend="doPartitionDisks">Partitsioneerimine</link>,
-nagu ka otsepaigalduse korral.</para>
</section>
</section>
</section>
diff --git a/docs/docs/stable/installer/et/uninstall-Mageia.xml b/docs/docs/stable/installer/et/uninstall-Mageia.xml
index bf82d153..6df41436 100644
--- a/docs/docs/stable/installer/et/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/et/uninstall-Mageia.xml
@@ -1,33 +1,44 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="et">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="uninstall-Mageia"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1999/xhtml"
+ xmlns:ns2="http://www.w3.org/1999/xlink"
+ xmlns:ns="http://docbook.org/ns/docbook">
<!--Lebarhon 2015-07-06 Not true with UEFI
Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
<info>
<title xml:id="uninstall-Mageia-ti1">Mageia eemaldamine</title>
</info>
+
+
<para>Kui Mageia ei võida teie poolehoidu või paigaldamine ei kulge korralikult,
võib tekkida soov sellest üldse lahti saada. Erinevalt mõnestki
operatsioonisüsteemist Mageia arvestab teie sooviga ja võimaldab soovi
korral ka endale täielikult selja keerata.</para>
- <para>Kui olete oma andmed varundanud, taaskäivitage Mageia DVD ja valige
-<emphasis role="bold">Päästesüsteem</emphasis> ning seejärel käsk <emphasis
-role="bold">Restore Windows boot loader</emphasis>. Järgmisel arvuti
-käivitamisel ongi teie käsutuses ainult Windows, mitte enam võimalus
-operatsioonisüsteemi valida.</para>
+ <para>After backing up your data, reboot your Mageia installation DVD and select
+<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot
+loader</emphasis>. At the next boot, you will only have Windows, with no
+option to choose your Mageia operating system.</para>
- <para>Ruumi tagasisaamiseks Windowsis, mida Mageia oma partitsioonide alla võttis,
-valige <code>Start -> Control Panel -> Administrative Tools -> Computer
-Management -> Storage -> Disk Management</code>, mis avab partitsioonide
-haldamise tööriista. Mageia partitsiooni tunneb ära kirje
-<guilabel>Unknown</guilabel> ning samuti suuruse ja asukoha järgi
-kettal. Klõpsake mõnele Mageia partitsioonile hiire parema nupuga ja valige
-<guibutton>Delete</guibutton>. Ruum vabanebki.</para>
+ <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
- <para>Kui teil on XP, saate luua uue partitsiooni ja selle vormindada (kas FAT32
-või NTFS-vormingusse). Uuele partitsioonile antakse oma täht.</para>
+ <para>If you are using Windows XP, you can create a new partition and format it
+(FAT32 or NTFS). It will then get a partition letter.</para>
<para>Vista või 7 korral on veel üks võimalus: saab laiendada olemasolevat
partitsiooni, mis asub vabanenud ruumist vasakul. Leidub ka teisi
@@ -35,4 +46,4 @@ partitsioneerimistööriistu, mida saab kasutada, näiteks nii Windowsis kui ka
Linuxis kättesaadav <emphasis role="bold">gparted</emphasis>. Nagu ikka
partitsioonide muutmise korral, olge väga ettevaatlik ja kindlasti varundage
eelnevalt kõik oma vähegi olulisemad andmed.</para>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/et/unused.xml b/docs/docs/stable/installer/et/unused.xml
index bf075f8a..be957769 100644
--- a/docs/docs/stable/installer/et/unused.xml
+++ b/docs/docs/stable/installer/et/unused.xml
@@ -1,28 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="et" xml:id="unused" xmlns="http://docbook.org/ns/docbook"
- xmlns:ns6="http://www.w3.org/1999/xlink"
- xmlns:ns5="http://www.w3.org/1999/xhtml"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1998/Math/MathML"
- xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="et">
<info>
<title xml:id="unused-ti1">Kasutuseta materjali säilitamine või kustutamine</title>
</info>
+
+
<mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-unused.png"
-format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
+
+ <para>In this step, the installer looks for unused locales packages and unused
+hardware packages and you are then given an opportunity to delete them.</para>
+
+ <para>If you do not foresee a case where your installation may need to run on
+different hardware, or that you might need additional localization files
+then you might wish to accept this proposal.</para>
- <para>Sellel sammul otsib paigaldusprogramm tarbetuid lokaadi- ja
-riistvarapakette. Seejärel tehakse ettepanek need kustutada. See on üldiselt
-hea mõte, kui te just ei valmistu paigalduseks sootuks teistsugusel
-riistvaral.</para>
+ <para>Clicking <emphasis>Advanced</emphasis> will list the unused hardware and
+localization files that will be removed if you proceed.</para>
<mediaobject>
<imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
</imageobject></mediaobject>
- <para>Järgmisel sammul kopeeritakse failid kõvakettale. See võtab mõne minuti
-aega. Lõpus näeb mõnda aega tühja ekraani, millest ei tasu end heidutada
-lasta.</para>
+ <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
</section>