aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuri Chornoivan <yurchor@ukr.net>2019-01-06 13:19:27 +0200
committerYuri Chornoivan <yurchor@ukr.net>2019-01-06 13:19:27 +0200
commit8177f94c67a3b13faddc133196eb73ca508007bd (patch)
tree4cc4c0c0624efca30e7988597657686937e20870
parent4c61fede99490034606417935575640755612507 (diff)
downloadtools-8177f94c67a3b13faddc133196eb73ca508007bd.tar
tools-8177f94c67a3b13faddc133196eb73ca508007bd.tar.gz
tools-8177f94c67a3b13faddc133196eb73ca508007bd.tar.bz2
tools-8177f94c67a3b13faddc133196eb73ca508007bd.tar.xz
tools-8177f94c67a3b13faddc133196eb73ca508007bd.zip
Update Installer catalog
-rw-r--r--docs/docs/stable/installer/en/DrakLive-cover.xml118
-rw-r--r--docs/docs/stable/installer/en/DrakLive.xml35
-rw-r--r--docs/docs/stable/installer/en/DrakX-cover.xml174
-rw-r--r--docs/docs/stable/installer/en/DrakX.xml90
-rw-r--r--docs/docs/stable/installer/en/SelectAndUseISOs2.xml261
-rw-r--r--docs/docs/stable/installer/en/acceptLicense.xml37
-rw-r--r--docs/docs/stable/installer/en/addUser.xml111
-rw-r--r--docs/docs/stable/installer/en/add_supplemental_media.xml40
-rw-r--r--docs/docs/stable/installer/en/ask_mntpoint_s.xml70
-rw-r--r--docs/docs/stable/installer/en/bestTime.xml28
-rw-r--r--docs/docs/stable/installer/en/bootLive.xml199
-rw-r--r--docs/docs/stable/installer/en/chooseDesktop.xml54
-rw-r--r--docs/docs/stable/installer/en/choosePackageGroups.xml4
-rw-r--r--docs/docs/stable/installer/en/choosePackagesTree.xml16
-rw-r--r--docs/docs/stable/installer/en/configureServices.xml27
-rw-r--r--docs/docs/stable/installer/en/configureTimezoneUTC.xml20
-rw-r--r--docs/docs/stable/installer/en/configureX_card_list.xml50
-rw-r--r--docs/docs/stable/installer/en/configureX_chooser.xml104
-rw-r--r--docs/docs/stable/installer/en/configureX_monitor.xml112
-rw-r--r--docs/docs/stable/installer/en/diskdrake.xml148
-rw-r--r--docs/docs/stable/installer/en/doPartitionDisks.xml348
-rw-r--r--docs/docs/stable/installer/en/exitInstall.xml16
-rw-r--r--docs/docs/stable/installer/en/firewall.xml28
-rw-r--r--docs/docs/stable/installer/en/formatPartitions.xml44
-rw-r--r--docs/docs/stable/installer/en/installUpdates.xml47
-rw-r--r--docs/docs/stable/installer/en/installer.xml330
-rw-r--r--docs/docs/stable/installer/en/login.xml21
-rw-r--r--docs/docs/stable/installer/en/media_selection.xml18
-rw-r--r--docs/docs/stable/installer/en/minimal-install.xml49
-rw-r--r--docs/docs/stable/installer/en/misc-params.xml133
-rw-r--r--docs/docs/stable/installer/en/reboot.xml14
-rw-r--r--docs/docs/stable/installer/en/securityLevel.xml36
-rw-r--r--docs/docs/stable/installer/en/selectCountry.xml48
-rw-r--r--docs/docs/stable/installer/en/selectInstallClass.xml81
-rw-r--r--docs/docs/stable/installer/en/selectKeyboard.xml42
-rw-r--r--docs/docs/stable/installer/en/selectKeyboardLive.xml28
-rw-r--r--docs/docs/stable/installer/en/selectLanguage.xml88
-rw-r--r--docs/docs/stable/installer/en/selectMouse.xml46
-rw-r--r--docs/docs/stable/installer/en/setupBootloader.xml305
-rw-r--r--docs/docs/stable/installer/en/setupSCSI.xml26
-rw-r--r--docs/docs/stable/installer/en/soundConfig.xml52
-rw-r--r--docs/docs/stable/installer/en/takeOverHdConfirm.xml48
-rw-r--r--docs/docs/stable/installer/en/testing.xml49
-rw-r--r--docs/docs/stable/installer/en/uninstall-Mageia.xml50
-rw-r--r--docs/docs/stable/installer/en/unused.xml33
-rw-r--r--docs/docs/stable/installer/help.pot3735
-rw-r--r--docs/docs/stable/installer/uk.po5900
47 files changed, 7739 insertions, 5574 deletions
diff --git a/docs/docs/stable/installer/en/DrakLive-cover.xml b/docs/docs/stable/installer/en/DrakLive-cover.xml
index 733678c8..29d97b71 100644
--- a/docs/docs/stable/installer/en/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/en/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="en" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="UTF-8"?>
+<book version="5.0" xml:id="DrakLive-installer" xml:lang="en"
+ 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">
+ <!--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)-->
+
<info>
<title>Installation from LIVE medium</title>
- <publisher>
- <publishername>Mageia.org</publishername>
- </publisher>
- <revhistory>
- <revision>
- <date>January 2015</date>
+
+ <publisher>
+ <publishername>Mageia.org</publishername>
+ </publisher>
+
+ <revhistory>
+ <revision>
+ <date>March 2016</date>
+
<revremark>Mageia 5</revremark>
- </revision>
- </revhistory>
+ </revision>
+ </revhistory>
+
<cover>
- <para role="tagline">The Official Documentation for Mageia</para>
+ <para role="tagline">The Official Documentation for Mageia</para>
+
<mediaobject>
<imageobject>
- <imagedata fileref="mageia-2013.png"/>
+ <imagedata fileref="../mageia-2013.png"/>
</imageobject>
</mediaobject>
- <para>The texts and screenshots in this manual are available under the CC BY-SA 3.0 license
- <link ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
- </para>
- <para>This manual was produced with the help of the <link ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link ns6:href="http://www.neodoc.biz">NeoDoc</link>.
- </para>
- <para>It was written by volunteers in their free time. Please contact <link ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation Team</link>, if you would like to help improve this manual.</para>
+
+ <para>The texts and screenshots in this manual are available under the
+ CC BY-SA 3.0 license <link
+ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+ <para>This manual was produced with the help of the <link
+ ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link
+ ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+ <para>It was written by volunteers in their free time. Please contact
+ <link
+ ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
+ Team</link>, if you would like to help improve this manual.</para>
</cover>
</info>
+
<article>
<title>Installation from LIVE medium</title>
- <para><note>
- <para>No one will see all the installer screens that you see in this
- manual. Which screens you will see, depends on your hardware and the
- choices you make while installing.</para>
- </note></para>
- <xi:include href="SelectAndUseISOs2.xml"/>
- <xi:include href="bootLive.xml"/>
+ <para><note>
+ <para>No one will see all the installer screens that you see in this
+ manual. Which screens you will see, depends on your hardware and the
+ choices you make while installing.</para>
+ </note></para>
+
+ <xi:include href="SelectAndUseISOs2.xml"/>
+
+ <xi:include href="bootLive.xml"/>
+
+ <xi:include href="selectLanguage.xml"/>
- <xi:include href="selectLanguage.xml"/>
+ <xi:include href="acceptLicense.xml"/>
- <xi:include href="acceptLicense.xml"/>
+ <xi:include href="configureTimezoneUTC.xml"/>
- <xi:include href="configureTimezoneUTC.xml"/>
+ <xi:include href="bestTime.xml"/>
- <xi:include href="bestTime.xml"/>
+ <xi:include href="selectKeyboardLive.xml"/>
- <xi:include href="selectKeyboardLive.xml"/>
+ <xi:include href="testing.xml"/>
- <xi:include href="testing.xml"/>
+ <xi:include href="diskPartitioning.xml"/>
- <xi:include href="doPartitionDisks.xml"/>
+ <!-- <xi:include href="doPartitionDisks.xml"/>
- <xi:include href="ask_mntpoint_s.xml"/>
+ <xi:include href="ask_mntpoint_s.xml"/>
- <xi:include href="takeOverHdConfirm.xml"/>
+ <xi:include href="takeOverHdConfirm.xml"/>
- <xi:include href="diskdrake.xml"/>
+ <xi:include href="diskdrake.xml"/>
- <xi:include href="formatPartitions.xml"/>
+ <xi:include href="formatPartitions.xml"/> -->
- <xi:include href="unused.xml"/>
+ <xi:include href="unused.xml"/>
- <xi:include href="setupBootloader.xml"/>
+ <xi:include href="setupBootloader.xml"/>
- <xi:include href="setupBootloaderAddEntry.xml"/>
+ <!-- <xi:include href="setupBootloaderAddEntry.xml"/> -->
- <xi:include href="reboot.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/en/DrakLive.xml b/docs/docs/stable/installer/en/DrakLive.xml
index 2141248e..ffdfe056 100644
--- a/docs/docs/stable/installer/en/DrakLive.xml
+++ b/docs/docs/stable/installer/en/DrakLive.xml
@@ -1,4 +1,17 @@
-<?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="en" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="UTF-8"?>
+<article version="5.0" xml:id="Quick-Startup" xml:lang="en"
+ 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">
+ <!--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-->
+
<info>
<title>Installation from LIVE medium</title>
@@ -10,12 +23,16 @@
</note></para>
<para xml:id="CC_BY-SA">The texts and screenshots in this manual are
- available under the CC BY-SA 3.0 license <link ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+ available under the CC BY-SA 3.0 license <link
+ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
- <para>This manual was produced with the help of the <link ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+ <para>This manual was produced with the help of the <link
+ ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link
+ ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
<para>It was written by volunteers in their free time. Please contact
- <link ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
+ 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>
@@ -36,7 +53,9 @@
<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"/>
@@ -46,11 +65,11 @@
<xi:include href="formatPartitions.xml"/>
- <xi:include href="unused.xml"/>
+ <xi:include href="unused.xml"/> -->
<xi:include href="setupBootloader.xml"/>
- <xi:include href="setupBootloaderAddEntry.xml"/>
+ <!-- <xi:include href="setupBootloaderAddEntry.xml"/> -->
<xi:include href="reboot.xml"/>
@@ -59,4 +78,4 @@
<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/en/DrakX-cover.xml b/docs/docs/stable/installer/en/DrakX-cover.xml
index f26eb588..1f0845fe 100644
--- a/docs/docs/stable/installer/en/DrakX-cover.xml
+++ b/docs/docs/stable/installer/en/DrakX-cover.xml
@@ -1,129 +1,163 @@
-<?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="en" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:id="Quick-Startup" xml:lang="en"
+ 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>Installation with DrakX</title>
- <publisher>
- <publishername>Mageia.org</publishername>
- </publisher>
- <revhistory>
- <revision>
- <date>February 2014</date>
+
+ <publisher>
+ <publishername>Mageia.org</publishername>
+ </publisher>
+
+ <revhistory>
+ <revision>
+ <date>February 2014</date>
+
<revremark>Mageia 4</revremark>
- </revision>
- </revhistory>
+ </revision>
+ </revhistory>
+
<cover>
- <para role="tagline">The Official Documentation for Mageia</para>
+ <para role="tagline">The Official Documentation for Mageia</para>
+
<mediaobject>
<imageobject>
<imagedata fileref="../mageia-2013.png"/>
</imageobject>
</mediaobject>
- <para>The texts and screenshots in this manual are available under the CC BY-SA 3.0 license
- <link ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
- </para>
- <para>This manual was produced with the help of the <link ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link ns6:href="http://www.neodoc.biz">NeoDoc</link>.
- </para>
- <para>It was written by volunteers in their free time. Please contact <link ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation Team</link>, if you would like to help improve this manual.</para>
+
+ <para>The texts and screenshots in this manual are available under the
+ CC BY-SA 3.0 license <link
+ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+ <para>This manual was produced with the help of the <link
+ ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link
+ ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+ <para>It was written by volunteers in their free time. Please contact
+ <link
+ ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
+ Team</link>, if you would like to help improve this manual.</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-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 -->
-<title>Installation with DrakX</title>
- <para><note>
- <para>No one will see all the installer screens that you see in this
- manual. Which screens you will see, depends on your hardware and the
- choices you make while installing.</para>
- </note></para>
-
- <!-- <xi:include href="drakx-intro.xml"/> -->
+ <!-- 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 -->
- <xi:include href="SelectAndUseISOs2.xml"/>
+ <!--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 -->
- <xi:include href="installer.xml"/>
+ <!--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 -->
- <xi:include href="selectLanguage.xml"/>
+ <!--2013-12-08 add soundConfig.xml -->
- <xi:include href="acceptLicense.xml"/>
+ <title>Installation with DrakX</title>
- <xi:include href="setupSCSI.xml"/>
+ <para>
+ <note>
+ <para>No one will see all the installer screens that you see in this
+ manual. Which screens you will see, depends on your hardware and the
+ choices you make while installing.</para>
+ </note>
+ </para>
- <xi:include href="selectInstallClass.xml"/>
+ <!-- <xi:include href="drakx-intro.xml"/> -->
- <xi:include href="selectKeyboard.xml"/>
+ <xi:include href="SelectAndUseISOs2.xml"/>
- <xi:include href="doPartitionDisks.xml"/>
+ <xi:include href="installer.xml"/>
- <!-- <xi:include href="resizeFATChoose.xml"/>
+ <xi:include href="selectLanguage.xml"/>
- <xi:include href="takeOverHdChoose.xml"/> -->
+ <xi:include href="acceptLicense.xml"/>
+
+ <xi:include href="setupSCSI.xml"/>
+
+ <xi:include href="selectInstallClass.xml"/>
+
+ <xi:include href="selectKeyboard.xml"/>
+
+ <!-- <xi:include href="resizeFATChoose.xml"/> -->
+
+ <!-- <xi:include href="doPartitionDisks.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"/>
+ <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="setRootPassword.xml"></xi:include> -->
+ <xi:include href="diskPartitioning.xml"/>
- <xi:include href="addUser.xml"/>
+ <xi:include href="software.xml"/>
- <xi:include href="configureX_chooser.xml"/>
+ <!-- <xi:include href="setRootPassword.xml"></xi:include> -->
- <xi:include href="configureX_card_list.xml"/>
+ <xi:include href="addUser.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="setupYabootGeneral.xml"></xi:include>
+ <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="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="selectCountry.xml"/> -->
-<xi:include href="soundConfig.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="configureNetwork.xml"></xi:include> -->
+ <xi:include href="firewall.xml"/>
- <xi:include href="installUpdates.xml"/>
+ <!-- <xi:include href="configureNetwork.xml"></xi:include> -->
- <xi:include href="exitInstall.xml"/>
-
- <xi:include href="uninstall-Mageia.xml"/>
+ <xi:include href="installUpdates.xml"/>
+
+ <xi:include href="exitInstall.xml"/>
+
+ <xi:include href="uninstall-Mageia.xml"/>
</article>
</book>
diff --git a/docs/docs/stable/installer/en/DrakX.xml b/docs/docs/stable/installer/en/DrakX.xml
index 207771b1..ab2d0444 100644
--- a/docs/docs/stable/installer/en/DrakX.xml
+++ b/docs/docs/stable/installer/en/DrakX.xml
@@ -1,4 +1,36 @@
-<?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="en" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:id="Quick-Startup" xml:lang="en"
+ 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">
+ <!-- 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-->
+
+ <!--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.-->
+
<info>
<title>Installation with DrakX</title>
@@ -10,28 +42,20 @@
</note></para>
<para xml:id="CC_BY-SA">The texts and screenshots in this manual are
- available under the CC BY-SA 3.0 license <link ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+ available under the CC BY-SA 3.0 license <link
+ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
- <para>This manual was produced with the help of the <link ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+ <para>This manual was produced with the help of the <link
+ ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link
+ ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
<para>It was written by volunteers in their free time. Please contact
- <link ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
+ <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>
- <!-- 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"/> -->
<xi:include href="SelectAndUseISOs2.xml"/>
@@ -48,21 +72,21 @@
<xi:include href="selectKeyboard.xml"/>
- <xi:include href="doPartitionDisks.xml"/>
-
- <!-- <xi:include href="resizeFATChoose.xml"/>
+ <!-- <xi:include href="resizeFATChoose.xml"/> -->
- <xi:include href="takeOverHdChoose.xml"/> -->
+ <!-- <xi:include href="doPartitionDisks.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"/>
@@ -72,7 +96,11 @@
<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> -->
@@ -80,13 +108,13 @@
<xi:include href="configureX_chooser.xml"/>
- <xi:include href="configureX_card_list.xml"/>
+ <!-- <xi:include href="configureX_card_list.xml"/>
- <xi:include href="configureX_monitor.xml"/>
+ <xi:include href="configureX_monitor.xml"/> -->
<xi:include href="setupBootloader.xml"/>
- <xi:include href="setupBootloaderAddEntry.xml"/>
+ <!-- <xi:include href="setupBootloaderAddEntry.xml"/> -->
<!-- <xi:include href="setupYabootGeneral.xml"></xi:include>
@@ -96,9 +124,11 @@
<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="selectCountry.xml"/> -->
<xi:include href="configureServices.xml"/>
@@ -117,4 +147,4 @@
<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/en/SelectAndUseISOs2.xml b/docs/docs/stable/installer/en/SelectAndUseISOs2.xml
index e82044c9..162136e9 100644
--- a/docs/docs/stable/installer/en/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/en/SelectAndUseISOs2.xml
@@ -2,6 +2,15 @@
<!-- 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-->
<info>
<title xml:id="Select-and-use-ISOs-ti1">Select and use ISOs</title>
</info>
@@ -9,30 +18,52 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
<title>Introduction</title>
<para>Mageia is distributed via ISO images. This page will help you to
choose which image best suits your needs.</para>
- <para>There are two families of media:</para>
+ <para>There are three types of installation media:</para>
<itemizedlist>
<listitem>
- <para>Classical installer: 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>
+ <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 media: This option allows you to try out Mageia without
- having to actually install it, or make any changes to your computer.
- If the installation is decided, the process is simpler, but you get
- fewer choices than offered by the Classical installer</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>These media are very light (less than 100 MB) and are convenient
+ if bandwidth is too low to download a full DVD, or if you have a PC
+ without a DVD drive or is unable to boot from a USB stick.</para>
</listitem>
</itemizedlist>
- <para>Details are given in the next sections.</para>
+ <para>More details are given in the next sections.</para>
</section>
<section>
<title>Media</title>
<section>
<title>Definition</title>
<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
- support (DVD, USB stick, ...) the ISO file is copied to.</para>
+ you to install and/or update Mageia and, by extension, any physical
+ medium (DVD, USB stick, ...) the ISO file is copied to.</para>
<para>You can find Mageia ISO's <link ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
</section>
<section>
@@ -41,26 +72,28 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
<title>Common features</title>
<itemizedlist>
<listitem>
- <para>These ISOs use the Classical installer called drakx.</para>
+ <para>These ISOs use the Classical installer called DrakX</para>
</listitem>
<listitem>
<para>They are used for performing clean installs or to upgrade a
- previously installed version of Mageia.</para>
+ previously installed version of Mageia</para>
</listitem>
<listitem>
- <para>Different media for 32 and 64 bit architectures.</para>
+ <para>Different media for 32 and 64-bit architectures</para>
</listitem>
<listitem>
- <para>Some tools are available in the Welcome screen: Rescue
- System, Memory Test, Hardware Detection Tool.</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>Each DVD contains many available desktop environments and
- languages.</para>
+ languages</para>
</listitem>
<listitem>
<para>You'll be given the choice during the installation to add
- non free software.</para>
+ non-free software</para>
</listitem>
</itemizedlist>
</section>
@@ -72,23 +105,20 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
<itemizedlist>
<listitem>
<para>Can be used to preview the Mageia operating system without
- having to install it. Can also be used to install Mageia if you
- wish.</para>
+ having to install it</para>
</listitem>
<listitem>
- <para>Each ISO contains only one desktop environment (Plasma,
- GNOME or Xfce).</para>
+ <para>The Live media also includes an Installer.</para>
</listitem>
<listitem>
- <para>Different media for 32 and 64 bit architectures.</para>
+ <para>Each ISO contains only one desktop environment (Plasma,
+ GNOME or Xfce)</para>
</listitem>
<listitem>
- <para><emphasis role="bold">Live ISOs can only be used to create
- clean installations, they cannot be used to upgrade previously
- installed Mageia releases.</emphasis></para>
+ <para>Different media for 32 and 64-bit architectures</para>
</listitem>
<listitem>
- <para>They contain non free software.</para>
+ <para>They contain non-free software</para>
</listitem>
</itemizedlist>
</section>
@@ -96,13 +126,13 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
<title>Live DVD Plasma</title>
<itemizedlist>
<listitem>
- <para>Plasma desktop environment only.</para>
+ <para>Plasma desktop environment only</para>
</listitem>
<listitem>
- <para>All available languages are present.</para>
+ <para>All available languages are present</para>
</listitem>
<listitem>
- <para>64 bit architecture only.</para>
+ <para>64-bit architecture only</para>
</listitem>
</itemizedlist>
</section>
@@ -110,13 +140,13 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
<title>Live DVD GNOME</title>
<itemizedlist>
<listitem>
- <para>GNOME desktop environment only.</para>
+ <para>GNOME desktop environment only</para>
</listitem>
<listitem>
- <para>All available languages are present.</para>
+ <para>All available languages are present</para>
</listitem>
<listitem>
- <para>64 bit architecture only</para>
+ <para>64-bit architecture only</para>
</listitem>
</itemizedlist>
</section>
@@ -124,13 +154,13 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
<title>Live DVD Xfce</title>
<itemizedlist>
<listitem>
- <para>Xfce desktop environment only.</para>
+ <para>Xfce desktop environment only</para>
</listitem>
<listitem>
- <para>All available languages are present.</para>
+ <para>All available languages are present</para>
</listitem>
<listitem>
- <para>32 or 64 bit architectures.</para>
+ <para>32 or 64-bit architectures</para>
</listitem>
</itemizedlist>
</section>
@@ -141,24 +171,10 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
<title>Common features</title>
<itemizedlist>
<listitem>
- <para>These are minimal ISO's containing no more than that which
- is needed to start the drakx installer and find
- drakx-installer-stage2 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>
- </listitem>
- <listitem>
- <para>These media are very light (less than 100 MB) and are
- convenient if bandwidth is too low to download a full DVD, or if
- you have a PC without a DVD drive or is unable to boot from a USB
- stick.</para>
- </listitem>
- <listitem>
- <para>Different media for 32 and 64 bit architectures.</para>
+ <para>Different media for 32 and 64-bit architectures</para>
</listitem>
<listitem>
- <para>First steps are English language only.</para>
+ <para>First steps are English language only</para>
</listitem>
</itemizedlist>
</section>
@@ -166,8 +182,8 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
<title>netinstall.iso</title>
<itemizedlist>
<listitem>
- <para>Contains only free software, for those people who prefer not
- to use non-free software.</para>
+ <para>Contains only free software, for those who prefer to not use
+ non-free software</para>
</listitem>
</itemizedlist>
</section>
@@ -176,7 +192,7 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
<itemizedlist>
<listitem>
<para>Contains non-free software (mostly drivers, codecs...) for
- people who need it.</para>
+ those who need it</para>
</listitem>
</itemizedlist>
</section>
@@ -186,21 +202,32 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
<title>Downloading and Checking Media</title>
<section>
<title>Downloading</title>
- <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 if the bandwidth is too low. If http is chosen, you will also see something regarding checksums.</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"/>
+ <imagedata align="center" fileref="Checking.png"/>
</imageobject>
</mediaobject>
- <para>md5sum and sha1sum are tools to check the ISO integrity. Choose
- one or the other, and copy the checksum <link linkend="integrity">for
- later use</link>. Then a window similar to this one appears:</para>
+
+ <para>In the meantime, a window to download the actual ISO will
+ open:</para>
<mediaobject>
<imageobject>
- <imagedata fileref="Download.png"/>
+ <imagedata align="center" fileref="Download.png"/>
</imageobject>
</mediaobject>
- <para>Select the Save File option, then, click OK.</para>
+ <para>Click on <emphasis>Save File</emphasis>, then click
+ <emphasis>OK</emphasis>.</para>
</section>
<section>
<title xml:id="integrity">Checking the integrity of the downloaded
@@ -209,52 +236,65 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
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 it is the case, then you should retry
- the download or attempt a repair using BitTorrent.</para>
+ 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>To generate the checksum for your downloaded ISO, open a console,
(no need to be root), and:</para>
<itemizedlist>
<listitem>
- <para>To use md5sum, type: <userinput>md5sum
- path/to/the/image/file.iso</userinput>.</para>
+ <para>To use the md5sum, type: <command>md5sum
+ path/to/the/image/file.iso</command></para>
</listitem>
<listitem>
- <para>To use sha1sum, type: <userinput>sha1sum
- path/to/the/image/file.iso</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> Example:</para>
+ <para>Example:</para>
<mediaobject>
<imageobject>
- <imagedata fileref="../Md5sum.png"/>
+ <imagedata align="center" fileref="Md5sum.png"/>
</imageobject>
</mediaobject>
- <para>and compare the result (you may have to wait for a while) with the
- checksum provided by Mageia.</para>
+
+ <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>Burn or dump the ISO</title>
- <para>The verified ISO can now be burned to a CD/DVD or dumped to a USB
- stick. This is not a standard copy operation as a bootable medium will
- actually be created.</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>Burning the ISO to a CD/DVD</title>
- <para>Whichever software you use, ensure that the option to burn an <emphasis role="bold">image</emphasis> is used, burn <emphasis role="bold">data</emphasis> or <emphasis role="bold">files</emphasis> is
- not correct. See <link ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the
+ <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>Dump the ISO to a USB stick</title>
- <para>All Mageia ISOs are hybrids, which means you can 'dump' them to a
- USB stick and then use it to boot and install the system.</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>"Dumping" an image onto a flash device destroys any previous
- file-system on the device; any existing data will be lost and the
- partition capacity will be reduced to the image size.</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>To recover the original capacity, you must redo partitioning and
- re-format the USB stick.</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>Using a graphical tool within Mageia</title>
<para>You can use a graphical tool like <link ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks">IsoDumper</link></para>
@@ -265,7 +305,7 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
<itemizedlist>
<listitem>
<para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using
- the "ISO image" option;</para>
+ the "ISO image" option</para>
</listitem>
<listitem>
<para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
@@ -274,7 +314,7 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
</itemizedlist>
</section>
<section>
- <title>Using Command line within a GNU/Linux system</title>
+ <title>Using the Command line within a GNU/Linux system</title>
<warning>
<para>It is potentially *dangerous* to do this by hand. You risk
overwriting potentially valuable existing data if you specify the
@@ -285,35 +325,38 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
<para>Open a console</para>
</listitem>
<listitem>
- <para>Become a root (Administrator) user with the command
- <userinput>su -</userinput> (don't forget the final '-' )</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"/>
+ <imagedata align="center" fileref="Root.png"/>
</imageobject>
</mediaobject>
</listitem>
<listitem>
- <para>Plug in your USB stick (do not mount it, this also means do
- not open any application or file manager that could access or read
- it)</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>Enter the command <userinput>fdisk -l</userinput></para>
+ <para>Enter the command <command>fdisk -l</command></para>
<mediaobject>
<imageobject>
- <imagedata fileref="../Fdisk.png"/>
+ <imagedata align="center" fileref="Fdisk.png"/>
</imageobject>
</mediaobject>
</listitem>
<listitem>
<para>Find the device name for your USB stick (by its size), for
- example <code>/dev/sdb</code> in the screenshot above, it is an 8GB USB stick.</para>
+ 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
- <code>dmesg</code>: towards the end of this example, you can see
- the device name starting with <emphasis>sd</emphasis>, and
- in this case, <emphasis>sdd</emphasis> is the
- actual device. You can also see that its size is 2GB:</para>
+ <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
@@ -334,19 +377,19 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para>
</listitem>
<listitem>
- <para>Enter the command: <emphasis role="bold"># <userinput>dd
- if=path/to/the/ISO/file of=/dev/sdX
- bs=1M</userinput></emphasis></para>
- <para>Where X=your device name eg: /dev/sdd</para>
- <para>Example:<emphasis role="bold"> # <userinput>dd
+ <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</userinput></emphasis></para>
+ bs=1M</literal></para>
<tip>
- <para>It might 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>
+ <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>Enter the command: # <userinput>sync</userinput></para>
+ <para>Enter the command: <command>sync</command></para>
</listitem>
<listitem>
<para>This is the end of the process, and you may now unplug your
@@ -356,4 +399,4 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
</section>
</section>
</section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/en/acceptLicense.xml b/docs/docs/stable/installer/en/acceptLicense.xml
index b3b2508e..1f39e245 100644
--- a/docs/docs/stable/installer/en/acceptLicense.xml
+++ b/docs/docs/stable/installer/en/acceptLicense.xml
@@ -21,6 +21,12 @@
<!-- 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.-->
+
<info>
<title xml:id="acceptLicense-ti1">License and Release Notes</title>
</info>
@@ -40,19 +46,26 @@
<title xml:id="license-ti1">License Agreement</title>
</info>
- <para>Before installing <application>Mageia</application>, please read the
- license terms and conditions carefully.</para>
+ <itemizedlist>
+ <listitem>
+ <para>Before installing Mageia, please read the license terms and
+ conditions carefully.</para>
+ </listitem>
- <para>These terms and conditions apply to the entire
- <application>Mageia</application> distribution and must be accepted before
- you can continue.</para>
+ <listitem>
+ <para>These terms and conditions apply to the entire Mageia
+ distribution and must be accepted before you can continue.</para>
+ </listitem>
- <para>To proceed, simply select <guilabel>Accept</guilabel> and then click
- on <guibutton>Next</guibutton>.</para>
+ <listitem>
+ <para>To proceed, simply select <emphasis>Accept</emphasis> and then
+ click on <emphasis>Next</emphasis></para>
+ </listitem>
+ </itemizedlist>
<para>If you decide not to accept these conditions, then we thank you for
- looking. Clicking <guibutton>Quit</guibutton> will reboot your
- computer.</para>
+ 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 -
marja, 20120405 -->
@@ -67,8 +80,8 @@
<para>Release Notes</para>
-->
- <para>Important information about this release of
- <application>Mageia</application> can be viewed by clicking on the
- <guibutton>Release Notes</guibutton> button.</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/en/addUser.xml b/docs/docs/stable/installer/en/addUser.xml
index bb398e43..13e08249 100644
--- a/docs/docs/stable/installer/en/addUser.xml
+++ b/docs/docs/stable/installer/en/addUser.xml
@@ -1,17 +1,33 @@
-<?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:id="addUser">
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" 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">User and Superuser Management</title>
+ <title xml:id="addUser-ti1">User Management</title>
</info>
<!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
+ <!--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.-->
+
<mediaobject>
<imageobject condition="classical">
- <imagedata format="PNG" fileref="dx2-setRootPassword.png" align="center" revision="1" xml:id="setRootPassword-im1"/>
+ <imagedata align="center" fileref="dx2-setRootPassword.png" format="PNG"
+ revision="1" xml:id="setRootPassword-im1"/>
</imageobject>
<imageobject>
- <imagedata format="PNG" fileref="live-user1.png"/>
+ <imagedata fileref="live-user1.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -21,17 +37,16 @@
Password:</title>
</info>
- <para>It is advisable for all <application>Mageia</application>
- installations to set a <emphasis role="bold">superuser</emphasis>
- (administrator) password, usually called the <emphasis>root
- password</emphasis> 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>
+ <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>All passwords are case sensitive. It is best to use a mixture of
+ <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>
@@ -42,42 +57,49 @@
<title xml:id="enterUser-ti3">Enter a user</title>
</info>
- <para>Add a user here. A regular user has fewer privileges than the
- <emphasis role="bold">superuser</emphasis> (root), but enough to use the
- internet, office applications or play games and anything else the average
- user might use their computer for.</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>Icon</guibutton>: if you click on this button it will
- change the user's icon.</para>
- </listitem>
+ <para><emphasis role="bold">Icon</emphasis></para>
- <listitem>
- <para><guilabel>Real Name</guilabel>: Insert the user's real name into
- this text box.</para>
+ <para>Click on this button if you want to change the user's
+ icon</para>
</listitem>
<listitem>
- <para><guilabel>Login Name</guilabel>: 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>
+ <para><emphasis role="bold">Real Name</emphasis></para>
+
+ <para>Insert the user's real name into this text box</para>
</listitem>
<listitem>
- <para><guilabel>Password</guilabel>: 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">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>Password (again)</guilabel>: Retype the user password
- DrakX will check that you have not mistyped the password.</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>Any users you added while installing Mageia, will have a home
- directory that is both read and write protected (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>You can add any extra needed users in the <emphasis>Configuration
- Summary</emphasis> step during the install. Choose <emphasis>User
@@ -88,31 +110,32 @@
</note>
</section>
- <section xml:id="addUserAdvanced" condition="classical">
+ <section condition="classical" xml:id="addUserAdvanced">
<info>
- <title xml:id="addUserAdvanced-ti3">Advanced User Management</title>
+ <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
</info>
- <para>The <guibutton>Advanced</guibutton> option allows you to edit
- further settings for the user you are adding.</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>: This drop-down list allows you to
+ <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 <emphasis role="bold">Bash</emphasis>, <emphasis role="bold">Dash</emphasis> and <emphasis role="bold">Sh</emphasis></para>
+ screen. Options are <literal>Bash</literal>, <literal>Dash</literal>
+ and <literal>Sh</literal></para>
</listitem>
<listitem>
- <para><guilabel>User ID</guilabel>: Here you can set the <emphasis role="bold">user ID</emphasis> for any user you added in the previous
- screen. If you are unsure what the purpose of this is, then leave it
- blank.</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>Group ID</guilabel>: This lets you set the <emphasis role="bold">group ID</emphasis>. Again, if unsure, leave it
- blank.</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/en/add_supplemental_media.xml b/docs/docs/stable/installer/en/add_supplemental_media.xml
index 256cf9db..901a86be 100644
--- a/docs/docs/stable/installer/en/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/en/add_supplemental_media.xml
@@ -1,7 +1,7 @@
-<?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="en">
+<?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:lang="en" xml:id="add_supplemental_media" version="5.0">
<info>
- <title xml:id="add_supplemental_media-ti1">Media Selection (Configure
- Supplemental Installation Media)</title>
+ <title xml:id="add_supplemental_media-ti1">Supplemental Installation
+ Media</title>
</info>
<!-- papoteur 2013-04-13 - created -->
@@ -10,40 +10,44 @@
<!-- 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-->
+
<mediaobject>
<imageobject>
<imagedata format="PNG" fileref="dx2-add_supplemental_media.png" xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
</imageobject>
</mediaobject>
- <para>This screen shows you the list of already recognized repositories. You
- can add other sources for packages, like an optical disc or a remote source.
+ <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
- next steps.</para>
+ subsequent steps.</para>
<para>For a network source, there are two steps to follow:</para>
<orderedlist>
<listitem>
- <para>Choosing and activation of the network, if not already up.</para>
+ <para>Choosing and activating the network, if not already up.</para>
</listitem>
<listitem>
<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 role="bold">Nonfree</emphasis>,
- the <emphasis role="bold">Tainted</emphasis> repositories and the
- <emphasis role="bold">Updates</emphasis>. With the URL, you can
- designate a specific repository or your own NFS installation.</para>
+ 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>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
- ticking one of the Network protocols here. The 64-bit DVD ISO only
- contains 64-bit and noarch 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>
+ <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/en/ask_mntpoint_s.xml b/docs/docs/stable/installer/en/ask_mntpoint_s.xml
index f2b70920..9ab8a986 100644
--- a/docs/docs/stable/installer/en/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/en/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 version="1.0" encoding="utf-8"?>
+<section version="5.0" 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">Choose the mount points</title>
</info>
@@ -23,55 +30,64 @@
<!-- 2012-04-19 Language proofreading done -->
+ <!--2018/02/12 apb: Text and typography.-->
+
+ <!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+
<mediaobject>
<imageobject condition="classical">
- <imagedata format="PNG" xml:id="chooseMountPoints-im1" align="center" fileref="dx2-chooseMountpoints.png" revision="1"/>
+ <imagedata align="center" fileref="dx2-chooseMountpoints.png"
+ format="PNG" revision="1" xml:id="chooseMountPoints-im1"/>
</imageobject>
<imageobject condition="live">
- <imagedata format="PNG" fileref="live-chooseMountpoints.png" align="center" xml:id="live-chooseMountPoints-im1" revision="1"/>
+ <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 <application>DrakX</application>
- suggestions, you can change the mount points.</para>
-
- <note>
- <para>If you change anything, make sure you still have a <emphasis role="bold"><literal>/</literal></emphasis> (root) partition.</para>
- </note>
+ computer. If you don't agree with the DrakX suggestions, you can change the
+ mount points yourself.</para>
<itemizedlist>
<listitem>
- <para>Every partition is shown to the left as: <emphasis role="bold">Device (capacity, mount point, type).</emphasis></para>
- </listitem>
-
- <listitem>
- <para><emphasis role="bold">Device</emphasis>, is made up of: <emphasis role="bold">hard drive</emphasis>, [<emphasis role="bold">hard drive
- name</emphasis> (letter)], <emphasis role="bold">partition
- number</emphasis> (for example, <emphasis role="bold">sda5</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>If you have several partitions, you can choose various different
- mount points from the drop down menu, such as <emphasis role="bold">/</emphasis>, <emphasis role="bold"><literal>/home</literal></emphasis> and <emphasis role="bold">/var</emphasis>. You can even make your own mount points,
- for instance <emphasis role="bold"><literal>/video</literal></emphasis>
- for a partition where you want to store your films, or <emphasis role="bold">/Data</emphasis> (or some other name) for your data.</para>
+ <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>
- <para>For any partitions that you don't need to make use of, you can leave the
- mount point field blank.</para>
+ <para>For any partitions that you don't need to make use of, you can
+ leave the mount point field blank.</para>
</listitem>
</itemizedlist>
<warning>
- <para>If you are not sure what to choose, click <emphasis role="bold">Previous</emphasis> to go back and then tick <guilabel>Custom
- disk partitioning</guilabel>, where, you can click on a partition to see
- its type and size.</para>
+ <para>If you make any changes here, ensure you still have a
+ <filename>/</filename> (root) partition.</para>
</warning>
+ <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
- <guibutton>Next</guibutton>, and choose whether you only want to format the
- partition(s) DrakX suggests, or more.</para>
-</section> \ No newline at end of file
+ <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/en/bestTime.xml b/docs/docs/stable/installer/en/bestTime.xml
index e7227e6a..991822fe 100644
--- a/docs/docs/stable/installer/en/bestTime.xml
+++ b/docs/docs/stable/installer/en/bestTime.xml
@@ -1,25 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<section version="5.0" 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:id="bestTime">
+ <!--2018/03/01 apb: Slight adjustment to text-->
+ <!--2018/03/03/ apb: Redo definition for the Advanced option,-->
<info>
- <title xml:id="bestTime-ti1">Clock settings</title>
+ <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"/>
+ <imagedata format="PNG" align="center" fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
</imageobject>
</mediaobject>
-
- <para>In this step, you have to select on which time your internal clock is
- set, either local time or UTC time.</para>
-
- <para>In advanced tab, you will find more options about clock
- settings.</para>
-</section>
+ <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/en/bootLive.xml b/docs/docs/stable/installer/en/bootLive.xml
index bd74d9b9..5d05fb1f 100644
--- a/docs/docs/stable/installer/en/bootLive.xml
+++ b/docs/docs/stable/installer/en/bootLive.xml
@@ -1,33 +1,166 @@
-<?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"><info><title xml:id="bootLive-ti1">Boot Mageia as Live system</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Booting the medium</title></info><section><info><title xml:id="bootLive11-ti1">From a disc</title></info><para>You can boot directly from the media you used to burn your image
- (CD-ROM, DVD-ROM...). You usually just need to insert it in your CD/DVD
- drive for the bootloader to launch the installation automatically after
- rebooting the computer. If that does not happen you may need to
- reconfigure your BIOS or press one key that will offer you to choose the
- peripheral from which the computer will boot.</para><para>According to which hardware you have, and how it is configured,
- you get either one or another of the two screens below.</para></section><section><info><title xml:id="bootLive12-ti1">From a USB device</title></info><para>You can boot from the USB device on which you dumped your image
- ISO. According to your BIOS settings, the computer boots perhaps
- directly on the USB device already plugged in a port. If that does not
- happen you may need to reconfigure your BIOS or press one key that will
- offer you to choose the peripheral from which the computer will
- boot.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>First screen while booting in BIOS mode</para></caption></mediaobject><para>In the middle menu, you have the choice between three
- actions:</para><itemizedlist><listitem><para>Boot Mageia: That means Mageia 5 will start from the connected
- media (CD/DVD or USB stick) without writing anything on the disk, so
- expect a very slow system. Once the boot is done, you can proceed to
- the installation on a hard disk.</para></listitem><listitem><para>Install Mageia: This choice will directly install Mageia on a
- hard disk.</para></listitem><listitem><para>Boot from hard disk: This choice allows to boot from hard disk,
- as usual, when no media (CD/DVD or USB stick) is connected. (not
- working with Mageia 5).</para></listitem></itemizedlist><para>In the bottom menu, are the Boot Options:</para><itemizedlist><listitem><para>F1 - Help. Explain the options "splash", "apm", "acpi" and
- "Ide"</para></listitem><listitem><para>F2 - Language. Choose the display language of the
- screens.</para></listitem><listitem><para>F3 - Screen resolution. Choose between text, 640x400, 800x600,
- 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is
- performed from the inserted installation medium. Here, select other
- sources, like FTP or NFS servers. If the installation is carried out
- in a network with an SLP server, select one of the installation
- sources available on the server with this option.</para></listitem><listitem><para>F5 - Driver. Yes or No. The system is aware about the presence
- of an optional disk with a driver update and will require its
- insertion during installation process.</para></listitem><listitem><para>F6 - Kernel options. This is a way to specify options according
- to your hardware and the drivers to use.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">In UEFI mode</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png" align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>First screen while booting on UEFI system from disk</para></caption></mediaobject><para>You have only the choice to run Mageia in Live mode (first choice)
- or to process the installation (second choice).</para><para>If you booted from a USB stick, you get two supplemental lines which
- are a duplicata of the previous lines suffixed with "USB". You have to
- choose them.</para><para>In each case, the first steps will be the same to choose language,
- timezone and keyboard, then the processes differ, with <link linkend="testing">additional steps in Live mode</link>.</para></section></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" version="5.0">
+ <!--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.-->
+ <info>
+ <title xml:id="bootLive-ti1">Boot Mageia as Live system</title>
+ </info>
+ <section xml:id="bootLive-1">
+ <info>
+ <title xml:id="bootLive1-ti1">Booting the medium</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">In BIOS/CSM/Legacy mode</title>
+ </info>
+ <itemizedlist>
+ <title>Main 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>
+ </itemizedlist>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="live-bootCSM.png" align="center"/>
+ </imageobject>
+ <caption>
+ <para>First screen while booting in BIOS mode</para>
+ </caption>
+ </mediaobject>
+ <itemizedlist>
+ <title>Function Keys</title>
+ <listitem>
+ <para><keycap>F1</keycap> <emphasis role="bold">Help</emphasis></para>
+ <para>Within any of the <keycap>F2</keycap> to <keycap>F6</keycap>
+ options, you can view relevant help by pressing
+ <keycap>F1</keycap>.</para>
+ </listitem>
+ <listitem>
+ <para><keycap>F2</keycap> <emphasis role="bold">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>
+ <listitem>
+ <para><keycap>F3</keycap> <emphasis role="bold">Video
+ Mode</emphasis></para>
+ <para>If needed, change the screen resolution by pressing
+ <keycap>F3</keycap>. Options are: 640x480, 800x600, 1024x768.</para>
+ </listitem>
+ <listitem>
+ <para><keycap>F4</keycap> <emphasis role="bold">Source</emphasis></para>
+ <para>Normally, the installation is performed from the inserted installation medium. Here, you may select other sources, like FTP or NFS servers.</para>
+ <para>If the installation is carried out in a network with an SLP server, then select one of the installation sources available on the server with this option.</para>
+ </listitem>
+ <listitem>
+ <para><keycap>F5</keycap> <emphasis role="bold">Driver</emphasis></para>
+ <para>If you have a driver update that you wish to use, select this
+ option and then answer <emphasis>Yes</emphasis>. You will be prompted
+ to insert the update disc at the appropriate time.</para>
+ </listitem>
+ <listitem>
+ <para><keycap>F6</keycap> <emphasis role="bold">Kernel
+ Options</emphasis></para>
+ <para>If you experience problems with the installation, you could try
+ modifying the default settings using the <emphasis>Kernel
+ Option</emphasis> menu:</para>
+ <itemizedlist>
+ <listitem>
+ <para><emphasis role="bold">Default:</emphasis> splash quiet noiswmd resume audit=0</para>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">Safe Settings:</emphasis>
+ <literal>apm=off acpi=off mce=off barrier=off ide=nodma idewait=50
+ i8042.nomux psmouse.proto=bare irqpoll
+ pci=nommconf</literal></para>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">No ACPI:</emphasis> (Advanced
+ Configuration and Power Interface): Power management features are
+ not used.</para>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">No Local APIC:</emphasis> (Local
+ Advanced Programmable Interrupt Controller): CPU interrupt. Select
+ this option if you experience system misbehaviour like a kernel
+ panic in relation to APIC.</para>
+ </listitem>
+ </itemizedlist>
+ <para>If you open any of the above <keycap>F6</keycap> menu items, and
+ then click on <keycap>F1</keycap>, an info window will open to show
+ more details for that particular item:</para>
+ </listitem>
+ </itemizedlist>
+ </section>
+ <section xml:id="uefimode">
+ <info>
+ <title xml:id="uefimode-ti1">In UEFI mode</title>
+ </info>
+ <mediaobject condition="live">
+ <imageobject>
+ <imagedata format="PNG" fileref="live-bootUEFI.png" align="center" xml:id="bootUEFI-im1" revision="1"/>
+ </imageobject>
+ <caption>
+ <para>First screen while booting in UEFI mode</para>
+ </caption>
+ </mediaobject>
+ <para>In UEFI mode, you have just the two menu options to choose from:</para>
+ <itemizedlist>
+ <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>
+ </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> \ No newline at end of file
diff --git a/docs/docs/stable/installer/en/chooseDesktop.xml b/docs/docs/stable/installer/en/chooseDesktop.xml
index b9f9ab00..dbb1193f 100644
--- a/docs/docs/stable/installer/en/chooseDesktop.xml
+++ b/docs/docs/stable/installer/en/chooseDesktop.xml
@@ -1,29 +1,51 @@
-<?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:id="chooseDesktop">
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" 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">
+ <!--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.-->
+
<info>
<title xml:id="chooseDesktop-ti1">Desktop Selection</title>
</info>
<!--Lebarhon 20170209 updated SC-->
- <para>Depending on your selection here, you may be offered further screens
- to fine-tune your choice.</para>
+ <!--2018/02/12 apb: Text and typography.-->
- <para>After the selection step(s), you will see a slide-show during package
- installation. The slide show can be disabled by pressing the
- <guilabel>Details</guilabel> button</para>
+ <para>Some choices made here will open other screens with related
+ options.</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"/>
+ <imagedata align="center" fileref="dx2-chooseDesktop.png" format="PNG"/>
</imageobject>
</mediaobject>
- <para>Choose whether you prefer to use the <application>KDE</application>
- <emphasis role="bold">Plasma</emphasis> or <application>GNOME</application>
- desktop environment. Both come with a full set of useful applications and
- tools. Tick <guilabel>Custom</guilabel> if you wish to use neither (or even
- use both), or if you want to modify the default software choices for these
- desktop environments. The <application>LXDE</application> desktop, for
- instance, is lighter than the previous two, sporting less eye candy and
- fewer packages installed by default.</para>
-</section> \ No newline at end of file
+ <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/en/choosePackageGroups.xml b/docs/docs/stable/installer/en/choosePackageGroups.xml
index 440022fb..f4e5cfe7 100644
--- a/docs/docs/stable/installer/en/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/en/choosePackageGroups.xml
@@ -1,10 +1,12 @@
-<?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: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:id="choosePackageGroups" xreflabel="Choose Package Groups">
<info>
<title xml:id="choosePackageGroups-ti1">Package Group Selection</title>
</info>
<!--Lebarhon 20170209 Updated SC-->
+ <!--2018/02/25 apb: add xreflabel to this section.-->
+
<mediaobject>
<imageobject>
<imagedata format="PNG" fileref="dx2-choosePackageGroups.png" align="center"/>
diff --git a/docs/docs/stable/installer/en/choosePackagesTree.xml b/docs/docs/stable/installer/en/choosePackagesTree.xml
index 0314129f..f240e351 100644
--- a/docs/docs/stable/installer/en/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/en/choosePackagesTree.xml
@@ -1,10 +1,14 @@
-<?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 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">
<info>
<title xml:id="choosePackagesTree-ti1">Choose Individual Packages</title>
</info>
<!--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.-->
+
<mediaobject>
<imageobject>
<imagedata format="PNG" fileref="dx2-choosePackagesTree.png" align="center"/>
@@ -14,9 +18,9 @@
<para>Here you can add or remove any extra packages to customize your
installation.</para>
- <para>After having made your choice, you can click on the <guibutton>floppy
- icon</guibutton> at the bottom of the page to save your choice of packages
- (saving to a USB key works, too). You can then use this file to install the
- same packages on another system, by pressing the same button during install
- and choosing to load it.</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/en/configureServices.xml b/docs/docs/stable/installer/en/configureServices.xml
index 24a75c40..d82144da 100644
--- a/docs/docs/stable/installer/en/configureServices.xml
+++ b/docs/docs/stable/installer/en/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: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:id="configureServices">
<info>
<title xml:id="configureServices-ti1">Configure your Services</title>
</info>
@@ -7,6 +7,10 @@
<!-- 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.-->
+
<mediaobject>
<imageobject>
<imagedata format="PNG" fileref="dx2-configureServices.png" xml:id="configureServices-im1" align="center" revision="1"/>
@@ -16,14 +20,19 @@
<para xml:id="configureServices-pa1" revision="1">Here you can choose which
services should start when you boot your system.</para>
- <para xml:id="configureServices-pa2" revision="1">Click on a triangle to
- expand a group to all the relevant services.</para>
-
- <para xml:id="configureServices-pa3" revision="1">The settings DrakX chose
- are usually good.</para>
-
- <para xml:id="configureServices-pa4" revision="1">If you highlight a
- service, some information about it is shown in the info box below.</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>
+
+ <listitem>
+ <para xml:id="configureServices-pa4" revision="1">If you highlight a
+ service, some information about it is shown in the info box
+ below.</para>
+ </listitem>
+ </itemizedlist>
<para xml:id="configureServices-pa5" revision="1">Only change things when
you know very well what you are doing.</para>
diff --git a/docs/docs/stable/installer/en/configureTimezoneUTC.xml b/docs/docs/stable/installer/en/configureTimezoneUTC.xml
index 0210abad..a06ff733 100644
--- a/docs/docs/stable/installer/en/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/en/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 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">
<info>
<title xml:id="configureTimezoneUTC-ti6">Configure your Timezone</title>
</info>
@@ -7,19 +7,27 @@
<!-- 2013-05-05 marja - added screenshot -->
+ <!--2018/02/13 apb: Minor text adjustment.-->
+
+ <!--2018/02/25 apb: Added xreflabel to this section.-->
+
<mediaobject>
<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 condition="live">
+ <imagedata format="png" fileref="live-timeZone.png" align="center"/>
</imageobject>
</mediaobject>
- <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your time-zone
- by choosing your country or a city close to you in the same
- time-zone.</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">In the next screen you
can choose to set your hardware clock to local time or to GMT, also known as
diff --git a/docs/docs/stable/installer/en/configureX_card_list.xml b/docs/docs/stable/installer/en/configureX_card_list.xml
index 8bab1ffb..3f43ec2b 100644
--- a/docs/docs/stable/installer/en/configureX_card_list.xml
+++ b/docs/docs/stable/installer/en/configureX_card_list.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: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 version="1.0" encoding="utf-8"?>
+<section version="5.0" 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">
<!-- Initiated by Marja 2012-08-08 -->
<!-- Further text JohnR 2012-08-29 -->
@@ -9,6 +16,10 @@
<!-- Done corrections accordind to tmb remarks. Papoteur -->
+ <!--2018/02/15 apb: Text and typography.-->
+
+ <!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
+
<info>
<title xml:id="configureX_card_list-ti1">Choose an X Server (Configure
your Graphic Card)</title>
@@ -16,7 +27,8 @@
<mediaobject>
<imageobject>
- <imagedata format="PNG" xml:id="configureX_card_list-im1" align="center" fileref="dx2-configureX_card_list.png" revision="1"/>
+ <imagedata align="center" fileref="dx2-configureX_card_list.png"
+ format="PNG" revision="1" xml:id="configureX_card_list-im1"/>
</imageobject>
</mediaobject>
@@ -26,34 +38,34 @@
<para>If the installer has not correctly detected your graphic card and you
know which one you have, you can select it from the tree by: <itemizedlist>
<listitem>
- <para>vendor</para>
+ <para>Vendor</para>
</listitem>
<listitem>
- <para>then the name of your card</para>
+ <para>then the make of your card</para>
</listitem>
<listitem>
- <para>and the type of card</para>
+ <para>and the model of card</para>
</listitem>
</itemizedlist></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 role="bold">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 <emphasis role="bold">vesa</emphasis> driver which provides basic capabilities.</para>
+ <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>Be aware that if you select an incompatible driver you may only have
- access to the <emphasis role="bold">Command-line</emphasis>
- Interface.</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>Some video card manufacturers provide proprietary drivers for Linux
- which may only be available in the <emphasis role="bold">Nonfree</emphasis>
- repository and in some cases only from the card manufacturers'
- websites.</para>
-
- <para>The <emphasis role="bold">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> \ No newline at end of file
+ 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/en/configureX_chooser.xml b/docs/docs/stable/installer/en/configureX_chooser.xml
index fc1ea70b..8551977c 100644
--- a/docs/docs/stable/installer/en/configureX_chooser.xml
+++ b/docs/docs/stable/installer/en/configureX_chooser.xml
@@ -1,4 +1,12 @@
-<?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 version="1.0" encoding="UTF-8"?>
+<section version="5.0" 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">Graphic Card and Monitor
Configuration</title>
@@ -6,62 +14,86 @@
<!-- 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-->
+ <!--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.-->
+
<mediaobject>
<imageobject>
- <imagedata format="PNG" xml:id="configureX_chooser-im1" fileref="dx2-configureX_chooser.png" align="center" revision="1"/>
+ <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 <application>Mageia</application>, they are all based on a graphical user
- interface system called <acronym>X Window System</acronym>, or simply
- <acronym>X</acronym>. So in order for <acronym>KDE</acronym> Plasma,
- <acronym>GNOME</acronym>, <acronym>LXDE</acronym> or any other graphical
- environment to work well, the following <acronym>X</acronym> settings need
- to be correct. Choose the correct settings if none are shown, or if you
- think the details are incorrect.</para>
+ 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. Choose the
+ appropriate settings - if none are shown, or if you think the details are
+ incorrect.</para>
<itemizedlist>
<listitem>
- <para xml:id="configureX_chooser-pa2" revision="1"><emphasis><guibutton>Graphic
- card</guibutton></emphasis>: Choose your card from the list if
- needed.</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>:
- You can choose <guilabel>Plug'n Play</guilabel> if applicable, or choose
- your monitor from the <guilabel>Vendor</guilabel> or
- <guilabel>Generic</guilabel> list. Choose <guilabel>Custom</guilabel> if
- you prefer to manually set the horizontal and vertical refresh rates of
- your monitor.</para>
-
- <warning>
- <para xml:id="configureX_chooser-pa3a" revision="1">Incorrect refresh
- rates may damage your monitor</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>
+ list. 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>Resolution</guibutton></emphasis>:
- The resolution and color depth of your monitor can be set here.</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>:
- The test button does not always appear during install. If the option is
- there, and you test your settings, you should be ask whether your
- settings are correct. If you answer <emphasis role="bold">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>
+ <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 whether
+ 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>Options</guibutton></emphasis>:
- Here you can choose to enable or disable various options.</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>
+
+ <xi:include href="configureX_card_list.xml"/>
+
+ <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/en/configureX_monitor.xml b/docs/docs/stable/installer/en/configureX_monitor.xml
index 0884c5fd..e31a96f1 100644
--- a/docs/docs/stable/installer/en/configureX_monitor.xml
+++ b/docs/docs/stable/installer/en/configureX_monitor.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: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 version="1.0" encoding="utf-8"?>
+<section version="5.0" 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">
<!-- Initiated by Marga 2012-8-09 -->
<!-- Further text JohnR 2012-08-30 -->
@@ -7,16 +14,21 @@
<!---->
+ <!--2018/02/12 apb: Text and typography-->
+
+ <!--2018/02/22 apb: Change list style.-->
+
<info>
<title xml:id="configureX_monitor-ti1">Choosing your Monitor</title>
</info>
- <para xml:id="configureX_monitor-pa1" revision="1">DrakX has a very
+ <para revision="1" xml:id="configureX_monitor-pa1">DrakX has a very
comprehensive database of monitors and will usually correctly identify
yours.</para>
<warning>
- <para xml:id="configureX_monitor-pa1w" revision="1"><emphasis role="bold">Selecting a monitor with different characteristics could
+ <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis
+ role="bold">Selecting a monitor with different characteristics could
damage your monitor or video hardware. Please don't try something without
knowing what you are doing.</emphasis> If in doubt you should consult your
monitor documentation.</para>
@@ -24,54 +36,74 @@
<mediaobject>
<imageobject>
- <imagedata format="PNG" xml:id="configureX_monitor-im1" fileref="dx2-configureX_monitor.png" align="center" revision="1"/>
+ <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>Custom</emphasis></para>
-
- <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">It is <emphasis>VERY
- IMPORTANT</emphasis> that you do not specify a monitor type with a sync
- range that is beyond the capabilities of your monitor: you may damage your
- monitor. If in doubt, choose a conservative setting and consult your monitor
- documentation.</para>
-
- <para xml:id="configureX_monitor-pa5" revision="1"><emphasis>Plug 'n
- Play</emphasis></para>
-
- <para xml:id="configureX_monitor-pa6" revision="1">This is the default
- option and tries to determine the monitor type from the monitor
- database.</para>
-
- <para xml:id="configureX_monitor-pa7" revision="1"><emphasis>Vendor</emphasis></para>
+ <variablelist spacing="compact">
+ <varlistentry>
+ <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
- <para xml:id="configureX_monitor-pa8" revision="1">If the installer has not
- correctly detected your monitor and you know which one you have, you can
- select it from the tree by selecting: <itemizedlist>
<listitem>
- <para>vendor</para>
+ <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">It is
+ <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor
+ type with a sync range that is beyond the capabilities of your
+ monitor: you may damage your monitor. If in doubt, choose a
+ conservative setting and consult your monitor documentation.</para>
</listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
<listitem>
- <para>the monitor manufacturers name</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>
+
+ <varlistentry>
+ <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
<listitem>
- <para>the monitor description</para>
+ <para revision="1" xml:id="configureX_monitor-pa8">If the installer
+ has not correctly detected your monitor and you know which one you
+ have, you can select it from the tree by selecting:</para>
</listitem>
- </itemizedlist></para>
+ </varlistentry>
+ </variablelist>
+
+ <itemizedlist>
+ <listitem>
+ <para>Manufacturer</para>
+ </listitem>
- <para xml:id="configureX_monitor-pa9" revision="1"><emphasis>Generic</emphasis></para>
+ <listitem>
+ <para>Monitor model</para>
+ </listitem>
+ </itemizedlist>
- <para xml:id="configureX_monitor-pa10" revision="1">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 <emphasis role="bold">Vesa</emphasis> card driver when your video hardware cannot be
- determined automatically. Once again it may be wise to be conservative in
- your selections.</para>
-</section> \ No newline at end of file
+ <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/en/diskdrake.xml b/docs/docs/stable/installer/en/diskdrake.xml
index a36e49df..90caf8e7 100644
--- a/docs/docs/stable/installer/en/diskdrake.xml
+++ b/docs/docs/stable/installer/en/diskdrake.xml
@@ -1,76 +1,118 @@
-<?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:id="diskdrake">
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" 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">
<!-- Lebarhon 2016 12 16 updated for Mageia 6
Lebarhon 20170902 added SC-->
+ <!--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.-->
+
<info>
- <title xml:id="diskdrake-ti1">Custom disk partitioning with
+ <title xml:id="diskdrake-ti1">Custom Disk Partitioning with
DiskDrake</title>
</info>
<mediaobject>
<imageobject condition="classical">
- <imagedata fileref="dx2-diskdrake.png" align="center"/>
+ <imagedata align="center" fileref="dx2-diskdrake.png"/>
</imageobject>
<imageobject condition="live">
- <imagedata fileref="live-diskdrake.png" align="center"/>
+ <imagedata align="center" fileref="live-diskdrake.png"/>
</imageobject>
</mediaobject>
+ <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>
+
+ <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>
+
+ <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>
+
<warning>
- <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on
- your <emphasis role="bold">/</emphasis> partition you must ensure that you
- have a separate <emphasis role="bold">/boot</emphasis> partition. The
- encryption option for the <emphasis role="bold">/boot</emphasis> partition
- must NOT be set, otherwise your system will be unbootable.</para>
+ <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>
+
+ <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-pa3" revision="2">Modify the layout of your disk(s)
- here. You can remove or create partitions, change the filesystem of a
- partition or change its size and even view their details before you
- start.</para>
-
- <para xml:id="diskdrake-pa4" revision="1">There is a tab at the top for
- every detected hard disk (or other storage device like a USB key). In the
- screen-shot above there are two available devices: <emphasis role="bold">sda
- </emphasis>and <emphasis role="bold">sdb</emphasis>.</para>
-
- <para xml:id="diskdrake-pa5" revision="1">Take care with the <guibutton>Clear
- all</guibutton> option, use it only if you are sure you want to wipe all
- partitions on the selected storage device.</para>
-
- <para xml:id="diskdrake-pa6" revision="1">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. <guibutton>Expert mode</guibutton>
- provides more options such as a label (give a name to) a partition, or to
- choose a partition type.</para>
-
- <para xml:id="diskdrake-pa6a" revision="1">Continue until you have adjusted
- everything to your satisfaction.</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>
+
+ <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>
+
+ <figure>
+ <title>EFI System Partition</title>
- <para xml:id="diskdrake-pa7" revision="1">Click <guibutton>Done</guibutton>
- when you're ready.</para>
-
- <note>
- <para>If you are installing Mageia on a UEFI system, check that an ESP
- (EFI System Partition) is present and correctly mounted on /boot/EFI (see
- below)</para>
-
- <para><mediaobject>
- <imageobject condition="classical">
- <imagedata fileref="dx2-diskdrake2.png" align="center"/>
- </imageobject>
+ <mediaobject>
+ <imageobject condition="classical">
+ <imagedata align="center" fileref="dx2-diskdrake2.png"/>
+ </imageobject>
- <imageobject condition="live">
- <imagedata align="center" fileref="live-diskdrake2.png"/>
- </imageobject>
- </mediaobject></para>
- </note>
+ <imageobject condition="live">
+ <imagedata align="center" fileref="live-diskdrake2.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
- <note>
- <para>If you are installing Mageia on a Legacy/GPT system, check that a
- BIOS boot partition is present and of the correct type</para>
+ <figure>
+ <title>BIOS boot partition</title>
<mediaobject>
<imageobject condition="classical">
@@ -81,5 +123,5 @@ Lebarhon 20170902 added SC-->
<imagedata align="center" fileref="live-doPartitionDisks3.png"/>
</imageobject>
</mediaobject>
- </note>
-</section> \ No newline at end of file
+ </figure>
+</section>
diff --git a/docs/docs/stable/installer/en/doPartitionDisks.xml b/docs/docs/stable/installer/en/doPartitionDisks.xml
index 46130388..09b3f106 100644
--- a/docs/docs/stable/installer/en/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/en/doPartitionDisks.xml
@@ -1,63 +1,101 @@
-<?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:id="doPartitionDisks">
- <!---->
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" 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">
+ <!--lebarhon 20161216 updated for Mageia 6
+
+lebarhon 20170209 added SC-->
- <!-- lebarhon 20161216 updated for Mageia 6
+ <!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
-lebarhon 20170209 added SC-->
+ <!--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.-->
<info>
- <title xml:id="doPartitionDisks-ti1">Partitioning</title>
+ <title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
</info>
- <para xml:id="doPartitionDisks-pa1" revision="1">In this screen you can see
+ <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 <application>Mageia</application>.</para>
+ proposals for where to install Mageia.</para>
- <para xml:id="doPartitionDisks-pa2" revision="1">The options available from
- those shown below will vary according to the layout and content of your
- particular hard drive(s).</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"/>
+ <imagedata align="center" fileref="dx2-doPartitionDisks.png"/>
</imageobject>
<imageobject condition="live">
- <imagedata fileref="live-doPartitionDisks.png" align="center"/>
+ <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">Use Existing
- Partitions</para>
-
- <para xml:id="doPartitionDisks-pa5" revision="1">If this option is
- available, then existing Linux compatible partitions have been found
- and may be used for the installation.</para>
- </listitem>
-
- <listitem>
- <para xml:id="doPartitionDisks-pa6" revision="1">Use Free Space</para>
-
- <para xml:id="doPartitionDisks-pa7" revision="1">If you have unused
- space on your hard drive then this option will use it for your new
- Mageia installation.</para>
- </listitem>
-
- <listitem>
- <para xml:id="doPartitionDisks-pa8" revision="1">Use Free Space on a
- Windows Partition</para>
-
- <para xml:id="doPartitionDisks-pa9" revision="1">If you have unused
- space on an existing Windows partition, the installer may offer to use
- it.</para>
-
- <para xml:id="doPartitionDisks-pa10" revision="2">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>
-
+ <itemizedlist>
+ <title>Main Options</title>
+
+ <listitem>
+ <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis
+ role="bold">Use Existing Partitions</emphasis></para>
+
+ <para revision="1" xml:id="doPartitionDisks-pa5">If this option is
+ available, then existing Linux compatible partitions have been found and
+ may be used for the installation.</para>
+ </listitem>
+
+ <listitem>
+ <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis
+ role="bold">Use Free Space</emphasis></para>
+
+ <para revision="1" xml:id="doPartitionDisks-pa7">If you have unused
+ space on your hard drive then this option will use it for your new
+ Mageia installation.</para>
+ </listitem>
+
+ <listitem>
+ <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis
+ role="bold">Use Free Space on a Windows Partition</emphasis></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>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">Note that this
involves shrinking the size of the Windows partition. The partition
must be "clean", meaning that Windows must have closed down correctly
@@ -65,133 +103,137 @@ lebarhon 20170209 added SC-->
although this is not a guarantee that all files in the partition have
been moved out of the area that is about to be used. It is highly
recommended to back up your personal files.</para>
+ </important>
+ </listitem>
- <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 screen-shot.</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">Erase and use Entire
- Disk.</para>
-
- <para xml:id="doPartitionDisks-pa13" revision="1">This option will
- allocate the entire drive for Mageia.</para>
-
- <para xml:id="doPartitionDisks-pa14" revision="1">Note! This will
- erase ALL data on the selected hard drive. Take care!</para>
-
- <para xml:id="doPartitionDisks-pa15" revision="1">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>
- </listitem>
- </itemizedlist><itemizedlist>
- <listitem>
- <para xml:id="doPartitionDisks-pa16" revision="1">Custom disk
- partitioning</para>
-
- <para xml:id="doPartitionDisks-pa17" revision="1">This gives you
- complete control over the placing of the installation on your hard
- drive(s).</para>
- </listitem>
- </itemizedlist></para>
+ <listitem>
+ <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis
+ role="bold">Custom Disk Partitioning</emphasis></para>
- <para><emphasis role="bold">Partition sizing:</emphasis></para>
+ <para revision="1" xml:id="doPartitionDisks-pa17">This gives you
+ complete control over the placing of the installation on your hard
+ drive(s).</para>
+ </listitem>
+ </itemizedlist>
- <para>If you are not using the <emphasis role="bold">Custom disk
- partitioning</emphasis> option, the installer will allocate the available
- space according to the following rules:</para>
-
- <para><itemizedlist>
- <listitem>
- <para>If the total available space is less than 50 GB, then only one
- partition is created. This will be the <emphasis role="bold">/</emphasis> (root) partition.</para>
- </listitem>
+ <mediaobject>
+ <imageobject condition="classical">
+ <imagedata align="center" fileref="dx2-doPartitionDisks2.png"/>
+ </imageobject>
- <listitem>
- <para>If the total available space is greater than 50 GB, then three
- partitions are created</para>
-
- <itemizedlist>
- <listitem>
- <para>6/19 of the total available place is allocated to <emphasis role="bold">/</emphasis> with a maximum of 50 GB</para>
- </listitem>
-
- <listitem>
- <para>1/19 is allocated to swap with a maximum of 4 GB</para>
- </listitem>
-
- <listitem>
- <para>the rest (at least 12/19) is allocated to <emphasis role="bold">/home.</emphasis></para>
- </listitem>
- </itemizedlist>
- </listitem>
- </itemizedlist></para>
+ <imageobject condition="live">
+ <imagedata align="center" fileref="live-doPartitionDisks2.png"/>
+ </imageobject>
+ </mediaobject>
- <para>That means that from 160 GB or greater available space, the installer
- will create three partitions: 50 GB for <emphasis role="bold">/</emphasis>,
- 4 GB for <emphasis role="bold">swap</emphasis> and the remainder for
- <emphasis role="bold">/home</emphasis>.</para>
+ <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>If the total available space is greater than 50 GB, then three
+ partitions are created</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
+ <emphasis>/</emphasis><filename>home</filename><emphasis
+ role="bold">.</emphasis></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>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 /boot/EFI. The <emphasis role="bold">Custom disk
+ 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>
- </note>
+ been correctly done.</para>
- <note>
- <para>If you are using a Legacy (CSM or BIOS) system with a GPT disk, you
- need to create a BIOS boot partition if not already existing. It is a
- roughly 1 MiB partition with no mount point. Choose <xref linkend="diskdrake"/> to be able to create it with the Installer like any
- other partition, just select BIOS boot partition as the filesystem
- type.</para>
-
- <mediaobject>
- <imageobject condition="classical">
- <imagedata align="center" fileref="dx2-doPartitionDisks3.png"/>
- </imageobject>
-
- <imageobject condition="live">
- <imagedata fileref="live-doPartitionDisks3.png"/>
- </imageobject>
- </mediaobject>
-
- <mediaobject>
- <imageobject>
- <imagedata fileref="dx2-doPartitionDisks4.png"/>
- </imageobject>
- </mediaobject>
+ <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>
- <warning>
+ <mediaobject>
+ <imageobject condition="classical">
+ <imagedata align="center" fileref="dx2-doPartitionDisks3.png"/>
+ </imageobject>
+
+ <imageobject condition="live">
+ <imagedata align="center" fileref="live-doPartitionDisks3.png"/>
+ </imageobject>
+ </mediaobject>
+
+ <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. Also 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 <emphasis role="bold">gparted</emphasis>, and to use the following settings:</para>
+ drive.</para>
- <para><emphasis role="bold">Align to</emphasis> = MiB</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">Free space preceding (MiB)</emphasis> =
- 2</para>
+ <itemizedlist>
+ <listitem>
+ <para><emphasis>Align to</emphasis> = MiB</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+ </listitem>
+ </itemizedlist>
<para>Also make sure all partitions are created using an even number of
megabytes.</para>
- </warning>
-</section> \ No newline at end of file
+ </important>
+</section>
diff --git a/docs/docs/stable/installer/en/exitInstall.xml b/docs/docs/stable/installer/en/exitInstall.xml
index cafa76f8..22ecc5cd 100644
--- a/docs/docs/stable/installer/en/exitInstall.xml
+++ b/docs/docs/stable/installer/en/exitInstall.xml
@@ -5,6 +5,10 @@
<!-- Lebarhon 20170209 updated SC-->
+ <!--2018/02/12 apb: Text and typography.-->
+
+ <!--2018/02/25 apb: Added clickable link to mageia.org-->
+
<mediaobject>
<imageobject>
<imagedata format="PNG" fileref="dx2-exitInstall.png" align="center" revision="1" xml:id="exitInstall-im1"/>
@@ -12,12 +16,12 @@
</mediaobject>
<para xml:id="exitInstall-pa1" revision="2">You have finished installing and
- configuring <application>Mageia</application> and it is now safe to remove
- the installation medium and reboot your computer.</para>
+ configuring Mageia and it is now safe to remove the installation medium and
+ reboot your computer.</para>
- <para xml:id="exitInstall-pa2" revision="2">After reboot, in the bootloader
- screen, you can choose between the operating systems (if there are more than
- one) on your computer.</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">If you didn't adjust the
settings for the bootloader, your Mageia install will be automatically
@@ -25,6 +29,6 @@
<para xml:id="exitInstall-pa4" revision="1">Enjoy!</para>
- <para xml:id="exitInstall-pa5" revision="1">Visit www.mageia.org if you have
+ <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/en/firewall.xml b/docs/docs/stable/installer/en/firewall.xml
index 0309fd02..a27b09f2 100644
--- a/docs/docs/stable/installer/en/firewall.xml
+++ b/docs/docs/stable/installer/en/firewall.xml
@@ -1,4 +1,8 @@
-<?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 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" xreflabel="Firewall">
+ <!--2018/02/15 apb: Text and typography.-->
+
+ <!--2018/02/25 apb: Added xreflabel for this section.-->
+
<info>
<title xml:id="firewall-ti1">Firewall</title>
</info>
@@ -10,23 +14,23 @@
Internet.</para>
<para>In the default setting (no button is checked), no service of the
- system is accessible from the network. The <emphasis role="bold">Everything
- (no firewall)</emphasis> 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
+ 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>All other options are more or less self-explanatory. As an example,
- you will enable the <emphasis role="bold">CUPS server</emphasis> if you want
- printers on your machine to be accessible from the network.</para>
+ you will enable the CUPS server if you want printers on your machine to be
+ accessible from the network.</para>
<para><emphasis role="bold">Advanced</emphasis></para>
- <para>The <emphasis role="bold">Advanced</emphasis> option opens a window
- where you can enable a series of services by typing a list of couples (blank
- separated)</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;port-number>/&lt;protocol></emphasis></para>
diff --git a/docs/docs/stable/installer/en/formatPartitions.xml b/docs/docs/stable/installer/en/formatPartitions.xml
index 5c27dc01..12a82831 100644
--- a/docs/docs/stable/installer/en/formatPartitions.xml
+++ b/docs/docs/stable/installer/en/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 version="1.0" encoding="utf-8"?>
+<section version="5.0" 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">Formatting</title>
</info>
@@ -11,36 +18,39 @@
<!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
+ <!--2018/02/10 apb: Text and typography.-->
+
<mediaobject>
<imageobject condition="classical">
- <imagedata format="PNG" fileref="dx2-formatPartitions.png" xml:id="formatPartitions-im1" align="center" revision="1"/>
+ <imagedata align="center" fileref="dx2-formatPartitions.png"
+ format="PNG" revision="1" xml:id="formatPartitions-im1"/>
</imageobject>
<imageobject condition="live">
- <imagedata format="PNG" xml:id="live-formatPartitions-im1" align="center" fileref="live-formatPartitions.png" revision="1"/>
+ <imagedata align="center" fileref="live-formatPartitions.png"
+ format="PNG" revision="1" xml:id="live-formatPartitions-im1"/>
</imageobject>
</mediaobject>
- <para xml:id="formatPartitions-pa1" revision="2">Here you can choose which
+ <para revision="2" xml:id="formatPartitions-pa1">Here you can choose which
partition(s) you wish to format. Any data on partitions
<emphasis>not</emphasis> marked for formatting will be preserved.</para>
- <para xml:id="formatPartitions-pa2" revision="1">Usually at least the
- partitions DrakX selected, need to be formatted</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">Click on
- <guibutton>Advanced</guibutton> to choose partitions you want to check for
- so called <emphasis>bad blocks</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">If you're not sure you
+ <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you
have made the right choice, you can click on
- <guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton>
- and then on <guibutton>Custom</guibutton> to get back to the main screen,
- where you can choose to view details of your partitions.</para>
+ <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">When you are confident
- about the selection, click on <guibutton>Next</guibutton> to
- continue.</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/en/installUpdates.xml b/docs/docs/stable/installer/en/installUpdates.xml
index 69e5924a..d6a68a83 100644
--- a/docs/docs/stable/installer/en/installUpdates.xml
+++ b/docs/docs/stable/installer/en/installUpdates.xml
@@ -1,31 +1,44 @@
<?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">
- <info>
- <title xml:id="installUpdates-ti1">Updates</title>
- </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 -->
+ <!--2018/02/12 apb: Text and typography.-->
+
+ <!--2018/02/25 apb: Added bullets to some text.-->
+
+ <info>
+ <title xml:id="installUpdates-ti1">Updates</title>
+ </info>
+
<mediaobject>
<imageobject>
- <imagedata format="PNG" fileref="dx2-installUpdates.png" align="center" revision="1" xml:id="installUpdates-im1"/>
+ <imagedata format="png" fileref="dx2-installUpdates.png" align="center" revision="1" xml:id="installUpdates-im1"/>
</imageobject>
</mediaobject>
- <para xml:id="installUpdates-pa1" revision="1">Since this version of
- <application>Mageia</application> was released, some packages will have been
- updated or improved.</para>
-
- <para xml:id="installUpdates-pa2" revision="1">Choose
- <guilabel>Yes</guilabel> if you wish to download and install them, select
- <guilabel>No</guilabel> if you don't want to do this now, or if you aren't
- connected to the Internet</para>
-
- <para xml:id="installUpdates-pa3" revision="1">Press
- <guibutton>Next</guibutton> to continue</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>
+
+ <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>
+
+ <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/en/installer.xml b/docs/docs/stable/installer/en/installer.xml
index 7b4ac785..dcb3cb27 100644
--- a/docs/docs/stable/installer/en/installer.xml
+++ b/docs/docs/stable/installer/en/installer.xml
@@ -1,259 +1,161 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<section version="5.0" xml:id="installer"
- 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 version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1998/Math/MathML" version="5.0" xml:id="installer">
+ <!--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: 2.2 Typo. 2.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.-->
<info>
<title xml:id="installer-ti1">DrakX, the Mageia Installer</title>
</info>
-
<para>Whether you are new to GNU-Linux or an experienced user, the Mageia
Installer is designed to help make your installation or upgrade as easy as
possible.</para>
-
- <para>The initial menu screen has various options, however the default one
- will start the installer, which will normally be all that you will
- need.</para>
-
+ <section>
+ <title>The installation steps</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>Installation Welcome Screen</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>
<section>
- <title>Using a Mageia DVD</title>
-
- <para>Here are the default welcome screens when using a Mageia DVD, The
- first one is what you will see if you have a UEFI system, the second one
- is for a Legacy system:</para>
-
+ <title>Legacy (BIOS) Systems</title>
<mediaobject>
<imageobject>
- <imagedata fileref="dx-welcome2.png"/>
+ <imagedata fileref="dx-welcome.png" align="center"/>
</imageobject>
</mediaobject>
-
- <para>From this screen, you have access to options by pressing
- "<emphasis role="bold">e</emphasis>" to enter the edit mode. To come
- back to this screen, press either <emphasis role="bold">Esc</emphasis>
- key to quit without saving or press the key <emphasis
- role="bold">Ctrl</emphasis> or <emphasis role="bold">F10</emphasis> to
- quit with saving.</para>
-
+ <itemizedlist>
+ <title>Menu</title>
+ <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>
+ <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 fileref="dx-welcome.png"/>
+ <imagedata fileref="dx-welcome2.png" align="center"/>
</imageobject>
</mediaobject>
-
- <para>From this screen, it is possible to set some preferences (note
- that the options <emphasis role="bold">F1</emphasis> to <emphasis
- role="bold">F6</emphasis> are available only on Legacy
- systems):<itemizedlist>
- <listitem>
- <para>Within any of the <emphasis role="bold">F2</emphasis> to
- <emphasis role="bold">F6</emphasis> options, you can view relevant
- help by pressing <emphasis role="bold">F1</emphasis></para>
- </listitem>
- </itemizedlist></para>
-
- <para><itemizedlist>
- <listitem>
- <para>Press <emphasis role="bold">F2</emphasis> to have the
- installer use a specific language for the installation.</para>
-
- <mediaobject>
- <imageobject>
- <imagedata fileref="dx-welcome-lang.png"/>
- </imageobject>
- </mediaobject>
-
- <para>Use the arrow keys to select the language then press
- <emphasis role="bold">Enter</emphasis>.</para>
- </listitem>
-
- <listitem>
- <para>If needed, change the screen resolution by pressing
- <emphasis role="bold">F3</emphasis> (Legacy mode only).</para>
-
- <mediaobject>
- <imageobject>
- <imagedata fileref="dx-welcome5def.png"/>
- </imageobject>
- </mediaobject>
- </listitem>
-
- <listitem>
- <para>If you experience problems with the installation, you could
- try modifying the default settings using the <emphasis
- role="bold">F6</emphasis> <emphasis role="bold">Kernel
- Options</emphasis> (for UEFI systems press <emphasis
- role="bold">e</emphasis> instead).</para>
-
- <itemizedlist>
- <listitem>
- <para>Default: It doesn't alter anything in the default
- options.</para>
- </listitem>
-
- <listitem>
- <para>Safe Settings: Priority is given to the safer options at
- the price of a performance detriment.</para>
- </listitem>
-
- <listitem>
- <para>No ACPI: (Advanced Configuration and Power Interface):
- Power management features are not used.</para>
- </listitem>
- </itemizedlist>
-
- <itemizedlist>
- <listitem>
- <para>No Local APIC: (Local Advanced Programmable Interrupt
- Controller): CPU interrupt. Select this option if you
- experience system misbehaviour like a kernel panic in relation
- to APIC.</para>
- </listitem>
- </itemizedlist>
-
- <para>When you select one of these entries, it modifies the
- default options displayed in the <guilabel>Boot Options</guilabel>
- line.</para>
-
- <note>
- <para>In some Mageia releases, it may happen that the entries
- selected with <emphasis role="bold">F6</emphasis> do not appear
- in the <guilabel>Boot Options</guilabel> line, despite this,
- they will in fact be applied.</para>
- </note>
-
- <mediaobject>
- <imageobject>
- <imagedata fileref="dx-welcome6opt.png"/>
- </imageobject>
- </mediaobject>
- </listitem>
-
- <listitem>
- <para>Pressing <emphasis role="bold">F1</emphasis> opens a help
- window for various boot options. Select an item with the arrow
- keys and press <emphasis role="bold">Enter</emphasis> for more
- details or press <emphasis role="bold">Esc</emphasis> to go back
- to the welcome screen.</para>
-
- <mediaobject>
- <imageobject>
- <imagedata fileref="dx-welcomeHelp1.png"/>
- </imageobject>
- </mediaobject>
-
- <para>The detailed view about the splash option. Press <emphasis
- role="bold">Esc</emphasis> or select <guilabel>Return to Boot
- Options</guilabel> to go back to the options list. These options
- can be added by hand in the <guilabel>Boot Options</guilabel>
- line.</para>
-
- <mediaobject>
- <imageobject>
- <imagedata fileref="dx-welcomeHelp2.png"/>
- </imageobject>
- </mediaobject>
-
- <note>
- <para>The help is translated in the chosen language with
- <emphasis role="bold">F2</emphasis>.</para>
- </note>
-
- <para>For more information about kernel options on legacy and UEFI
- systems, see: <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>
+ <para>In UEFI mode you have only two menu options to choose from:</para>
+ <itemizedlist>
+ <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>
+ </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>
- <title>The installation steps</title>
-
- <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>
-
- <para>Each step has one or more screens which may also have
- <guibutton>Advanced</guibutton> sections with extra, less commonly
- required, options.</para>
-
- <para>Most screens have <guibutton>Help</guibutton> buttons for further
- details about the particular step.</para>
-
- <note>
- <para>If at some points during the install you decide to stop the
- installation, it is possible to reboot, but please think twice before
- you do this. Once a partition has been formatted or updates have started
- to be installed, your computer is no longer in the same state and
- rebooting it could very well leave you with an unusable system. If in
- spite of this you are very sure rebooting is what you want, go to a text
- terminal by pressing the three keys <guibutton>Alt Ctrl F2</guibutton>
- at the same time. After that, press <guibutton>Alt Ctrl
- Delete</guibutton> simultaneously to reboot.</para>
- </note>
- </section>
-
<section>
<title>Installation Problems and Possible Solutions</title>
-
<section>
<title>No Graphical Interface</title>
-
<itemizedlist>
<listitem>
- <para>After the initial screen you did not reach the language
- selection screen. This can happen with some graphic cards and older
- systems. Try using low resolution by typing <code>vgalo</code> at
- the prompt.</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>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 <emphasis role="bold">Esc</emphasis>
- at the first welcome screen and confirm with <emphasis
- role="bold">ENTER</emphasis>. You will be presented with a black
- screen with the word "boot:". Type "text" and press <emphasis
- role="bold">ENTER</emphasis> to continue with the installation in
- text mode.</para>
+ 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>
-
<section>
<title>The Install Freezes</title>
-
<para>If the system appeared to freeze during the installation, this may
be a problem with hardware detection. In this case the automatic
- detection of hardware may be bypassed and dealt with later. To try this,
- type <code>noauto</code> at the prompt. This option may also be combined
- with other options as necessary.</para>
+ 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 problem</title>
-
<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 <code>mem=xxxM</code> parameter, where xxx is the correct amount
- of RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM.</para>
+ 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>Dynamic partitions</title>
-
- <para>If you converted your hard disk from <emphasis
- role="bold">basic</emphasis> format to <emphasis
- role="bold">dynamic</emphasis> format in Microsoft Windows, then it is
- not possible to install Mageia on this disc. To revert to a basic 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>
+ <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>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/en/login.xml b/docs/docs/stable/installer/en/login.xml
index be1a0f7b..01abae73 100644
--- a/docs/docs/stable/installer/en/login.xml
+++ b/docs/docs/stable/installer/en/login.xml
@@ -1,3 +1,18 @@
-<?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"><info><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>KDM login screen</para></caption></mediaobject><para>Finally, you will come to the login screen.</para><para>Enter your user name and user password, and in a few seconds you will
- find yourself with a loaded KDE or GNOME desktop, depending on which live
- medium you used. You can now start using your Mageia installation.</para><para>You can find another part of our documentation in <link linkend="https://wiki.mageia.org/en/Category:Documentation">the Mageia wiki</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">
+ <!--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.-->
+ <info>
+ <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/en/media_selection.xml b/docs/docs/stable/installer/en/media_selection.xml
index ea03fb55..78d8cc39 100644
--- a/docs/docs/stable/installer/en/media_selection.xml
+++ b/docs/docs/stable/installer/en/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="en">
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" xml:id="media_selection" xml:lang="en"
+ 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">Media Selection (Nonfree)</title>
+ <title xml:id="media_selection-ti1">Nonfree Media</title>
</info>
<!-- papoteur 2013-04-11 - created -->
@@ -11,9 +18,12 @@
<!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
+ <!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
+
<mediaobject>
<imageobject>
- <imagedata format="PNG" xml:id="media_selection-im1" align="center" revision="1" fileref="dx2-media_selection.png"/>
+ <imagedata align="center" fileref="dx2-media_selection.png" format="PNG"
+ revision="1" xml:id="media_selection-im1"/>
</imageobject>
</mediaobject>
@@ -32,7 +42,7 @@
<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 ATI graphics card proprietary drivers,
+ repository includes nVidia and AMD graphics card proprietary drivers,
firmware for various WiFi cards, etc.</para>
</listitem>
diff --git a/docs/docs/stable/installer/en/minimal-install.xml b/docs/docs/stable/installer/en/minimal-install.xml
index d6696c6a..7db26ff6 100644
--- a/docs/docs/stable/installer/en/minimal-install.xml
+++ b/docs/docs/stable/installer/en/minimal-install.xml
@@ -1,4 +1,4 @@
-<?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 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">
<info>
<title xml:id="minimal-install-ti1">Minimal Install</title>
</info>
@@ -8,26 +8,39 @@
<!--2013-05-05 marja - added screenshot and s/next/related/ -->
- <para>You can choose a Minimal Installation by de-selecting everything in
- the Package Group Selection screen, see <xref linkend="choosePackageGroups"/>.</para>
+ <!--2018/02/12 apb: Text and typography.-->
- <para>If desired, you can additionally tick the <emphasis role="bold">Individual package selection</emphasis> option in the same
- screen.</para>
+ <!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
- <para>Minimal Installation is intended for those with specific uses in mind
- for <application>Mageia</application>, such as a server or a specialised
- workstation. You will probably use this option combined with the <emphasis role="bold">Individual package selection</emphasis> option mentioned above,
- to fine-tune your installation, see <xref linkend="choosePackagesTree"/>.</para>
-
- <para>If you choose this installation method, then the relevant screen will
- offer you a few useful extras to install, such as documentation and
- X.</para>
+ <!--2018/02/22 apb: Added xreflabel to this section.-->
- <para>If <emphasis role="bold">With X</emphasis> is chosen, then IceWM (a
- lightweight desktop environment) will also be included.</para>
-
- <para>The basic documentation is provided in the form of man and info pages.
- It contains the man pages from the <link xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
+ <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
Project</link> and the <link xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
coreutils</link> info pages.</para>
diff --git a/docs/docs/stable/installer/en/misc-params.xml b/docs/docs/stable/installer/en/misc-params.xml
index 9df3ff00..c4019229 100644
--- a/docs/docs/stable/installer/en/misc-params.xml
+++ b/docs/docs/stable/installer/en/misc-params.xml
@@ -1,21 +1,30 @@
<?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:id="misc-params">
<info>
- <title xml:id="misc-params-ti1">Summary of miscellaneous
- parameters</title>
+ <title xml:id="misc-params-ti1">Configuration Summary</title>
</info>
<!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
+ <!--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-->
+
<mediaobject>
<imageobject>
- <imagedata fileref="dx2-summaryTop.png"/>
+ <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 <guibutton>Configure</guibutton>.</para>
+ you want by pressing <emphasis>Configure</emphasis>.</para>
<note>
<para>As a general rule, it is recommended that you accept the default
@@ -29,8 +38,8 @@
</listitem>
<listitem>
- <para>some other factor mentionned in the detailed sections below is
- an issue.</para>
+ <para>some other factor mentioned in the detailed sections below is
+ an issue</para>
</listitem>
</itemizedlist></para>
</note>
@@ -42,16 +51,15 @@
<itemizedlist>
<listitem>
- <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Timezone</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 selects a
- time zone for you, depending on your preferred language. You can
- change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
+ 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>Country /
- Region</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">If the selected
country is wrong, it is very important that you correct the setting.
@@ -59,29 +67,28 @@
</listitem>
<listitem>
- <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Bootloader</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 has made
- good choices for the bootloader setting.</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">Do not change
- anything, unless you know how to configure GRUB2</para>
-
- <para xml:id="misc-params-system-pa4c" revision="2">For more
+ anything, unless you know how to configure GRUB2. For more
information, see <xref linkend="setupBootloader"/></para>
+
+ <!-- revision="2" xml:id="misc-params-system-pa4c"-->
</listitem>
<listitem>
- <para xml:id="misc-params-system-pa5" revision="1"><guilabel>User
- management</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">You can add extra
- users here. They will each get their own <literal>/home</literal>
- directories.</para>
+ 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>Services</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">System services
refer to those small programs which run in the background (daemons).
@@ -89,9 +96,7 @@
<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.</para>
-
- <para>For more information, see <xref linkend="configureServices"/></para>
+ computer from operating correctly. For more information, see <xref linkend="configureServices"/></para>
</listitem>
</itemizedlist>
</section>
@@ -103,7 +108,7 @@
<itemizedlist>
<listitem>
- <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Keyboard</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">Configure your
keyboard layout according to your location, language and type of
@@ -116,32 +121,33 @@
</listitem>
<listitem>
- <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Mouse</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">Here you can add
or configure other pointing devices, tablets, trackballs etc.</para>
</listitem>
<listitem>
- <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Sound
- card</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">The installer
- uses the default driver - if there is a default one. The option to
- select a different driver is only given when there is more than one
- driver for your card, but where none of them is the default
- one.</para>
+ 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>Graphical
- interface</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">This section
- allows you to configure your graphic card(s) and displays.</para>
+ 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">For more
- information, see <xref linkend="configureX_chooser"/>.</para>
+ <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
</listitem>
</itemizedlist>
@@ -160,12 +166,12 @@
<itemizedlist>
<listitem>
- <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Network</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">You can configure
your network here, but for network cards with non-free drivers it is
- better to do that after reboot, using the <application>Mageia Control
- Center</application>, if you have not yet enabled the Nonfree media
+ 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>
@@ -176,16 +182,16 @@
</listitem>
<listitem>
- <para xml:id="misc-params-network-pa4" revision="1"><guilabel>Proxies</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">A Proxy Server
- acts as an intermediary between your computer and the wider internet.
+ 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">You may need to
- consult your systems administrator to get the parameters you need to
- enter here.</para>
+ consult your systems administrator to obtain the parameters you need
+ to enter here.</para>
</listitem>
</itemizedlist>
</section>
@@ -197,32 +203,35 @@
<itemizedlist>
<listitem>
- <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Security
- Level</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">Here you set the
- Security level for your computer, in most cases the default setting
- (Standard) is adequate for general use.</para>
-
- <para xml:id="misc-params-security-pa1b" revision="1">Check the option
- which best suits your usage.</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>Firewall</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">A firewall is
- intended to be a barrier between your important data and the rascals
- out there on the internet who would compromise or steal it.</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">Select the
- services that you wish to have access to your system. Your selections
- will depend on what you use your computer for. For more information,
- see <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">Bear in mind
- that allowing everything (no firewall) may be very risky.</para>
+ that allowing <emphasis>everything</emphasis> (no firewall) may be
+ very risky.</para>
</warning>
</listitem>
</itemizedlist>
diff --git a/docs/docs/stable/installer/en/reboot.xml b/docs/docs/stable/installer/en/reboot.xml
index ba527d96..b638ad68 100644
--- a/docs/docs/stable/installer/en/reboot.xml
+++ b/docs/docs/stable/installer/en/reboot.xml
@@ -3,16 +3,18 @@
<title xml:id="reboot-ti1">Reboot</title>
</info>
<!--Lebarhon 20170210 updated for Mageia6-->
- <para>Once the bootloader has been installed, you will be prompted to halt
- your computer, remove the live CD and restart the computer, click on
- <emphasis role="bold"><guibutton>Finish</guibutton></emphasis> and act as
- asked<emphasis role="bold"> in this order!</emphasis></para>
+ <!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
+ <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"/>
+ <imagedata align="center" fileref="live-reboot2.png"/>
</imageobject>
</mediaobject>
- <para>When you restart, you will see a succession of download progress bars. These indicate that the software media lists are being downloaded (see Software management).</para>
+ <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"/>
diff --git a/docs/docs/stable/installer/en/securityLevel.xml b/docs/docs/stable/installer/en/securityLevel.xml
index 72aae2b3..e7a8c0ae 100644
--- a/docs/docs/stable/installer/en/securityLevel.xml
+++ b/docs/docs/stable/installer/en/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:id="securityLevel">
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" 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">Security Level</title>
</info>
@@ -7,29 +14,34 @@
<!-- 2013-05-05 marja - added screenshot -->
+ <!--2018/02/12 apb: Minor wording.-->
+
<mediaobject>
<imageobject>
- <imagedata format="PNG" xml:id="securityLevel-im1" align="center" fileref="dx2-securityLevel.png" revision="1"/>
+ <imagedata align="center" fileref="dx2-securityLevel.png" format="PNG"
+ revision="1" xml:id="securityLevel-im1"/>
</imageobject>
</mediaobject>
<para><emphasis role="bold">Please choose the desired security
level</emphasis></para>
- <para xml:id="securityLevel-pa1" revision="1"><emphasis role="bold">Standard</emphasis> is the default, and recommended setting for
- the average user. The <emphasis role="bold">Secure</emphasis> setting will
- create a highly protected system - for instance if the system is to be used
- as a public server.</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">Security Administrator</emphasis></para>
- <para xml:id="securityLevel-pa2" revision="1">This item allows you to
+ <para revision="1" xml:id="securityLevel-pa2">This item allows you to
configure an email address to which the system will send <emphasis>security
alert messages</emphasis> when it detects situations which require
notification to a system administrator.</para>
<para>A good, and easy-to-implement, choice is to enter
- &lt;user>@localhost - where &lt;user> is the login name of the user to
+ &lt;user&gt;@localhost - where &lt;user&gt; is the login name of the user to
receive these messages.</para>
<note>
@@ -38,7 +50,7 @@
therefore be configured for receiving such mail!</para>
</note>
- <para revision="2" xml:id="securityLevel-pa3">After install, it will always
- be possible to adjust your security settings in the
- <guilabel>Security</guilabel> section of the Mageia Control Center.</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/en/selectCountry.xml b/docs/docs/stable/installer/en/selectCountry.xml
index 6450e3a2..cf723f4e 100644
--- a/docs/docs/stable/installer/en/selectCountry.xml
+++ b/docs/docs/stable/installer/en/selectCountry.xml
@@ -1,31 +1,40 @@
-<?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 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">
<info>
<title xml:id="selectCountry-ti1">Select your Country / Region</title>
</info>
<!-- 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.-->
+
<mediaobject>
<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">Select your country or region.
- This is important for all kinds of settings, like the currency and wireless
- regulatory domain. Setting the wrong country can lead to not being able to
- use a Wireless network.</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">If your country isn't in the
- list, click the <guilabel>Other Countries</guilabel> option and choose your
- country / region there.</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">If your country is only in
- the <guilabel>Other Countries</guilabel> list, after clicking
- <guibutton>OK</guibutton> it may seem that a country from the first list
- was chosen. Please ignore this, as DrakX will apply your actual
- choice.</para>
+ 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">
@@ -33,8 +42,8 @@
<title xml:id="inputMethod-ti7">Input method</title>
</info>
- <para xml:id="selectCountry-pa4" revision="1">In the <guilabel>Other
- Countries</guilabel> screen you can also select an input method (at the
+ <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
@@ -43,10 +52,13 @@
<note>
<para xml:id="selectCountry-pa5" revision="1">If you missed the input
- method setup during installation, you can access it after you boot your
- installed system via <emphasis role="bold">Configure your
- Computer</emphasis> -> <emphasis role="bold">System</emphasis>, or by
- running localedrake as root.</para>
+ 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/en/selectInstallClass.xml b/docs/docs/stable/installer/en/selectInstallClass.xml
index 91befa12..76523855 100644
--- a/docs/docs/stable/installer/en/selectInstallClass.xml
+++ b/docs/docs/stable/installer/en/selectInstallClass.xml
@@ -1,4 +1,11 @@
-<?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:id="selectInstallClass">
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" 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">
<!-- Made by marja on 2012 03 18 -->
<!-- 20120405 updated JohnR -->
@@ -10,58 +17,62 @@
<!-- 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.-->
+
<info>
<title xml:id="selectInstallClass-ti1">Install or Upgrade</title>
</info>
<mediaobject>
<imageobject>
- <imagedata format="PNG" align="center" fileref="dx2-selectInstallClass.png"/>
+ <imagedata align="center" fileref="dx2-selectInstallClass.png"
+ format="PNG"/>
</imageobject>
</mediaobject>
- <itemizedlist>
+ <itemizedlist spacing="compact">
<listitem>
- <para>Install</para>
+ <para><emphasis role="bold">Install</emphasis></para>
- <para>Use this option to perform a fresh installation of
- <application>Mageia</application>. This will format the root partition
- (/), but can preserve a separated /home partition.</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>Upgrade</para>
-
- <para>This can be used to upgrade an existing installation of
- <application>Mageia</application>.</para>
-
- <warning>
- <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 End Of Life, then it is better to do a
- clean install instead while preserving your <literal>/home</literal>
- partition.</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>If during install you decide to stop the installation, it is
- possible to reboot, but please think twice before you do this. Once a
- partition has been formatted or updates have started to be installed, your
- computer isn't in the same state anymore and rebooting it could very well
- leave you with an unusable system. If in spite of that, and only if you
- are very sure rebooting is what you want, go to a text terminal by
- pressing <guilabel>Alt Ctrl F2</guilabel> simultaneously. After that,
- press <guilabel>Alt Ctrl Delete</guilabel> simultaneously to
- reboot.</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>If you have discovered that you forgot to select an additional
- language, you can return from the <emphasis role="bold">Install or
- Upgrade</emphasis> screen to the language choice screen by pressing
- <guilabel>Alt Ctrl Home</guilabel> simultaneously. <emphasis role="bold">Do not</emphasis> do this later in the install.</para>
+ 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/en/selectKeyboard.xml b/docs/docs/stable/installer/en/selectKeyboard.xml
index 2913109f..9c2b06ad 100644
--- a/docs/docs/stable/installer/en/selectKeyboard.xml
+++ b/docs/docs/stable/installer/en/selectKeyboard.xml
@@ -1,52 +1,66 @@
-<?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 version="1.0" encoding="UTF-8"?>
+<section version="5.0" 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">
<!-- 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).-->
+
<info>
<title xml:id="selectKeyboard-ti1">Keyboard</title>
</info>
- <para xml:id="selectKeyboard-pa1" revision="1">DrakX selects an appropriate
+ <para revision="1" xml:id="selectKeyboard-pa1">DrakX selects an appropriate
keyboard for your language. If no suitable keyboard is found it will default
to a US keyboard layout.</para>
<mediaobject>
<imageobject>
- <imagedata fileref="dx2-selectKeyboard.png" align="center"/>
+ <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
</imageobject>
</mediaobject>
<itemizedlist>
<listitem>
- <para xml:id="selectKeyboard-pa2" revision="1">Make sure that the
+ <para revision="1" xml:id="selectKeyboard-pa2">Make sure that the
selection is correct or choose another keyboard layout. If you don't
know which layout your keyboard has, look in the specifications that
came with your system, or ask the computer vendor. There may even be a
label on the keyboard that identifies the layout. You can also look
- here: <link xlink:href="http://en.wikipedia.org/wiki/Keyboard_layout">en.wikipedia.org/wiki/Keyboard_layout</link></para>
+ here: <link
+ xlink:href="http://en.wikipedia.org/wiki/Keyboard_layout">en.wikipedia.org/wiki/Keyboard_layout</link></para>
</listitem>
<listitem>
- <para xml:id="selectKeyboard-pa3" revision="1">If your keyboard isn't in
- the list shown, click on <guibutton>More</guibutton> to get a fuller
- list, and select your keyboard there.</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"><warning>
+ <para revision="1"><note>
<para revision="1" xml:id="selectKeyboard-pa5">After choosing a
- keyboard from the <guibutton>More</guibutton> dialog, you'll return
- to the first keyboard choice dialog and it will seem as though a
+ keyboard from 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>
- </warning></para>
+ </note></para>
</listitem>
<listitem>
- <para xml:id="selectKeyboard-pa4" revision="1">If you choose a keyboard
+ <para revision="1" xml:id="selectKeyboard-pa4">If you choose a keyboard
based on non-Latin characters, you will see an extra dialogue screen
asking how you would prefer to switch between the Latin and non-Latin
keyboard layouts</para>
</listitem>
</itemizedlist>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/en/selectKeyboardLive.xml b/docs/docs/stable/installer/en/selectKeyboardLive.xml
index 05243493..770c06d2 100644
--- a/docs/docs/stable/installer/en/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/en/selectKeyboardLive.xml
@@ -1,15 +1,29 @@
-<?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:id="selectKeyboardLive">
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" 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">
+ <!--2018/03/01 apb: Slight adjustment to text-->
+
+ <!--2018/03/20 apb: Adjustment to text-->
+
<info>
- <title xml:id="selectKeyboardLive-ti1">Select keyboard</title>
+ <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"/>
+ <imagedata align="center" fileref="live-selectKeyboard.png" format="PNG"
+ revision="1" xml:id="selectKeyboardLive-im1"/>
</imageobject>
</mediaobject>
- <para>You will be required to set the keyboard layout you wish to use in
- Mageia​​. The default one is selected according to your language and
- timezone previously selected.</para>
-</section> \ No newline at end of file
+ <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/en/selectLanguage.xml b/docs/docs/stable/installer/en/selectLanguage.xml
index 9af2326e..5b520a53 100644
--- a/docs/docs/stable/installer/en/selectLanguage.xml
+++ b/docs/docs/stable/installer/en/selectLanguage.xml
@@ -1,4 +1,11 @@
-<?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:id="selectLanguage">
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" 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">
<!-- Made by marja on 2012 04 01, using barjac's text -->
<!-- NEEDS TO BE REVIEWED! -->
@@ -11,59 +18,82 @@
<!-- 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.-->
+
<info>
<title xml:id="selectLanguage-ti1">Please choose a language to use</title>
</info>
- <para condition="classical">Select your preferred language, by first
- expanding the list for your continent. <application>Mageia</application>
- will use this selection during the installation and for your installed
- system.</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">Select your preferred language.
- <application>Mageia</application> will use this selection during the
- installation and for your installed system.</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">If it is likely that you (or others) will
- require several languages to be installed on your system, then you should
- use the <guibutton>Multiple languages</guibutton> option to add them now. It
- will be difficult to add extra language support after installation.</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"/>
+ <imagedata align="center" fileref="dx2-selectLanguage.png" format="PNG"/>
</imageobject>
<imageobject condition="live">
- <imagedata fileref="live-language.png" format=""/>
+ <imagedata align="center" fileref="live-language.png" format="PNG"/>
</imageobject>
</mediaobject>
- <warning condition="classical">
+ <important condition="classical">
<para>Even if you choose more than one language, you must first choose one
- as your preferred language in the first language screen. It will also be
- marked as chosen in the multiple languages screen.</para>
- </warning>
+ 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>If your keyboard language is not the same as your preferred
- language, then it is advisable to install the language of your keyboard
- as well.</para>
+ language, then it is advisable to install the required language for your
+ keyboard as well</para>
</listitem>
<listitem>
- <para>Mageia uses UTF-8 (Unicode) support by default.</para>
-
- <para condition="classical">This may be disabled in the <emphasis role="bold">Multiple languages</emphasis> screen if you know that it is
- inappropriate for your language. Disabling UTF-8 applies to all
- installed languages.</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>You can change the language of your system after installation in
- the Mageia Control Center -> System -> Manage localization for
- your system.</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/en/selectMouse.xml b/docs/docs/stable/installer/en/selectMouse.xml
index ab6becac..43b2736f 100644
--- a/docs/docs/stable/installer/en/selectMouse.xml
+++ b/docs/docs/stable/installer/en/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 version="1.0" encoding="utf-8"?>
+<section version="5.0" 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">Select mouse</title>
</info>
@@ -7,22 +13,32 @@
<!-- 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 -->
-
- <mediaobject>
- <imageobject>
- <imagedata fileref="dx2-selectMouse.png" align="center" format="PNG"
- >
- </imagedata>
- </imageobject>
- </mediaobject>
- <para revision="2" xml:id="selectMouse-pa1">If you are not happy with how your mouse responds, you can select a different one here.</para>
+ <!--2018/02/15 apb: Text and typography.-->
+
+ <mediaobject>
+ <imageobject>
+ <imagedata align="center" fileref="dx2-selectMouse.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+
+ <para revision="2" xml:id="selectMouse-pa1">If you are not happy with how
+ your mouse responds, you can select a different one here.</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-pa2">Usually, <guilabel>Universal</guilabel> - <guilabel>Any PS/2 and USB mice</guilabel> is a good choice.</para>
+ <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice>
+ <guimenu>Universal</guimenu>
- <para revision="2" xml:id="selectMouse-pa3">Select <guilabel>Universal</guilabel> - <guilabel>Force evdev</guilabel> to configure the buttons that do not work on a mouse with six or more buttons.</para>
+ <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/en/setupBootloader.xml b/docs/docs/stable/installer/en/setupBootloader.xml
index ff5fff22..d27036b4 100644
--- a/docs/docs/stable/installer/en/setupBootloader.xml
+++ b/docs/docs/stable/installer/en/setupBootloader.xml
@@ -1,169 +1,216 @@
-<?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:id="setupBootloader">
- <!---->
- <!--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
-
+<?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:id="setupBootloader">
+ <!--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-->
+ <!--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.-->
<info>
- <title xml:id="setupBootloader-ti1">Bootloader main options</title>
+ <title xml:id="setupBootloader-ti1">Bootloader</title>
</info>
<section>
- <title>Bootloader interface</title>
- <para>By default, Mageia uses exclusively:</para>
+ <title>Grub2</title>
<itemizedlist>
+ <title>Grub2 on Legacy MBR/GPT systems</title>
<listitem>
- <para>GRUB2 (with or without graphical menu) for a Legacy/MBR or
- Legacy/GPT system</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 for a UEFI system.</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>The Mageia graphical menus are nice :)</para>
- </tip>
+ <itemizedlist>
+ <title>Grub2-efi on UEFI systems</title>
+ <listitem>
+ <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI
+ system.</para>
+ </listitem>
+ <listitem>
+ <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>
+ </section>
+ <section>
+ <info>
+ <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+ </info>
<section>
- <title>GRUB2 on Legacy/MBR and Legacy/GPT systems</title>
+ <title>Bootloader main options</title>
<mediaobject>
<imageobject condition="classical">
- <imagedata fileref="dx2-setupBootloader.png" align="center"/>
+ <imagedata align="center" fileref="dx2-setupBootloader.png"/>
</imageobject>
+
<imageobject condition="live">
- <imagedata xml:id="setupBootloader-im1" fileref="live-setupBootloader.png"/>
+ <imagedata fileref="live-setupBootloader.png"
+ xml:id="setupBootloader-im1"/>
</imageobject>
</mediaobject>
- <para>Don't modify the <emphasis role="bold">Boot Device</emphasis>
- unless you really know what you are doing.</para>
+ <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>GRUB2-efi on UEFI systems</title>
- <para>With a UEFI system, the user interface is slightly different as you cannot choose between the <emphasis role="bold">with</emphasis> or
- <emphasis role="bold">without graphical menu</emphasis> options.</para>
+ <title>Bootloader Configuration</title>
<mediaobject>
- <imageobject condition="classical">
- <imagedata fileref="dx2-setupBootloader2.png" align="center"/>
- </imageobject>
- <imageobject condition="live">
- <imagedata fileref="live-setupBootloader2.png"/>
- </imageobject>
- </mediaobject>
- <para>If Mageia is the only system installed on your computer, the
- installer created an ESP (EFI System Partition) to house the bootloader
- (GRUB2-efi). If there are already UEFI operating systems installed on
- your computer (Windows 8 for example), the Mageia installer detects the
- existing ESP created by Windows and adds GRUB2-efi. Although it is
- possible to have several ESPs, only one is required (and advised),
- whatever the number of operating systems you have.</para>
- <para>Don't modify the <emphasis role="bold">Boot Device</emphasis>
- unless you really know what you are doing.</para>
- </section>
- </section>
- <section>
- <title xml:id="setupMageiaBootloader">Using a Mageia bootloader</title>
- <para>By default, and according to your system, Mageia writes one of the
- following:</para>
- <itemizedlist>
- <listitem>
- <para>a GRUB2 bootloader either into the MBR (Master Boot Record) of
- your first hard drive or in the BIOS boot partition.</para>
- </listitem>
- <listitem>
- <para>a GRUB2-efi bootloader into the ESP</para>
- </listitem>
- </itemizedlist>
- <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, click on <guibutton>Next</guibutton> and then untick the
- <emphasis role="bold">Probe Foreign OS</emphasis> option.</para>
- <mediaobject>
<imageobject condition="classical">
<imagedata align="center" fileref="dx2-setupBootloader3.png"/>
</imageobject>
+
<imageobject condition="live">
- <imagedata fileref="live-setupBootloader3.png" align="center"/>
+ <imagedata align="center" fileref="live-setupBootloader3.png"/>
</imageobject>
</mediaobject>
- </section>
- <section>
- <title>Using an existing bootloader</title>
- <para>The exact procedure for adding your Mageia system 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 and add it automatically. See the documentation for
- the operating system in question.</para>
- </section>
- <section>
- <title xml:id="setupChainLoading">Using chain loading</title>
- <para>If you don't want a bootable Mageia, but to chain-load it from
- another OS, click on <guibutton>Next</guibutton>, then on
- <guibutton>Advanced</guibutton> and tick the box <guilabel>Do not touch
- ESP or MBR</guilabel>.</para>
- <mediaobject>
+ <itemizedlist>
+ <listitem>
+ <para><emphasis role="bold">Default</emphasis></para>
+ <para>The operating system to started up by default</para>
+ </listitem>
+ <listitem>
+ <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><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 fileref="dx2-setupBootloader4.png" align="center"/>
+ <imagedata align="center" fileref="dx2-setupBootloader4.png"/>
</imageobject>
+
<imageobject condition="live">
- <imagedata fileref="live-setupBootloader4.png" align="center"/>
- </imageobject>
- </mediaobject>
- <para>You will get a warning that the bootloader is missing, ignore it by
- clicking <guibutton>OK</guibutton>.</para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="live-setupBootloader5.png"/>
+ <imagedata align="center" fileref="live-setupBootloader4.png"/>
</imageobject>
</mediaobject>
- </section>
- <section>
- <title>Options</title>
- <section>
- <title>First page</title>
- <para><itemizedlist><listitem><para><guilabel>Delay before booting the default image</guilabel>:
- This lets you set a delay in seconds before the default operating
- system is started up.</para></listitem><listitem><para><guilabel>Security</guilabel>: This allows you to set a
- password for the bootloader. This means a username and password
- will be required when booting to select a booting entry or change
- settings. The username is <emphasis role="bold">root</emphasis> and the password is the one chosen here-after.</para></listitem><listitem><para><guilabel>Password</guilabel>: Choose a password for the
- bootloader.</para></listitem><listitem><para><guilabel>Password (again)</guilabel>: Retype the password
- and DrakX will check that it matches with the one above.</para></listitem><listitem><para><guilabel>Advanced</guilabel></para><itemizedlist><listitem><para><guilabel>Enable ACPI:</guilabel> 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><guilabel>Enable SMP</guilabel>: This option
- enables/disables symmetric multiprocessing for multi core
- processors.</para></listitem><listitem><para><guilabel>Enable APIC</guilabel>: 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><guilabel>Enable Local APIC</guilabel>: Local APIC
- manages all external interrupts for a specific processor in an
- SMP system.</para></listitem></itemizedlist></listitem></itemizedlist></para>
- </section>
- <section>
- <title>Next page</title>
<itemizedlist>
<listitem>
- <para><guilabel>Default:</guilabel> Operating system started up by
- default</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><guilabel>Append:</guilabel> This option lets you pass the
- kernel information or tell the kernel to give you more information
- as it boots.</para>
- </listitem>
- <listitem>
- <para><guilabel>Probe foreign OS</guilabel>: see above <link linkend="setupMageiaBootloader">Using a Mageia
- bootloader</link></para>
- </listitem>
- <listitem>
- <para><guilabel>Advanced</guilabel><itemizedlist><listitem><para><guilabel>Video mode:</guilabel> 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 role="bold">Do not touch ESP or
- MBR</emphasis>: see above <link linkend="setupChainLoading">Using the chain
- loading</link></para></listitem></itemizedlist></para>
+ <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>Using an existing bootloader</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>Add or Modify a Boot Menu Entry</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/en/setupSCSI.xml b/docs/docs/stable/installer/en/setupSCSI.xml
index 77fca6b8..8ef8e575 100644
--- a/docs/docs/stable/installer/en/setupSCSI.xml
+++ b/docs/docs/stable/installer/en/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 version="1.0" encoding="utf-8"?>
+<section version="5.0" 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">Setup SCSI</title>
</info>
@@ -18,9 +25,14 @@
<!-- 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 -->
+ <!--2018/02/15 apb: Text and typography.-->
+
+ <!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+
<mediaobject>
<imageobject>
- <imagedata format="PNG" fileref="dx2-setupSCSI.png" align="center" xml:id="setupSCSI-im1" revision="1"/>
+ <imagedata align="center" fileref="dx2-setupSCSI.png" format="PNG"
+ revision="1" xml:id="setupSCSI-im1"/>
</imageobject>
</mediaobject>
@@ -29,9 +41,7 @@
to determine the correct drivers to use and subsequently fail to recognise
the drive.</para>
- <para revision="2" xml:id="setupSCSI-pa2">If this happens, you will need to
- manually tell DrakX which SCSI drive(s) you have.</para>
-
- <para xml:id="setupSCSI-pa3" revision="3">DrakX should then be able to
- configure the drive(s) correctly.</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/en/soundConfig.xml b/docs/docs/stable/installer/en/soundConfig.xml
index 516d6f05..ad271af5 100644
--- a/docs/docs/stable/installer/en/soundConfig.xml
+++ b/docs/docs/stable/installer/en/soundConfig.xml
@@ -1,28 +1,41 @@
-<?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 version="1.0" encoding="UTF-8"?>
+<section version="5.0" 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">Sound Configuration</title>
</info>
<!-- Lebarhon 20170209 updated SC-->
+ <!--2018/02/13 apb: Text and typography.-->
+
+ <!--2018/02/17 apb: Centre-align PNG-->
+
<mediaobject>
<imageobject>
- <imagedata format="PNG" fileref="dx2-soundConfig.png" xml:id="soundConfig-im1" revision="1"/>
+ <imagedata align="center" fileref="dx2-soundConfig.png" format="PNG"
+ revision="1" xml:id="soundConfig-im1"/>
</imageobject>
</mediaobject>
- <para>In this screen the name of the driver that the installer chose for
- your sound card is given, which will be the default driver if one
- exists.</para>
+ <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>The default driver should work without problems. However, if after
- install you do encounter problems, then run <command>draksound</command> or
- start this tool via MCC (Mageia Control Center), by choosing the
- <guilabel>Hardware</guilabel> tab and clicking on <guilabel>Sound
- Configuration</guilabel> at the top right of the screen.</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>
- <para>Then, in the <emphasis role="bold">draksound</emphasis> or <emphasis role="bold">Sound Configuration</emphasis> tool screen, click on
- <guibutton>Troubleshooting</guibutton> to find useful advice about how to
+ <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">
@@ -30,13 +43,10 @@
<title xml:id="soundConfig-Advanced-ti1">Advanced</title>
</info>
- <para>Clicking <emphasis role="bold"><guibutton>Advanced</guibutton></emphasis> in this screen,
- during install, is useful if there is no default driver and there are
- several drivers available, but you think the installer selected the wrong
- one.</para>
-
- <para>In that case you can select a different driver after clicking on
- <emphasis role="bold"><guibutton>Let me pick any
- driver</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/en/takeOverHdConfirm.xml b/docs/docs/stable/installer/en/takeOverHdConfirm.xml
index 53a614f5..a3289ace 100644
--- a/docs/docs/stable/installer/en/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/en/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 version="1.0" encoding="utf-8"?>
+<section version="5.0" 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">Confirm hard disk to be
formatted</title>
@@ -14,22 +21,35 @@
<!-- 2013-05-05 marja added screenshot -->
+ <!--2018/02/15 apb: Text and typography-->
+
+ <!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+
<mediaobject>
- <imageobject condition="live">
- <imagedata format="PNG" fileref="live-takeOverHdConfirm.png" align="center"/>
+ <imageobject condition="classical">
+ <imagedata align="center" fileref="dx2-takeOverHdConfirm.png"
+ format="PNG"/>
</imageobject>
- <imageobject condition="classical">
- <imagedata format="PNG" fileref="dx2-takeOverHdConfirm.png" align="center"/>
+ <imageobject condition="live">
+ <imagedata align="center" fileref="live-takeOverHdConfirm.png"
+ format="PNG"/>
</imageobject>
</mediaobject>
- <para xml:id="takeOverHdConfirm-pa1" revision="1">Click on
- <guibutton>Previous</guibutton> if you are at all unsure about your
- choice.</para>
-
- <para xml:id="takeOverHdConfirm-pa2" revision="1">Click on
- <guibutton>Next</guibutton> to proceed if you are sure that it is ok to
- erase every partition, every operating system and all data that might be on
- that hard disk.</para>
-</section> \ No newline at end of file
+ <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>
+
+ <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/en/testing.xml b/docs/docs/stable/installer/en/testing.xml
index a7758747..5f9d97fc 100644
--- a/docs/docs/stable/installer/en/testing.xml
+++ b/docs/docs/stable/installer/en/testing.xml
@@ -1,10 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<section version="5.0" xml:id="testing" 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" version="5.0" xml:id="testing">
<info>
<title xml:id="testing-ti1">Testing Mageia as Live system</title>
</info>
@@ -14,24 +8,23 @@
<title xml:id="testing1-ti1">Live mode</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>You get this screen if you selected "Boot Mageia". If not, you get
- the "<link linkend="doPartitionDisks">Partitioning</link> step"</para>
-
<section>
<info>
<title xml:id="testing2-ti1">Testing hardware</title>
</info>
- <para>One of the Live mode goals is to test if the hardware is
- correctly managed by Mageia. You can check if all devices have a driver in
- the Hardware section of the Mageia Control Center. You can test the most
- current devices:</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>
@@ -39,7 +32,7 @@
</listitem>
<listitem>
- <para>graphical card: if you see the previous screen, it's already
+ <para>graphics card: if you see the previous screen, it's already
OK.</para>
</listitem>
@@ -52,7 +45,7 @@
</listitem>
<listitem>
- <para>printer: configure it and print a test page</para>
+ <para>printer: configure your printer/s and print a test page</para>
</listitem>
<listitem>
@@ -60,11 +53,14 @@
</listitem>
</itemizedlist>
- <para>If all is OK for you, you can process to the installation. If not,
- you can leave with the quit button.</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>The configuration settings you made here are kept for the
- installation.</remark>
+ <note>
+ <para>The configuration settings you apply here are carried over if
+ you decide to proceed with the installation.</para>
+ </note>
</section>
<section>
@@ -72,17 +68,16 @@
<title xml:id="testing3-ti1">Launch installation</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>To launch the installation of Mageia LiveCD or Live DVD to the hard disc or
- SSD drive, simply click on the icon "Install on Hard Disk". You will get
- this screen, and then the "<link
- linkend="doPartitionDisks">Partitioning</link> step" as for the direct
- installation.</para>
</section>
</section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/en/uninstall-Mageia.xml b/docs/docs/stable/installer/en/uninstall-Mageia.xml
index 07b3c7d5..a8dacc17 100644
--- a/docs/docs/stable/installer/en/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/en/uninstall-Mageia.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" xml:id="uninstall-Mageia" version="5.0">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" 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">
<info>
<title xml:id="uninstall-Mageia-ti1">Uninstalling Mageia</title>
</info>
@@ -6,30 +13,43 @@
<!--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.-->
+
<para>If Mageia didn't convince you or you can't install it correctly - in
short you want get rid of it - that is your right and Mageia also gives you
the possibility to uninstall. This is not true for every operating
system.</para>
- <para>After your data backup, reboot your Mageia installation DVD and select
- <emphasis role="bold">Rescue system</emphasis>, then, <emphasis role="bold">Restore Windows boot loader</emphasis>. At the next boot, you
- will only have Windows, with no option to choose your operating
- system.</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>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>
- <para>In Windows to recover the space used by Mageia partitions: click on
- <code>Start -> Control Panel -> Administrative Tools -> Computer
- Management -> Storage -> Disk Management</code>. You will recognize a
- Mageia partition because they are labeled <guilabel>Unknown</guilabel>, and
- also by their size and place on the disk. Right click on each of these
- partitions and select <guibutton>Delete</guibutton> to free up the
- space.</para>
+ <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>If you are using Windows XP, you can create a new partition and format
- it (FAT32 or NTFS). It will get a partition letter.</para>
+ it (FAT32 or NTFS). It will then get a partition letter.</para>
<para>If you have Vista or 7, you have one more possibility, you can extend
the existing partition that is at the left of the freed space. There are
- other partitioning tools that can be used, such as <emphasis role="bold">gparted</emphasis>, available for both Windows and Linux. As
+ other partitioning tools that can be used, such as <emphasis
+ role="bold">gparted</emphasis>, available for both Windows and Linux. As
always, when changing partitions, be very careful to back up anything
important to you.</para>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/en/unused.xml b/docs/docs/stable/installer/en/unused.xml
index 51fb643a..4f4b8601 100644
--- a/docs/docs/stable/installer/en/unused.xml
+++ b/docs/docs/stable/installer/en/unused.xml
@@ -1,25 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<section version="5.0" 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">
<info>
<title xml:id="unused-ti1">Keep or delete unused material</title>
</info>
+ <!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+
<mediaobject condition="live">
<imageobject>
- <imagedata align="center" fileref="live-unused.png" format="PNG"
- revision="1" xml:id="unused-im1"/>
+ <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. Then it proposes you to delete them. It is a good
- idea to accept, except if you prepare an installation which has to run on
- different hardware.</para>
+ 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>Clicking <emphasis>Advanced</emphasis> will list the unused hardware
+ and localization files that will be removed if you proceed.</para>
<mediaobject>
<imageobject>
@@ -27,7 +28,7 @@
</imageobject>
</mediaobject>
- <para>The next step is the copying of files on hard disk. This takes some
- minutes. At the end, you get a blank screen for some time, it's
- normal.</para>
-</section>
+ <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 finising you will
+ briefly get a blank screen - this is normal.</para>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/help.pot b/docs/docs/stable/installer/help.pot
index d73c8dda..d8153b45 100644
--- a/docs/docs/stable/installer/help.pot
+++ b/docs/docs/stable/installer/help.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia Installer Help 6.0\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2018-04-19 16:32+0300\n"
+"POT-Creation-Date: 2019-01-06 12:43+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,12 +18,12 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: <section><info><title>
-#: en/acceptLicense.xml:25
+#: en/acceptLicense.xml:31
msgid "License and Release Notes"
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/acceptLicense.xml:29
+#: en/acceptLicense.xml:35
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" "
"xml:id=\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" "
@@ -33,67 +33,68 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:40
+#: en/acceptLicense.xml:46
msgid "License Agreement"
msgstr ""
-#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:43
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/acceptLicense.xml:51
msgid ""
-"Before installing <application>Mageia</application>, please read the license "
-"terms and conditions carefully."
+"Before installing Mageia, please read the license terms and conditions "
+"carefully."
msgstr ""
-#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:46
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/acceptLicense.xml:56
msgid ""
-"These terms and conditions apply to the entire "
-"<application>Mageia</application> distribution and must be accepted before "
-"you can continue."
+"These terms and conditions apply to the entire Mageia distribution and must "
+"be accepted before you can continue."
msgstr ""
-#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:50
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/acceptLicense.xml:61
msgid ""
-"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
-"<guibutton>Next</guibutton>."
+"To proceed, simply select <emphasis>Accept</emphasis> and then click on "
+"<emphasis>Next</emphasis>"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:53
+#: en/acceptLicense.xml:66
msgid ""
-"If you decide not to accept these conditions, then we thank you for "
-"looking. Clicking <guibutton>Quit</guibutton> will reboot your computer."
+"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."
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:63
+#: en/acceptLicense.xml:76
msgid "Release Notes"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:70
+#: en/acceptLicense.xml:83
msgid ""
-"Important information about this release of "
-"<application>Mageia</application> can be viewed by clicking on the "
-"<guibutton>Release Notes</guibutton> button."
+"Important information about this particular Mageia release can be viewed by "
+"clicking on the <emphasis>Release Notes</emphasis> button."
msgstr ""
#. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1 en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:2 en/DrakX-cover.xml:3 en/DrakX.xml:3 en/media_selection.xml:2
msgid "en"
msgstr ""
#. type: Content of: <section><info><title>
#: en/add_supplemental_media.xml:3
-msgid "Media Selection (Configure Supplemental Installation Media)"
+msgid "Supplemental Installation Media"
msgstr ""
#. 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
#. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:14
+#: en/add_supplemental_media.xml:18
msgid ""
"<imageobject> <imagedata format=\"PNG\" "
"fileref=\"dx2-add_supplemental_media.png\" "
@@ -102,145 +103,165 @@ msgid ""
msgstr ""
#. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:19
+#: en/add_supplemental_media.xml:23
msgid ""
-"This screen shows you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. "
+"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 "
-"next steps."
+"subsequent steps."
msgstr ""
#. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:28
msgid "For a network source, there are two steps to follow:"
msgstr ""
#. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:28
-msgid "Choosing and activation of the network, if not already up."
+#: en/add_supplemental_media.xml:32
+msgid "Choosing and activating the network, if not already up."
msgstr ""
#. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:32
+#: en/add_supplemental_media.xml:36
msgid ""
"Selecting a mirror or specifying a URL (very first entry). By selecting a "
"mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
-"role=\"bold\">Tainted</emphasis> repositories and the <emphasis "
-"role=\"bold\">Updates</emphasis>. With the URL, you can designate a specific "
+"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."
msgstr ""
#. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:42
+#: en/add_supplemental_media.xml:46
msgid ""
-"If you are updating a 64 bit installation which may contain some 32 bit "
+"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 "
-"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
-"64-bit and noarch 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."
+"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."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/addUser.xml:3
-msgid "User and Superuser Management"
+#: en/addUser.xml:9
+msgid "User Management"
msgstr ""
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
+#. 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.
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:24
msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" "
-"fileref=\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" "
+"<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>"
+"fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:36
msgid "Set Administrator (root) Password:"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:40
msgid ""
-"It is advisable for all <application>Mageia</application> installations to "
-"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
-"usually called the <emphasis>root password</emphasis> 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."
+"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."
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:49
msgid ""
-"All passwords are case sensitive. It is best to use a mixture of letters "
+"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."
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:57
msgid "Enter a user"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:60
msgid ""
-"Add a user here. A regular user has fewer privileges than the <emphasis "
-"role=\"bold\">superuser</emphasis> (root), but enough to use the internet, "
-"office applications or play games and anything else the average user might "
-"use their computer for."
+"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."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
-msgid ""
-"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"user's icon."
+#: en/addUser.xml:67
+msgid "<emphasis role=\"bold\">Icon</emphasis>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
-msgid ""
-"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
-"box."
+#: en/addUser.xml:69
+msgid "Click on this button if you want to change the user's icon"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:62
+#: en/addUser.xml:74
+msgid "<emphasis role=\"bold\">Real Name</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:76
+msgid "Insert the user's real name into this text box"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:80
+msgid "<emphasis role=\"bold\">Login Name</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:82
msgid ""
-"<guilabel>Login Name</guilabel>: 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>"
+"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>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:88 en/setupBootloader.xml:87
+msgid "<emphasis role=\"bold\">Password</emphasis>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:90
msgid ""
-"<guilabel>Password</guilabel>: 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\"/>)"
+"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\"/>)"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:94
msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
-"check that you have not mistyped the password."
+"<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
+"password. DrakX will check that you have not mistyped the password."
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:101
msgid ""
-"Any users you added while installing Mageia, will have a home directory that "
-"is both read and write protected (umask=0027)."
+"Any users added while installing Mageia, will have a home directory that is "
+"both read and write protected (umask=0027)"
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:82
+#: en/addUser.xml:104
msgid ""
"You can add any extra needed users in the <emphasis>Configuration - "
"Summary</emphasis> step during the install. Choose <emphasis>User "
@@ -248,48 +269,47 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:86
+#: en/addUser.xml:108
msgid "The access permissions can also be changed after the install."
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:93
-msgid "Advanced User Management"
+#: en/addUser.xml:115
+msgid "User Management (advanced)"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/addUser.xml:96
+#: en/addUser.xml:118
msgid ""
-"The <guibutton>Advanced</guibutton> option allows you to edit further "
-"settings for the user you are adding."
+"The <emphasis>Advanced</emphasis> option allows you to edit further settings "
+"for the user you are adding."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:123
msgid ""
-"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"<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 "
-"<emphasis role=\"bold\">Bash</emphasis>, <emphasis "
-"role=\"bold\">Dash</emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
+"<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:107
+#: en/addUser.xml:130
msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the <emphasis "
-"role=\"bold\">user ID</emphasis> for any user you added in the previous "
-"screen. If you are unsure what the purpose of this is, then leave it blank."
+"<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."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:113
+#: en/addUser.xml:136
msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the <emphasis "
-"role=\"bold\">group ID</emphasis>. Again, if unsure, leave it blank."
+"<emphasis>Group ID</emphasis>: This lets you set the group ID. Again, if "
+"unsure, leave it blank."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:3
+#: en/ask_mntpoint_s.xml:10
msgid "Choose the mount points"
msgstr ""
@@ -304,323 +324,419 @@ msgstr ""
#. 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
+#. 2018/02/12 apb: Text and typography.
+#. 2019/01/04 apb: Typo & minor reword on custom mount-points.
#. type: Content of: <section><mediaobject>
-#: en/ask_mntpoint_s.xml:27
+#: en/ask_mntpoint_s.xml:38
msgid ""
-"<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>"
+"<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>"
msgstr ""
#. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:36
+#: en/ask_mntpoint_s.xml:49
msgid ""
"Here you see the Linux partitions that have been found on your computer. If "
-"you don't agree with the <application>DrakX</application> suggestions, you "
-"can change the mount points."
-msgstr ""
-
-#. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:41
-msgid ""
-"If you change anything, make sure you still have a <emphasis "
-"role=\"bold\"><literal>/</literal></emphasis> (root) partition."
+"you don't agree with the DrakX suggestions, you can change the mount points "
+"yourself."
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:46
+#: en/ask_mntpoint_s.xml:55
msgid ""
-"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
-"(capacity, mount point, type).</emphasis>"
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:50
-msgid ""
-"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis "
-"role=\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive "
-"name</emphasis> (letter)], <emphasis role=\"bold\">partition "
-"number</emphasis> (for example, <emphasis role=\"bold\">sda5</emphasis>)."
+"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."
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:56
+#: en/ask_mntpoint_s.xml:63
msgid ""
-"If you have several partitions, you can choose various different mount "
-"points from the drop down menu, such as <emphasis "
-"role=\"bold\">/</emphasis>, <emphasis "
-"role=\"bold\"><literal>/home</literal></emphasis> and <emphasis "
-"role=\"bold\">/var</emphasis>. You can even make your own mount points, for "
-"instance <emphasis role=\"bold\"><literal>/video</literal></emphasis> for a "
-"partition where you want to store your films, or <emphasis "
-"role=\"bold\">/Data</emphasis> (or some other name) for your data."
+"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."
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:63
+#: en/ask_mntpoint_s.xml:73
msgid ""
"For any partitions that you don't need to make use of, you can leave the "
"mount point field blank."
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:79
+msgid ""
+"If you make any changes here, ensure you still have a <filename>/</filename> "
+"(root) partition."
+msgstr ""
+
+#. type: Content of: <section><tip><para>
+#: en/ask_mntpoint_s.xml:84
msgid ""
-"If you are not sure what to choose, click <emphasis "
-"role=\"bold\">Previous</emphasis> to go back and then tick <guilabel>Custom "
-"disk partitioning</guilabel>, where, you can click on a partition to see its "
-"type and size."
+"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."
msgstr ""
#. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:74
+#: en/ask_mntpoint_s.xml:90
msgid ""
"If you are sure the mount points are correct, click on "
-"<guibutton>Next</guibutton>, and choose whether you only want to format the "
-"partition(s) DrakX suggests, or more."
+"<emphasis>Next</emphasis>, and choose whether you only want to format the "
+"partition suggested by DrakX, or more."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/bestTime.xml:10
-msgid "Clock settings"
+#: en/bestTime.xml:5
+msgid "Clock Settings"
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/bestTime.xml:14
+#: en/bestTime.xml:8
msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" "
+"fileref=\"live-bestTime.png\" revision=\"1\" xml:id=\"bestTime-im1\"/> "
+"</imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/bestTime.xml:20
+#: en/bestTime.xml:12
msgid ""
-"In this step, you have to select on which time your internal clock is set, "
-"either local time or UTC time."
+"Here, you can select whether your computer internal clock is set to local "
+"time or UTC time."
msgstr ""
#. type: Content of: <section><para>
-#: en/bestTime.xml:23
-msgid "In advanced tab, you will find more options about clock settings."
+#: en/bestTime.xml:14
+msgid ""
+"In the <emphasis>Advanced</emphasis> tab, you can enable automatic time "
+"synchronization and specify an NTP server."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:6
msgid "Boot Mageia as Live system"
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:10
msgid "Booting the medium"
msgstr ""
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:1
-msgid "From a disc"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:1
+#. type: Content of: <section><section><para>
+#: en/bootLive.xml:12
msgid ""
-"You can boot directly from the media you used to burn your image (CD-ROM, "
-"DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the "
-"bootloader to launch the installation automatically after rebooting the "
-"computer. If that does not happen you may need to reconfigure your BIOS or "
-"press one key that will offer you to choose the peripheral from which the "
-"computer will boot."
+"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."
msgstr ""
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:6
+#. type: Content of: <section><section><para>
+#: en/bootLive.xml:15
msgid ""
-"According to which hardware you have, and how it is configured, you get "
-"either one or another of the two screens below."
+"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."
msgstr ""
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:7
-msgid "From a USB device"
+#. type: Content of: <section><section><tip><para>
+#: en/bootLive.xml:20
+msgid ""
+"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."
msgstr ""
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:7
+#. type: Content of: <section><section><note><para>
+#: en/bootLive.xml:28
msgid ""
-"You can boot from the USB device on which you dumped your image "
-"ISO. According to your BIOS settings, the computer boots perhaps directly on "
-"the USB device already plugged in a port. If that does not happen you may "
-"need to reconfigure your BIOS or press one key that will offer you to choose "
-"the peripheral from which the computer will boot."
+"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."
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:35
msgid "In BIOS/CSM/Legacy mode"
msgstr ""
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/bootLive.xml:38
+msgid "Main Menu"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:40 en/bootLive.xml:152
+msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:41
+msgid ""
+"This option will boot the Mageia Live system from the connected DVD/USB "
+"media (expect a very slow system compared to an installed OS)."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:42
+msgid "Once the boot is done, you can proceed to the installation."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:45 en/bootLive.xml:57
+msgid ""
+"<emphasis role=\"bold\">+ use non-free video drivers (slower to "
+"boot)</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:47
+msgid "Boot the Mageia Live system using non-free video drivers"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:53 en/bootLive.xml:156 en/installer.xml:65
+msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:54 en/bootLive.xml:157
+msgid "This option will install Mageia to a hard disk."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:59
+msgid "Install Mageia using non-free video drivers"
+msgstr ""
+
#. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:12
-msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+#: en/bootLive.xml:65
+msgid ""
+"<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
msgstr ""
#. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:69
msgid "First screen while booting in BIOS mode"
msgstr ""
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:12
-msgid "In the middle menu, you have the choice between three actions:"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/bootLive.xml:73
+msgid "Function Keys"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:75
+msgid "<keycap>F1</keycap> <emphasis role=\"bold\">Help</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:76
msgid ""
-"Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD "
-"or USB stick) without writing anything on the disk, so expect a very slow "
-"system. Once the boot is done, you can proceed to the installation on a hard "
-"disk."
+"Within any of the <keycap>F2</keycap> to <keycap>F6</keycap> options, you "
+"can view relevant help by pressing <keycap>F1</keycap>."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:16
-msgid "Install Mageia: This choice will directly install Mageia on a hard disk."
+#: en/bootLive.xml:81
+msgid "<keycap>F2</keycap> <emphasis role=\"bold\">Language</emphasis>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:17
+#: en/bootLive.xml:82
msgid ""
-"Boot from hard disk: This choice allows to boot from hard disk, as usual, "
-"when no media (CD/DVD or USB stick) is connected. (not working with Mageia "
-"5)."
+"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>."
msgstr ""
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:19
-msgid "In the bottom menu, are the Boot Options:"
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:87
+msgid "<keycap>F3</keycap> <emphasis role=\"bold\">Video Mode</emphasis>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:19
-msgid "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
+#: en/bootLive.xml:89
+msgid ""
+"If needed, change the screen resolution by pressing "
+"<keycap>F3</keycap>. Options are: 640x480, 800x600, 1024x768."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:20
-msgid "F2 - Language. Choose the display language of the screens."
+#: en/bootLive.xml:93
+msgid "<keycap>F4</keycap> <emphasis role=\"bold\">Source</emphasis>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:21
-msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
+#: en/bootLive.xml:94
+msgid ""
+"Normally, the installation is performed from the inserted installation "
+"medium. Here, you may select other sources, like FTP or NFS servers."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:22
+#: en/bootLive.xml:95
msgid ""
-"F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
-"the inserted installation medium. Here, select other sources, like FTP or "
-"NFS servers. If the installation is carried out in a network with an SLP "
-"server, select one of the installation sources available on the server with "
-"this option."
+"If the installation is carried out in a network with an SLP server, then "
+"select one of the installation sources available on the server with this "
+"option."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:26
+#: en/bootLive.xml:98
+msgid "<keycap>F5</keycap> <emphasis role=\"bold\">Driver</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:99
msgid ""
-"F5 - Driver. Yes or No. The system is aware about the presence of an "
-"optional disk with a driver update and will require its insertion during "
-"installation process."
+"If you have a driver update that you wish to use, select this option and "
+"then answer <emphasis>Yes</emphasis>. You will be prompted to insert the "
+"update disc at the appropriate time."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:104
+msgid "<keycap>F6</keycap> <emphasis role=\"bold\">Kernel Options</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:106
+msgid ""
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis>Kernel Option</emphasis> menu:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:111
msgid ""
-"F6 - Kernel options. This is a way to specify options according to your "
-"hardware and the drivers to use."
+"<emphasis role=\"bold\">Default:</emphasis> splash quiet noiswmd resume "
+"audit=0"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:114
+msgid ""
+"<emphasis role=\"bold\">Safe Settings:</emphasis> <literal>apm=off acpi=off "
+"mce=off barrier=off ide=nodma idewait=50 i8042.nomux psmouse.proto=bare "
+"irqpoll pci=nommconf</literal>"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:120
+msgid ""
+"<emphasis role=\"bold\">No ACPI:</emphasis> (Advanced Configuration and "
+"Power Interface): Power management features are not used."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:125
+msgid ""
+"<emphasis role=\"bold\">No Local APIC:</emphasis> (Local Advanced "
+"Programmable Interrupt Controller): CPU interrupt. Select this option if you "
+"experience system misbehaviour like a kernel panic in relation to APIC."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:131
+msgid ""
+"If you open any of the above <keycap>F6</keycap> menu items, and then click "
+"on <keycap>F1</keycap>, an info window will open to show more details for "
+"that particular item:"
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:139
msgid "In UEFI mode"
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:142
msgid ""
-"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
-"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:29
-msgid "First screen while booting on UEFI system from disk"
+#: en/bootLive.xml:146
+msgid "First screen while booting in UEFI mode"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/bootLive.xml:29
-msgid ""
-"You have only the choice to run Mageia in Live mode (first choice) or to "
-"process the installation (second choice)."
+#: en/bootLive.xml:149
+msgid "In UEFI mode, you have just the two menu options to choose from:"
msgstr ""
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:30
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:153
msgid ""
-"If you booted from a USB stick, you get two supplemental lines which are a "
-"duplicata of the previous lines suffixed with \"USB\". You have to choose "
-"them."
+"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"
msgstr ""
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:32
+#. type: Content of: <section><section><note><para>
+#: en/bootLive.xml:161
msgid ""
-"In each case, the first steps will be the same to choose language, timezone "
-"and keyboard, then the processes differ, with <link "
-"linkend=\"testing\">additional steps in Live mode</link>."
+"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\"."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:3
+#: en/chooseDesktop.xml:16
msgid "Desktop Selection"
msgstr ""
#. type: Content of: <section><para>
-#: en/chooseDesktop.xml:8
-msgid ""
-"Depending on your selection here, you may be offered further screens to "
-"fine-tune your choice."
+#: en/chooseDesktop.xml:23
+msgid "Some choices made here will open other screens with related options."
msgstr ""
#. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:26
msgid ""
-"After the selection step(s), you will see a slide-show during package "
-"installation. The slide show can be disabled by pressing the "
-"<guilabel>Details</guilabel> button"
+"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."
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:16
+#: en/chooseDesktop.xml:31
msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
-"align=\"center\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-chooseDesktop.png\" "
+"format=\"PNG\"/> </imageobject>"
msgstr ""
-#. type: Content of: <section><para>
-#: en/chooseDesktop.xml:21
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/chooseDesktop.xml:38
+msgid ""
+"Choose whether you prefer to use the KDE Plasma or GNOME desktop "
+"environment. Both come with a full set of useful applications and tools."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/chooseDesktop.xml:44
msgid ""
-"Choose whether you prefer to use the <application>KDE</application> "
-"<emphasis role=\"bold\">Plasma</emphasis> or "
-"<application>GNOME</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you wish to use neither (or even use both), or if you want to modify the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop, for instance, is lighter than the "
-"previous two, sporting less eye candy and fewer packages installed by "
-"default."
+"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."
msgstr ""
#. type: Content of: <section><info><title>
@@ -629,15 +745,16 @@ msgid "Package Group Selection"
msgstr ""
#. Lebarhon 20170209 Updated SC
+#. 2018/02/25 apb: add xreflabel to this section.
#. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:9
+#: en/choosePackageGroups.xml:11
msgid ""
"<imageobject> <imagedata format=\"PNG\" "
"fileref=\"dx2-choosePackageGroups.png\" align=\"center\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:14
+#: en/choosePackageGroups.xml:16
msgid ""
"Packages are arranged into common groups, to make choosing what you need on "
"your system a lot easier. The groups are fairly self explanatory, however "
@@ -646,29 +763,29 @@ msgid ""
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:21
+#: en/choosePackageGroups.xml:23
msgid "<emphasis role=\"bold\">Workstation</emphasis>"
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:25
+#: en/choosePackageGroups.xml:27
msgid "<emphasis role=\"bold\">Server</emphasis>"
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:29
+#: en/choosePackageGroups.xml:31
msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:33
+#: en/choosePackageGroups.xml:35
msgid ""
"<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can use "
"this option to manually add or remove packages"
msgstr ""
#. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:38
+#: en/choosePackageGroups.xml:40
msgid ""
"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
"minimal install (without or with X &amp; IceWM)."
@@ -680,28 +797,30 @@ msgid "Choose Individual Packages"
msgstr ""
#. 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.
#. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:9
+#: en/choosePackagesTree.xml:13
msgid ""
"<imageobject> <imagedata format=\"PNG\" "
"fileref=\"dx2-choosePackagesTree.png\" align=\"center\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:14
+#: en/choosePackagesTree.xml:18
msgid ""
"Here you can add or remove any extra packages to customize your "
"installation."
msgstr ""
#. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:21
msgid ""
-"After having made your choice, you can click on the <guibutton>floppy "
-"icon</guibutton> at the bottom of the page to save your choice of packages "
-"(saving to a USB key works, too). You can then use this file to install the "
-"same packages on another system, by pressing the same button during install "
-"and choosing to load it."
+"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."
msgstr ""
#. type: Content of: <section><info><title>
@@ -711,8 +830,10 @@ msgstr ""
#. 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.
#. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:11
+#: en/configureServices.xml:15
msgid ""
"<imageobject> <imagedata format=\"PNG\" "
"fileref=\"dx2-configureServices.png\" xml:id=\"configureServices-im1\" "
@@ -720,29 +841,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><para>
-#: en/configureServices.xml:16
+#: en/configureServices.xml:20
msgid "Here you can choose which services should start when you boot your system."
msgstr ""
-#. type: Content of: <section><para>
-#: en/configureServices.xml:19
-msgid "Click on a triangle to expand a group to all the relevant services."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureServices.xml:22
-msgid "The settings DrakX chose are usually good."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureServices.xml:25
+msgid ""
+"Click on a triangle to expand a group to all the relevant services. The "
+"settings DrakX chose are usually good."
msgstr ""
-#. type: Content of: <section><para>
-#: en/configureServices.xml:25
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureServices.xml:31
msgid ""
"If you highlight a service, some information about it is shown in the info "
"box below."
msgstr ""
#. type: Content of: <section><para>
-#: en/configureServices.xml:28
+#: en/configureServices.xml:37
msgid "Only change things when you know very well what you are doing."
msgstr ""
@@ -753,203 +871,226 @@ msgstr ""
#. 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.
#. type: Content of: <section><mediaobject>
-#: en/configureTimezoneUTC.xml:11
+#: en/configureTimezoneUTC.xml:15
msgid ""
"<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>"
+"<imageobject condition=\"live\"> <imagedata format=\"png\" "
+"fileref=\"live-timeZone.png\" align=\"center\"/> </imageobject>"
msgstr ""
-#. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:20
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureTimezoneUTC.xml:26
msgid ""
-"Choose your time-zone by choosing your country or a city close to you in the "
-"same time-zone."
+"Choose your timezone by choosing your country, or a city close to you in the "
+"same timezone."
msgstr ""
#. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:24
+#: en/configureTimezoneUTC.xml:32
msgid ""
"In the next screen you can choose to set your hardware clock to local time "
"or to GMT, also known as UTC."
msgstr ""
#. type: Content of: <section><note><para>
-#: en/configureTimezoneUTC.xml:29
+#: en/configureTimezoneUTC.xml:37
msgid ""
"If you have more than one operating system on your computer, make sure they "
"are all set to local time, or all to UTC/GMT."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:13
+#: en/configureX_card_list.xml:24
msgid "Choose an X Server (Configure your Graphic Card)"
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:18
+#: en/configureX_card_list.xml:29
msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_card_list-im1\" "
-"align=\"center\" fileref=\"dx2-configureX_card_list.png\" revision=\"1\"/> "
-"</imageobject>"
+"<imageobject> <imagedata align=\"center\" "
+"fileref=\"dx2-configureX_card_list.png\" format=\"PNG\" revision=\"1\" "
+"xml:id=\"configureX_card_list-im1\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:23
+#: en/configureX_card_list.xml:35
msgid ""
"DrakX has a very comprehensive database of video cards and will usually "
"correctly identify your video device."
msgstr ""
#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:26
+#: en/configureX_card_list.xml:38
msgid ""
"If the installer has not correctly detected your graphic card and you know "
"which one you have, you can select it from the tree by:"
msgstr ""
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
-msgid "vendor"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+msgid "Vendor"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:33
-msgid "then the name of your card"
+#: en/configureX_card_list.xml:45
+msgid "then the make of your card"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:37
-msgid "and the type of card"
+#: en/configureX_card_list.xml:49
+msgid "and the model of card"
msgstr ""
#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:41
+#: en/configureX_card_list.xml:53
msgid ""
"If you cannot find your card in the vendor lists (because it's not yet in "
"the database or it's an older card) you may find a suitable driver in the "
-"<emphasis role=\"bold\">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 <emphasis "
-"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
+"<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."
msgstr ""
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:47
+#. type: Content of: <section><caution><para>
+#: en/configureX_card_list.xml:61
msgid ""
"Be aware that if you select an incompatible driver you may only have access "
-"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
+"to the <emphasis>Command Line Interface</emphasis>"
msgstr ""
#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:51
+#: en/configureX_card_list.xml:65
msgid ""
"Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
-"repository and in some cases only from the card manufacturers' websites."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:56
-msgid ""
-"The <emphasis role=\"bold\">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."
+"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."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:3
+#: en/configureX_chooser.xml:11
msgid "Graphic Card and Monitor Configuration"
msgstr ""
#. 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
+#. 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.
#. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:10
+#: en/configureX_chooser.xml:24
msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
-"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> "
-"</imageobject>"
+"<imageobject> <imagedata align=\"center\" "
+"fileref=\"dx2-configureX_chooser.png\" format=\"PNG\" revision=\"1\" "
+"xml:id=\"configureX_chooser-im1\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/configureX_chooser.xml:15
+#: en/configureX_chooser.xml:30
msgid ""
"No matter which graphical environment (also known as desktop environment) "
-"you chose for this install of <application>Mageia</application>, they are "
-"all based on a graphical user interface system called <acronym>X Window "
-"System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, "
-"<acronym>LXDE</acronym> or any other graphical environment to work well, the "
-"following <acronym>X</acronym> settings need to be correct. Choose the "
-"correct settings if none are shown, or if you think the details are "
-"incorrect."
+"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. Choose the appropriate settings - if none are shown, or "
+"if you think the details are incorrect."
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:27
-msgid ""
-"<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
-"from the list if needed."
+#: en/configureX_chooser.xml:41
+msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:33
+#: en/configureX_chooser.xml:44
msgid ""
-"<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
-"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
-"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
-"vertical refresh rates of your monitor."
+"If you need to, you can select a specific card from this expandable "
+"list. See <xref linkend=\"configureX_card_list\"/>."
msgstr ""
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:41
-msgid "Incorrect refresh rates may damage your monitor"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:49
+msgid "<emphasis role=\"bold\">Monitor</emphasis>"
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:52
msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
-"color depth of your monitor can be set here."
+"You can choose Plug'n Play, if applicable, or choose your monitor from the "
+"<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> list. Choose "
+"<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor. See <xref "
+"linkend=\"configureX_monitor\"/>."
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
-msgid ""
-"<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the option is there, and you test your "
-"settings, you should be ask whether your settings are correct. If you answer "
-"<emphasis role=\"bold\">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."
+#: en/configureX_chooser.xml:60
+msgid "<emphasis role=\"bold\">Resolution</emphasis>"
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
#: en/configureX_chooser.xml:63
+msgid "The resolution and color depth of your monitor can be set here"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:68
+msgid "<emphasis role=\"bold\">Test</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:71
msgid ""
-"<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
-"enable or disable various options."
+"The test button does not always appear during install. If the option is "
+"there, and you test your settings, you should be asked whether 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."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:81
+msgid "<emphasis role=\"bold\">Options</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:84
+msgid "Here you can choose to enable or disable various options"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/configureX_chooser.xml:89
+msgid ""
+"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."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:11
+#: en/configureX_monitor.xml:22
msgid "Choosing your Monitor"
msgstr ""
#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:14
+#: en/configureX_monitor.xml:25
msgid ""
"DrakX has a very comprehensive database of monitors and will usually "
"correctly identify yours."
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:19
+#: en/configureX_monitor.xml:30
msgid ""
"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
"could damage your monitor or video hardware. Please don't try something "
@@ -958,29 +1099,29 @@ msgid ""
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:38
msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
-"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> "
-"</imageobject>"
+"<imageobject> <imagedata align=\"center\" "
+"fileref=\"dx2-configureX_monitor.png\" format=\"PNG\" revision=\"1\" "
+"xml:id=\"configureX_monitor-im1\"/> </imageobject>"
msgstr ""
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:31
-msgid "<emphasis>Custom</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:46
+msgid "Custom"
msgstr ""
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:33
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:49
msgid ""
-"This option allows you to set two critical parameters, the vertical refresh "
+"This option allows you to set two critical parameters: the vertical refresh "
"rate and the horizontal sync rate. Vertical refresh determines how often the "
"screen is refreshed and horizontal sync is the rate at which scan lines are "
"displayed."
msgstr ""
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:38
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:55
msgid ""
"It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
"type with a sync range that is beyond the capabilities of your monitor: you "
@@ -988,153 +1129,153 @@ msgid ""
"consult your monitor documentation."
msgstr ""
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
-msgid "<emphasis>Plug 'n Play</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:64
+msgid "Plug'n Play"
msgstr ""
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:47
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:67
msgid ""
-"This is the default option and tries to determine the monitor type from the "
-"monitor database."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:51
-msgid "<emphasis>Vendor</emphasis>"
+"This is the default option and automatically tries to determine the monitor "
+"type from the monitor database."
msgstr ""
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:53
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:77
msgid ""
"If the installer has not correctly detected your monitor and you know which "
"one you have, you can select it from the tree by selecting:"
msgstr ""
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:61
-msgid "the monitor manufacturers name"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_monitor.xml:86
+msgid "Manufacturer"
msgstr ""
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:65
-msgid "the monitor description"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_monitor.xml:90
+msgid "Monitor model"
msgstr ""
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:69
-msgid "<emphasis>Generic</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:96
+msgid "Generic"
msgstr ""
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:71
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:99
msgid ""
-"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 <emphasis "
-"role=\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
-"determined automatically. Once again it may be wise to be conservative in "
-"your selections."
+"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."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
-msgid "Custom disk partitioning with DiskDrake"
+#: en/diskdrake.xml:22
+msgid "Custom Disk Partitioning with DiskDrake"
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:27
msgid ""
-"<imageobject condition=\"classical\"> <imagedata "
-"fileref=\"dx2-diskdrake.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-diskdrake.png\" "
-"align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" "
+"fileref=\"dx2-diskdrake.png\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata align=\"center\" "
+"fileref=\"live-diskdrake.png\"/> </imageobject>"
msgstr ""
-#. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:38
msgid ""
-"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
-"partition you must ensure that you have a separate <emphasis "
-"role=\"bold\">/boot</emphasis> partition. The encryption option for the "
-"<emphasis role=\"bold\">/boot</emphasis> partition must NOT be set, "
-"otherwise your system will be unbootable."
+"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."
msgstr ""
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:45
msgid ""
-"Modify the layout of your disk(s) here. You can remove or create "
-"partitions, change the filesystem of a partition or change its size and even "
-"view their details before you start."
+"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>."
msgstr ""
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:52
msgid ""
-"There is a tab at the top for every detected hard disk (or other storage "
-"device like a USB key). In the screen-shot above there are two available "
-"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis "
-"role=\"bold\">sdb</emphasis>."
+"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."
msgstr ""
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:60
msgid ""
-"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
-"you are sure you want to wipe all partitions on the selected storage device."
+"Continue until you have adjusted everything to your satisfaction, then click "
+"<emphasis>Done</emphasis> when you're ready."
msgstr ""
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:43
+#. type: Content of: <section><warning><orderedlist><listitem><para>
+#: en/diskdrake.xml:69
msgid ""
-"For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe "
-"it. <guibutton>Expert mode</guibutton> provides more options such as a label "
-"(give a name to) a partition, or to choose a partition type."
+"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."
msgstr ""
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:49
-msgid "Continue until you have adjusted everything to your satisfaction."
+#. type: Content of: <section><warning><orderedlist><listitem><para>
+#: en/diskdrake.xml:75
+msgid ""
+"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."
msgstr ""
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:52
-msgid "Click <guibutton>Done</guibutton> when you're ready."
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:87
+msgid ""
+"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."
msgstr ""
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:56
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:93
msgid ""
-"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
-"Partition) is present and correctly mounted on /boot/EFI (see below)"
+"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."
msgstr ""
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:101
+msgid "EFI System Partition"
+msgstr ""
+
+#. type: Content of: <section><figure><mediaobject>
+#: en/diskdrake.xml:104
msgid ""
-"<imageobject condition=\"classical\"> <imagedata "
-"fileref=\"dx2-diskdrake2.png\" align=\"center\"/> </imageobject> "
-"<imageobject condition=\"live\"> <imagedata align=\"center\" "
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" "
+"fileref=\"dx2-diskdrake2.png\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata align=\"center\" "
"fileref=\"live-diskdrake2.png\"/> </imageobject>"
msgstr ""
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:60
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:103 en/diskdrake.xml:117
msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr ""
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:72
-msgid ""
-"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present and of the correct type"
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:115
+msgid "BIOS boot partition"
msgstr ""
-#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:76
+#. type: Content of: <section><mediaobject>
+#: en/diskdrake.xml:118 en/doPartitionDisks.xml:200
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" "
"fileref=\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject "
@@ -1143,293 +1284,298 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
-msgid "Partitioning"
+#: en/doPartitionDisks.xml:25
+msgid "Suggested Partitioning"
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:28
msgid ""
"In this screen you can see the content of your hard drive(s) along with the "
-"DrakX partitioning proposals for where to install "
-"<application>Mageia</application>."
+"DrakX partitioning proposals for where to install Mageia."
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:16
+#: en/doPartitionDisks.xml:32
msgid ""
-"The options available from those shown below will vary according to the "
-"layout and content of your particular hard drive(s)."
+"The actual options available from those shown below will vary according to "
+"the layout and content of your particular hard drive(s)."
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:21
+#: en/doPartitionDisks.xml:37
msgid ""
-"<imageobject condition=\"classical\"> <imagedata "
-"fileref=\"dx2-doPartitionDisks.png\" align=\"center\"/> </imageobject> "
-"<imageobject condition=\"live\"> <imagedata "
-"fileref=\"live-doPartitionDisks.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" "
+"fileref=\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata align=\"center\" "
+"fileref=\"live-doPartitionDisks.png\"/> </imageobject>"
msgstr ""
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
-msgid "Use Existing Partitions"
+#. type: Content of: <section><itemizedlist><title>
+#: en/doPartitionDisks.xml:47
+msgid "Main Options"
msgstr ""
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:50
+msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:53
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
msgstr ""
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
-msgid "Use Free Space"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:59
+msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
msgstr ""
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:43
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:62
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
msgstr ""
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:49
-msgid "Use Free Space on a Windows Partition"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:68
+msgid "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
msgstr ""
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:71
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
-"offer to use it."
-msgstr ""
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
-msgid ""
-"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!"
-msgstr ""
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
-msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
-"correctly the last time it was used. It must also have been defragmented, "
-"although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
+"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!"
msgstr ""
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:69
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:77
msgid ""
"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 "
-"screen-shot."
+"clicking and dragging the gap between both partitions. See the following "
+"screenshot:"
msgstr ""
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:76
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata "
-"fileref=\"dx2-doPartitionDisks2.png\" align=\"center\"/> </imageobject> "
-"<imageobject condition=\"live\"> <imagedata "
-"fileref=\"live-doPartitionDisks2.png\" align=\"center\"/> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "Erase and use Entire Disk."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:85
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
msgstr ""
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
-msgid "This option will allocate the entire drive for Mageia."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:88
+msgid "This option will allocate the entire drive for Mageia"
msgstr ""
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:93
-msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:92
+msgid ""
+"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."
msgstr ""
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:99
msgid ""
-"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."
+"Note that this involves shrinking the size of the Windows partition. The "
+"partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used. It is highly recommended to "
+"back up your personal files."
msgstr ""
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:103
-msgid "Custom disk partitioning"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:110
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
msgstr ""
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:113
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
msgstr ""
-#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:120
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" "
+"fileref=\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata align=\"center\" "
+"fileref=\"live-doPartitionDisks2.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:129
msgid ""
-"If you are not using the <emphasis role=\"bold\">Custom disk "
-"partitioning</emphasis> option, the installer will allocate the available "
-"space according to the following rules:"
+"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:"
msgstr ""
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:120
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:135
msgid ""
"If the total available space is less than 50 GB, then only one partition is "
-"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
-"partition."
+"created. This will be the <filename>/</filename> (root) partition."
msgstr ""
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:141
msgid ""
"If the total available space is greater than 50 GB, then three partitions "
"are created"
msgstr ""
-#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:146
msgid ""
-"6/19 of the total available place is allocated to <emphasis "
-"role=\"bold\">/</emphasis> with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <filename>/</filename> "
+"with a maximum of 50 GB"
msgstr ""
-#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
-msgid "1/19 is allocated to swap with a maximum of 4 GB"
+#. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:151
+msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
msgstr ""
-#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:138
+#. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:156
msgid ""
-"the rest (at least 12/19) is allocated to <emphasis "
-"role=\"bold\">/home.</emphasis>"
+"the rest (at least 12/19) is allocated to "
+"<emphasis>/</emphasis><filename>home</filename><emphasis "
+"role=\"bold\">.</emphasis>"
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:144
+#: en/doPartitionDisks.xml:164
msgid ""
-"That means that from 160 GB or greater available space, the installer will "
-"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
-"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
-"<emphasis role=\"bold\">/home</emphasis>."
+"This means that from 160 GB or greater available space, the installer will "
+"create three partitions:"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:169
+msgid "50 GB for <filename>/</filename>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:173
+msgid "4 GB for <filename>swap</filename>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:177
+msgid "and the remainder for <filename>/home</filename>."
msgstr ""
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
-"/boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</emphasis> "
-"option is the only one that allows to check it has been correctly done"
+"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."
msgstr ""
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:188
msgid ""
-"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
-"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
-"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
-"able to create it with the Installer like any other partition, just select "
-"BIOS boot partition as the filesystem type."
+"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."
msgstr ""
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" "
-"fileref=\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> "
-"</imageobject>"
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:195
+msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
msgstr ""
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:210
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata align=\"center\" "
+"fileref=\"dx2-doPartitionDisks4.png\"/> </imageobject>"
msgstr ""
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:216
msgid ""
"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. Also 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 <emphasis "
-"role=\"bold\">gparted</emphasis>, and to use the following settings:"
+"drive."
msgstr ""
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:189
-msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:221
+msgid ""
+"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:"
msgstr ""
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:191
-msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:228
+msgid "<emphasis>Align to</emphasis> = MiB"
msgstr ""
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:232
+msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
+msgstr ""
+
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:236
msgid "Also make sure all partitions are created using an even number of megabytes."
msgstr ""
#. type: Content of: <article><info><title>
-#: en/DrakLive-cover.xml:4 en/DrakLive-cover.xml:30 en/DrakLive.xml:3
+#: en/DrakLive-cover.xml:15 en/DrakLive-cover.xml:54 en/DrakLive.xml:16
msgid "Installation from LIVE medium"
msgstr ""
#. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
+#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:14
msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
msgstr ""
#. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakLive-cover.xml:10
-msgid "January 2015"
+#: en/DrakLive-cover.xml:23
+msgid "March 2016"
msgstr ""
#. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakLive-cover.xml:11
+#: en/DrakLive-cover.xml:25
msgid "Mageia 5"
msgstr ""
#. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
+#: en/DrakLive-cover.xml:30 en/DrakX-cover.xml:27
msgid "The Official Documentation for Mageia"
msgstr ""
#. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17
-msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+#: en/DrakLive-cover.xml:33 en/DrakX-cover.xml:30
+msgid "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20 en/DrakX.xml:12
+#: en/DrakLive-cover.xml:38 en/DrakLive.xml:25 en/DrakX-cover.xml:35 en/DrakX.xml:44
msgid ""
"The texts and screenshots in this manual are available under the CC BY-SA "
"3.0 license <link "
@@ -1437,7 +1583,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23 en/DrakX.xml:15
+#: en/DrakLive-cover.xml:42 en/DrakLive.xml:29 en/DrakX-cover.xml:39 en/DrakX.xml:48
msgid ""
"This manual was produced with the help of the <link "
"ns6:href=\"http://www.calenco.com\">Calenco CMS</link> developed by <link "
@@ -1445,105 +1591,109 @@ msgid ""
msgstr ""
#. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25 en/DrakX.xml:17
+#: en/DrakLive-cover.xml:46 en/DrakX-cover.xml:43 en/DrakX.xml:52
msgid ""
"It was written by volunteers in their free time. Please contact <link "
"ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation "
"Team</link>, if you would like to help improve this manual."
msgstr ""
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36 en/DrakX.xml:6
+#. type: Content of: <section><itemizedlist><listitem><para><note>
+#: en/DrakLive-cover.xml:56 en/DrakLive.xml:19 en/DrakX-cover.xml:64 en/DrakX.xml:38 en/selectKeyboard.xml:49
msgid "<note>"
msgstr ""
#. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37 en/DrakX.xml:7
+#: en/DrakLive-cover.xml:57 en/DrakLive.xml:20 en/DrakX-cover.xml:65 en/DrakX.xml:39
msgid ""
"No one will see all the installer screens that you see in this manual. Which "
"screens you will see, depends on your hardware and the choices you make "
"while installing."
msgstr ""
-#. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40 en/DrakX.xml:10
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/DrakLive-cover.xml:60 en/DrakLive.xml:23 en/DrakX-cover.xml:68 en/DrakX.xml:42 en/selectKeyboard.xml:56
msgid "</note>"
msgstr ""
+#. type: Content of: <article><info><cover><para>
+#: en/DrakLive.xml:33
+msgid ""
+"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."
+msgstr ""
+
#. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
+#: en/DrakX-cover.xml:12 en/DrakX-cover.xml:61 en/DrakX.xml:35
msgid "Installation with DrakX"
msgstr ""
#. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:9
+#: en/DrakX-cover.xml:20
msgid "February 2014"
msgstr ""
#. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:22
msgid "Mageia 4"
msgstr ""
-#. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakX-cover.xml:16
-msgid "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
-msgstr ""
-
#. type: Content of: <section><info><title>
#: en/exitInstall.xml:3
msgid "Congratulations"
msgstr ""
#. Lebarhon 20170209 updated SC
+#. 2018/02/12 apb: Text and typography.
+#. 2018/02/25 apb: Added clickable link to mageia.org
#. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:13
msgid ""
"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
msgid ""
-"You have finished installing and configuring "
-"<application>Mageia</application> and it is now safe to remove the "
-"installation medium and reboot your computer."
+"You have finished installing and configuring Mageia and it is now safe to "
+"remove the installation medium and reboot your computer."
msgstr ""
#. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:22
msgid ""
-"After reboot, in the bootloader screen, you can choose between the operating "
-"systems (if there are more than one) on your computer."
+"After rebooting, you can use the bootloader screen to choose which operating "
+"system to start (if there are more than one on your computer)."
msgstr ""
#. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:26
msgid ""
"If you didn't adjust the settings for the bootloader, your Mageia install "
"will be automatically selected and started."
msgstr ""
#. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:30
msgid "Enjoy!"
msgstr ""
#. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:32
msgid ""
-"Visit www.mageia.org if you have any questions or want to contribute to "
-"Mageia"
+"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"
msgstr ""
#. type: Content of: <section><info><title>
-#: en/firewall.xml:3
+#: en/firewall.xml:7
msgid "Firewall"
msgstr ""
#. type: Content of: <section><para>
-#: en/firewall.xml:6
+#: en/firewall.xml:10
msgid ""
"This section allows you to configure some simple firewall rules: they "
"determine which type of message from the Internet will be accepted by the "
@@ -1552,46 +1702,46 @@ msgid ""
msgstr ""
#. type: Content of: <section><para>
-#: en/firewall.xml:12
+#: en/firewall.xml:16
msgid ""
"In the default setting (no button is checked), no service of the system is "
-"accessible from the network. The <emphasis role=\"bold\">Everything (no "
-"firewall)</emphasis> 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 "
+"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."
msgstr ""
#. type: Content of: <section><para>
-#: en/firewall.xml:21
+#: en/firewall.xml:25
msgid ""
"All other options are more or less self-explanatory. As an example, you will "
-"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
-"printers on your machine to be accessible from the network."
+"enable the CUPS server if you want printers on your machine to be accessible "
+"from the network."
msgstr ""
#. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:29
msgid "<emphasis role=\"bold\">Advanced</emphasis>"
msgstr ""
#. type: Content of: <section><para>
-#: en/firewall.xml:27
+#: en/firewall.xml:31
msgid ""
-"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
-"you can enable a series of services by typing a list of couples (blank "
+"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)"
msgstr ""
#. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:35
msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
msgstr ""
#. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:34
+#: en/firewall.xml:38
msgid ""
"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -1599,7 +1749,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:42
msgid ""
"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
"<emphasis>UDP</emphasis> - the internet protocol that is used by the "
@@ -1607,21 +1757,21 @@ msgid ""
msgstr ""
#. type: Content of: <section><para>
-#: en/firewall.xml:43
+#: en/firewall.xml:47
msgid ""
"For instance, the entry for enabling access to the RSYNC service therefore "
"is <emphasis>873/tcp</emphasis>."
msgstr ""
#. type: Content of: <section><para>
-#: en/firewall.xml:46
+#: en/firewall.xml:50
msgid ""
"In case a service is implemented to use both protocols, you specify 2 "
"couples for the same port."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:3
+#: en/formatPartitions.xml:10
msgid "Formatting"
msgstr ""
@@ -1629,465 +1779,409 @@ msgstr ""
#. NEEDS TO BE REVIEWED!
#. marja 2012-04-24 added screenshot
#. marja 2012-04-24 added emphasis tags in formatPartitions-pa1
+#. 2018/02/10 apb: Text and typography.
#. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:15
+#: en/formatPartitions.xml:24
msgid ""
-"<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>"
+"<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>"
msgstr ""
#. type: Content of: <section><para>
-#: en/formatPartitions.xml:24
+#: en/formatPartitions.xml:35
msgid ""
"Here you can choose which partition(s) you wish to format. Any data on "
"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
msgstr ""
#. type: Content of: <section><para>
-#: en/formatPartitions.xml:28
-msgid "Usually at least the partitions DrakX selected, need to be formatted"
+#: en/formatPartitions.xml:39
+msgid "Usually, at least the partitions that DrakX selected need to be formatted."
msgstr ""
#. type: Content of: <section><para>
-#: en/formatPartitions.xml:31
+#: en/formatPartitions.xml:42
msgid ""
-"Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
-"check for so called <emphasis>bad blocks</emphasis>"
+"Click on <emphasis>Advanced</emphasis> to choose the partitions you want to "
+"check for so-called <emphasis>bad blocks</emphasis>"
msgstr ""
#. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:36
+#: en/formatPartitions.xml:47
msgid ""
"If you're not sure you have made the right choice, you can click on "
-"<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
-"where you can choose to view details of your partitions."
+"<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."
msgstr ""
#. type: Content of: <section><para>
-#: en/formatPartitions.xml:43
+#: en/formatPartitions.xml:54
msgid ""
-"When you are confident about the selection, click on "
-"<guibutton>Next</guibutton> to continue."
+"When you are confident about the selections, click on "
+"<emphasis>Next</emphasis> to continue."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/installer.xml:10
+#: en/installer.xml:14
msgid "DrakX, the Mageia Installer"
msgstr ""
#. type: Content of: <section><para>
-#: en/installer.xml:13
+#: en/installer.xml:16
msgid ""
"Whether you are new to GNU-Linux or an experienced user, the Mageia "
"Installer is designed to help make your installation or upgrade as easy as "
"possible."
msgstr ""
-#. type: Content of: <section><para>
-#: en/installer.xml:17
-msgid ""
-"The initial menu screen has various options, however the default one will "
-"start the installer, which will normally be all that you will need."
-msgstr ""
-
#. type: Content of: <section><section><title>
-#: en/installer.xml:22
-msgid "Installation Welcome Screen"
-msgstr ""
-
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:25
-msgid "Using a Mageia DVD"
+#: en/installer.xml:20
+msgid "The installation steps"
msgstr ""
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:27
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:23
msgid ""
-"Here are the default welcome screens when using a Mageia DVD, The first one "
-"is what you will see if you have a UEFI system, the second one is for a "
-"Legacy system:"
-msgstr ""
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:32
-msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+"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."
msgstr ""
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:28
msgid ""
-"From this screen, you have access to options by pressing \"<emphasis "
-"role=\"bold\">e</emphasis>\" to enter the edit mode. To come back to this "
-"screen, press either <emphasis role=\"bold\">Esc</emphasis> key to quit "
-"without saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or "
-"<emphasis role=\"bold\">F10</emphasis> to quit with saving."
-msgstr ""
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:45
-msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+"Each step has one or more screens, which may also have "
+"<emphasis>Advanced</emphasis> sections with extra, less commonly required "
+"options."
msgstr ""
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:50
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:33
msgid ""
-"From this screen, it is possible to set some preferences (note that the "
-"options <emphasis role=\"bold\">F1</emphasis> to <emphasis "
-"role=\"bold\">F6</emphasis> are available only on Legacy systems):"
+"Most screens have <emphasis>Help</emphasis> buttons for further details "
+"about the particular step."
msgstr ""
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:38
msgid ""
-"Within any of the <emphasis role=\"bold\">F2</emphasis> to <emphasis "
-"role=\"bold\">F6</emphasis> options, you can view relevant help by pressing "
-"<emphasis role=\"bold\">F1</emphasis>"
+"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."
msgstr ""
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:63
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:43
msgid ""
-"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
-"specific language for the installation."
-msgstr ""
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:67
-msgid "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"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."
msgstr ""
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
-msgid ""
-"Use the arrow keys to select the language then press <emphasis "
-"role=\"bold\">Enter</emphasis>."
+#. type: Content of: <section><section><title>
+#: en/installer.xml:48
+msgid "Installation Welcome Screen"
msgstr ""
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:77
+#. type: Content of: <section><section><para>
+#: en/installer.xml:49
msgid ""
-"If needed, change the screen resolution by pressing <emphasis "
-"role=\"bold\">F3</emphasis> (Legacy mode only)."
-msgstr ""
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:81
-msgid "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+"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."
msgstr ""
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:88
+#. type: Content of: <section><section><para>
+#: en/installer.xml:52
msgid ""
-"If you experience problems with the installation, you could try modifying "
-"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
-"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
-"<emphasis role=\"bold\">e</emphasis> instead)."
+"The welcome menu screen has various options, however the default option will "
+"start the installer, and is normally all that you will need."
msgstr ""
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:96
-msgid "Default: It doesn't alter anything in the default options."
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:56
+msgid "Legacy (BIOS) Systems"
msgstr ""
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:101
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:58
msgid ""
-"Safe Settings: Priority is given to the safer options at the price of a "
-"performance detriment."
+"<imageobject> <imagedata fileref=\"dx-welcome.png\" align=\"center\"/> "
+"</imageobject>"
msgstr ""
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:106
-msgid ""
-"No ACPI: (Advanced Configuration and Power Interface): Power management "
-"features are not used."
+#. type: Content of: <section><section><section><itemizedlist><title>
+#: en/installer.xml:63
+msgid "Menu"
msgstr ""
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:113
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:66
msgid ""
-"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
-"interrupt. Select this option if you experience system misbehaviour like a "
-"kernel panic in relation to APIC."
+"Install Mageia to a hard disk. This is the default option, and will "
+"automatically start after a short while unless another option is selected."
msgstr ""
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:120
-msgid ""
-"When you select one of these entries, it modifies the default options "
-"displayed in the <guilabel>Boot Options</guilabel> line."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:69
+msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
msgstr ""
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:125
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:70
msgid ""
-"In some Mageia releases, it may happen that the entries selected with "
-"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
-"Options</guilabel> line, despite this, they will in fact be applied."
+"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."
msgstr ""
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:132
-msgid "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:75
+msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
msgstr ""
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:139
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:76
msgid ""
-"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
-"various boot options. Select an item with the arrow keys and press <emphasis "
-"role=\"bold\">Enter</emphasis> for more details or press <emphasis "
-"role=\"bold\">Esc</emphasis> to go back to the welcome screen."
+"Test the installed RAM by performing multiple read and write "
+"operations. Reboot to end the test."
msgstr ""
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:146
-msgid "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:80
+msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
msgstr ""
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:151
-msgid ""
-"The detailed view about the splash option. Press <emphasis "
-"role=\"bold\">Esc</emphasis> or select <guilabel>Return to Boot "
-"Options</guilabel> to go back to the options list. These options can be "
-"added by hand in the <guilabel>Boot Options</guilabel> line."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:81
+msgid "Press F2 for alternative languages."
msgstr ""
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:158
-msgid "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:86
+msgid "UEFI Systems"
msgstr ""
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:164
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:87
msgid ""
-"The help is translated in the chosen language with <emphasis "
-"role=\"bold\">F2</emphasis>."
+"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."
msgstr ""
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:168
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:92
msgid ""
-"For more information about kernel options on legacy and UEFI systems, see: "
-"<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>"
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> "
+"</imageobject>"
msgstr ""
-#. type: Content of: <section><section><title>
-#: en/installer.xml:177
-msgid "The installation steps"
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:96
+msgid "In UEFI mode you have only two menu options to choose from:"
msgstr ""
-#. type: Content of: <section><section><para>
-#: en/installer.xml:179
-msgid ""
-"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."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:99
+msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
msgstr ""
-#. type: Content of: <section><section><para>
-#: en/installer.xml:182
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:103
msgid ""
-"Each step has one or more screens which may also have "
-"<guibutton>Advanced</guibutton> sections with extra, less commonly required, "
-"options."
+"<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."
msgstr ""
-#. type: Content of: <section><section><para>
-#: en/installer.xml:186
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:109
msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons for further details "
-"about the particular step."
-msgstr ""
-
-#. type: Content of: <section><section><note><para>
-#: en/installer.xml:190
-msgid ""
-"If at some points during the install you decide to stop the installation, it "
-"is possible to reboot, but please think twice before you do this. Once a "
-"partition has been formatted or updates have started to be installed, your "
-"computer is no longer in the same state and rebooting it could very well "
-"leave you with an unusable system. If in spite of this you are very sure "
-"rebooting is what you want, go to a text terminal by pressing the three keys "
-"<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press "
-"<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
+"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\"."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/installer.xml:203
+#: en/installer.xml:115
msgid "Installation Problems and Possible Solutions"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/installer.xml:206
+#: en/installer.xml:117
msgid "No Graphical Interface"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:210
+#: en/installer.xml:120
msgid ""
-"After the initial screen you did not reach the language selection "
-"screen. This can happen with some graphic cards and older systems. Try using "
-"low resolution by typing <code>vgalo</code> at the prompt."
+"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."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:217
+#: en/installer.xml:126
msgid ""
"If the hardware is very old, a graphical installation may not be "
-"possible. In this case it is worth trying a text mode installation. To use "
-"this press <emphasis role=\"bold\">Esc</emphasis> at the first welcome "
-"screen and confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will "
-"be presented with a black screen with the word \"boot:\". Type \"text\" and "
-"press <emphasis role=\"bold\">ENTER</emphasis> to continue with the "
-"installation in text mode."
+"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."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/installer.xml:230
+#: en/installer.xml:138
msgid "The Install Freezes"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/installer.xml:232
+#: en/installer.xml:139
msgid ""
"If the system appeared to freeze during the installation, this may be a "
-"problem with hardware detection. In this case the automatic detection of "
-"hardware may be bypassed and dealt with later. To try this, type "
-"<code>noauto</code> at the prompt. This option may also be combined with "
-"other options as necessary."
+"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."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/installer.xml:240
+#: en/installer.xml:146
msgid "RAM problem"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/installer.xml:242
+#: en/installer.xml:147
msgid ""
"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 "
-"<code>mem=xxxM</code> parameter, where xxx is the correct amount of "
-"RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM."
+"<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."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/installer.xml:249
+#: en/installer.xml:154
msgid "Dynamic partitions"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/installer.xml:251
+#: en/installer.xml:155
msgid ""
-"If you converted your hard disk from <emphasis "
-"role=\"bold\">basic</emphasis> format to <emphasis "
-"role=\"bold\">dynamic</emphasis> format in Microsoft Windows, then it is not "
-"possible to install Mageia on this disc. To revert to a basic disk, see the "
-"Microsoft documentation: <link "
+"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>."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/installUpdates.xml:3
+#: en/installUpdates.xml:16
msgid "Updates"
msgstr ""
-#. 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, 2012-04-24 added screenshot
#. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:15
+#: en/installUpdates.xml:20
msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"<imageobject> <imagedata format=\"png\" fileref=\"dx2-installUpdates.png\" "
"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> "
"</imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/installUpdates.xml:20
+#: en/installUpdates.xml:25
msgid ""
-"Since this version of <application>Mageia</application> was released, some "
-"packages will have been updated or improved."
+"Since this version of Mageia was released, some packages will have been "
+"updated or improved."
msgstr ""
-#. type: Content of: <section><para>
-#: en/installUpdates.xml:24
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:30
+msgid "Select <emphasis>Yes</emphasis> if you wish to download and install them"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:35
msgid ""
-"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
-"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
+"Select <emphasis>No</emphasis> if you don't want to do this now, or if you "
"aren't connected to the Internet"
msgstr ""
-#. type: Content of: <section><para>
-#: en/installUpdates.xml:29
-msgid "Press <guibutton>Next</guibutton> to continue"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:40
+msgid "Press <emphasis>Next</emphasis> to continue"
msgstr ""
#. type: Content of: <section><info><title>
-#: en/login.xml:1
-msgid "Login screen"
+#: en/login.xml:4
+msgid "Login Screen"
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/login.xml:1
+#: en/login.xml:7
msgid ""
-"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" "
-"fileref=\"live-login.png\" align=\"center\" revision=\"1\"/></imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"login-im1\" "
+"fileref=\"live-login.png\" align=\"center\" revision=\"1\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:1
-msgid "KDM login screen"
+#: en/login.xml:11
+msgid "SDDM login screen"
msgstr ""
#. type: Content of: <section><para>
-#: en/login.xml:1
-msgid "Finally, you will come to the login screen."
+#: en/login.xml:14
+msgid "Finally, you will come to the desktop login screen."
msgstr ""
#. type: Content of: <section><para>
-#: en/login.xml:1
+#: en/login.xml:15
msgid ""
"Enter your user name and user password, and in a few seconds you will find "
-"yourself with a loaded KDE or GNOME desktop, depending on which live medium "
-"you used. You can now start using your Mageia installation."
+"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."
msgstr ""
#. type: Content of: <section><para>
-#: en/login.xml:3
+#: en/login.xml:16
msgid ""
-"You can find another part of our documentation in <link "
-"linkend=\"https://wiki.mageia.org/en/Category:Documentation\">the Mageia "
-"wiki</link>."
+"You can find further documentation in <link "
+"xmlns:ns0=\"http://www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the "
+"Mageia wiki</link>."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/media_selection.xml:3
-msgid "Media Selection (Nonfree)"
+#: en/media_selection.xml:10
+msgid "Nonfree Media"
msgstr ""
#. 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)
+#. 2019.01.05 apb: Changed Ati to AMD in Nonfree para.
#. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:15
+#: en/media_selection.xml:24
msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" "
-"align=\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata align=\"center\" "
+"fileref=\"dx2-media_selection.png\" format=\"PNG\" revision=\"1\" "
+"xml:id=\"media_selection-im1\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/media_selection.xml:20
+#: en/media_selection.xml:30
msgid ""
"Here you have the list of available repositories. Not all repositories are "
"available, according to which media you use for installing. The repositories "
@@ -2096,24 +2190,24 @@ msgid ""
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:27
+#: en/media_selection.xml:37
msgid ""
"The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
"the base of the distribution."
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:32
+#: en/media_selection.xml:42
msgid ""
"The <emphasis>Nonfree</emphasis> repository includes packages that are "
"free-of-charge, i.e. Mageia may redistribute them, but they contain "
"closed-source software (hence the name - Nonfree). For example this "
-"repository includes nVidia and ATI graphics card proprietary drivers, "
+"repository includes nVidia and AMD graphics card proprietary drivers, "
"firmware for various WiFi cards, etc."
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:40
+#: en/media_selection.xml:50
msgid ""
"The <emphasis>Tainted</emphasis> repository includes packages released under "
"a free license. The main criteria for placing packages in this repository is "
@@ -2128,49 +2222,50 @@ msgid "Minimal Install"
msgstr ""
#. type: Content of: <section><para>
-#: en/minimal-install.xml:11
+#: en/minimal-install.xml:17
msgid ""
-"You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
+"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\"/>."
msgstr ""
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:14
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:24
msgid ""
-"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
-"package selection</emphasis> option in the same screen."
+"You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting "
+"everything in the <emphasis>Package Group Selection</emphasis> screen, see "
+"<xref linkend=\"choosePackageGroups\"/>."
msgstr ""
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:17
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:28
msgid ""
-"Minimal Installation is intended for those with specific uses in mind for "
-"<application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the <emphasis "
-"role=\"bold\">Individual package selection</emphasis> option mentioned "
-"above, to fine-tune your installation, see <xref "
-"linkend=\"choosePackagesTree\"/>."
+"If desired, you can additionally tick the <emphasis>Individual package "
+"selection</emphasis> option in the same screen."
msgstr ""
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:33
msgid ""
-"If you choose this installation method, then the relevant screen will offer "
-"you a few useful extras to install, such as documentation and X."
+"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>."
msgstr ""
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:26
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:37
msgid ""
-"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"If the <emphasis>With X</emphasis> option is selected, then IceWM (a "
"lightweight desktop environment) will also be included."
msgstr ""
#. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:42
msgid ""
-"The basic documentation is provided in the form of man and info pages. It "
-"contains the man pages from the <link "
+"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 "
"Project</link> and the <link "
"xlink:href=\"http://www.gnu.org/software/coreutils/manual/\">GNU "
@@ -2178,7 +2273,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:35
+#: en/minimal-install.xml:48
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" "
"align=\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> "
@@ -2187,197 +2282,200 @@ msgstr ""
#. type: Content of: <section><info><title>
#: en/misc-params.xml:3
-msgid "Summary of miscellaneous parameters"
+msgid "Configuration Summary"
msgstr ""
#. Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
+#. 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
#. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:10
-msgid "<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+#: en/misc-params.xml:19
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\" align=\"center\"/> "
+"</imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/misc-params.xml:15
+#: en/misc-params.xml:24
msgid ""
"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 "
-"<guibutton>Configure</guibutton>."
+"<emphasis>Configure</emphasis>."
msgstr ""
#. type: Content of: <section><note><para>
-#: en/misc-params.xml:21
+#: en/misc-params.xml:30
msgid ""
"As a general rule, it is recommended that you accept the default settings "
"unless:"
msgstr ""
#. type: Content of: <section><note><para><itemizedlist><listitem><para>
-#: en/misc-params.xml:24
+#: en/misc-params.xml:33
msgid "there are known issues with a default setting"
msgstr ""
#. type: Content of: <section><note><para><itemizedlist><listitem><para>
-#: en/misc-params.xml:28
+#: en/misc-params.xml:37
msgid "the default setting has already been tried and it fails"
msgstr ""
#. type: Content of: <section><note><para><itemizedlist><listitem><para>
-#: en/misc-params.xml:32
-msgid "some other factor mentionned in the detailed sections below is an issue."
+#: en/misc-params.xml:41
+msgid "some other factor mentioned in the detailed sections below is an issue"
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:40
+#: en/misc-params.xml:49
msgid "System parameters"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:45
-msgid "<guilabel>Timezone</guilabel>"
+#: en/misc-params.xml:54
+msgid "<emphasis role=\"bold\">Timezone</emphasis>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:47
+#: en/misc-params.xml:56
msgid ""
-"DrakX selects a time zone for you, depending on your preferred language. You "
+"DrakX selects a timezone for you, depending on your preferred language. You "
"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:53
-msgid "<guilabel>Country / Region</guilabel>"
+#: en/misc-params.xml:62
+msgid "<emphasis role=\"bold\">Country / Region</emphasis>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:56
+#: en/misc-params.xml:64
msgid ""
"If the selected country is wrong, it is very important that you correct the "
"setting. See <xref linkend=\"selectCountry\"/>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:62
-msgid "<guilabel>Bootloader</guilabel>"
-msgstr ""
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:64
-msgid "DrakX has made good choices for the bootloader setting."
+#: en/misc-params.xml:70
+msgid "<emphasis role=\"bold\">Bootloader</emphasis>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
-msgid "Do not change anything, unless you know how to configure GRUB2"
+#: en/misc-params.xml:72
+msgid "DrakX proposal for the bootloader setting"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:70
-msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
+#: en/misc-params.xml:75
+msgid ""
+"Do not change anything, unless you know how to configure GRUB2. For more "
+"information, see <xref linkend=\"setupBootloader\"/>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
-msgid "<guilabel>User management</guilabel>"
+#: en/misc-params.xml:83
+msgid "<emphasis role=\"bold\">User management</emphasis>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:78
+#: en/misc-params.xml:85
msgid ""
-"You can add extra users here. They will each get their own "
-"<literal>/home</literal> directories."
+"You can add extra users here. They will each be allocated their own "
+"<filename>/home</filename> directories."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:84
-msgid "<guilabel>Services</guilabel>:"
+#: en/misc-params.xml:91
+msgid "<emphasis role=\"bold\">Services</emphasis>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:86
+#: en/misc-params.xml:93
msgid ""
"System services refer to those small programs which run in the background "
"(daemons). This tool allows you to enable or disable certain processes."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:90
+#: en/misc-params.xml:97
msgid ""
"You should check carefully before changing anything here - a mistake may "
-"prevent your computer from operating correctly."
-msgstr ""
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:94
-msgid "For more information, see <xref linkend=\"configureServices\"/>"
+"prevent your computer from operating correctly. For more information, see "
+"<xref linkend=\"configureServices\"/>"
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:101
+#: en/misc-params.xml:106
msgid "Hardware parameters"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:106
-msgid "<guilabel>Keyboard</guilabel>:"
+#: en/misc-params.xml:111
+msgid "<emphasis role=\"bold\">Keyboard</emphasis>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:108
+#: en/misc-params.xml:113
msgid ""
"Configure your keyboard layout according to your location, language and type "
"of keyboard."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:118
msgid ""
"If you notice a wrong keyboard layout and want to change it, keep in mind "
"that your passwords are going to change too."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
-msgid "<guilabel>Mouse</guilabel>:"
+#: en/misc-params.xml:124
+msgid "<emphasis role=\"bold\">Mouse</emphasis>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:126
msgid ""
"Here you can add or configure other pointing devices, tablets, trackballs "
"etc."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
-msgid "<guilabel>Sound card</guilabel>:"
+#: en/misc-params.xml:131
+msgid "<emphasis role=\"bold\">Sound card</emphasis>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
-msgid ""
-"The installer uses the default driver - if there is a default one. The "
-"option to select a different driver is only given when there is more than "
-"one driver for your card, but where none of them is the default one."
+#: en/misc-params.xml:133
+msgid "The installer will use the default driver if one is available."
msgstr ""
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:137
-msgid "<guilabel>Graphical interface</guilabel>:"
+#. type: Content of: <section><section><para>
+#: en/misc-params.xml:136 en/soundConfig.xml:46
+msgid ""
+"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."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:140
-msgid "This section allows you to configure your graphic card(s) and displays."
+#: en/misc-params.xml:144
+msgid "<emphasis role=\"bold\">Graphical interface</emphasis>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:143
-msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
+#: en/misc-params.xml:146
+msgid ""
+"This section allows you to configure your graphics card(s) and displays. For "
+"more information, see <xref linkend=\"configureX_chooser\"/>"
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:149
+#: en/misc-params.xml:155
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" "
"align=\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> "
@@ -2385,96 +2483,102 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:157
+#: en/misc-params.xml:163
msgid "Network and Internet parameters"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
-msgid "<guilabel>Network</guilabel>:"
+#: en/misc-params.xml:169
+msgid "<emphasis role=\"bold\">Network</emphasis>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:165
+#: en/misc-params.xml:171
msgid ""
"You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, using the <application>Mageia "
-"Control Center</application>, if you have not yet enabled the Nonfree media "
+"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."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:172
+#: en/misc-params.xml:178
msgid ""
"When you add a network card, do not forget to set your firewall to monitor "
"that interface as well."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
-msgid "<guilabel>Proxies</guilabel>:"
+#: en/misc-params.xml:185
+msgid "<emphasis role=\"bold\">Proxies</emphasis>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:181
+#: en/misc-params.xml:187
msgid ""
"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 "
+"Internet. This section allows you to configure your computer to utilize a "
"proxy service."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:186
+#: en/misc-params.xml:192
msgid ""
-"You may need to consult your systems administrator to get the parameters you "
-"need to enter here."
+"You may need to consult your systems administrator to obtain the parameters "
+"you need to enter here."
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:195
+#: en/misc-params.xml:201
msgid "Security"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:200
-msgid "<guilabel>Security Level</guilabel>:"
+#: en/misc-params.xml:206
+msgid "<emphasis role=\"bold\">Security Level</emphasis>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:203
+#: en/misc-params.xml:208
msgid ""
-"Here you set the Security level for your computer, in most cases the default "
-"setting (Standard) is adequate for general use."
+"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."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:207
-msgid "Check the option which best suits your usage."
+#: en/misc-params.xml:215
+msgid "<emphasis role=\"bold\">Firewall</emphasis>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
-msgid "<guilabel>Firewall</guilabel>:"
+#: en/misc-params.xml:217
+msgid ""
+"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."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:214
+#: en/misc-params.xml:223
msgid ""
-"A firewall is intended to be a barrier between your important data and the "
-"rascals out there on the internet who would compromise or steal it."
+"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."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:218
-msgid ""
-"Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for. For more "
-"information, see <xref linkend=\"firewall\"/>."
+#: en/misc-params.xml:229
+msgid "For more information, see <xref linkend=\"firewall\"/>."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:224
-msgid "Bear in mind that allowing everything (no firewall) may be very risky."
+#: en/misc-params.xml:232
+msgid ""
+"Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may "
+"be very risky."
msgstr ""
#. type: Content of: <section><info><title>
@@ -2483,29 +2587,41 @@ msgid "Reboot"
msgstr ""
#. type: Content of: <section><para>
-#: en/reboot.xml:6
+#: en/reboot.xml:7
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer, click on <emphasis "
-"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
-"asked<emphasis role=\"bold\"> in this order!</emphasis>"
+"computer, remove the live DVD/USB stick and restart the computer."
+msgstr ""
+
+#. type: Content of: <section><important><simpara>
+#: en/reboot.xml:9
+msgid ""
+"Ensure that you follow these shut-down and restart instruction steps in the "
+"<emphasis role=\"bold\">same</emphasis> order."
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:11
-msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+#: en/reboot.xml:12
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot2.png\"/> "
+"</imageobject>"
msgstr ""
-#. type: Content of: <section><para>
-#: en/reboot.xml:15
+#. type: Content of: <section><simpara>
+#: en/reboot.xml:16
+msgid "When you are ready, press <emphasis>Finish</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><simpara>
+#: en/reboot.xml:17
msgid ""
"When you restart, you will see a succession of download progress bars. These "
-"indicate that the software media lists are being downloaded (see Software "
-"management)."
+"indicate that the software media lists are being downloaded (see "
+"<emphasis>Software Management</emphasis>)."
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:17
+#: en/reboot.xml:19
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" "
"fileref=\"live-reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -2528,41 +2644,46 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/securityLevel.xml:3
+#: en/securityLevel.xml:10
msgid "Security Level"
msgstr ""
#. 2012-12-25 marja - moved this part out of misc-params.xml"
#. 2013-05-05 marja - added screenshot
+#. 2018/02/12 apb: Minor wording.
#. type: Content of: <section><mediaobject>
-#: en/securityLevel.xml:11
+#: en/securityLevel.xml:20
msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" "
-"align=\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> "
-"</imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-securityLevel.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"securityLevel-im1\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/securityLevel.xml:16
+#: en/securityLevel.xml:26
msgid "<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
msgstr ""
#. type: Content of: <section><para>
-#: en/securityLevel.xml:19
+#: en/securityLevel.xml:29
+msgid ""
+"<emphasis>Standard</emphasis> is the default, and recommended setting for "
+"the average user."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:32
msgid ""
-"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
-"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
-"setting will create a highly protected system - for instance if the system "
-"is to be used as a public server."
+"<emphasis>Secure</emphasis> will create a highly protected system - for "
+"instance if the system is to be used as a public server."
msgstr ""
#. type: Content of: <section><para>
-#: en/securityLevel.xml:24
+#: en/securityLevel.xml:36
msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
msgstr ""
#. type: Content of: <section><para>
-#: en/securityLevel.xml:26
+#: en/securityLevel.xml:38
msgid ""
"This item allows you to configure an email address to which the system will "
"send <emphasis>security alert messages</emphasis> when it detects situations "
@@ -2570,14 +2691,14 @@ msgid ""
msgstr ""
#. type: Content of: <section><para>
-#: en/securityLevel.xml:31
+#: en/securityLevel.xml:43
msgid ""
-"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
-"where &lt;user> is the login name of the user to receive these messages."
+"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."
msgstr ""
#. type: Content of: <section><note><para>
-#: en/securityLevel.xml:36
+#: en/securityLevel.xml:48
msgid ""
"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
@@ -2585,511 +2706,552 @@ msgid ""
msgstr ""
#. type: Content of: <section><para>
-#: en/securityLevel.xml:41
+#: en/securityLevel.xml:53
msgid ""
-"After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
+"It will always be possible to adjust your security settings post-install in "
+"the <emphasis>Security</emphasis> section of the Mageia Control Center."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:6
+#: en/SelectAndUseISOs2.xml:15
msgid "Select and use ISOs"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:18
msgid "Introduction"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:10
+#: en/SelectAndUseISOs2.xml:19
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image best suits your needs."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:12
-msgid "There are two families of media:"
+#: en/SelectAndUseISOs2.xml:21
+msgid "There are three types of installation media:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:15
+#: en/SelectAndUseISOs2.xml:24
msgid ""
-"Classical installer: 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"
+"<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."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:21
+#: en/SelectAndUseISOs2.xml:31
+msgid ""
+"<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."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><note><para>
+#: en/SelectAndUseISOs2.xml:37
+msgid ""
+"The Live Installer is simpler compared to the Classical Installer - but you "
+"have fewer configuration options."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><important><para>
+#: en/SelectAndUseISOs2.xml:41
+msgid ""
+"Live ISOs can only be used to create <quote>clean</quote> installations, "
+"they cannot be used to upgrade previously installed Mageia releases."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:47
msgid ""
-"LIVE media: This option allows you to try out Mageia without having to "
-"actually install it, or make any changes to your computer. If the "
-"installation is decided, the process is simpler, but you get fewer choices "
-"than offered by the Classical installer"
+"<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."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:53
+msgid ""
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:27
-msgid "Details are given in the next sections."
+#: en/SelectAndUseISOs2.xml:58
+msgid "More details are given in the next sections."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:30
+#: en/SelectAndUseISOs2.xml:61
msgid "Media"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:32
+#: en/SelectAndUseISOs2.xml:63
msgid "Definition"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:64
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support (DVD, USB "
-"stick, ...) the ISO file is copied to."
+"install and/or update Mageia and, by extension, any physical medium (DVD, "
+"USB stick, ...) the ISO file is copied to."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:36
+#: en/SelectAndUseISOs2.xml:67
msgid ""
"You can find Mageia ISO's <link "
"ns4:href=\"http://www.mageia.org/en/downloads/\">here</link>."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:70
msgid "Classical installation media"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71 en/SelectAndUseISOs2.xml:141
+#: en/SelectAndUseISOs2.xml:72 en/SelectAndUseISOs2.xml:104 en/SelectAndUseISOs2.xml:171
msgid "Common features"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:44
-msgid "These ISOs use the Classical installer called drakx."
+#: en/SelectAndUseISOs2.xml:75
+msgid "These ISOs use the Classical installer called DrakX"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:47
+#: en/SelectAndUseISOs2.xml:78
msgid ""
"They are used for performing clean installs or to upgrade a previously "
-"installed version of Mageia."
+"installed version of Mageia"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83 en/SelectAndUseISOs2.xml:158
-msgid "Different media for 32 and 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:82 en/SelectAndUseISOs2.xml:118 en/SelectAndUseISOs2.xml:174
+msgid "Different media for 32 and 64-bit architectures"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:54
+#: en/SelectAndUseISOs2.xml:85
msgid ""
-"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
-"Hardware Detection Tool."
+"Some tools are available in the Installer <quote>Welcome</quote> screen: "
+"<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware "
+"Detection Tool</emphasis>"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:58
-msgid "Each DVD contains many available desktop environments and languages."
+#: en/SelectAndUseISOs2.xml:91
+msgid "Each DVD contains many available desktop environments and languages"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:62
-msgid "You'll be given the choice during the installation to add non free software."
+#: en/SelectAndUseISOs2.xml:95
+msgid "You'll be given the choice during the installation to add non-free software"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:102
msgid "Live media"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:74
+#: en/SelectAndUseISOs2.xml:107
msgid ""
"Can be used to preview the Mageia operating system without having to install "
-"it. Can also be used to install Mageia if you wish."
+"it"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
-msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
+#: en/SelectAndUseISOs2.xml:111
+msgid "The Live media also includes an Installer."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:86
-msgid ""
-"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade previously installed Mageia "
-"releases.</emphasis>"
+#: en/SelectAndUseISOs2.xml:114
+msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:91
-msgid "They contain non free software."
+#: en/SelectAndUseISOs2.xml:121
+msgid "They contain non-free software"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:96
+#: en/SelectAndUseISOs2.xml:126
msgid "Live DVD Plasma"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:99
-msgid "Plasma desktop environment only."
+#: en/SelectAndUseISOs2.xml:129
+msgid "Plasma desktop environment only"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116 en/SelectAndUseISOs2.xml:130
-msgid "All available languages are present."
+#: en/SelectAndUseISOs2.xml:132 en/SelectAndUseISOs2.xml:146 en/SelectAndUseISOs2.xml:160
+msgid "All available languages are present"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:105
-msgid "64 bit architecture only."
+#: en/SelectAndUseISOs2.xml:135 en/SelectAndUseISOs2.xml:149
+msgid "64-bit architecture only"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:110
+#: en/SelectAndUseISOs2.xml:140
msgid "Live DVD GNOME"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:113
-msgid "GNOME desktop environment only."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:119
-msgid "64 bit architecture only"
+#: en/SelectAndUseISOs2.xml:143
+msgid "GNOME desktop environment only"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:154
msgid "Live DVD Xfce"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:127
-msgid "Xfce desktop environment only."
+#: en/SelectAndUseISOs2.xml:157
+msgid "Xfce desktop environment only"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:133
-msgid "32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:163
+msgid "32 or 64-bit architectures"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:139
+#: en/SelectAndUseISOs2.xml:169
msgid "Net install media"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:144
-msgid ""
-"These are minimal ISO's containing no more than that which is needed to "
-"start the drakx installer and find drakx-installer-stage2 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."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
-msgid ""
-"These media are very light (less than 100 MB) and are convenient if "
-"bandwidth is too low to download a full DVD, or if you have a PC without a "
-"DVD drive or is unable to boot from a USB stick."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:161
-msgid "First steps are English language only."
+#: en/SelectAndUseISOs2.xml:177
+msgid "First steps are English language only"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:182
msgid "netinstall.iso"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:169
+#: en/SelectAndUseISOs2.xml:185
msgid ""
-"Contains only free software, for those people who prefer not to use non-free "
-"software."
+"Contains only free software, for those who prefer to not use non-free "
+"software"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:175
+#: en/SelectAndUseISOs2.xml:191
msgid "netinstall-nonfree.iso"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:178
-msgid ""
-"Contains non-free software (mostly drivers, codecs...) for people who need "
-"it."
+#: en/SelectAndUseISOs2.xml:194
+msgid "Contains non-free software (mostly drivers, codecs...) for those who need it"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:186
+#: en/SelectAndUseISOs2.xml:202
msgid "Downloading and Checking Media"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:204
msgid "Downloading"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:189
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"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 if the bandwidth is too low. If "
-"http is chosen, you will also see something regarding checksums."
+"the mirror in use and an option to switch to an alternative if the bandwidth "
+"is too low."
msgstr ""
-#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:191
-msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:209
+msgid "If http is chosen you will also see some information regarding checksums."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:195
+#: en/SelectAndUseISOs2.xml:212
msgid ""
-"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
-"other, and copy the checksum <link linkend=\"integrity\">for later "
-"use</link>. Then a window similar to this one appears:"
+"<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."
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:199
-msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:217
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Checking.png\"/> "
+"</imageobject>"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:222
+msgid "In the meantime, a window to download the actual ISO will open:"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/SelectAndUseISOs2.xml:225
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Download.png\"/> "
+"</imageobject>"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:203
-msgid "Select the Save File option, then, click OK."
+#: en/SelectAndUseISOs2.xml:229
+msgid "Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
+#: en/SelectAndUseISOs2.xml:233
msgid "Checking the integrity of the downloaded media"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:208
+#: en/SelectAndUseISOs2.xml:235
msgid ""
"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 it is the case, then you should retry the download or attempt "
-"a repair using BitTorrent."
+"match, and if that is the case, then you should retry the download or "
+"attempt a repair using BitTorrent."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#: en/SelectAndUseISOs2.xml:241
msgid ""
"To generate the checksum for your downloaded ISO, open a console, (no need "
"to be root), and:"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:245
msgid ""
-"To use md5sum, type: <userinput>md5sum "
-"path/to/the/image/file.iso</userinput>."
+"To use the md5sum, type: <command>md5sum "
+"path/to/the/image/file.iso</command>"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:249
+msgid ""
+"To use the sha1sum, type: <command>sha1sum "
+"path/to/the/image/file.iso</command>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:254
msgid ""
-"To use sha1sum, type: <userinput>sha1sum "
-"path/to/the/image/file.iso</userinput>"
+"To use the sha512sum, type: <command>sha512sum "
+"path/to/the/image/file.iso</command>"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:226
+#: en/SelectAndUseISOs2.xml:258
msgid "Example:"
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:228
-msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:260
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Md5sum.png\"/> "
+"</imageobject>"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:265
msgid ""
-"and compare the result (you may have to wait for a while) with the checksum "
-"provided by Mageia."
+"then compare the result (you may have to wait for a while) with the ISO "
+"checksum provided by Mageia."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:237
+#: en/SelectAndUseISOs2.xml:270
msgid "Burn or dump the ISO"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:238
+#: en/SelectAndUseISOs2.xml:271
msgid ""
-"The verified ISO can now be burned to a CD/DVD or dumped to a USB "
-"stick. This is not a standard copy operation as a bootable medium will "
+"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."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:275
msgid "Burning the ISO to a CD/DVD"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:243
+#: en/SelectAndUseISOs2.xml:276
msgid ""
-"Whichever software you use, ensure that the option to burn an <emphasis "
-"role=\"bold\">image</emphasis> is used, burn <emphasis "
-"role=\"bold\">data</emphasis> or <emphasis role=\"bold\">files</emphasis> is "
-"not correct. See <link "
+"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."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:282
msgid "Dump the ISO to a USB stick"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:283
msgid ""
-"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
-"and then use it to boot and install the system."
+"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."
msgstr ""
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any existing data will be lost and the partition capacity "
-"will be reduced to the image size."
+"Dumping an image onto a flash device destroys any previous file-system on "
+"the device and all existing data will be lost."
msgstr ""
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:256
+#. type: Content of: <section><section><section><note><para>
+#: en/SelectAndUseISOs2.xml:290
msgid ""
-"To recover the original capacity, you must redo partitioning and re-format "
-"the USB stick."
+"Also, the only partition on the flash device will then just be the Mageia "
+"ISO partition."
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/SelectAndUseISOs2.xml:292
+msgid ""
+"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."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:299
msgid "Using a graphical tool within Mageia"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#: en/SelectAndUseISOs2.xml:300
msgid ""
"You can use a graphical tool like <link "
"ns4:href=\"https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:263
+#: en/SelectAndUseISOs2.xml:303
msgid "Using a graphical tool within Windows"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:304
msgid "You could try:"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:267
+#: en/SelectAndUseISOs2.xml:307
msgid ""
"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
-"\"ISO image\" option;"
+"\"ISO image\" option"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:271
+#: en/SelectAndUseISOs2.xml:311
msgid ""
"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:277
-msgid "Using Command line within a GNU/Linux system"
+#: en/SelectAndUseISOs2.xml:317
+msgid "Using the Command line within a GNU/Linux system"
msgstr ""
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:279
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"It is potentially *dangerous* to do this by hand. You risk overwriting "
"potentially valuable existing data if you specify the wrong target device."
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:325
msgid "Open a console"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:328
msgid ""
-"Become a root (Administrator) user with the command <userinput>su "
-"-</userinput> (don't forget the final '-' )"
+"Become a <emphasis>root</emphasis> (Administrator) user with the command "
+"<command>su -</command> (don't forget the <command>-</command> )"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
-msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:332
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Root.png\"/> "
+"</imageobject>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:297
+#: en/SelectAndUseISOs2.xml:338
msgid ""
-"Plug in your USB stick (do not mount it, this also means do not open any "
-"application or file manager that could access or read it)"
+"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)"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:302
-msgid "Enter the command <userinput>fdisk -l</userinput>"
+#: en/SelectAndUseISOs2.xml:343
+msgid "Enter the command <command>fdisk -l</command>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
-msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:345
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Fdisk.png\"/> "
+"</imageobject>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:310
+#: en/SelectAndUseISOs2.xml:351
msgid ""
"Find the device name for your USB stick (by its size), for example "
-"<code>/dev/sdb</code> in the screenshot above, it is an 8GB USB stick."
+"<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick."
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:354
msgid ""
"Alternatively, you can find the device name with the command "
-"<code>dmesg</code>: towards the end of this example, you can see the device "
-"name starting with <emphasis>sd</emphasis>, and in this case, "
-"<emphasis>sdd</emphasis> is the actual device. You can also see that its "
+"<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:"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
-#: en/SelectAndUseISOs2.xml:317
+#: en/SelectAndUseISOs2.xml:360
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3119,47 +3281,48 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:317
+#: en/SelectAndUseISOs2.xml:360
msgid "<placeholder type=\"screen\" id=\"0\"/>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:337
+#: en/SelectAndUseISOs2.xml:380
msgid ""
-"Enter the command: <emphasis role=\"bold\"># <userinput>dd "
-"if=path/to/the/ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
+"Enter the command: <command>dd if=path/to/the/ISO/file "
+"of=/dev/sd<replaceable>X</replaceable> bs=1M</command>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:340
-msgid "Where X=your device name eg: /dev/sdd"
+#: en/SelectAndUseISOs2.xml:382
+msgid ""
+"Where <replaceable>X</replaceable>=your device name eg: "
+"<filename>/dev/sdd</filename>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:341
+#: en/SelectAndUseISOs2.xml:384
msgid ""
-"Example:<emphasis role=\"bold\"> # <userinput>dd "
-"if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/sdd "
-"bs=1M</userinput></emphasis>"
+"Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso "
+"of=/dev/sdd bs=1M</literal>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:388
msgid ""
-"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
-"for <emphasis role=\"bold\">i</emphasis>nput <emphasis "
+"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"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:349
-msgid "Enter the command: # <userinput>sync</userinput>"
+#: en/SelectAndUseISOs2.xml:392
+msgid "Enter the command: <command>sync</command>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:395
msgid "This is the end of the process, and you may now unplug your USB stick."
msgstr ""
@@ -3169,47 +3332,48 @@ msgid "Select your Country / Region"
msgstr ""
#. 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.
#. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:9
+#: en/selectCountry.xml:13
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" "
"align=\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> "
"</imageobject>"
msgstr ""
-#. type: Content of: <section><para>
-#: en/selectCountry.xml:14
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectCountry.xml:20
msgid ""
-"Select your country or region. This is important for all kinds of settings, "
+"Select your country or region. This is important for all kinds of settings, "
"like the currency and wireless regulatory domain. Setting the wrong country "
-"can lead to not being able to use a Wireless network."
+"can lead to being unable to use a Wireless network."
msgstr ""
-#. type: Content of: <section><para>
-#: en/selectCountry.xml:19
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectCountry.xml:27
msgid ""
-"If your country isn't in the list, click the <guilabel>Other "
-"Countries</guilabel> option and choose your country / region there."
+"If your country isn't in the list, click the <emphasis>Other "
+"Countries</emphasis> option and choose your country / region there."
msgstr ""
#. type: Content of: <section><note><para>
-#: en/selectCountry.xml:24
+#: en/selectCountry.xml:34
msgid ""
-"If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
-"first list was chosen. Please ignore this, as DrakX will apply your actual "
-"choice."
+"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."
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:33
+#: en/selectCountry.xml:42
msgid "Input method"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/selectCountry.xml:36
+#: en/selectCountry.xml:45
msgid ""
-"In the <guilabel>Other Countries</guilabel> screen you can also select an "
+"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 "
@@ -3219,126 +3383,118 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:45
+#: en/selectCountry.xml:54
msgid ""
"If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via <emphasis role=\"bold\">Configure "
-"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
-"running localedrake as root."
+"post-install via <menuchoice> <guimenu>Configure your Computer</guimenu> "
+"<guimenuitem>System</guimenuitem> </menuchoice>, or by running "
+"<command>localedrake</command> as <emphasis>root</emphasis>."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:14
+#: en/selectInstallClass.xml:29
msgid "Install or Upgrade"
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:18
+#: en/selectInstallClass.xml:33
msgid ""
-"<imageobject> <imagedata format=\"PNG\" align=\"center\" "
-"fileref=\"dx2-selectInstallClass.png\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" "
+"fileref=\"dx2-selectInstallClass.png\" format=\"PNG\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:25
-msgid "Install"
+#: en/selectInstallClass.xml:41
+msgid "<emphasis role=\"bold\">Install</emphasis>"
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:27
+#: en/selectInstallClass.xml:43
msgid ""
-"Use this option to perform a fresh installation of "
-"<application>Mageia</application>. This will format the root partition (/), "
-"but can preserve a separated /home partition."
+"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)."
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:33
-msgid "Upgrade"
+#: en/selectInstallClass.xml:50
+msgid "<emphasis role=\"bold\">Upgrade</emphasis>"
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:35
-msgid ""
-"This can be used to upgrade an existing installation of "
-"<application>Mageia</application>."
+#: en/selectInstallClass.xml:52
+msgid "Use this option to upgrade an existing installation of Mageia."
msgstr ""
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:39
+#. type: Content of: <section><important><para>
+#: en/selectInstallClass.xml:58
msgid ""
"Only upgrading from a previous Mageia version that was <emphasis>still "
-"supported</emphasis> when this installer's version was released, has been "
+"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 End Of Life, then it is better to do a clean install instead while "
-"preserving your <literal>/home</literal> partition."
-msgstr ""
-
-#. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:50
-msgid ""
-"If during install you decide to stop the installation, it is possible to "
-"reboot, but please think twice before you do this. Once a partition has been "
-"formatted or updates have started to be installed, your computer isn't in "
-"the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that, and only if you are very sure "
-"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
-"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
-"Delete</guilabel> simultaneously to reboot."
+"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."
msgstr ""
#. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:62
+#: en/selectInstallClass.xml:67
msgid ""
"If you have discovered that you forgot to select an additional language, you "
-"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
-"screen to the language choice screen by pressing <guilabel>Alt Ctrl "
-"Home</guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do "
-"this later in the install."
+"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."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/selectKeyboardLive.xml:3
-msgid "Select keyboard"
+#: en/selectKeyboardLive.xml:14
+msgid "Select Keyboard"
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/selectKeyboardLive.xml:7
+#: en/selectKeyboardLive.xml:18
msgid ""
-"<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata align=\"center\" "
+"fileref=\"live-selectKeyboard.png\" format=\"PNG\" revision=\"1\" "
+"xml:id=\"selectKeyboardLive-im1\"/> </imageobject>"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/selectKeyboardLive.xml:24
+msgid "Here you can set the keyboard layout you wish to use with Mageia​​."
msgstr ""
#. type: Content of: <section><para>
-#: en/selectKeyboardLive.xml:12
+#: en/selectKeyboardLive.xml:27
msgid ""
-"You will be required to set the keyboard layout you wish to use in "
-"Mageia​​. The default one is selected according to your language and "
-"timezone previously selected."
+"A suggested keyboard layout (highlighted), has been chosen for you based "
+"upon your previously selected language and timezone choices."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:7
+#: en/selectKeyboard.xml:20
msgid "Keyboard"
msgstr ""
#. type: Content of: <section><para>
-#: en/selectKeyboard.xml:10
+#: en/selectKeyboard.xml:23
msgid ""
"DrakX selects an appropriate keyboard for your language. If no suitable "
"keyboard is found it will default to a US keyboard layout."
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:15
+#: en/selectKeyboard.xml:28
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" "
-"align=\"center\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" "
+"fileref=\"dx2-selectKeyboard.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:35
msgid ""
"Make sure that the selection is correct or choose another keyboard "
"layout. If you don't know which layout your keyboard has, look in the "
@@ -3349,25 +3505,24 @@ msgid ""
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:31
+#: en/selectKeyboard.xml:45
msgid ""
-"If your keyboard isn't in the list shown, click on "
-"<guibutton>More</guibutton> to get a fuller list, and select your keyboard "
-"there."
+"If your keyboard isn't in the list shown, click on <emphasis>More</emphasis> "
+"to get a fuller list, and select your keyboard there."
msgstr ""
-#. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:36
+#. type: Content of: <section><itemizedlist><listitem><para><note><para>
+#: en/selectKeyboard.xml:50
msgid ""
-"After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
-"you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this and "
-"continue the installation: the keyboard chosen from the full list will be "
-"applied."
+"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."
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:46
+#: en/selectKeyboard.xml:60
msgid ""
"If you choose a keyboard based on non-Latin characters, you will see an "
"extra dialogue screen asking how you would prefer to switch between the "
@@ -3375,80 +3530,78 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:34
msgid "Please choose a language to use"
msgstr ""
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:39
msgid ""
"Select your preferred language, by first expanding the list for your "
-"continent. <application>Mageia</application> will use this selection during "
-"the installation and for your installed system."
+"continent. Mageia will use this selection during the installation and for "
+"your installed system."
msgstr ""
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:23
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:45
msgid ""
-"Select your preferred language. <application>Mageia</application> will use "
-"this selection during the installation and for your installed system."
+"Select your preferred language. Mageia will use this selection during the "
+"installation and for your installed system."
msgstr ""
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:27
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:50
msgid ""
"If it is likely that you (or others) will require several languages to be "
-"installed on your system, then you should use the <guibutton>Multiple "
-"languages</guibutton> option to add them now. It will be difficult to add "
+"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."
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:58
msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" "
-"fileref=\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> "
-"<imageobject condition=\"live\"> <imagedata fileref=\"live-language.png\" "
-"format=\"\"/> </imageobject>"
+"<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>"
msgstr ""
-#. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:43
+#. type: Content of: <section><important><para>
+#: en/selectLanguage.xml:68
msgid ""
"Even if you choose more than one language, you must first choose one as your "
-"preferred language in the first language screen. It will also be marked as "
-"chosen in the multiple languages screen."
+"preferred language from the main list of languages. It will also be marked "
+"as chosen in the <emphasis>Multiple languages</emphasis> screen."
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:76
msgid ""
"If your keyboard language is not the same as your preferred language, then "
-"it is advisable to install the language of your keyboard as well."
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:56
-msgid "Mageia uses UTF-8 (Unicode) support by default."
+"it is advisable to install the required language for your keyboard as well"
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:58
+#: en/selectLanguage.xml:82
msgid ""
-"This may be disabled in the <emphasis role=\"bold\">Multiple "
-"languages</emphasis> screen if you know that it is inappropriate for your "
-"language. Disabling UTF-8 applies to all installed languages."
+"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."
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:64
+#: en/selectLanguage.xml:89
msgid ""
-"You can change the language of your system after installation in the Mageia "
-"Control Center -> System -> Manage localization for your system."
+"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>."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/selectMouse.xml:4
+#: en/selectMouse.xml:10
msgid "Select mouse"
msgstr ""
@@ -3456,36 +3609,38 @@ msgstr ""
#. 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.
#. type: Content of: <section><mediaobject>
-#: en/selectMouse.xml:16
+#: en/selectMouse.xml:24
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
-"format=\"PNG\" > </imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectMouse.png\" "
+"format=\"PNG\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/selectMouse.xml:23
+#: en/selectMouse.xml:29
msgid ""
"If you are not happy with how your mouse responds, you can select a "
"different one here."
msgstr ""
#. type: Content of: <section><para>
-#: en/selectMouse.xml:25
+#: en/selectMouse.xml:32
msgid ""
-"Usually, <guilabel>Universal</guilabel> - <guilabel>Any PS/2 and USB "
-"mice</guilabel> is a good choice."
+"Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and "
+"USB mice</guimenuitem> </menuchoice> is a good choice."
msgstr ""
#. type: Content of: <section><para>
-#: en/selectMouse.xml:27
+#: en/selectMouse.xml:38
msgid ""
-"Select <guilabel>Universal</guilabel> - <guilabel>Force evdev</guilabel> to "
-"configure the buttons that do not work on a mouse with six or more buttons."
+"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."
msgstr ""
-#. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloaderAddEntry.xml:7 en/setupBootloader.xml:206
msgid "Add or Modify a Boot Menu Entry"
msgstr ""
@@ -3505,300 +3660,347 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
+#: en/setupBootloader.xml:10
+msgid "Bootloader"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:10
-msgid "Bootloader interface"
+#: en/setupBootloader.xml:13
+msgid "Grub2"
msgstr ""
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:11
-msgid "By default, Mageia uses exclusively:"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:15
+msgid "Grub2 on Legacy MBR/GPT systems"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:14
-msgid "GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+#: en/setupBootloader.xml:17
+msgid ""
+"GRUB2 (with or without graphical menu) will be used exclusively as the "
+"bootloader for a Legacy/MBR or Legacy/GPT system."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:18
-msgid "GRUB2-efi for a UEFI system."
+#: en/setupBootloader.xml:21
+msgid ""
+"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."
msgstr ""
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:22
-msgid "The Mageia graphical menus are nice :)"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:27
+msgid "Grub2-efi on UEFI systems"
msgstr ""
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:25
-msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:29
+msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
msgstr ""
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:27
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:33
msgid ""
-"<imageobject condition=\"classical\"> <imagedata "
-"fileref=\"dx2-setupBootloader.png\" align=\"center\"/> </imageobject> "
-"<imageobject condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" "
-"fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
+"System Partition)."
msgstr ""
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:35
msgid ""
-"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
-"really know what you are doing."
+"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."
msgstr ""
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:38
-msgid "GRUB2-efi on UEFI systems"
+#. type: Content of: <section><section><info><title>
+#: en/setupBootloader.xml:46
+msgid "Bootloader Setup"
msgstr ""
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:39
-msgid ""
-"With a UEFI system, the user interface is slightly different as you cannot "
-"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis "
-"role=\"bold\">without graphical menu</emphasis> options."
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:49
+msgid "Bootloader main options"
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
+#: en/setupBootloader.xml:51
msgid ""
-"<imageobject condition=\"classical\"> <imagedata "
-"fileref=\"dx2-setupBootloader2.png\" align=\"center\"/> </imageobject> "
-"<imageobject condition=\"live\"> <imagedata "
-"fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" "
+"fileref=\"dx2-setupBootloader.png\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader.png\" "
+"xml:id=\"setupBootloader-im1\"/> </imageobject>"
msgstr ""
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:49
-msgid ""
-"If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to house the bootloader "
-"(GRUB2-efi). If there are already UEFI operating systems installed on your "
-"computer (Windows 8 for example), the Mageia installer detects the existing "
-"ESP created by Windows and adds GRUB2-efi. Although it is possible to have "
-"several ESPs, only one is required (and advised), whatever the number of "
-"operating systems you have."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:62
+msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
msgstr ""
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:61
-msgid "Using a Mageia bootloader"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+msgid ""
+"This feature is only available to Legacy MBR/BIOS systems. Users of UEFI "
+"systems will not see this option here."
msgstr ""
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:62
-msgid ""
-"By default, and according to your system, Mageia writes one of the "
-"following:"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:67
+msgid "<emphasis role=\"bold\">Boot device</emphasis>"
msgstr ""
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:66
-msgid ""
-"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
-"hard drive or in the BIOS boot partition."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
+msgid "Don't change this unless you really know what you are doing"
msgstr ""
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:70
-msgid "a GRUB2-efi bootloader into the ESP"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:72
+msgid "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
msgstr ""
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:73
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:74
msgid ""
-"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, "
-"click on <guibutton>Next</guibutton> and then untick the <emphasis "
-"role=\"bold\">Probe Foreign OS</emphasis> option."
+"This text box lets you set a delay, in seconds, before the default operating "
+"system is started up."
msgstr ""
-#. type: Content of: <section><section><mediaobject>
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
#: en/setupBootloader.xml:78
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" "
-"fileref=\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" "
-"align=\"center\"/> </imageobject>"
+msgid "<emphasis role=\"bold\">Security</emphasis>"
msgstr ""
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:87
-msgid "Using an existing bootloader"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:79
+msgid ""
+"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."
msgstr ""
-#. type: Content of: <section><section><para>
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
#: en/setupBootloader.xml:88
-msgid ""
-"The exact procedure for adding your Mageia system 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 and add it automatically. See the documentation for the operating "
-"system in question."
+msgid "Choose a password for the bootloader (optional)"
msgstr ""
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:95
-msgid "Using chain loading"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:91
+msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
msgstr ""
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:96
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:92
msgid ""
-"If you don't want a bootable Mageia, but to chain-load it from another OS, "
-"click on <guibutton>Next</guibutton>, then on "
-"<guibutton>Advanced</guibutton> and tick the box <guilabel>Do not touch ESP "
-"or MBR</guilabel>."
+"Retype the password and DrakX will check that it matches with the one set "
+"above"
msgstr ""
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:101
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+msgid "<emphasis>Advanced</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:99
+msgid "<emphasis>Enable ACPI</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:100
msgid ""
-"<imageobject condition=\"classical\"> <imagedata "
-"fileref=\"dx2-setupBootloader4.png\" align=\"center\"/> </imageobject> "
-"<imageobject condition=\"live\"> <imagedata "
-"fileref=\"live-setupBootloader4.png\" align=\"center\"/> </imageobject>"
+"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)."
msgstr ""
-#. type: Content of: <section><section><para>
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
#: en/setupBootloader.xml:108
-msgid ""
-"You will get a warning that the bootloader is missing, ignore it by clicking "
-"<guibutton>OK</guibutton>."
+msgid "<emphasis>Enable SMP</emphasis>"
msgstr ""
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:109
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> "
-"</imageobject>"
+"This option enables/disables symmetric multiprocessing for multi-core "
+"processors"
msgstr ""
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:117
-msgid "Options"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:113
+msgid "<emphasis>Enable APIC</emphasis>"
msgstr ""
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:119
-msgid "First page"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:114
+msgid ""
+"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."
msgstr ""
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
#: en/setupBootloader.xml:120
-msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This lets you "
-"set a delay in seconds before the default operating system is started up."
+msgid "<emphasis>Enable Local APIC</emphasis>"
msgstr ""
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:122
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:121
msgid ""
-"<guilabel>Security</guilabel>: This allows you to set a password for the "
-"bootloader. This means a username and password will be required when booting "
-"to select a booting entry or change settings. The username is <emphasis "
-"role=\"bold\">root</emphasis> and the password is the one chosen here-after."
+"Here you can set Local APIC, which manages all external interrupts for a "
+"specific processor in an SMP system"
msgstr ""
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:125
-msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:127
+msgid "Bootloader Configuration"
msgstr ""
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:129
msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
-"check that it matches with the one above."
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" "
+"fileref=\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata align=\"center\" "
+"fileref=\"live-setupBootloader3.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
-msgid "<guilabel>Advanced</guilabel>"
+#: en/setupBootloader.xml:139
+msgid "<emphasis role=\"bold\">Default</emphasis>"
msgstr ""
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:127
-msgid ""
-"<guilabel>Enable ACPI:</guilabel> 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)."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:140
+msgid "The operating system to started up by default"
msgstr ""
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:133
-msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
-"multiprocessing for multi core processors."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:143
+msgid "<emphasis role=\"bold\">Append</emphasis>"
msgstr ""
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:135
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:144
msgid ""
-"<guilabel>Enable APIC</guilabel>: 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."
+"This option lets you pass information to the kernel or tell the kernel to "
+"give you more information as it boots"
msgstr ""
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:138
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:148
+msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:149
msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
-"interrupts for a specific processor in an SMP system."
+"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."
msgstr ""
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:143
-msgid "Next page"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:156
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" "
+"fileref=\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata align=\"center\" "
+"fileref=\"live-setupBootloader4.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:146
-msgid "<guilabel>Default:</guilabel> Operating system started up by default"
+#: en/setupBootloader.xml:166
+msgid "<emphasis>Video mode</emphasis>"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:150
+#: en/setupBootloader.xml:167
msgid ""
-"<guilabel>Append:</guilabel> This option lets you pass the kernel "
-"information or tell the kernel to give you more information as it boots."
+"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."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:155
+#: en/setupBootloader.xml:172
+msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:173
msgid ""
-"<guilabel>Probe foreign OS</guilabel>: see above <link "
-"linkend=\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
+"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."
msgstr ""
-#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:181
msgid ""
-"<guilabel>Video mode:</guilabel> 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."
+"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" "
+"align=\"center\"/> </imageobject>"
+msgstr ""
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:188
+msgid "Other Options"
msgstr ""
-#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:190
+msgid "Using an existing bootloader"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:191
msgid ""
-"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
-"linkend=\"setupChainLoading\">Using the chain loading</link>"
+"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."
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:199
+msgid "Installing Without a Bootloader"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:200
+msgid ""
+"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."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:207
+msgid ""
+"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)."
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:212
+msgid ""
+"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>"
msgstr ""
#. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:3
+#: en/setupSCSI.xml:10
msgid "Setup SCSI"
msgstr ""
@@ -3810,15 +4012,17 @@ msgstr ""
#. 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
+#. 2018/02/15 apb: Text and typography.
+#. 2018/0217 apb: Merge 2nd/3rd paras and reword.
#. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:22
+#: en/setupSCSI.xml:33
msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" "
-"align=\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-setupSCSI.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"setupSCSI-im1\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/setupSCSI.xml:27
+#: en/setupSCSI.xml:39
msgid ""
"DrakX will normally detect hard disks correctly. However, with some older "
"SCSI controllers it may be unable to determine the correct drivers to use "
@@ -3826,79 +4030,54 @@ msgid ""
msgstr ""
#. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:44
msgid ""
-"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
-"you have."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/setupSCSI.xml:35
-msgid "DrakX should then be able to configure the drive(s) correctly."
+"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."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/soundConfig.xml:3
+#: en/soundConfig.xml:10
msgid "Sound Configuration"
msgstr ""
#. Lebarhon 20170209 updated SC
+#. 2018/02/13 apb: Text and typography.
+#. 2018/02/17 apb: Centre-align PNG
#. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:9
-msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
-"xml:id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/soundConfig.xml:14
+#: en/soundConfig.xml:20
msgid ""
-"In this screen the name of the driver that the installer chose for your "
-"sound card is given, which will be the default driver if one exists."
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-soundConfig.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"soundConfig-im1\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/soundConfig.xml:18
+#: en/soundConfig.xml:26
msgid ""
-"The default driver should work without problems. However, if after install "
-"you do encounter problems, then run <command>draksound</command> or start "
-"this tool via MCC (Mageia Control Center), by choosing the "
-"<guilabel>Hardware</guilabel> tab and clicking on <guilabel>Sound "
-"Configuration</guilabel> at the top right of the screen."
+"This screen shows the details of the sound card driver chosen for you by the "
+"installer, and this driver should work without problems."
msgstr ""
#. type: Content of: <section><para>
-#: en/soundConfig.xml:24
+#: en/soundConfig.xml:29
msgid ""
-"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis "
-"role=\"bold\">Sound Configuration</emphasis> tool screen, click on "
-"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
-"solve the problem."
+"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."
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:30
+#: en/soundConfig.xml:43
msgid "Advanced"
msgstr ""
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:33
-msgid ""
-"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
-"in this screen, during install, is useful if there is no default driver and "
-"there are several drivers available, but you think the installer selected "
-"the wrong one."
-msgstr ""
-
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:38
-msgid ""
-"In that case you can select a different driver after clicking on <emphasis "
-"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
-msgstr ""
-
#. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:3
+#: en/takeOverHdConfirm.xml:10
msgid "Confirm hard disk to be formatted"
msgstr ""
@@ -3908,136 +4087,140 @@ msgstr ""
#. 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
+#. 2018/02/15 apb: Text and typography
+#. 2018/02/20 apb: Change the 2 paras to itemized listitems.
#. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:18
+#: en/takeOverHdConfirm.xml:29
msgid ""
-"<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>"
+"<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>"
msgstr ""
-#. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:27
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/takeOverHdConfirm.xml:42
msgid ""
-"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
+"Click on <emphasis>Previous</emphasis> if you are at all unsure about your "
"choice."
msgstr ""
-#. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:31
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/takeOverHdConfirm.xml:48
msgid ""
-"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
-"ok to erase every partition, every operating system and all data that might "
-"be on that hard disk."
+"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."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/testing.xml:9
+#: en/testing.xml:3
msgid "Testing Mageia as Live system"
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/testing.xml:14
+#: en/testing.xml:8
msgid "Live mode"
msgstr ""
-#. type: Content of: <section><section><mediaobject>
-#: en/testing.xml:18
-msgid "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
-msgstr ""
-
#. type: Content of: <section><section><para>
-#: en/testing.xml:23
+#: en/testing.xml:11
msgid ""
-"You get this screen if you selected \"Boot Mageia\". If not, you get the "
-"\"<link linkend=\"doPartitionDisks\">Partitioning</link> step\""
+"This is the screen you will see if you selected the <emphasis "
+"role=\"bold\">Boot Mageia </emphasis>option from the Live media menu."
+msgstr ""
+
+#. type: Content of: <section><section><mediaobject>
+#: en/testing.xml:14
+msgid "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:28
+#: en/testing.xml:21
msgid "Testing hardware"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/testing.xml:31
+#: en/testing.xml:24
msgid ""
-"One of the Live mode goals is to test if the hardware is correctly managed "
-"by Mageia. You can check if all devices have a driver in the Hardware "
-"section of the Mageia Control Center. You can test the most current devices:"
+"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:"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:38
+#: en/testing.xml:31
msgid "network interface: configure it with net_applet"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:42
-msgid "graphical card: if you see the previous screen, it's already OK."
+#: en/testing.xml:35
+msgid "graphics card: if you see the previous screen, it's already OK."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:47
+#: en/testing.xml:40
msgid "webcam:"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:51
+#: en/testing.xml:44
msgid "sound: a jingle has already been played"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:55
-msgid "printer: configure it and print a test page"
+#: en/testing.xml:48
+msgid "printer: configure your printer/s and print a test page"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:59
+#: en/testing.xml:52
msgid "scanner: scan a document from ..."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/testing.xml:63
+#: en/testing.xml:56
msgid ""
-"If all is OK for you, you can process to the installation. If not, you can "
-"leave with the quit button."
+"If everything is satisfactory, you can proceed with the installation. If "
+"not, you can use the <emphasis>Quit</emphasis> button to exit."
msgstr ""
-#. type: Content of: <section><section><section><remark>
-#: en/testing.xml:66
-msgid "The configuration settings you made here are kept for the installation."
+#. type: Content of: <section><section><section><note><para>
+#: en/testing.xml:61
+msgid ""
+"The configuration settings you apply here are carried over if you decide to "
+"proceed with the installation."
msgstr ""
#. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:72
+#: en/testing.xml:68
msgid "Launch installation"
msgstr ""
-#. type: Content of: <section><section><section><mediaobject>
-#: en/testing.xml:76
+#. type: Content of: <section><section><section><para>
+#: en/testing.xml:71
msgid ""
-"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> "
-"</imageobject>"
+"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."
msgstr ""
-#. type: Content of: <section><section><section><para>
-#: en/testing.xml:81
+#. type: Content of: <section><section><section><mediaobject>
+#: en/testing.xml:77
msgid ""
-"To launch the installation of Mageia LiveCD or Live DVD to the hard disc or "
-"SSD drive, simply click on the icon \"Install on Hard Disk\". You will get "
-"this screen, and then the \"<link "
-"linkend=\"doPartitionDisks\">Partitioning</link> step\" as for the direct "
-"installation."
+"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> "
+"</imageobject>"
msgstr ""
#. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:3
+#: en/uninstall-Mageia.xml:10
msgid "Uninstalling Mageia"
msgstr ""
#. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:18
msgid ""
"If Mageia didn't convince you or you can't install it correctly - in short "
"you want get rid of it - that is your right and Mageia also gives you the "
@@ -4045,34 +4228,37 @@ msgid ""
msgstr ""
#. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:14
+#: en/uninstall-Mageia.xml:23
msgid ""
-"After your data backup, reboot your Mageia installation DVD and select "
-"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis "
-"role=\"bold\">Restore Windows boot loader</emphasis>. At the next boot, you "
-"will only have Windows, with no option to choose your operating system."
+"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."
msgstr ""
#. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:19
+#: en/uninstall-Mageia.xml:28
msgid ""
-"In Windows to recover the space used by Mageia partitions: click on "
-"<code>Start -> Control Panel -> Administrative Tools -> Computer Management "
-"-> Storage -> Disk Management</code>. You will recognize a Mageia partition "
-"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
-"size and place on the disk. Right click on each of these partitions and "
-"select <guibutton>Delete</guibutton> to free up the space."
+"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."
msgstr ""
#. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:46
msgid ""
"If you are using Windows XP, you can create a new partition and format it "
-"(FAT32 or NTFS). It will get a partition letter."
+"(FAT32 or NTFS). It will then get a partition letter."
msgstr ""
#. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:30
+#: en/uninstall-Mageia.xml:49
msgid ""
"If you have Vista or 7, you have one more possibility, you can extend the "
"existing partition that is at the left of the freed space. There are other "
@@ -4083,36 +4269,51 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/unused.xml:9
+#: en/unused.xml:3
msgid "Keep or delete unused material"
msgstr ""
+#. 2018/03/03 apb: Adjusted text and updated SC's to Mga6.
#. type: Content of: <section><mediaobject>
-#: en/unused.xml:13
+#: en/unused.xml:9
msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"unused-im1\" "
+"fileref=\"live-unused.png\" align=\"center\" revision=\"1\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/unused.xml:19
+#: en/unused.xml:14
msgid ""
"In this step, the installer looks for unused locales packages and unused "
-"hardware packages. Then it proposes you to delete them. It is a good idea to "
-"accept, except if you prepare an installation which has to run on different "
-"hardware."
+"hardware packages and you are then given an opportunity to delete them."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/unused.xml:18
+msgid ""
+"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."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/unused.xml:22
+msgid ""
+"Clicking <emphasis>Advanced</emphasis> will list the unused hardware and "
+"localization files that will be removed if you proceed."
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/unused.xml:25
+#: en/unused.xml:26
msgid ""
"<imageobject> <imagedata "
"fileref=\"../live-unused-InstallationProgress.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/unused.xml:30
+#: en/unused.xml:31
msgid ""
-"The next step is the copying of files on hard disk. This takes some "
-"minutes. At the end, you get a blank screen for some time, it's normal."
+"The next step is the copying of files to hard disk. This process should just "
+"take a little while to complete. When it is finising you will briefly get a "
+"blank screen - this is normal."
msgstr ""
diff --git a/docs/docs/stable/installer/uk.po b/docs/docs/stable/installer/uk.po
index e5190d40..7ed6e80a 100644
--- a/docs/docs/stable/installer/uk.po
+++ b/docs/docs/stable/installer/uk.po
@@ -1,13 +1,13 @@
# Copyright (C) 2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the PACKAGE package.
#
-# Yuri Chornoivan <yurchor@ukr.net>, 2012, 2013, 2014, 2015, 2016, 2017, 2018.
+# Yuri Chornoivan <yurchor@ukr.net>, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2018-04-19 16:32+0300\n"
-"PO-Revision-Date: 2018-04-19 16:36+0200\n"
+"POT-Creation-Date: 2019-01-06 12:43+0200\n"
+"PO-Revision-Date: 2019-01-06 13:04+0200\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
"Language: uk\n"
@@ -18,12 +18,12 @@ msgstr ""
"X-Generator: Lokalize 2.0\n"
#. type: Content of: <section><info><title>
-#: en/acceptLicense.xml:25
+#: en/acceptLicense.xml:31
msgid "License and Release Notes"
msgstr "Умови ліцензування та нотатки щодо випуску"
#. type: Content of: <section><mediaobject>
-#: en/acceptLicense.xml:29
+#: en/acceptLicense.xml:35
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
@@ -38,81 +38,89 @@ msgstr ""
"\"center\" condition=\"live\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:40
+#: en/acceptLicense.xml:46
msgid "License Agreement"
msgstr "Ліцензійна угода"
-#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:43
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/acceptLicense.xml:51
+#, fuzzy
msgid ""
-"Before installing <application>Mageia</application>, please read the license "
-"terms and conditions carefully."
+"Before installing Mageia, please read the license terms and conditions "
+"carefully."
msgstr ""
-"Перш ніж встановлювати <application>Mageia</application>, будь ласка, "
+"Перш ніж встановлювати Mageia, будь ласка, "
"ретельно ознайомтеся з умовами ліцензування."
-#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:46
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/acceptLicense.xml:56
+#, fuzzy
msgid ""
-"These terms and conditions apply to the entire <application>Mageia</"
-"application> distribution and must be accepted before you can continue."
+"These terms and conditions apply to the entire Mageia distribution and must "
+"be accepted before you can continue."
msgstr ""
"Ці умови ліцензування стосуються всього дистрибутива <application>Mageia</"
"application>. Вам слід прийняти ці умови, інакше встановлення буде "
"неможливим."
-#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:50
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/acceptLicense.xml:61
+#, fuzzy
msgid ""
-"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
-"<guibutton>Next</guibutton>."
+"To proceed, simply select <emphasis>Accept</emphasis> and then click on "
+"<emphasis>Next</emphasis>"
msgstr ""
"Щоб погодитися з умовами, позначте пункт <guilabel>Прийняти</guilabel>, а "
"потім натисніть кнопку <guibutton>Далі</guibutton>."
#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:53
+#: en/acceptLicense.xml:66
+#, fuzzy
msgid ""
-"If you decide not to accept these conditions, then we thank you for looking. "
-"Clicking <guibutton>Quit</guibutton> will reboot your computer."
+"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."
msgstr ""
"Якщо ви не погоджуєтеся з умовами ліцензування, ми залишимося вдячні за те, "
"що ви звернули увагу на дистрибутив. Після натискання кнопки "
"<guibutton>Вийти</guibutton> ваш комп’ютер буде перезавантажено."
#. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:63
+#: en/acceptLicense.xml:76
msgid "Release Notes"
msgstr "Нотатки щодо випуску"
#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:70
+#: en/acceptLicense.xml:83
+#, fuzzy
msgid ""
-"Important information about this release of <application>Mageia</"
-"application> can be viewed by clicking on the <guibutton>Release Notes</"
-"guibutton> button."
+"Important information about this particular Mageia release can be viewed by "
+"clicking on the <emphasis>Release Notes</emphasis> button."
msgstr ""
"Щоб ознайомитися із важливою інформацією щодо поточного випуску "
-"<application>Mageia</application>, натисніть кнопку <guibutton>Нотатки щодо "
+"Mageia, натисніть кнопку <guibutton>Нотатки щодо "
"випуску</guibutton>."
#. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:2
+#: en/DrakX-cover.xml:3 en/DrakX.xml:3 en/media_selection.xml:2
msgid "en"
msgstr "uk"
#. type: Content of: <section><info><title>
#: en/add_supplemental_media.xml:3
-msgid "Media Selection (Configure Supplemental Installation Media)"
+#, fuzzy
+msgid "Supplemental Installation Media"
msgstr ""
"Вибір носія (налаштовування додаткових носіїв пакунків для встановлення)"
-#. 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
+#. 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
#. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:14
+#: en/add_supplemental_media.xml:18
msgid ""
"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
@@ -123,12 +131,13 @@ msgstr ""
"\"1\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:19
+#: en/add_supplemental_media.xml:23
+#, fuzzy
msgid ""
-"This screen shows you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. "
+"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 "
-"next steps."
+"subsequent steps."
msgstr ""
"На цій сторінці буде наведено список визначених сховищ пакунків. Ви зможете "
"додати інші джерела пакунків, зокрема оптичний носій даних або віддалений "
@@ -136,24 +145,25 @@ msgstr ""
"доступними для вибору на наступних кроках."
#. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:28
msgid "For a network source, there are two steps to follow:"
msgstr "Щоб додати джерело у інтернет, слід виконати два таких кроки:"
#. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:28
-msgid "Choosing and activation of the network, if not already up."
+#: en/add_supplemental_media.xml:32
+#, fuzzy
+msgid "Choosing and activating the network, if not already up."
msgstr "Вибір і вмикання мережі, якщо її ще не було увімкнено."
#. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:32
+#: en/add_supplemental_media.xml:36
+#, fuzzy
msgid ""
"Selecting a mirror or specifying a URL (very first entry). By selecting a "
"mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
-"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
-"\">Updates</emphasis>. With the URL, you can designate a specific repository "
-"or your own NFS installation."
+"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."
msgstr ""
"Вибір дзеркала або визначення адреси (перший запис). Після вибору дзеркала "
"ви отримаєте доступ до вибору сховищ, які використовуються у Mageia, зокрема "
@@ -164,14 +174,15 @@ msgstr ""
"пакунків або розгорнуту вами за допомогою NFS систему."
#. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:42
+#: en/add_supplemental_media.xml:46
+#, fuzzy
msgid ""
-"If you are updating a 64 bit installation which may contain some 32 bit "
+"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 "
-"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
-"64-bit and noarch 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."
+"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."
msgstr ""
"Якщо ви оновлюєте 64-бітову версію системи, де можуть міститися якісь 32-"
"бітові пакунки, вам варто скористатися цією сторінкою для додавання сховища "
@@ -182,18 +193,25 @@ msgstr ""
"бітові пакунки."
#. type: Content of: <section><info><title>
-#: en/addUser.xml:3
-msgid "User and Superuser Management"
-msgstr "Керування обліковими записами користувача і адміністратора"
+#: en/addUser.xml:9
+#, fuzzy
+msgid "User Management"
+msgstr "Додаткові можливості керування записами користувачів"
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
+#. 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.
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:24
+#, fuzzy
msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata fileref="
+"\"live-user1.png\" format=\"PNG\"/> </imageobject>"
msgstr ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -201,22 +219,23 @@ msgstr ""
"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:36
msgid "Set Administrator (root) Password:"
msgstr "Встановлення пароля адміністратора (root):"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
-msgid ""
-"It is advisable for all <application>Mageia</application> installations to "
-"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
-"usually called the <emphasis>root password</emphasis> 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."
-msgstr ""
-"У кожній встановленій системі <application>Mageia</application> варто "
+#: en/addUser.xml:40
+#, fuzzy
+msgid ""
+"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."
+msgstr ""
+"У кожній встановленій системі Mageia варто "
"визначити пароль <emphasis role=\"bold\">суперкористувача</emphasis> або "
"адміністратора. Такий пароль у Linux зазвичай має назву <emphasis>пароль "
"root</emphasis>. Під час введення пароля колір позначки щита змінюватиметься "
@@ -226,26 +245,28 @@ msgstr ""
"пароль було вказано без помилок."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:49
+#, fuzzy
msgid ""
-"All passwords are case sensitive. It is best to use a mixture of letters "
+"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."
msgstr ""
"Всі паролі слід вказувати з врахуванням регістру. Краще використовувати у "
"паролі суміш літер (великих і малих), цифр та інших символів."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:57
msgid "Enter a user"
msgstr "Введіть користувача"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:60
+#, fuzzy
msgid ""
-"Add a user here. A regular user has fewer privileges than the <emphasis role="
-"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
-"applications or play games and anything else the average user might use "
-"their computer for."
+"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."
msgstr ""
"За допомогою цієї панелі ви можете додати користувачів. Кожен користувач має "
"вужчі права доступу, ніж <emphasis role=\"bold\">суперкористувач</emphasis> "
@@ -254,66 +275,91 @@ msgstr ""
"звичайним користувачем за комп’ютером."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
-msgid ""
-"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"user's icon."
+#: en/addUser.xml:67
+#, fuzzy
+msgid "<emphasis role=\"bold\">Icon</emphasis>"
+msgstr "<emphasis role=\"bold\">Додатково</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:69
+#, fuzzy
+msgid "Click on this button if you want to change the user's icon"
msgstr ""
"<guibutton>Піктограма</guibutton>: за допомогою цієї кнопки можна змінити "
"піктограму користувача."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
-msgid ""
-"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
-"box."
+#: en/addUser.xml:74
+#, fuzzy
+msgid "<emphasis role=\"bold\">Real Name</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:76
+#, fuzzy
+msgid "Insert the user's real name into this text box"
msgstr ""
"<guilabel>Справжнє ім’я</guilabel>: у цьому полі для введення тексту слід "
"вказати справжнє ім’я користувача."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:62
+#: en/addUser.xml:80
+#, fuzzy
+msgid "<emphasis role=\"bold\">Login Name</emphasis>"
+msgstr "<emphasis role=\"bold\">Додатково</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:82
+#, fuzzy
msgid ""
-"<guilabel>Login Name</guilabel>: 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>"
+"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>"
msgstr ""
"<guilabel>Ім’я користувача, що реєструється</guilabel>: тут ви можете ввести "
"реєстраційне ім’я користувача або надати змогу drakx використовувати певну "
"версію справжнього імені користувача."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:88 en/setupBootloader.xml:87
+#, fuzzy
+msgid "<emphasis role=\"bold\">Password</emphasis>"
+msgstr "<emphasis role=\"bold\">Додатково</emphasis>"
+
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:90
+#, fuzzy
msgid ""
-"<guilabel>Password</guilabel>: 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\"/>)"
+"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\"/>)"
msgstr ""
"<guilabel>Пароль</guilabel>: у цьому полі вам слід вказати пароль "
"користувача. Колір позначки щита поряд з цим полем відповідає складності "
"пароля (див. також <xref linkend=\"givePassword\"/>)"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:94
+#, fuzzy
msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
-"check that you have not mistyped the password."
+"<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
+"password. DrakX will check that you have not mistyped the password."
msgstr ""
"<guilabel>Пароль (ще раз)</guilabel>: повторіть введення пароля користувача "
"у цьому полі. DrakX перевірить, чи збігається введений вами повторно пароль "
"з його початковим варіантом."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:101
+#, fuzzy
msgid ""
-"Any users you added while installing Mageia, will have a home directory that "
-"is both read and write protected (umask=0027)."
+"Any users added while installing Mageia, will have a home directory that is "
+"both read and write protected (umask=0027)"
msgstr ""
"Вміст домашніх каталогів всіх користувачів, записи яких буде створено під "
"час встановлення Mageia, буде захищено від читання і запису (umask=0027)."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:82
+#: en/addUser.xml:104
msgid ""
"You can add any extra needed users in the <emphasis>Configuration - Summary</"
"emphasis> step during the install. Choose <emphasis>User management</"
@@ -325,34 +371,36 @@ msgstr ""
"користувачами</emphasis>."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:86
+#: en/addUser.xml:108
msgid "The access permissions can also be changed after the install."
msgstr ""
"Права доступу до домашніх каталогів, звичайно ж, можна змінити і після "
"завершення встановлення системи."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:93
-msgid "Advanced User Management"
+#: en/addUser.xml:115
+#, fuzzy
+msgid "User Management (advanced)"
msgstr "Додаткові можливості керування записами користувачів"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:96
+#: en/addUser.xml:118
+#, fuzzy
msgid ""
-"The <guibutton>Advanced</guibutton> option allows you to edit further "
-"settings for the user you are adding."
+"The <emphasis>Advanced</emphasis> option allows you to edit further settings "
+"for the user you are adding."
msgstr ""
"Якщо ви натиснете кнопку <guibutton>Додатково</guibutton>, програма відкриє "
"діалогове вікно, за допомогою якого ви зможете змінити параметри облікового "
"запису, який ви додаєте."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:123
+#, fuzzy
msgid ""
-"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"<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 "
-"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
-"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
+"<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal>"
msgstr ""
"<guilabel>Командна оболонка</guilabel>: за допомогою цього спадного списку "
"ви можете змінити командну оболонку, яка використовуватиметься для роботи "
@@ -361,11 +409,12 @@ msgstr ""
"role=\"bold\">Dash</emphasis> та <emphasis role=\"bold\">Sh</emphasis>."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:107
+#: en/addUser.xml:130
+#, fuzzy
msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
-"\">user ID</emphasis> for any user you added in the previous screen. If you "
-"are unsure what the purpose of this is, then leave it blank."
+"<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."
msgstr ""
"<guilabel>Код користувача</guilabel>: тут ви можете встановити <emphasis "
"role=\"bold\">код (ідентифікатор) користувача</emphasis>, обліковий запис "
@@ -374,40 +423,43 @@ msgstr ""
"дій."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:113
+#: en/addUser.xml:136
+#, fuzzy
msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
-"\">group ID</emphasis>. Again, if unsure, leave it blank."
+"<emphasis>Group ID</emphasis>: This lets you set the group ID. Again, if "
+"unsure, leave it blank."
msgstr ""
"<guilabel>Ід. групи</guilabel>: надає вам змогу встановити <emphasis role="
"\"bold\">ідентифікатор групи</emphasis>. Знову ж таки, якщо не певні, не "
"заповнюйте це поле."
#. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:3
+#: en/ask_mntpoint_s.xml:10
msgid "Choose the mount points"
msgstr "Вибір точок монтування"
-#. Made by marja on 2012 03 28
-#. NEEDS TO BE REVIEWED!
-#. SimonNZG 2012-04-03 has taken a look but needs to come back
-#. removed para xml:id's, marja, 20120409
+#. Made by marja on 2012 03 28
+#. NEEDS TO BE REVIEWED!
+#. SimonNZG 2012-04-03 has taken a look but needs to come back
+#. removed para xml:id's, marja, 20120409
#. barjac 14/04/2012 Minor edit to improve grammar and replaced "at least ONE"
-#. with "a", as I can't imagine having more than one root partition ;)
-#. Lebarhon : I put [] where it seems having mistakes
+#. with "a", as I can't imagine having more than one root partition ;)
+#. Lebarhon : I put [] where it seems having mistakes
#. Marja: you're right, in English English it is "its type", however, the Americans
#. 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
+#. And JohnR says the Americans are WRONG! :-))
+#. 2012-04-19 Language proofreading done
+#. 2018/02/12 apb: Text and typography.
+#. 2019/01/04 apb: Typo & minor reword on custom mount-points.
#. type: Content of: <section><mediaobject>
-#: en/ask_mntpoint_s.xml:27
+#: en/ask_mntpoint_s.xml:38
+#, fuzzy
msgid ""
-"<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>"
+"<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>"
msgstr ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
@@ -417,57 +469,37 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:36
+#: en/ask_mntpoint_s.xml:49
+#, fuzzy
msgid ""
"Here you see the Linux partitions that have been found on your computer. If "
-"you don't agree with the <application>DrakX</application> suggestions, you "
-"can change the mount points."
+"you don't agree with the DrakX suggestions, you can change the mount points "
+"yourself."
msgstr ""
"За допомогою цієї сторінки ви можете переглянути список розділів Linux на "
"вашому комп’ютері. Якщо ви не згодні з пропозиціями <application>DrakX</"
"application>, ви можете змінити точки монтування."
-#. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:41
-msgid ""
-"If you change anything, make sure you still have a <emphasis role=\"bold"
-"\"><literal>/</literal></emphasis> (root) partition."
-msgstr ""
-"У разі внесення змін не забудьте, що серед розділів обов’язково має бути "
-"розділ <emphasis role=\"bold\"><literal>/</literal></emphasis>."
-
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:46
+#: en/ask_mntpoint_s.xml:55
msgid ""
-"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
-"(capacity, mount point, type).</emphasis>"
-msgstr ""
-"Для кожного з розділів буде показано такі дані: <emphasis role=\"bold"
-"\">Пристрій</emphasis> («Місткість», «Точка монтування», «Тип»)."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:50
-msgid ""
-"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
-"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
-"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
-"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
+"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."
msgstr ""
-"<emphasis role=\"bold\">Пристрій</emphasis>, складається з таких частин: "
-"<emphasis role=\"bold\">твердий диск</emphasis>, [<emphasis role=\"bold"
-"\">назва твердого диска</emphasis> (літера)], <emphasis role=\"bold\">номер "
-"розділу</emphasis> (приклад: <emphasis role=\"bold\">sda5</emphasis>)."
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:56
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
msgid ""
-"If you have several partitions, you can choose various different mount "
-"points from the drop down menu, such as <emphasis role=\"bold\">/</"
-"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
-"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
-"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
-"emphasis> for a partition where you want to store your films, or <emphasis "
-"role=\"bold\">/Data</emphasis> (or some other name) for your data."
+"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."
msgstr ""
"Якщо у вашій системі багато розділів, за допомогою спадного меню ви зможете "
"вибрати для них різні точки монтування, зокрема такі: <literal>/</literal>, "
@@ -477,7 +509,7 @@ msgstr ""
"literal> (або якась інша назва) для розділу з даними."
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:63
+#: en/ask_mntpoint_s.xml:73
msgid ""
"For any partitions that you don't need to make use of, you can leave the "
"mount point field blank."
@@ -486,11 +518,22 @@ msgstr ""
"здійснюватиметься, ви можете не вказувати точку монтування."
#. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:79
+#, fuzzy
msgid ""
-"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
-"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
-"guilabel>, where, you can click on a partition to see its type and size."
+"If you make any changes here, ensure you still have a <filename>/</filename> "
+"(root) partition."
+msgstr ""
+"У разі внесення змін не забудьте, що серед розділів обов’язково має бути "
+"розділ <emphasis role=\"bold\"><literal>/</literal></emphasis>."
+
+#. type: Content of: <section><tip><para>
+#: en/ask_mntpoint_s.xml:84
+#, fuzzy
+msgid ""
+"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."
msgstr ""
"Натисніть кнопку <guibutton>Назад</guibutton>, якщо ви не певні, щодо "
"вибору. Потім натисніть кнопку <guilabel>Спеціальний розподіл диска</"
@@ -498,198 +541,243 @@ msgstr ""
"область розділу, щоб переглянути дані щодо типу і розміру розділу."
#. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:74
+#: en/ask_mntpoint_s.xml:90
+#, fuzzy
msgid ""
-"If you are sure the mount points are correct, click on <guibutton>Next</"
-"guibutton>, and choose whether you only want to format the partition(s) "
-"DrakX suggests, or more."
+"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."
msgstr ""
"Якщо ви певні, що точки монтування визначено правильно, натисніть кнопку "
"<guibutton>Далі</guibutton> і визначтеся з тим, слід лише форматувати "
"розділи згідно пропозицій DrakX чи виконати додаткові дії."
#. type: Content of: <section><info><title>
-#: en/bestTime.xml:10
-msgid "Clock settings"
+#: en/bestTime.xml:5
+#, fuzzy
+msgid "Clock Settings"
msgstr "Параметри годинника"
#. type: Content of: <section><mediaobject>
-#: en/bestTime.xml:14
+#: en/bestTime.xml:8
+#, fuzzy
msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"live-"
+"bestTime.png\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
msgstr ""
"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/bestTime.xml:20
+#: en/bestTime.xml:12
+#, fuzzy
msgid ""
-"In this step, you have to select on which time your internal clock is set, "
-"either local time or UTC time."
+"Here, you can select whether your computer internal clock is set to local "
+"time or UTC time."
msgstr ""
"На цьому кроці вам слід вибрати часовий пояс, для якого встановлено годинник "
"комп’ютера, локальний чи світовий (UTC)."
#. type: Content of: <section><para>
-#: en/bestTime.xml:23
-msgid "In advanced tab, you will find more options about clock settings."
+#: en/bestTime.xml:14
+msgid ""
+"In the <emphasis>Advanced</emphasis> tab, you can enable automatic time "
+"synchronization and specify an NTP server."
msgstr ""
-"На вкладці додаткових параметрів можна знайти додаткові параметри "
-"налаштування годинника."
#. type: Content of: <section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:6
msgid "Boot Mageia as Live system"
msgstr "Завантаження Mageia як портативної системи"
#. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:10
msgid "Booting the medium"
msgstr "Завантаження системи з носія"
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:1
-msgid "From a disc"
-msgstr "З диска"
-
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:1
-msgid ""
-"You can boot directly from the media you used to burn your image (CD-ROM, "
-"DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the "
-"bootloader to launch the installation automatically after rebooting the "
-"computer. If that does not happen you may need to reconfigure your BIOS or "
-"press one key that will offer you to choose the peripheral from which the "
-"computer will boot."
-msgstr ""
-"Ви можете завантажити систему безпосередньо із носія, на який було записано "
-"ваш образ (компакт-диска, DVD тощо). Зазвичай, достатньо вставити його до "
-"пристрою зчитування компакт-дисків або DVD, щоб завантажувач автоматично "
-"запустив процедуру встановлення після перезавантаження комп’ютера. Якщо "
-"цього не трапиться, ймовірно, вам доведеться внести зміни у налаштування "
-"BIOS або натиснути якусь клавішу (підказку буде показано під час "
-"завантаження), яка надасть змогу вибрати пристрій, з якого відбуватиметься "
-"завантаження системи на комп’ютері."
+#. type: Content of: <section><section><para>
+#: en/bootLive.xml:12
+msgid ""
+"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."
+msgstr ""
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:6
+#. type: Content of: <section><section><para>
+#: en/bootLive.xml:15
msgid ""
-"According to which hardware you have, and how it is configured, you get "
-"either one or another of the two screens below."
+"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."
msgstr ""
-"Відповідно до обладнання, на якому ви працюєте, та способу його "
-"налаштування, ви побачите один із наведених нижче двох варіантів зображення "
-"на екрані."
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:7
-msgid "From a USB device"
-msgstr "З пристрою USB"
+#. type: Content of: <section><section><tip><para>
+#: en/bootLive.xml:20
+msgid ""
+"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."
+msgstr ""
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:7
+#. type: Content of: <section><section><note><para>
+#: en/bootLive.xml:28
msgid ""
-"You can boot from the USB device on which you dumped your image ISO. "
-"According to your BIOS settings, the computer boots perhaps directly on the "
-"USB device already plugged in a port. If that does not happen you may need "
-"to reconfigure your BIOS or press one key that will offer you to choose the "
-"peripheral from which the computer will boot."
+"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."
msgstr ""
-"Ви можете завантажити систему із флешки USB, на яку було записано образ ISO. "
-"Відповідно до параметрів роботи BIOS, комп’ютер може завантажуватися "
-"безпосередньо із флешки, яку вставлено у порт USB. Якщо цього не трапилося "
-"одразу, вам доведеться трохи змінити налаштування BIOS або натиснути клавішу "
-"(підказку буде показано під час завантаження), яка надаться вам змогу "
-"вибрати периферійний пристрій, з якого завантажуватиметься комп’ютер."
#. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:35
msgid "In BIOS/CSM/Legacy mode"
msgstr "У застарілому режимі BIOS/CSM"
-#. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:12
-msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/bootLive.xml:38
+msgid "Main Menu"
msgstr ""
-"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
-#. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:12
-msgid "First screen while booting in BIOS mode"
-msgstr "Перший екран завантаження у режимі BIOS"
-
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:12
-msgid "In the middle menu, you have the choice between three actions:"
-msgstr "За допомогою середнього меню ви можете вибрати одну з трьох дій:"
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:40 en/bootLive.xml:152
+#, fuzzy
+msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
+msgstr "<emphasis role=\"bold\">Робоча станція</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:41
msgid ""
-"Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD "
-"or USB stick) without writing anything on the disk, so expect a very slow "
-"system. Once the boot is done, you can proceed to the installation on a hard "
-"disk."
+"This option will boot the Mageia Live system from the connected DVD/USB "
+"media (expect a very slow system compared to an installed OS)."
msgstr ""
-"Завантажити Mageia: вибір цього пункту означає, що буде завантажено Mageia 5 "
-"зі з’єднаного носія (CD/DVD або флешки USB), на жорсткий диск комп’ютера "
-"нічого не буде записано, система працюватиме доволі повільно. Після "
-"завантаження системи ви зможете встановити її на жорсткий диск комп’ютера "
-"або просто ознайомитися із нею."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:42
+#, fuzzy
+msgid "Once the boot is done, you can proceed to the installation."
+msgstr ""
+"Вказані вами параметри налаштування буде збережено у встановленій системі."
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:45 en/bootLive.xml:57
+#, fuzzy
msgid ""
-"Install Mageia: This choice will directly install Mageia on a hard disk."
+"<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
+"emphasis>"
+msgstr "<emphasis role=\"bold\">Будь ласка, виберіть рівень безпеки</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:47
+msgid "Boot the Mageia Live system using non-free video drivers"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:53 en/bootLive.xml:156 en/installer.xml:65
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
+msgstr "<emphasis role=\"bold\">Робоча станція</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:54 en/bootLive.xml:157
+#, fuzzy
+msgid "This option will install Mageia to a hard disk."
msgstr ""
"Встановити Mageia: якщо буде вибрано цей пункт, розпочнеться процедура "
"встановлення Mageia на жорсткий диск."
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:59
+msgid "Install Mageia using non-free video drivers"
+msgstr ""
+
+#. type: Content of: <section><section><mediaobject>
+#: en/bootLive.xml:65
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><mediaobject><caption><para>
+#: en/bootLive.xml:69
+msgid "First screen while booting in BIOS mode"
+msgstr "Перший екран завантаження у режимі BIOS"
+
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/bootLive.xml:73
+msgid "Function Keys"
+msgstr ""
+
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:17
+#: en/bootLive.xml:75
+#, fuzzy
+msgid "<keycap>F1</keycap> <emphasis role=\"bold\">Help</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:76
+#, fuzzy
msgid ""
-"Boot from hard disk: This choice allows to boot from hard disk, as usual, "
-"when no media (CD/DVD or USB stick) is connected. (not working with Mageia "
-"5)."
+"Within any of the <keycap>F2</keycap> to <keycap>F6</keycap> options, you "
+"can view relevant help by pressing <keycap>F1</keycap>."
msgstr ""
-"Завантажити з твердого диска: за допомогою цього варіанта можна завантажити "
-"систему з твердого диска, як звичайно відбувається, якщо з комп’ютером не "
-"з’єднано додаткових носіїв систем (компакт-дисків, DVD або флешок USB) (не "
-"працює у Mageia 5)."
+"Довідку щодо кожного з пунктів, від <emphasis role=\"bold\">F2</emphasis> до "
+"<emphasis role=\"bold\">F6</emphasis>, можна переглянути, натиснувши клавішу "
+"<emphasis role=\"bold\">F1</emphasis>"
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:19
-msgid "In the bottom menu, are the Boot Options:"
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:81
+#, fuzzy
+msgid "<keycap>F2</keycap> <emphasis role=\"bold\">Language</emphasis>"
+msgstr "<emphasis role=\"bold\">Додатково</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:82
+msgid ""
+"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>."
msgstr ""
-"За допомогою нижнього меню можна отримати доступ до параметрів завантаження:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:19
+#: en/bootLive.xml:87
+#, fuzzy
+msgid "<keycap>F3</keycap> <emphasis role=\"bold\">Video Mode</emphasis>"
+msgstr "<emphasis role=\"bold\">Додатково</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:89
+#, fuzzy
msgid ""
-"F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
-msgstr "F1 — Довідка. Опис параметрі «splash», «apm», «acpi» та «Ide»"
+"If needed, change the screen resolution by pressing <keycap>F3</keycap>. "
+"Options are: 640x480, 800x600, 1024x768."
+msgstr ""
+"Змінити роздільну здатність екрана можна за допомогою натискання клавіші "
+"<emphasis role=\"bold\">F3</emphasis> (лише у застарілому режимі)."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:20
-msgid "F2 - Language. Choose the display language of the screens."
-msgstr "F2 — Мова. Вибір мови інтерфейсу."
+#: en/bootLive.xml:93
+#, fuzzy
+msgid "<keycap>F4</keycap> <emphasis role=\"bold\">Source</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:21
-msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
+#: en/bootLive.xml:94
+msgid ""
+"Normally, the installation is performed from the inserted installation "
+"medium. Here, you may select other sources, like FTP or NFS servers."
msgstr ""
-"F3 — Роздільна здатність. Тут можна вибрати один із таких варіантів: text, "
-"640x400, 800x600, 1024x728"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:22
+#: en/bootLive.xml:95
+#, fuzzy
msgid ""
-"F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
-"the inserted installation medium. Here, select other sources, like FTP or "
-"NFS servers. If the installation is carried out in a network with an SLP "
-"server, select one of the installation sources available on the server with "
-"this option."
+"If the installation is carried out in a network with an SLP server, then "
+"select one of the installation sources available on the server with this "
+"option."
msgstr ""
"F4 — CD-Rom. Варіанти: CD-Rom або Other (інше). Зазвичай, встановлення "
"виконується зі з’єднаного з комп’ютером носія системи.За допомогою цього "
@@ -698,121 +786,179 @@ msgstr ""
"цього пункту можна вибрати одне із джерел пакунків на сервері."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:26
+#: en/bootLive.xml:98
+#, fuzzy
+msgid "<keycap>F5</keycap> <emphasis role=\"bold\">Driver</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:99
msgid ""
-"F5 - Driver. Yes or No. The system is aware about the presence of an "
-"optional disk with a driver update and will require its insertion during "
-"installation process."
+"If you have a driver update that you wish to use, select this option and "
+"then answer <emphasis>Yes</emphasis>. You will be prompted to insert the "
+"update disc at the appropriate time."
msgstr ""
-"F5 — Драйвер. «Yes» («Так») або «No» («Ні»). За допомогою цього пункту можна "
-"повідомити системі про наявність додаткового диска з оновленням драйвера і "
-"наказати їй попросити його вставити під час встановлення."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:104
+#, fuzzy
+msgid "<keycap>F6</keycap> <emphasis role=\"bold\">Kernel Options</emphasis>"
+msgstr "<emphasis role=\"bold\">Робоча станція</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:106
+#, fuzzy
+msgid ""
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis>Kernel Option</emphasis> menu:"
+msgstr ""
+"Якщо у вас виникають проблеми зі встановленням, ви можете спробувати змінити "
+"типові параметри, скориставшись пунктом <emphasis role=\"bold\">F6</"
+"emphasis> <emphasis role=\"bold\">Kernel Options</emphasis> (у системах із "
+"UEFI слід замість цього натиснути клавішу <emphasis role=\"bold\">E</"
+"emphasis>)."
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:111
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Default:</emphasis> splash quiet noiswmd resume "
+"audit=0"
+msgstr "<emphasis role=\"bold\">Вирівняти до</emphasis> = МіБ"
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:114
+msgid ""
+"<emphasis role=\"bold\">Safe Settings:</emphasis> <literal>apm=off acpi=off "
+"mce=off barrier=off ide=nodma idewait=50 i8042.nomux psmouse.proto=bare "
+"irqpoll pci=nommconf</literal>"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:120
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">No ACPI:</emphasis> (Advanced Configuration and "
+"Power Interface): Power management features are not used."
+msgstr ""
+"No ACPI (без розширеного інтерфейсу налаштовування та керування живленням)^ "
+"не брати до уваги параметри керування живленням."
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:125
+#, fuzzy
msgid ""
-"F6 - Kernel options. This is a way to specify options according to your "
-"hardware and the drivers to use."
+"<emphasis role=\"bold\">No Local APIC:</emphasis> (Local Advanced "
+"Programmable Interrupt Controller): CPU interrupt. Select this option if you "
+"experience system misbehaviour like a kernel panic in relation to APIC."
+msgstr ""
+"No Local APIC (без локального розширеного контролера переривань з можливістю "
+"програмування): цей варіант пов’язано з перериваннями роботи центрального "
+"процесора, виберіть його, якщо маєте відповідні настанови."
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:131
+msgid ""
+"If you open any of the above <keycap>F6</keycap> menu items, and then click "
+"on <keycap>F1</keycap>, an info window will open to show more details for "
+"that particular item:"
msgstr ""
-"F6 — Параметри ядра. За допомогою цього пункту можна вказати параметри, "
-"відповідні до апаратної частини, і драйвери, якими слід скористатися."
#. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:139
msgid "In UEFI mode"
msgstr "У режимі UEFI"
#. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:142
+#, fuzzy
msgid ""
-"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
-"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"live-bootUEFI.png\" align="
+"\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
msgstr ""
"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
#. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:29
-msgid "First screen while booting on UEFI system from disk"
-msgstr "Перший екран під час завантаження системи UEFI з диска"
+#: en/bootLive.xml:146
+#, fuzzy
+msgid "First screen while booting in UEFI mode"
+msgstr "Перший екран завантаження у режимі BIOS"
#. type: Content of: <section><section><para>
-#: en/bootLive.xml:29
-msgid ""
-"You have only the choice to run Mageia in Live mode (first choice) or to "
-"process the installation (second choice)."
+#: en/bootLive.xml:149
+msgid "In UEFI mode, you have just the two menu options to choose from:"
msgstr ""
-"Вам доведеться обирати один з двох варіантів: запустити Mageia у "
-"портативному режимі (перший варіант) або продовжити встановлення (другий "
-"варіант)."
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:30
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:153
+#, fuzzy
msgid ""
-"If you booted from a USB stick, you get two supplemental lines which are a "
-"duplicata of the previous lines suffixed with \"USB\". You have to choose "
-"them."
+"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"
msgstr ""
-"Якщо завантаження відбувалося із флешки USB, буде показано два додаткових "
-"рядки, які дублікатами попередніх, із суфіксами «USB». Вам слід вибрати саме "
-"один із цих рядків."
+"Завантажити Mageia: вибір цього пункту означає, що буде завантажено Mageia 5 "
+"зі з’єднаного носія (CD/DVD або флешки USB), на жорсткий диск комп’ютера "
+"нічого не буде записано, система працюватиме доволі повільно. Після "
+"завантаження системи ви зможете встановити її на жорсткий диск комп’ютера "
+"або просто ознайомитися із нею."
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:32
+#. type: Content of: <section><section><note><para>
+#: en/bootLive.xml:161
msgid ""
-"In each case, the first steps will be the same to choose language, timezone "
-"and keyboard, then the processes differ, with <link linkend=\"testing"
-"\">additional steps in Live mode</link>."
+"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\"."
msgstr ""
-"У всіх варіантах перші кроки будуть однаковими: вибрати мову, часовий пояс і "
-"модель клавіатури. На наступних кроках процедура змінюється, з’являються "
-"<link linkend=\"testing\">додаткові кроки портативного режиму</link>."
#. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:3
+#: en/chooseDesktop.xml:16
msgid "Desktop Selection"
msgstr "Вибір стільниці"
#. type: Content of: <section><para>
-#: en/chooseDesktop.xml:8
-msgid ""
-"Depending on your selection here, you may be offered further screens to fine-"
-"tune your choice."
+#: en/chooseDesktop.xml:23
+msgid "Some choices made here will open other screens with related options."
msgstr ""
-"Залежно від вибраного вами за допомогою цієї сторінки варіанта встановлення, "
-"програма може запропонувати на подальших сторінка додаткові можливості "
-"остаточного налаштування вашої системи."
#. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:26
+#, fuzzy
msgid ""
-"After the selection step(s), you will see a slide-show during package "
-"installation. The slide show can be disabled by pressing the "
-"<guilabel>Details</guilabel> button"
+"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."
msgstr ""
"Після виконання кроків вибору, ви побачите показ слайдів. Вимкнути показ "
"слайдів можна натисканням кнопки <guilabel>Подробиці</guilabel>."
#. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:16
+#: en/chooseDesktop.xml:31
+#, fuzzy
msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
-"align=\"center\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-chooseDesktop.png\" "
+"format=\"PNG\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
-"align=\"center\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\"/> </imageobject>"
-#. type: Content of: <section><para>
-#: en/chooseDesktop.xml:21
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/chooseDesktop.xml:38
msgid ""
-"Choose whether you prefer to use the <application>KDE</application> "
-"<emphasis role=\"bold\">Plasma</emphasis> or <application>GNOME</"
-"application> desktop environment. Both come with a full set of useful "
-"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
-"neither (or even use both), or if you want to modify the default software "
-"choices for these desktop environments. The <application>LXDE</application> "
-"desktop, for instance, is lighter than the previous two, sporting less eye "
-"candy and fewer packages installed by default."
+"Choose whether you prefer to use the KDE Plasma or GNOME desktop "
+"environment. Both come with a full set of useful applications and tools."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/chooseDesktop.xml:44
+#, fuzzy
+msgid ""
+"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."
msgstr ""
"Виберіть бажане для вас графічне середовище, <emphasis role=\"bold\">Плазму</"
"emphasis> <application>KDE</application> або <application>GNOME</"
@@ -836,8 +982,9 @@ msgid "Package Group Selection"
msgstr "Вибір груп пакунків"
#. Lebarhon 20170209 Updated SC
+#. 2018/02/25 apb: add xreflabel to this section.
#. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:9
+#: en/choosePackageGroups.xml:11
msgid ""
"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
"\" align=\"center\"/> </imageobject>"
@@ -846,7 +993,7 @@ msgstr ""
"\" align=\"center\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:14
+#: en/choosePackageGroups.xml:16
msgid ""
"Packages are arranged into common groups, to make choosing what you need on "
"your system a lot easier. The groups are fairly self explanatory, however "
@@ -859,22 +1006,22 @@ msgstr ""
"на пункт групи у списку."
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:21
+#: en/choosePackageGroups.xml:23
msgid "<emphasis role=\"bold\">Workstation</emphasis>"
msgstr "<emphasis role=\"bold\">Робоча станція</emphasis>"
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:25
+#: en/choosePackageGroups.xml:27
msgid "<emphasis role=\"bold\">Server</emphasis>"
msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:29
+#: en/choosePackageGroups.xml:31
msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
msgstr "<emphasis role=\"bold\">Графічне середовище</emphasis>"
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:33
+#: en/choosePackageGroups.xml:35
msgid ""
"<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can use "
"this option to manually add or remove packages"
@@ -883,7 +1030,7 @@ msgstr ""
"варіантом можна скористатися для додавання або вилучення пакунків вручну."
#. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:38
+#: en/choosePackageGroups.xml:40
msgid ""
"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
"minimal install (without or with X &amp; IceWM)."
@@ -898,8 +1045,10 @@ msgid "Choose Individual Packages"
msgstr "Вибір окремих пакунків"
#. 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.
#. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:9
+#: en/choosePackagesTree.xml:13
msgid ""
"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
"\" align=\"center\"/> </imageobject>"
@@ -908,7 +1057,7 @@ msgstr ""
"\" align=\"center\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:14
+#: en/choosePackagesTree.xml:18
msgid ""
"Here you can add or remove any extra packages to customize your installation."
msgstr ""
@@ -917,13 +1066,14 @@ msgstr ""
"типового набору."
#. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:21
+#, fuzzy
msgid ""
-"After having made your choice, you can click on the <guibutton>floppy icon</"
-"guibutton> at the bottom of the page to save your choice of packages (saving "
-"to a USB key works, too). You can then use this file to install the same "
-"packages on another system, by pressing the same button during install and "
-"choosing to load it."
+"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."
msgstr ""
"Щойно вибір буде зроблено, ви зможете натиснути <guibutton>піктограму "
"дискети</guibutton> у нижній частині сторінки, щоб зберегти список пакунків "
@@ -937,10 +1087,12 @@ msgstr ""
msgid "Configure your Services"
msgstr "Налаштування ваших служб"
-#. 2012-12-25 marja - moved this section out of misc-params.xml
-#. 2013-05-05 marja - added screenshot
+#. 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.
#. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:11
+#: en/configureServices.xml:15
msgid ""
"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
@@ -951,26 +1103,24 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><para>
-#: en/configureServices.xml:16
+#: en/configureServices.xml:20
msgid ""
"Here you can choose which services should start when you boot your system."
msgstr ""
"За допомогою цієї сторінки ви можете визначити, які служби запускатимуться, "
"а які ні, під час завантаження вашої системи."
-#. type: Content of: <section><para>
-#: en/configureServices.xml:19
-msgid "Click on a triangle to expand a group to all the relevant services."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureServices.xml:25
+#, fuzzy
+msgid ""
+"Click on a triangle to expand a group to all the relevant services. The "
+"settings DrakX chose are usually good."
msgstr ""
"Натисніть трикутничок, щоб розгорнути групу до списку усіх відповідних служб."
-#. type: Content of: <section><para>
-#: en/configureServices.xml:22
-msgid "The settings DrakX chose are usually good."
-msgstr "Зазвичай, потреби у зміні налаштувань, вибраних DrakX, немає."
-
-#. type: Content of: <section><para>
-#: en/configureServices.xml:25
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureServices.xml:31
msgid ""
"If you highlight a service, some information about it is shown in the info "
"box below."
@@ -979,7 +1129,7 @@ msgstr ""
"інформаційній панелі під списком."
#. type: Content of: <section><para>
-#: en/configureServices.xml:28
+#: en/configureServices.xml:37
msgid "Only change things when you know very well what you are doing."
msgstr "Вносьте зміни, лише якщо вам добре відомі наслідки ваших дій."
@@ -988,16 +1138,19 @@ msgstr "Вносьте зміни, лише якщо вам добре відо
msgid "Configure your Timezone"
msgstr "Налаштування часового поясу"
-#. 2012-12-25 marja - moved this part out of misc-params.xml
-#. 2013-05-05 marja - added screenshot
+#. 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.
#. type: Content of: <section><mediaobject>
-#: en/configureTimezoneUTC.xml:11
+#: en/configureTimezoneUTC.xml:15
+#, fuzzy
msgid ""
"<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>"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata format=\"png\" fileref=\"live-timeZone.png\" "
+"align=\"center\"/> </imageobject>"
msgstr ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
@@ -1005,18 +1158,19 @@ msgstr ""
"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
"</imageobject>"
-#. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:20
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureTimezoneUTC.xml:26
+#, fuzzy
msgid ""
-"Choose your time-zone by choosing your country or a city close to you in the "
-"same time-zone."
+"Choose your timezone by choosing your country, or a city close to you in the "
+"same timezone."
msgstr ""
"Виберіть ваш часовий пояс. Для цього достатньо вибрати вашу країну або якесь "
"місто поруч з вашим місцем перебування так, щоб це місто було розташовано у "
"тому самому часовому поясі."
#. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:24
+#: en/configureTimezoneUTC.xml:32
msgid ""
"In the next screen you can choose to set your hardware clock to local time "
"or to GMT, also known as UTC."
@@ -1026,7 +1180,7 @@ msgstr ""
"також відомого як Всесвітній час."
#. type: Content of: <section><note><para>
-#: en/configureTimezoneUTC.xml:29
+#: en/configureTimezoneUTC.xml:37
msgid ""
"If you have more than one operating system on your computer, make sure they "
"are all set to local time, or all to UTC/GMT."
@@ -1036,23 +1190,24 @@ msgstr ""
"Всесвітній час (UTC/GMT)."
#. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:13
+#: en/configureX_card_list.xml:24
msgid "Choose an X Server (Configure your Graphic Card)"
msgstr "Вибір графічного сервера (налаштовування вашої графічної картки)"
#. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:18
+#: en/configureX_card_list.xml:29
+#, fuzzy
msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_card_list-im1\" "
-"align=\"center\" fileref=\"dx2-configureX_card_list.png\" revision=\"1\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_card_list-im1\" "
-"align=\"center\" fileref=\"dx2-configureX_card_list.png\" revision=\"1\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
"imageobject>"
#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:23
+#: en/configureX_card_list.xml:35
msgid ""
"DrakX has a very comprehensive database of video cards and will usually "
"correctly identify your video device."
@@ -1061,7 +1216,7 @@ msgstr ""
"програма може правильно визначити ваш графічний пристрій."
#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:26
+#: en/configureX_card_list.xml:38
msgid ""
"If the installer has not correctly detected your graphic card and you know "
"which one you have, you can select it from the tree by:"
@@ -1070,30 +1225,34 @@ msgstr ""
"картку і вам відома назва цієї картки, ви можете вибрати її пункт з "
"ієрархічного списку за такими критеріями:"
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
-msgid "vendor"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#, fuzzy
+msgid "Vendor"
msgstr "виробник"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:33
-msgid "then the name of your card"
+#: en/configureX_card_list.xml:45
+#, fuzzy
+msgid "then the make of your card"
msgstr "назва вашої картки"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:37
-msgid "and the type of card"
+#: en/configureX_card_list.xml:49
+#, fuzzy
+msgid "and the model of card"
msgstr "тип вашої картки"
#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:41
+#: en/configureX_card_list.xml:53
+#, fuzzy
msgid ""
"If you cannot find your card in the vendor lists (because it's not yet in "
"the database or it's an older card) you may find a suitable driver in the "
-"<emphasis role=\"bold\">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 <emphasis "
-"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
+"<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."
msgstr ""
"Якщо ви не можете знайти вашу картку у списку виробників (оскільки її ще не "
"має у базі даних або ви маєте справу із застарілою карткою), ви можете "
@@ -1103,70 +1262,68 @@ msgstr ""
"назвою, ви можете скористатися драйвером <emphasis role=\"bold\">vesa</"
"emphasis>. Цей драйвер забезпечує базові можливості з показу відео."
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:47
+#. type: Content of: <section><caution><para>
+#: en/configureX_card_list.xml:61
+#, fuzzy
msgid ""
"Be aware that if you select an incompatible driver you may only have access "
-"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
+"to the <emphasis>Command Line Interface</emphasis>"
msgstr ""
"Будьте уважними: якщо драйвер буде вибрано помилково, ви зможете отримати "
"доступ лише до інтерфейсу <emphasis role=\"bold\">командного рядка</"
"emphasis>."
#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:51
+#: en/configureX_card_list.xml:65
+#, fuzzy
msgid ""
"Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
-"repository and in some cases only from the card manufacturers' websites."
+"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."
msgstr ""
"Деякі виробники відеокарт самі створюють пропрієтарні (закриті) драйвери для "
"Linux. Доступ до таких драйверів можна отримати лише за допомогою сховищ "
"пакунків <emphasis role=\"bold\">Nonfree</emphasis> або сайтів виробників "
"карток."
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:56
-msgid ""
-"The <emphasis role=\"bold\">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."
-msgstr ""
-"Вам слід явним чином увімкнути сховища <emphasis role=\"bold\">Nonfree</"
-"emphasis>, щоб мати до них доступ. Зробити це слід після першого "
-"перезавантаження системи."
-
#. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:3
+#: en/configureX_chooser.xml:11
msgid "Graphic Card and Monitor Configuration"
msgstr "Налаштування графічної картки та монітора"
#. 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
+#. 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.
#. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:10
+#: en/configureX_chooser.xml:24
+#, fuzzy
msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
-"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
-"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
"imageobject>"
#. type: Content of: <section><para>
-#: en/configureX_chooser.xml:15
+#: en/configureX_chooser.xml:30
+#, fuzzy
msgid ""
"No matter which graphical environment (also known as desktop environment) "
-"you chose for this install of <application>Mageia</application>, they are "
-"all based on a graphical user interface system called <acronym>X Window "
-"System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
-"acronym> or any other graphical environment to work well, the following "
-"<acronym>X</acronym> settings need to be correct. Choose the correct "
-"settings if none are shown, or if you think the details are incorrect."
+"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. Choose the appropriate settings - if none are shown, or "
+"if you think the details are incorrect."
msgstr ""
"Байдуже, яке графічне середовище (або стільничне середовище) було вибрано "
-"під час встановлення <application>Mageia</application>, всі ці середовища "
+"під час встановлення Mageia, всі ці середовища "
"засновано на графічному інтерфейсі, який має назву <acronym>X Window System</"
"acronym> або просто <acronym>X</acronym>. Отже, щоб Плазма <acronym>KDE</"
"acronym>, <acronym>GNOME</acronym>, <acronym>LXDE</acronym> або будь-яке "
@@ -1177,22 +1334,33 @@ msgstr ""
"є помилковим."
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:27
+#: en/configureX_chooser.xml:41
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+msgstr "<emphasis role=\"bold\">Графічне середовище</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:44
msgid ""
-"<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
-"from the list if needed."
+"If you need to, you can select a specific card from this expandable list. "
+"See <xref linkend=\"configureX_card_list\"/>."
msgstr ""
-"<emphasis><guibutton>Графічна карта</guibutton></emphasis>: якщо потрібно, "
-"виберіть встановлену на вашому комп’ютері графічну картку зі списку."
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:33
+#: en/configureX_chooser.xml:49
+#, fuzzy
+msgid "<emphasis role=\"bold\">Monitor</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:52
+#, fuzzy
msgid ""
-"<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
-"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
-"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
-"vertical refresh rates of your monitor."
+"You can choose Plug'n Play, if applicable, or choose your monitor from the "
+"<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> list. Choose "
+"<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor. See <xref linkend="
+"\"configureX_monitor\"/>."
msgstr ""
"<emphasis><guibutton>Монітор</guibutton></emphasis>: ви можете вибрати "
"<guilabel>Plug'n Play</guilabel> якщо вважаєте, що це правильно, або вибрати "
@@ -1201,33 +1369,38 @@ msgstr ""
"guilabel>, якщо хочете вручну вказати частоту оновлення зображення за "
"вертикаллю та горизонталлю для вашого монітора."
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:41
-msgid "Incorrect refresh rates may damage your monitor"
-msgstr ""
-"Помилково вказані частоти оновлення зображення можуть призвести до "
-"пошкодження вашого монітора."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:60
+#, fuzzy
+msgid "<emphasis role=\"bold\">Resolution</emphasis>"
+msgstr "<emphasis role=\"bold\">Робоча станція</emphasis>"
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
-msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
-"color depth of your monitor can be set here."
+#: en/configureX_chooser.xml:63
+#, fuzzy
+msgid "The resolution and color depth of your monitor can be set here"
msgstr ""
"<emphasis><guibutton>Роздільна здатність</guibutton></emphasis>: за "
"допомогою цього пункту можна вибрати бажану роздільну здатність та глибину "
"кольорів на вашому моніторі."
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:68
+#, fuzzy
+msgid "<emphasis role=\"bold\">Test</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:71
+#, fuzzy
msgid ""
-"<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the option is there, and you test your "
-"settings, you should be ask whether your settings are correct. If you answer "
-"<emphasis role=\"bold\">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."
+"The test button does not always appear during install. If the option is "
+"there, and you test your settings, you should be asked whether 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."
msgstr ""
"<emphasis><guibutton>Перевірити</guibutton></emphasis>: кнопка перевірки під "
"час встановлення може бути недоступною. Якщо кнопка є доступною, за "
@@ -1241,21 +1414,35 @@ msgstr ""
"були безпечними.</emphasis>"
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
-msgid ""
-"<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
-"enable or disable various options."
+#: en/configureX_chooser.xml:81
+#, fuzzy
+msgid "<emphasis role=\"bold\">Options</emphasis>"
+msgstr "<emphasis role=\"bold\">Робоча станція</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:84
+#, fuzzy
+msgid "Here you can choose to enable or disable various options"
msgstr ""
"<emphasis><guibutton>Параметри</guibutton></emphasis>: за допомогою цього "
"пункту ви можете увімкнути або вимкнути різноманітні параметри."
+#. type: Content of: <section><warning><para>
+#: en/configureX_chooser.xml:89
+msgid ""
+"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."
+msgstr ""
+
#. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:11
+#: en/configureX_monitor.xml:22
msgid "Choosing your Monitor"
msgstr "Вибір монітора"
#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:14
+#: en/configureX_monitor.xml:25
msgid ""
"DrakX has a very comprehensive database of monitors and will usually "
"correctly identify yours."
@@ -1264,7 +1451,7 @@ msgstr ""
"правильно визначити ваш монітор."
#. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:19
+#: en/configureX_monitor.xml:30
msgid ""
"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
"could damage your monitor or video hardware. Please don't try something "
@@ -1277,25 +1464,26 @@ msgstr ""
"маєте певні сумніви, зверніться до документації з вашого монітора."
#. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:38
msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
-"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
-"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
"imageobject>"
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:31
-msgid "<emphasis>Custom</emphasis>"
-msgstr "<emphasis>Спеціальний</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:46
+msgid "Custom"
+msgstr "Спеціальний"
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:33
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:49
+#, fuzzy
msgid ""
-"This option allows you to set two critical parameters, the vertical refresh "
+"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."
@@ -1306,8 +1494,8 @@ msgstr ""
"зображення на екрані, а частота синхронізації є частотою, з якою буде "
"показано лінії зображення."
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:38
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:55
msgid ""
"It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
"type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1319,27 +1507,23 @@ msgstr ""
"сумніваєтеся, виберіть мінімальні параметри і уважно ознайомтеся з "
"документацією до вашого монітора."
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
-msgid "<emphasis>Plug 'n Play</emphasis>"
-msgstr "<emphasis>Plug 'n Play</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:64
+msgid "Plug'n Play"
+msgstr ""
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:47
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:67
+#, fuzzy
msgid ""
-"This is the default option and tries to determine the monitor type from the "
-"monitor database."
+"This is the default option and automatically tries to determine the monitor "
+"type from the monitor database."
msgstr ""
"Це типовий варіант: програма намагається визначити тип вашого монітора за "
"базою даних моніторів."
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:51
-msgid "<emphasis>Vendor</emphasis>"
-msgstr "<emphasis>Виробник</emphasis>"
-
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:53
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:77
msgid ""
"If the installer has not correctly detected your monitor and you know which "
"one you have, you can select it from the tree by selecting:"
@@ -1348,30 +1532,30 @@ msgstr ""
"вам відома назва цього монітора, ви можете вибрати її пункт з ієрархічного "
"списку за такими критеріями:"
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:61
-msgid "the monitor manufacturers name"
-msgstr "назва фірми-виробника монітора"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_monitor.xml:86
+msgid "Manufacturer"
+msgstr ""
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:65
-msgid "the monitor description"
-msgstr "опис монітора"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_monitor.xml:90
+msgid "Monitor model"
+msgstr ""
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:69
-msgid "<emphasis>Generic</emphasis>"
-msgstr "<emphasis>Загальний</emphasis>:"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:96
+msgid "Generic"
+msgstr ""
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:71
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:99
+#, fuzzy
msgid ""
-"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 <emphasis role="
-"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
-"determined automatically. Once again it may be wise to be conservative in "
-"your selections."
+"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."
msgstr ""
"якщо ви виберете цю групу, буде відкрито список з близько 30 типових "
"налаштувань дисплеїв, подібних до 1024x768 @ 60 Гц, до якого включено "
@@ -1381,77 +1565,57 @@ msgstr ""
"автоматично. Знову ж таки, варто параметри варто вибирати дуже обережно."
#. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
-msgid "Custom disk partitioning with DiskDrake"
+#: en/diskdrake.xml:22
+#, fuzzy
+msgid "Custom Disk Partitioning with DiskDrake"
msgstr "Нетиповий поділ диска на розділи за допомогою DiskDrake"
#. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:27
+#, fuzzy
msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake.png\"/> </imageobject>"
msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
-
-#. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
-msgid ""
-"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
-"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
-"boot</emphasis> partition. The encryption option for the <emphasis role="
-"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
-"will be unbootable."
-msgstr ""
-"Якщо на вашому розділі з <emphasis role=\"bold\">/</emphasis> ви хочете "
-"скористатися шифруванням, каталог <emphasis role=\"bold\">/boot</emphasis> "
-"слід зберігати на окремому розділі. Не слід шифрувати каталог <emphasis role="
-"\"bold\">/boot</emphasis>, інакше завантаження системи стане неможливим."
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:38
+#, fuzzy
msgid ""
-"Modify the layout of your disk(s) here. You can remove or create "
-"partitions, change the filesystem of a partition or change its size and even "
-"view their details before you start."
+"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."
msgstr ""
"За допомогою цієї сторінки можна визначити компонування розділів у вашій "
"системі. За її допомогою можна вилучати і створювати розділи, змінювати "
"файлові системи на розділах або розміри розділів і навіть переглядати вміст "
"розділів до внесення змін."
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:45
+#, fuzzy
msgid ""
"There is a tab at the top for every detected hard disk (or other storage "
-"device like a USB key). In the screen-shot above there are two available "
-"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
-"\">sdb</emphasis>."
+"device, like a USB key). In the screenshot above there are two available "
+"devices: <filename>sda </filename>and <filename>sdb</filename>."
msgstr ""
"Вгорі для кожного виявлено твердотільного диска (або іншого пристрою "
"зберігання даних, зокрема флешок USB) буде відведено вкладку. На наведеному "
"вище знімку вікна показано два доступних пристрої: <emphasis role=\"bold"
"\">sda</emphasis> і <emphasis role=\"bold\">sdb</emphasis>."
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:39
-msgid ""
-"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
-"you are sure you want to wipe all partitions on the selected storage device."
-msgstr ""
-"Будьте обережні з пунктом <guibutton>Очистити все</guibutton>, користуйтеся "
-"ним, лише якщо ви справді хочете, щоб всі розділи на вибраному носії даних "
-"було вилучено."
-
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:43
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:52
+#, fuzzy
msgid ""
"For all other actions: click on the desired partition first. Then view it, "
"or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Expert mode</guibutton> provides more options such as a label "
-"(give a name to) a partition, or to choose a partition type."
+"<emphasis>Expert mode</emphasis> provides more options such as to label "
+"(name) a partition, or to choose a partition type."
msgstr ""
"Щоб виконати будь-яку іншу дію, спочатку позначте область відповідного "
"розділу. Потім перегляньте дані щодо розділу, змініть його файлову систему і "
@@ -1459,56 +1623,92 @@ msgstr ""
"пункту <guibutton>Режим експерта</guibutton> можна отримати доступ до "
"додаткових можливостей, зокрема додавання мітки або вибору типу розділу."
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:49
-msgid "Continue until you have adjusted everything to your satisfaction."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:60
+#, fuzzy
+msgid ""
+"Continue until you have adjusted everything to your satisfaction, then click "
+"<emphasis>Done</emphasis> when you're ready."
msgstr ""
"Повторюйте ці дії для всіх відповідних розділів, аж доки все не набуде "
"потрібних вам обрисів."
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:52
-msgid "Click <guibutton>Done</guibutton> when you're ready."
+#. type: Content of: <section><warning><orderedlist><listitem><para>
+#: en/diskdrake.xml:69
+#, fuzzy
+msgid ""
+"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."
msgstr ""
-"Натисніть кнопку <guibutton>Виконано</guibutton>, коли налаштовування буде "
-"завершено."
+"Будьте обережні з пунктом <guibutton>Очистити все</guibutton>, користуйтеся "
+"ним, лише якщо ви справді хочете, щоб всі розділи на вибраному носії даних "
+"було вилучено."
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:56
+#. type: Content of: <section><warning><orderedlist><listitem><para>
+#: en/diskdrake.xml:75
+#, fuzzy
+msgid ""
+"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."
+msgstr ""
+"Якщо на вашому розділі з <emphasis role=\"bold\">/</emphasis> ви хочете "
+"скористатися шифруванням, каталог <emphasis role=\"bold\">/boot</emphasis> "
+"слід зберігати на окремому розділі. Не слід шифрувати каталог <emphasis role="
+"\"bold\">/boot</emphasis>, інакше завантаження системи стане неможливим."
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:87
+#, fuzzy
msgid ""
"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
-"Partition) is present and correctly mounted on /boot/EFI (see below)"
+"Partition) is present and correctly mounted on <filename>/boot/EFI</"
+"filename>. See Figure 1 below."
msgstr ""
"Якщо ви встановлюєте Mageia у системі із UEFI, переконайтеся, що існує ESP "
"(EFI System Partition) і що її змонтовано до /boot/EFI (див. нижче)."
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:93
+#, fuzzy
msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"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."
+msgstr ""
+"Якщо ви встановлюєте Mageia на застарілій системі з GPT, переконайтеся, що "
+"існує розділ BIOS належного типу."
+
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:101
+#, fuzzy
+msgid "EFI System Partition"
+msgstr "Користуватися існуючими розділами"
+
+#. type: Content of: <section><figure><mediaobject>
+#: en/diskdrake.xml:104
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
msgstr ""
"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:60
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:103 en/diskdrake.xml:117
msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:72
-msgid ""
-"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present and of the correct type"
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:115
+msgid "BIOS boot partition"
msgstr ""
-"Якщо ви встановлюєте Mageia на застарілій системі з GPT, переконайтеся, що "
-"існує розділ BIOS належного типу."
-#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:76
+#. type: Content of: <section><mediaobject>
+#: en/diskdrake.xml:118 en/doPartitionDisks.xml:200
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1521,50 +1721,60 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
-msgid "Partitioning"
+#: en/doPartitionDisks.xml:25
+#, fuzzy
+msgid "Suggested Partitioning"
msgstr "Розбиття на розділи"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:28
+#, fuzzy
msgid ""
"In this screen you can see the content of your hard drive(s) along with the "
-"DrakX partitioning proposals for where to install <application>Mageia</"
-"application>."
+"DrakX partitioning proposals for where to install Mageia."
msgstr ""
"За допомогою цієї сторінки ви зможете переглянути вміст всіх дисків "
"комп’ютера і ознайомитися з пропозиціями майстра поділу на розділи DrakX "
-"щодо місця встановлення <application>Mageia</application>."
+"щодо місця встановлення Mageia."
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:16
+#: en/doPartitionDisks.xml:32
+#, fuzzy
msgid ""
-"The options available from those shown below will vary according to the "
-"layout and content of your particular hard drive(s)."
+"The actual options available from those shown below will vary according to "
+"the layout and content of your particular hard drive(s)."
msgstr ""
"Перелік пунктів у наведеному нижче списку залежатиме від комплектації "
"комп’ютера та вмісту дисків."
#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:21
+#: en/doPartitionDisks.xml:37
+#, fuzzy
msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
-msgid "Use Existing Partitions"
-msgstr "Користуватися існуючими розділами"
+#. type: Content of: <section><itemizedlist><title>
+#: en/doPartitionDisks.xml:47
+#, fuzzy
+msgid "Main Options"
+msgstr "Параметри"
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:50
+#, fuzzy
+msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
+msgstr "<emphasis role=\"bold\">Розміри розділів диска:</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:53
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
@@ -1572,13 +1782,14 @@ msgstr ""
"Цим варіантом можна буде скористатися, якщо на диску буде виявлено сумісні з "
"Linux розділи, якими можна скористатися для встановлення системи."
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
-msgid "Use Free Space"
-msgstr "Використовувати вільний простір"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:43
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:62
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
@@ -1586,58 +1797,35 @@ msgstr ""
"Цим варіантом можна буде скористатися, якщо на вашому диску є вільне місце, "
"достатнє для встановлення нової системи Mageia."
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:49
-msgid "Use Free Space on a Windows Partition"
-msgstr "Використовувати вільний простір на розділі Microsoft Windows®"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:68
+#, fuzzy
msgid ""
-"If you have unused space on an existing Windows partition, the installer may "
-"offer to use it."
-msgstr ""
-"Цим варіантом можна буде скористатися, якщо на вже створених розділах "
-"Windows є достатньо вільного місця для встановлення нової операційної "
-"системи."
+"<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
+msgstr "<emphasis role=\"bold\">Робоча станція</emphasis>"
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:71
+#, fuzzy
msgid ""
-"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!"
+"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!"
msgstr ""
"Цей варіант отримання місця для встановлення Mageia може корисним, але у "
"разі його використання ви ризикуєте втратою даних, тому вам слід попередньо "
"створити резервні копії важливих для вас файлів!"
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
-msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
-"correctly the last time it was used. It must also have been defragmented, "
-"although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
-msgstr ""
-"Зауважте, що розмір розділу Windows буде зменшено. Розділ має бути "
-"«очищено», тобто роботу Windows має бути завершено у штатному режимі під час "
-"останнього сеансу, коли ви користувалися цією операційною системою. Крім "
-"того, розділ має бути дефрагментовано, хоча дефрагментація і не гарантує "
-"повного пересування файлів з місця на диску, яке буде використано для "
-"Mageia. Ми наполегливо рекомендуємо вам створити резервні копії важливих для "
-"вас файлів."
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:69
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:77
+#, fuzzy
msgid ""
"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 "
-"screen-shot."
+"clicking and dragging the gap between both partitions. See the following "
+"screenshot:"
msgstr ""
"Якщо буде вибрано цей варіант, засіб встановлення покаже решту розділу "
"Windows блакитним кольором, а майбутній розділ з Mageia — темно-синім. "
@@ -1645,54 +1833,57 @@ msgstr ""
"перетягуванням риски між ними за допомогою вказівника миші. Див. наведений "
"нижче знімок екрана."
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:76
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "Erase and use Entire Disk."
-msgstr "Стерти і використати весь диск"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
+msgstr "<emphasis role=\"bold\">Графічне середовище</emphasis>"
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
-msgid "This option will allocate the entire drive for Mageia."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:88
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia"
msgstr ""
"У разі використання цього варіанта для встановлення Mageia буде використано "
"усе місце на диску."
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:93
-msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
-msgstr ""
-"Зауваження: всіх дані на диску буде у такому разі витерто. Будьте обережні!"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:92
+#, fuzzy
msgid ""
-"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."
+"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."
msgstr ""
"Якщо частину диска буде згодом використано для зберігання якихось даних або "
"не диску вже зберігаються якісь важливі дані, не користуйтеся цим варіантом."
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:103
-msgid "Custom disk partitioning"
-msgstr "Нетиповий поділ диска на розділи"
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:99
+msgid ""
+"Note that this involves shrinking the size of the Windows partition. The "
+"partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used. It is highly recommended to "
+"back up your personal files."
+msgstr ""
+"Зауважте, що розмір розділу Windows буде зменшено. Розділ має бути "
+"«очищено», тобто роботу Windows має бути завершено у штатному режимі під час "
+"останнього сеансу, коли ви користувалися цією операційною системою. Крім "
+"того, розділ має бути дефрагментовано, хоча дефрагментація і не гарантує "
+"повного пересування файлів з місця на диску, яке буде використано для "
+"Mageia. Ми наполегливо рекомендуємо вам створити резервні копії важливих для "
+"вас файлів."
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:110
+#, fuzzy
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr "<emphasis role=\"bold\">Розміри розділів диска:</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:113
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
@@ -1700,85 +1891,108 @@ msgstr ""
"За допомогою цього варіанта ви можете отримати цілковитий доступ до "
"розташування розділів на вашому диску відповідно до ваших уподобань."
-#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
-msgstr "<emphasis role=\"bold\">Розміри розділів диска:</emphasis>"
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:120
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:129
+#, fuzzy
msgid ""
-"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
-"emphasis> option, the installer will allocate the available space according "
-"to the following rules:"
+"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:"
msgstr ""
"Якщо ви не скористалися пунктом <emphasis role=\"bold\">Нетиповий розподіл "
"диска</emphasis>, засіб встановлення розподілить доступне місце за такими "
"правилами:"
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:120
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:135
+#, fuzzy
msgid ""
"If the total available space is less than 50 GB, then only one partition is "
-"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
-"partition."
+"created. This will be the <filename>/</filename> (root) partition."
msgstr ""
"Якщо загалом доступного місця менше за 50 ГБ, буде створено лише один "
"кореневий розділ, /, окремого розділу для /home створено не буде."
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:141
msgid ""
"If the total available space is greater than 50 GB, then three partitions "
"are created"
msgstr "Якщо загалом доступного місця понад 50 ГБ, буде створено три розділи"
-#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:146
+#, fuzzy
msgid ""
-"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
-"emphasis> with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <filename>/</filename> "
+"with a maximum of 50 GB"
msgstr ""
"6/19 від доступного місця, але не більше за 50 ГБ, буде віддано розділу "
"<emphasis role=\"bold\">/</emphasis>"
-#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
-msgid "1/19 is allocated to swap with a maximum of 4 GB"
+#. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:151
+#, fuzzy
+msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
msgstr ""
"1/19, але не більше за 4 ГБ, буде віддано розділу резервної пам’яті на диску "
"(swap)"
-#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:138
+#. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:156
+#, fuzzy
msgid ""
-"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
-"emphasis>"
+"the rest (at least 12/19) is allocated to <emphasis>/</"
+"emphasis><filename>home</filename><emphasis role=\"bold\">.</emphasis>"
msgstr ""
"решту (принаймні 12/19) буде віддано розділу <emphasis role=\"bold\">/home</"
"emphasis>"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:144
+#: en/doPartitionDisks.xml:164
msgid ""
-"That means that from 160 GB or greater available space, the installer will "
-"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
-"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
-"<emphasis role=\"bold\">/home</emphasis>."
+"This means that from 160 GB or greater available space, the installer will "
+"create three partitions:"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:169
+msgid "50 GB for <filename>/</filename>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:173
+msgid "4 GB for <filename>swap</filename>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:177
+msgid "and the remainder for <filename>/home</filename>."
msgstr ""
-"Це означає, що якщо на диску 160 ГБ або більше вільного місця, засобом "
-"встановлення буде створено три розділи: 50 ГБ для <emphasis role=\"bold\">/</"
-"emphasis>, 4 ГБ для резервної пам’яті на диску. Решту місця буде віддано під "
-"<emphasis role=\"bold\">/home</emphasis>."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:182
+#, fuzzy
msgid ""
"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 /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"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"
+"done."
msgstr ""
"Якщо ви користуєтеся системою з UEFI, ESP (розділ із системою EFI) буде "
"виявлено автоматично або створено, якщо його ще не існувало, і змонтовано "
@@ -1787,13 +2001,15 @@ msgstr ""
"чином."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:188
+#, fuzzy
msgid ""
-"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
-"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
-"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
-"able to create it with the Installer like any other partition, just select "
-"BIOS boot partition as the filesystem type."
+"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."
msgstr ""
"Якщо ви користуєтеся застарілою системою (відомою як CSM або BIOS) із диском "
"GPT, вам доведеться створити розділ для завантаження BIOS, якщо його ще не "
@@ -1803,36 +2019,29 @@ msgstr ""
"розділу подібне до створення будь-якого іншого розділу, але треба вибрати "
"тип файлової системи «Розділ завантаження BIOS»."
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:195
+msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:210
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
+"\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\"/> </imageobject>"
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:216
+#, fuzzy
msgid ""
"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. Also 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 <emphasis role=\"bold\">gparted</"
-"emphasis>, and to use the following settings:"
+"drive."
msgstr ""
"У деяких новіших дисках використовуються логічні сектори у 4096 байтів "
"замість попереднього стандарту у 512 байтів на логічний сектор. Через те, що "
@@ -1843,18 +2052,38 @@ msgstr ""
"альтернативної спеціалізованої програми, наприклад <emphasis role=\"bold"
"\">gparted</emphasis> з використанням таких значень параметрів:"
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:189
-msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:221
+#, fuzzy
+msgid ""
+"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:"
+msgstr ""
+"У деяких новіших дисках використовуються логічні сектори у 4096 байтів "
+"замість попереднього стандарту у 512 байтів на логічний сектор. Через те, що "
+"у розробників немає достатнього доступу до відповідного обладнання, належне "
+"тестування програми для поділу диска на розділи на таких дисках не "
+"виконувалося. Крім того, у деяких дисках SSD використовується розмір блоку "
+"понад 1 МБ. Радимо вам виконати поділ такого диска на розділи за допомогою "
+"альтернативної спеціалізованої програми, наприклад <emphasis role=\"bold"
+"\">gparted</emphasis> з використанням таких значень параметрів:"
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:228
+#, fuzzy
+msgid "<emphasis>Align to</emphasis> = MiB"
msgstr "<emphasis role=\"bold\">Вирівняти до</emphasis> = МіБ"
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:191
-msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:232
+#, fuzzy
+msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
msgstr "<emphasis role=\"bold\">Вільне місце перед (МіБ)</emphasis> = 2"
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:236
msgid ""
"Also make sure all partitions are created using an even number of megabytes."
msgstr ""
@@ -1862,39 +2091,40 @@ msgstr ""
"мегабайтах."
#. type: Content of: <article><info><title>
-#: en/DrakLive-cover.xml:4 en/DrakLive-cover.xml:30 en/DrakLive.xml:3
+#: en/DrakLive-cover.xml:15 en/DrakLive-cover.xml:54 en/DrakLive.xml:16
msgid "Installation from LIVE medium"
msgstr "Встановлення з носія LIVE"
#. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
+#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:14
msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
#. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakLive-cover.xml:10
-msgid "January 2015"
-msgstr "Січень 2015 року"
+#: en/DrakLive-cover.xml:23
+msgid "March 2016"
+msgstr ""
#. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakLive-cover.xml:11
+#: en/DrakLive-cover.xml:25
msgid "Mageia 5"
msgstr "Mageia 5"
#. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
+#: en/DrakLive-cover.xml:30 en/DrakX-cover.xml:27
msgid "The Official Documentation for Mageia"
msgstr "Офіційна документація до Mageia"
#. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17
-msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+#: en/DrakLive-cover.xml:33 en/DrakX-cover.xml:30
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
msgstr ""
"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
#. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
-#: en/DrakX.xml:12
+#: en/DrakLive-cover.xml:38 en/DrakLive.xml:25 en/DrakX-cover.xml:35
+#: en/DrakX.xml:44
msgid ""
"The texts and screenshots in this manual are available under the CC BY-SA "
"3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -1905,8 +2135,8 @@ msgstr ""
"licenses/by-sa/3.0/\">http://creativecommons.org/licenses/by-sa/3.0/</link>ю"
#. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
-#: en/DrakX.xml:15
+#: en/DrakLive-cover.xml:42 en/DrakLive.xml:29 en/DrakX-cover.xml:39
+#: en/DrakX.xml:48
msgid ""
"This manual was produced with the help of the <link ns6:href=\"http://www."
"calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1917,8 +2147,7 @@ msgstr ""
"neodoc.biz\">NeoDoc</link>."
#. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
-#: en/DrakX.xml:17
+#: en/DrakLive-cover.xml:46 en/DrakX-cover.xml:43 en/DrakX.xml:52
msgid ""
"It was written by volunteers in their free time. Please contact <link ns6:"
"href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1929,15 +2158,15 @@ msgstr ""
"mageia.org/en/Documentation_team\">команди документування</link>, якщо "
"хочете допомогти у поліпшенні цього підручника."
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
-#: en/DrakX.xml:6
+#. type: Content of: <section><itemizedlist><listitem><para><note>
+#: en/DrakLive-cover.xml:56 en/DrakLive.xml:19 en/DrakX-cover.xml:64
+#: en/DrakX.xml:38 en/selectKeyboard.xml:49
msgid "<note>"
msgstr "<note>"
#. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
-#: en/DrakX.xml:7
+#: en/DrakLive-cover.xml:57 en/DrakLive.xml:20 en/DrakX-cover.xml:65
+#: en/DrakX.xml:39
msgid ""
"No one will see all the installer screens that you see in this manual. Which "
"screens you will see, depends on your hardware and the choices you make "
@@ -1947,42 +2176,50 @@ msgstr ""
"сторінок, які ви побачите залежить від набору обладнання у вашій системі та "
"вибраного вами варіанта встановлення."
-#. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
-#: en/DrakX.xml:10
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/DrakLive-cover.xml:60 en/DrakLive.xml:23 en/DrakX-cover.xml:68
+#: en/DrakX.xml:42 en/selectKeyboard.xml:56
msgid "</note>"
msgstr "</note>"
+#. type: Content of: <article><info><cover><para>
+#: en/DrakLive.xml:33
+#, fuzzy
+msgid ""
+"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."
+msgstr ""
+"Підручник було написано охочими до цього користувачами у вільний від "
+"основної роботи час. Будь ласка, зверніться до <link ns6:href=\"https://wiki."
+"mageia.org/en/Documentation_team\">команди документування</link>, якщо "
+"хочете допомогти у поліпшенні цього підручника."
+
#. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
+#: en/DrakX-cover.xml:12 en/DrakX-cover.xml:61 en/DrakX.xml:35
msgid "Installation with DrakX"
msgstr "Встановлення за допомогою DrakX"
#. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:9
+#: en/DrakX-cover.xml:20
msgid "February 2014"
msgstr "Лютий 2014 року"
#. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:22
msgid "Mageia 4"
msgstr "Mageia 4"
-#. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakX-cover.xml:16
-msgid ""
-"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
-
#. type: Content of: <section><info><title>
#: en/exitInstall.xml:3
msgid "Congratulations"
msgstr "Вітаємо"
#. Lebarhon 20170209 updated SC
+#. 2018/02/12 apb: Text and typography.
+#. 2018/02/25 apb: Added clickable link to mageia.org
#. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:13
msgid ""
"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1991,27 +2228,28 @@ msgstr ""
"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
msgid ""
-"You have finished installing and configuring <application>Mageia</"
-"application> and it is now safe to remove the installation medium and reboot "
-"your computer."
+"You have finished installing and configuring Mageia and it is now safe to "
+"remove the installation medium and reboot your computer."
msgstr ""
-"Тепер <application>Mageia</application> встановлено і налаштовано, можна "
+"Тепер Mageia встановлено і налаштовано, можна "
"вилучати носій для встановлення системи і перезавантажувати ваш комп’ютер."
#. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:22
+#, fuzzy
msgid ""
-"After reboot, in the bootloader screen, you can choose between the operating "
-"systems (if there are more than one) on your computer."
+"After rebooting, you can use the bootloader screen to choose which operating "
+"system to start (if there are more than one on your computer)."
msgstr ""
"Після перезавантаження за допомогою екрана завантаження ви зможете вибрати "
"одну з операційних систем, встановлених на вашому комп’ютері (якщо "
"встановлено декілька систем)."
#. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:26
msgid ""
"If you didn't adjust the settings for the bootloader, your Mageia install "
"will be automatically selected and started."
@@ -2020,26 +2258,27 @@ msgstr ""
"запущено встановлену вами операційну систему Mageia."
#. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:30
msgid "Enjoy!"
msgstr "Приємної роботи!"
#. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:32
+#, fuzzy
msgid ""
-"Visit www.mageia.org if you have any questions or want to contribute to "
-"Mageia"
+"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"
msgstr ""
"Відвідайте www.mageia.org, якщо хочете дізнатися більше про участь у "
"спільноті Mageia"
#. type: Content of: <section><info><title>
-#: en/firewall.xml:3
+#: en/firewall.xml:7
msgid "Firewall"
msgstr "Захисний шлюз"
#. type: Content of: <section><para>
-#: en/firewall.xml:6
+#: en/firewall.xml:10
msgid ""
"This section allows you to configure some simple firewall rules: they "
"determine which type of message from the Internet will be accepted by the "
@@ -2052,16 +2291,17 @@ msgstr ""
"уможливить доступ до відповідних служб системи з мережі Інтернет."
#. type: Content of: <section><para>
-#: en/firewall.xml:12
+#: en/firewall.xml:16
+#, fuzzy
msgid ""
"In the default setting (no button is checked), no service of the system is "
-"accessible from the network. The <emphasis role=\"bold\">Everything (no "
-"firewall)</emphasis> 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."
+"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."
msgstr ""
"У типовому стані жоден із пунктів не позначено — жодна зі служб у системі не "
"буде доступною з інтернету. Пункт <emphasis role=\"bold\">Все (захисного "
@@ -2073,26 +2313,28 @@ msgstr ""
"для тестування або діагностики."
#. type: Content of: <section><para>
-#: en/firewall.xml:21
+#: en/firewall.xml:25
+#, fuzzy
msgid ""
"All other options are more or less self-explanatory. As an example, you will "
-"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
-"printers on your machine to be accessible from the network."
+"enable the CUPS server if you want printers on your machine to be accessible "
+"from the network."
msgstr ""
"Призначення усіх інших пунктів має бути більш-менш зрозумілим. Наприклад, "
"позначте пункт <emphasis role=\"bold\">Сервер CUPS</emphasis>, якщо хочете, "
"щоб принтери на вашому комп’ютері були доступними з мережі."
#. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:29
msgid "<emphasis role=\"bold\">Advanced</emphasis>"
msgstr "<emphasis role=\"bold\">Додатково</emphasis>"
#. type: Content of: <section><para>
-#: en/firewall.xml:27
+#: en/firewall.xml:31
+#, fuzzy
msgid ""
-"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
-"you can enable a series of services by typing a list of couples (blank "
+"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)"
msgstr ""
"У списку пунктів містяться лише найпоширеніші типи служб. За допомогою "
@@ -2102,12 +2344,12 @@ msgstr ""
"(відокремлених пробілами)."
#. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:35
msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
msgstr "<emphasis>&lt;номер порту>/&lt;протокол></emphasis>"
#. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:34
+#: en/firewall.xml:38
msgid ""
"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -2118,7 +2360,7 @@ msgstr ""
"RSYNC). Номер визначається за протоколом <emphasis>RFC-433</emphasis>;"
#. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:42
msgid ""
"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
@@ -2128,7 +2370,7 @@ msgstr ""
"використовуватиметься для обміну даними із службою."
#. type: Content of: <section><para>
-#: en/firewall.xml:43
+#: en/firewall.xml:47
msgid ""
"For instance, the entry for enabling access to the RSYNC service therefore "
"is <emphasis>873/tcp</emphasis>."
@@ -2137,7 +2379,7 @@ msgstr ""
"<emphasis>873/tcp</emphasis>."
#. type: Content of: <section><para>
-#: en/firewall.xml:46
+#: en/firewall.xml:50
msgid ""
"In case a service is implemented to use both protocols, you specify 2 "
"couples for the same port."
@@ -2146,31 +2388,34 @@ msgstr ""
"вказати дві пари записів для одного порту."
#. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:3
+#: en/formatPartitions.xml:10
msgid "Formatting"
msgstr "Форматування"
-#. 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
+#. 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
+#. 2018/02/10 apb: Text and typography.
#. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:15
+#: en/formatPartitions.xml:24
+#, fuzzy
msgid ""
-"<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>"
-msgstr ""
-"<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>"
+"<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>"
+msgstr ""
+"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
+"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
+"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
+"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
+"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
+"</imagedata> </imageobject>"
#. type: Content of: <section><para>
-#: en/formatPartitions.xml:24
+#: en/formatPartitions.xml:35
msgid ""
"Here you can choose which partition(s) you wish to format. Any data on "
"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
@@ -2180,27 +2425,31 @@ msgstr ""
"форматування, буде збережено."
#. type: Content of: <section><para>
-#: en/formatPartitions.xml:28
-msgid "Usually at least the partitions DrakX selected, need to be formatted"
+#: en/formatPartitions.xml:39
+#, fuzzy
+msgid ""
+"Usually, at least the partitions that DrakX selected need to be formatted."
msgstr ""
"Зазвичай, форматування потрібне принаймні для розділів, вибраних DrakX."
#. type: Content of: <section><para>
-#: en/formatPartitions.xml:31
+#: en/formatPartitions.xml:42
+#, fuzzy
msgid ""
-"Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
-"check for so called <emphasis>bad blocks</emphasis>"
+"Click on <emphasis>Advanced</emphasis> to choose the partitions you want to "
+"check for so-called <emphasis>bad blocks</emphasis>"
msgstr ""
"Натисніть кнопку <guibutton>Додатково</guibutton>, щоб вибрати розділи, які "
"слід перевірити на так звані <emphasis>пошкоджені блоки</emphasis>."
#. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:36
+#: en/formatPartitions.xml:47
+#, fuzzy
msgid ""
"If you're not sure you have made the right choice, you can click on "
-"<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
-"where you can choose to view details of your partitions."
+"<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."
msgstr ""
"Якщо ви не певні щодо правильності свого вибору, ви можете натиснути кнопку "
"<guibutton>Назад</guibutton>, ще раз кнопку <guibutton>Назад</guibutton>, а "
@@ -2209,21 +2458,22 @@ msgstr ""
"параметри розділів."
#. type: Content of: <section><para>
-#: en/formatPartitions.xml:43
+#: en/formatPartitions.xml:54
+#, fuzzy
msgid ""
-"When you are confident about the selection, click on <guibutton>Next</"
-"guibutton> to continue."
+"When you are confident about the selections, click on <emphasis>Next</"
+"emphasis> to continue."
msgstr ""
"Якщо ви певні у своєму виборі, натисніть кнопку <guibutton>Далі</guibutton>, "
"щоб продовжити роботу з програмою."
#. type: Content of: <section><info><title>
-#: en/installer.xml:10
+#: en/installer.xml:14
msgid "DrakX, the Mageia Installer"
msgstr "DrakX, програма для встановлення Mageia"
#. type: Content of: <section><para>
-#: en/installer.xml:13
+#: en/installer.xml:16
msgid ""
"Whether you are new to GNU-Linux or an experienced user, the Mageia "
"Installer is designed to help make your installation or upgrade as easy as "
@@ -2233,337 +2483,240 @@ msgstr ""
"встановлення Mageia розроблено таким чином, що вона зробить встановлення або "
"оновлення системи якомога простішим для вас."
-#. type: Content of: <section><para>
-#: en/installer.xml:17
-msgid ""
-"The initial menu screen has various options, however the default one will "
-"start the installer, which will normally be all that you will need."
-msgstr ""
-"На початковому вікні меню встановлення ви побачити пункти варіантів дій. "
-"Типовим буде пункт запуску програми для встановлення системи. Зазвичай, це "
-"саме той пункт, який вам потрібен."
-
#. type: Content of: <section><section><title>
-#: en/installer.xml:22
-msgid "Installation Welcome Screen"
-msgstr "Вітальне вікно програми для встановлення"
-
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:25
-msgid "Using a Mageia DVD"
-msgstr "За допомогою DVD Mageia"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:27
-msgid ""
-"Here are the default welcome screens when using a Mageia DVD, The first one "
-"is what you will see if you have a UEFI system, the second one is for a "
-"Legacy system:"
-msgstr ""
-"Нижче наведено типові вікна вітання DVD Mageia. Перше з них відповідає "
-"системі з UEFI, друге — системі із застарілою системою завантаження:"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:32
-msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+#: en/installer.xml:20
+msgid "The installation steps"
+msgstr "Кроки встановлення"
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:23
+#, fuzzy
msgid ""
-"From this screen, you have access to options by pressing \"<emphasis role="
-"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
-"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
-"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
-"role=\"bold\">F10</emphasis> to quit with saving."
+"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."
msgstr ""
-"З цієї сторінки ви можете отримати доступ до параметрів, натиснувши клавішу "
-"<emphasis role=\"bold\">E</emphasis> для входу до режиму редагування. Щоб "
-"повернутися з цього режиму, натисніть або клавішу <emphasis role=\"bold"
-"\">Esc</emphasis>, якщо зміни не слід зберігати, або комбінацію клавіш "
-"<emphasis role=\"bold\">Ctrl</emphasis> і <emphasis role=\"bold\">F10</"
-"emphasis>, щоб зберегти зміни і вийти з режиму редагування."
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:45
-msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+"Процедуру встановлення поділено на послідовність кроків, перелік яких буде "
+"показано на лівій бічній панелі екрана."
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:50
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:28
+#, fuzzy
msgid ""
-"From this screen, it is possible to set some preferences (note that the "
-"options <emphasis role=\"bold\">F1</emphasis> to <emphasis role=\"bold\">F6</"
-"emphasis> are available only on Legacy systems):"
+"Each step has one or more screens, which may also have <emphasis>Advanced</"
+"emphasis> sections with extra, less commonly required options."
msgstr ""
-"За допомогою цієї сторінки можна вказати деякі налаштування (зауважте, що "
-"пункти від <emphasis role=\"bold\">F1</emphasis> до <emphasis role=\"bold"
-"\">F6</emphasis> доступні лише на застарілих системах):"
+"На кожному кроці вам буде показано одну або декілька сторінок, на яких ви "
+"можете побачити кнопку <guibutton>Додатково</guibutton> , за допомогою якої "
+"здійснюється доступ до додаткових параметрів, якими користуються не так "
+"часто як основними."
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:33
+#, fuzzy
msgid ""
-"Within any of the <emphasis role=\"bold\">F2</emphasis> to <emphasis role="
-"\"bold\">F6</emphasis> options, you can view relevant help by pressing "
-"<emphasis role=\"bold\">F1</emphasis>"
+"Most screens have <emphasis>Help</emphasis> buttons for further details "
+"about the particular step."
msgstr ""
-"Довідку щодо кожного з пунктів, від <emphasis role=\"bold\">F2</emphasis> до "
-"<emphasis role=\"bold\">F6</emphasis>, можна переглянути, натиснувши клавішу "
-"<emphasis role=\"bold\">F1</emphasis>"
+"На більшості сторінок ви також побачите кнопку <guibutton>Довідка</"
+"guibutton>, за допомогою якої можна отримати додаткові пояснення щодо "
+"поточного кроку."
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:63
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:38
+#, fuzzy
msgid ""
-"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
-"specific language for the installation."
+"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."
msgstr ""
-"Натисніть <emphasis role=\"bold\">F2</emphasis>, щоб вибрати мову, якою "
-"засіб встановлення показуватиме повідомлення."
+"Якщо протягом процедури встановлення ви вирішите припинити встановлення, ви "
+"можете перезавантажити комп’ютер. Втім, вам слід ретельно обдумати ваші дії. "
+"Після форматування розділу або початку процедури встановлення оновлень ваш "
+"комп’ютер перебуватиме у проміжному стані. Перезавантаження може призвести "
+"до неможливості користування системою. Якщо, всупереч цим попередженням, ви "
+"хочете перезавантажити систему, перейдіть у текстовий термінал натисканням "
+"комбінації цих трьох клавіш: <guibutton>Alt Ctrl F2</guibutton> одночасно. "
+"Після цього, натисніть комбінацію клавіш <guibutton>Alt Ctrl Delete</"
+"guibutton> одночасно, щоб перезавантажити комп’ютер."
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:67
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:43
msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"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."
msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
-msgid ""
-"Use the arrow keys to select the language then press <emphasis role=\"bold"
-"\">Enter</emphasis>."
-msgstr ""
-"Скористайтеся клавішами зі стрілками, щоб вибрати потрібний вам пункт у "
-"списку, і натисніть клавішу <emphasis role=\"bold\">Enter</emphasis>."
+#. type: Content of: <section><section><title>
+#: en/installer.xml:48
+msgid "Installation Welcome Screen"
+msgstr "Вітальне вікно програми для встановлення"
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:77
+#. type: Content of: <section><section><para>
+#: en/installer.xml:49
msgid ""
-"If needed, change the screen resolution by pressing <emphasis role=\"bold"
-"\">F3</emphasis> (Legacy mode only)."
+"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."
msgstr ""
-"Змінити роздільну здатність екрана можна за допомогою натискання клавіші "
-"<emphasis role=\"bold\">F3</emphasis> (лише у застарілому режимі)."
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:81
+#. type: Content of: <section><section><para>
+#: en/installer.xml:52
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+"The welcome menu screen has various options, however the default option will "
+"start the installer, and is normally all that you will need."
msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+"На початковому вікні меню встановлення ви побачити пункти варіантів дій. "
+"Типовим буде пункт запуску програми для встановлення системи. Зазвичай, це "
+"саме той пункт, який вам потрібен."
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:88
-msgid ""
-"If you experience problems with the installation, you could try modifying "
-"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
-"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
-"<emphasis role=\"bold\">e</emphasis> instead)."
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:56
+msgid "Legacy (BIOS) Systems"
msgstr ""
-"Якщо у вас виникають проблеми зі встановленням, ви можете спробувати змінити "
-"типові параметри, скориставшись пунктом <emphasis role=\"bold\">F6</"
-"emphasis> <emphasis role=\"bold\">Kernel Options</emphasis> (у системах із "
-"UEFI слід замість цього натиснути клавішу <emphasis role=\"bold\">E</"
-"emphasis>)."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:96
-msgid "Default: It doesn't alter anything in the default options."
-msgstr "Default (типовий): не змінювати нічого у типових параметрах."
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:101
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
msgid ""
-"Safe Settings: Priority is given to the safer options at the price of a "
-"performance detriment."
+"<imageobject> <imagedata fileref=\"dx-welcome.png\" align=\"center\"/> </"
+"imageobject>"
msgstr ""
-"Safe Settings (безпечні параметри): перевага безпечності параметрів над "
-"швидкодією."
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:106
-msgid ""
-"No ACPI: (Advanced Configuration and Power Interface): Power management "
-"features are not used."
+#. type: Content of: <section><section><section><itemizedlist><title>
+#: en/installer.xml:63
+msgid "Menu"
msgstr ""
-"No ACPI (без розширеного інтерфейсу налаштовування та керування живленням)^ "
-"не брати до уваги параметри керування живленням."
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:113
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:66
msgid ""
-"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
-"interrupt. Select this option if you experience system misbehaviour like a "
-"kernel panic in relation to APIC."
+"Install Mageia to a hard disk. This is the default option, and will "
+"automatically start after a short while unless another option is selected."
msgstr ""
-"No Local APIC (без локального розширеного контролера переривань з можливістю "
-"програмування): цей варіант пов’язано з перериваннями роботи центрального "
-"процесора, виберіть його, якщо маєте відповідні настанови."
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:120
-msgid ""
-"When you select one of these entries, it modifies the default options "
-"displayed in the <guilabel>Boot Options</guilabel> line."
-msgstr ""
-"Вибір одного з пунктів призводить до внесення змін до типових параметрів, "
-"показаних у рядку <guilabel>Параметри завантаження</guilabel>."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:69
+#, fuzzy
+msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:125
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:70
msgid ""
-"In some Mageia releases, it may happen that the entries selected with "
-"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
-"Options</guilabel> line, despite this, they will in fact be applied."
+"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."
msgstr ""
-"У деяких випусках Mageia параметри, вибрані за допомогою <emphasis role="
-"\"bold\">F6</emphasis>, не буде показано у рядку <guilabel>Параметри "
-"завантаження</guilabel>. Втім, ці параметри буде враховано під час "
-"завантаження системи."
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:132
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:75
+#, fuzzy
+msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:139
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:76
msgid ""
-"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
-"various boot options. Select an item with the arrow keys and press <emphasis "
-"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
-"\"bold\">Esc</emphasis> to go back to the welcome screen."
+"Test the installed RAM by performing multiple read and write operations. "
+"Reboot to end the test."
msgstr ""
-"Натискання клавіші <emphasis role=\"bold\">F1</emphasis> відкриває нове "
-"вікно зі списком пунктів. Виберіть один з пунктів за допомогою клавіш зі "
-"стрілками і натисніть клавішу <emphasis role=\"bold\">Enter</emphasis>, щоб "
-"отримати докладнішу довідку, або натисніть клавішу <emphasis role=\"bold"
-"\">Esc</emphasis>, щоб повернутися до вікна вітання."
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:146
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:80
+#, fuzzy
+msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
+msgstr "<emphasis role=\"bold\">Додатково</emphasis>"
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:151
-msgid ""
-"The detailed view about the splash option. Press <emphasis role=\"bold"
-"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
-"go back to the options list. These options can be added by hand in the "
-"<guilabel>Boot Options</guilabel> line."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:81
+msgid "Press F2 for alternative languages."
msgstr ""
-"Нижче наведено знімок вікна з докладним описом параметрів вікна вітання "
-"системи. Натисніть клавішу <emphasis role=\"bold\">Esc</emphasis> або "
-"виберіть пункт <guilabel>Return to Boot Options</guilabel> (Повернутися до "
-"параметрів завантаження), щоб повернутися до списку параметрів. Описані у "
-"вікні параметри можна додати вручну до рядка <guilabel>Параметри "
-"завантаження</guilabel>."
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:158
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:86
+msgid "UEFI Systems"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:164
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:87
+#, fuzzy
msgid ""
-"The help is translated in the chosen language with <emphasis role=\"bold"
-"\">F2</emphasis>."
+"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."
msgstr ""
-"Переглянути переклад довідки вибраною мовою можна за допомогою натискання "
-"клавіші <emphasis role=\"bold\">F2</emphasis>."
+"З цієї сторінки ви можете отримати доступ до параметрів, натиснувши клавішу "
+"<emphasis role=\"bold\">E</emphasis> для входу до режиму редагування. Щоб "
+"повернутися з цього режиму, натисніть або клавішу <emphasis role=\"bold"
+"\">Esc</emphasis>, якщо зміни не слід зберігати, або комбінацію клавіш "
+"<emphasis role=\"bold\">Ctrl</emphasis> і <emphasis role=\"bold\">F10</"
+"emphasis>, щоб зберегти зміни і вийти з режиму редагування."
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:168
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:92
+#, fuzzy
msgid ""
-"For more information about kernel options on legacy and UEFI systems, see: "
-"<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>"
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
msgstr ""
-"Докладніший опис параметрів ядра у застарілих системах та системах з UEFI "
-"можна знайти <link ns2:href=\"https://wiki.mageia.org/en/"
-"How_to_set_up_kernel_options\">тут</link>."
-
-#. type: Content of: <section><section><title>
-#: en/installer.xml:177
-msgid "The installation steps"
-msgstr "Кроки встановлення"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
-#. type: Content of: <section><section><para>
-#: en/installer.xml:179
-msgid ""
-"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."
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:96
+msgid "In UEFI mode you have only two menu options to choose from:"
msgstr ""
-"Процедуру встановлення поділено на послідовність кроків, перелік яких буде "
-"показано на лівій бічній панелі екрана."
-#. type: Content of: <section><section><para>
-#: en/installer.xml:182
-msgid ""
-"Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> sections with extra, less commonly required, options."
-msgstr ""
-"На кожному кроці вам буде показано одну або декілька сторінок, на яких ви "
-"можете побачити кнопку <guibutton>Додатково</guibutton> , за допомогою якої "
-"здійснюється доступ до додаткових параметрів, якими користуються не так "
-"часто як основними."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:99
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
+msgstr "<emphasis role=\"bold\">Вирівняти до</emphasis> = МіБ"
-#. type: Content of: <section><section><para>
-#: en/installer.xml:186
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:103
msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons for further details "
-"about the particular step."
+"<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."
msgstr ""
-"На більшості сторінок ви також побачите кнопку <guibutton>Довідка</"
-"guibutton>, за допомогою якої можна отримати додаткові пояснення щодо "
-"поточного кроку."
-#. type: Content of: <section><section><note><para>
-#: en/installer.xml:190
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:109
+#, fuzzy
msgid ""
-"If at some points during the install you decide to stop the installation, it "
-"is possible to reboot, but please think twice before you do this. Once a "
-"partition has been formatted or updates have started to be installed, your "
-"computer is no longer in the same state and rebooting it could very well "
-"leave you with an unusable system. If in spite of this you are very sure "
-"rebooting is what you want, go to a text terminal by pressing the three keys "
-"<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press "
-"<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
+"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\"."
msgstr ""
-"Якщо протягом процедури встановлення ви вирішите припинити встановлення, ви "
-"можете перезавантажити комп’ютер. Втім, вам слід ретельно обдумати ваші дії. "
-"Після форматування розділу або початку процедури встановлення оновлень ваш "
-"комп’ютер перебуватиме у проміжному стані. Перезавантаження може призвести "
-"до неможливості користування системою. Якщо, всупереч цим попередженням, ви "
-"хочете перезавантажити систему, перейдіть у текстовий термінал натисканням "
-"комбінації цих трьох клавіш: <guibutton>Alt Ctrl F2</guibutton> одночасно. "
-"Після цього, натисніть комбінацію клавіш <guibutton>Alt Ctrl Delete</"
-"guibutton> одночасно, щоб перезавантажити комп’ютер."
+"Якщо завантаження відбувалося із флешки USB, буде показано два додаткових "
+"рядки, які дублікатами попередніх, із суфіксами «USB». Вам слід вибрати саме "
+"один із цих рядків."
#. type: Content of: <section><section><title>
-#: en/installer.xml:203
+#: en/installer.xml:115
msgid "Installation Problems and Possible Solutions"
msgstr "Проблеми зі встановленням та можливі шляхи їх вирішення"
#. type: Content of: <section><section><section><title>
-#: en/installer.xml:206
+#: en/installer.xml:117
msgid "No Graphical Interface"
msgstr "Немає графічного інтерфейсу"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:210
+#: en/installer.xml:120
+#, fuzzy
msgid ""
-"After the initial screen you did not reach the language selection screen. "
-"This can happen with some graphic cards and older systems. Try using low "
-"resolution by typing <code>vgalo</code> at the prompt."
+"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."
msgstr ""
"Після початкової сторінки не відкривається сторінка вибору мови. Таке може "
"трапитися у системах з деякими графічними картками та застарілих системах. "
@@ -2571,15 +2724,15 @@ msgstr ""
"впишіть <code>vgalo</code> у рядок запиту."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:217
+#: en/installer.xml:126
+#, fuzzy
msgid ""
"If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this press "
-"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
-"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
-"with a black screen with the word \"boot:\". Type \"text\" and press "
-"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
-"in text mode."
+"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."
msgstr ""
"Якщо комп’ютер є дуже застарілим, встановлення у графічному режимі може бути "
"просто неможливим. У такому випадку варто скористатися встановленням у "
@@ -2590,18 +2743,19 @@ msgstr ""
"\"bold\">Enter</emphasis>. Встановлення буде продовжено у текстовому режимі."
#. type: Content of: <section><section><section><title>
-#: en/installer.xml:230
+#: en/installer.xml:138
msgid "The Install Freezes"
msgstr "Встановлення зупиняється"
#. type: Content of: <section><section><section><para>
-#: en/installer.xml:232
+#: en/installer.xml:139
+#, fuzzy
msgid ""
"If the system appeared to freeze during the installation, this may be a "
-"problem with hardware detection. In this case the automatic detection of "
-"hardware may be bypassed and dealt with later. To try this, type "
-"<code>noauto</code> at the prompt. This option may also be combined with "
-"other options as necessary."
+"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."
msgstr ""
"Якщо під час встановлення система припиняє відповідати на ваші запити, "
"ймовірно, виникла проблема з визначенням характеристик обладнання. У такому "
@@ -2611,17 +2765,19 @@ msgstr ""
"потреби, цю команду можна поєднати з вищевказаними командами."
#. type: Content of: <section><section><section><title>
-#: en/installer.xml:240
+#: en/installer.xml:146
msgid "RAM problem"
msgstr "Проблеми з оперативною пам’яттю"
#. type: Content of: <section><section><section><para>
-#: en/installer.xml:242
+#: en/installer.xml:147
+#, fuzzy
msgid ""
"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 "
-"<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
-"g. <code>mem=256M</code> would specify 256MB of RAM."
+"<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."
msgstr ""
"Потреба у визначенні параметрів ядра виникає нечасто, але у певних випадках "
"комп’ютер може повідомляти засобу встановлення помилкові дані щодо об’єму "
@@ -2631,19 +2787,20 @@ msgstr ""
"МБ оперативної пам’яті."
#. type: Content of: <section><section><section><title>
-#: en/installer.xml:249
+#: en/installer.xml:154
msgid "Dynamic partitions"
msgstr "Динамічні розділи"
#. type: Content of: <section><section><section><para>
-#: en/installer.xml:251
+#: en/installer.xml:155
+#, fuzzy
msgid ""
-"If you converted your hard disk from <emphasis role=\"bold\">basic</"
-"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
-"Microsoft Windows, then it is not possible to install Mageia on this disc. "
-"To revert to a basic 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>."
+"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>."
msgstr ""
"Якщо вами було перетворено ваш жорсткий диск з формату <emphasis role=\"bold"
"\">basic</emphasis> до формату <emphasis role=\"bold\">dynamic</emphasis> у "
@@ -2653,18 +2810,15 @@ msgstr ""
"aspx\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
#. type: Content of: <section><info><title>
-#: en/installUpdates.xml:3
+#: en/installUpdates.xml:16
msgid "Updates"
msgstr "Поновлення"
-#. 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, 2012-04-24 added screenshot
#. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:15
+#: en/installUpdates.xml:20
+#, fuzzy
msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"<imageobject> <imagedata format=\"png\" fileref=\"dx2-installUpdates.png\" "
"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
"imageobject>"
msgstr ""
@@ -2673,62 +2827,76 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><para>
-#: en/installUpdates.xml:20
+#: en/installUpdates.xml:25
+#, fuzzy
msgid ""
-"Since this version of <application>Mageia</application> was released, some "
-"packages will have been updated or improved."
+"Since this version of Mageia was released, some packages will have been "
+"updated or improved."
msgstr ""
-"З часу випуску цієї версії <application>Mageia</application> деякі пакунки "
+"З часу випуску цієї версії Mageia деякі пакунки "
"могло бути оновлено та поліпшено."
-#. type: Content of: <section><para>
-#: en/installUpdates.xml:24
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:30
msgid ""
-"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
-"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
+"Select <emphasis>Yes</emphasis> if you wish to download and install them"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:35
+#, fuzzy
+msgid ""
+"Select <emphasis>No</emphasis> if you don't want to do this now, or if you "
"aren't connected to the Internet"
msgstr ""
"Натисніть кнопку <guilabel>так</guilabel>, якщо ви хочете отримати і "
"встановити ці пакунки, або виберіть <guilabel>ні</guilabel>, якщо ви не "
"хочете робити цього зараз або ваш комп’ютер не з’єднано з інтернетом."
-#. type: Content of: <section><para>
-#: en/installUpdates.xml:29
-msgid "Press <guibutton>Next</guibutton> to continue"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:40
+#, fuzzy
+msgid "Press <emphasis>Next</emphasis> to continue"
msgstr ""
"Щойно вибір буде зроблено, натисніть кнопку <guibutton>Далі</guibutton>, щоб "
"продовжити роботу з програмою."
#. type: Content of: <section><info><title>
-#: en/login.xml:1
-msgid "Login screen"
+#: en/login.xml:4
+#, fuzzy
+msgid "Login Screen"
msgstr "Вікно вітання"
#. type: Content of: <section><mediaobject>
-#: en/login.xml:1
+#: en/login.xml:7
+#, fuzzy
msgid ""
-"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
-"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/> </imageobject>"
msgstr ""
"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
#. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:1
-msgid "KDM login screen"
+#: en/login.xml:11
+#, fuzzy
+msgid "SDDM login screen"
msgstr "Вікно вітання KDM"
#. type: Content of: <section><para>
-#: en/login.xml:1
-msgid "Finally, you will come to the login screen."
+#: en/login.xml:14
+#, fuzzy
+msgid "Finally, you will come to the desktop login screen."
msgstr "Нарешті, вам буде показано вікно вітання."
#. type: Content of: <section><para>
-#: en/login.xml:1
+#: en/login.xml:15
+#, fuzzy
msgid ""
"Enter your user name and user password, and in a few seconds you will find "
-"yourself with a loaded KDE or GNOME desktop, depending on which live medium "
-"you used. You can now start using your Mageia installation."
+"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."
msgstr ""
"Введіть ім’я та пароль вашого користувача і за декілька секунд ви опинитеся "
"у завантаженому KDE, GNOME чи іншому стільничному середовищі, залежно від "
@@ -2736,36 +2904,38 @@ msgstr ""
"користуватися встановленою Mageia, як вам заманеться."
#. type: Content of: <section><para>
-#: en/login.xml:3
+#: en/login.xml:16
+#, fuzzy
msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find further documentation in <link xmlns:ns0=\"http://www.w3."
+"org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
msgstr ""
"Іншу частину документації можна знайти у <link linkend=\"https://wiki.mageia."
"org/en/Category:Documentation\">вікі Mageia</link>."
#. type: Content of: <section><info><title>
-#: en/media_selection.xml:3
-msgid "Media Selection (Nonfree)"
-msgstr "Вибір носія (з пакунками, які не є вільними)"
+#: en/media_selection.xml:10
+msgid "Nonfree Media"
+msgstr ""
-#. papoteur 2013-04-11 - created
+#. 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-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)
+#. 2019.01.05 apb: Changed Ati to AMD in Nonfree para.
#. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:15
+#: en/media_selection.xml:24
msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
-"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
-"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
"imageobject>"
#. type: Content of: <section><para>
-#: en/media_selection.xml:20
+#: en/media_selection.xml:30
msgid ""
"Here you have the list of available repositories. Not all repositories are "
"available, according to which media you use for installing. The repositories "
@@ -2778,7 +2948,7 @@ msgstr ""
"наступних кроках."
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:27
+#: en/media_selection.xml:37
msgid ""
"The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
"the base of the distribution."
@@ -2787,12 +2957,13 @@ msgstr ""
"містяться основні пакунки дистрибутива."
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:32
+#: en/media_selection.xml:42
+#, fuzzy
msgid ""
"The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
"of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
"software (hence the name - Nonfree). For example this repository includes "
-"nVidia and ATI graphics card proprietary drivers, firmware for various WiFi "
+"nVidia and AMD graphics card proprietary drivers, firmware for various WiFi "
"cards, etc."
msgstr ""
"До сховища <emphasis>Nonfree</emphasis> включено пакунки, які є "
@@ -2802,7 +2973,7 @@ msgstr ""
"nVidia і ATI, мікропрограми для різноманітних карток WiFi тощо."
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:40
+#: en/media_selection.xml:50
msgid ""
"The <emphasis>Tainted</emphasis> repository includes packages released under "
"a free license. The main criteria for placing packages in this repository is "
@@ -2824,69 +2995,76 @@ msgid "Minimal Install"
msgstr "Мінімальне встановлення"
#. type: Content of: <section><para>
-#: en/minimal-install.xml:11
-msgid ""
-"You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
-msgstr ""
-"Ви можете вибрати «Мінімальне встановлення» зняттям позначок з усіх пунктів "
-"у списку вибору груп пакунків, див. розділ <xref linkend="
-"\"choosePackageGroups\"></xref>."
-
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:14
-msgid ""
-"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
-"package selection</emphasis> option in the same screen."
-msgstr ""
-"Якщо потрібно, ви можете додатково позначити пункт <emphasis role=\"bold"
-"\">Індивідуальний вибір пакунків</emphasis> на тій самій сторінці."
-
-#. type: Content of: <section><para>
#: en/minimal-install.xml:17
+#, fuzzy
msgid ""
"Minimal Installation is intended for those with specific uses in mind for "
-"<application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the <emphasis "
-"role=\"bold\">Individual package selection</emphasis> option mentioned "
-"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
-"\"/>."
+"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\"/>."
msgstr ""
"Мінімальний режим призначено для тих, хто має намір використовувати "
-"<application>Mageia</application> з якоюсь вузькоспеціалізованою метою, "
+"Mageia з якоюсь вузькоспеціалізованою метою, "
"зокрема як сервер або робочу станцію вузького спрямування. Вам варто "
"користуватися цим варіантом у поєднанні з пунктом <emphasis role=\"bold"
"\">Індивідуальний вибір пакунків</emphasis>, згаданим вище, для точнішого "
"налаштовування переліку встановлених пакунків, див. <xref linkend="
"\"choosePackagesTree\"></xref>."
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:24
+#, fuzzy
+msgid ""
+"You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting "
+"everything in the <emphasis>Package Group Selection</emphasis> screen, see "
+"<xref linkend=\"choosePackageGroups\"/>."
+msgstr ""
+"Ви можете вибрати «Мінімальне встановлення» зняттям позначок з усіх пунктів "
+"у списку вибору груп пакунків, див. розділ <xref linkend="
+"\"choosePackageGroups\"></xref>."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:28
+#, fuzzy
msgid ""
-"If you choose this installation method, then the relevant screen will offer "
-"you a few useful extras to install, such as documentation and X."
+"If desired, you can additionally tick the <emphasis>Individual package "
+"selection</emphasis> option in the same screen."
+msgstr ""
+"Якщо потрібно, ви можете додатково позначити пункт <emphasis role=\"bold"
+"\">Індивідуальний вибір пакунків</emphasis> на тій самій сторінці."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:33
+#, fuzzy
+msgid ""
+"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>."
msgstr ""
"Якщо ви виберете цей варіант встановлення, на наступній сторінці програми "
"вам буде запропоновано встановити корисні доповнення системи, зокрема "
"документацію та графічний сервер."
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:26
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:37
+#, fuzzy
msgid ""
-"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"If the <emphasis>With X</emphasis> option is selected, then IceWM (a "
"lightweight desktop environment) will also be included."
msgstr ""
"Якщо вибрано варіант <emphasis role=\"bold\">Разом з X</emphasis>, до "
"пакунків становлення буде включено IceWM (невибагливе графічне середовище)."
#. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:42
+#, fuzzy
msgid ""
-"The basic documentation is provided in the form of man and info pages. It "
-"contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
-"manpages/man.html\">Linux Documentation Project</link> and the <link xlink:"
-"href=\"http://www.gnu.org/software/coreutils/manual/\">GNU coreutils</link> "
-"info pages."
+"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 Project</"
+"link> and the <link xlink:href=\"http://www.gnu.org/software/coreutils/"
+"manual/\">GNU coreutils</link> info pages."
msgstr ""
"Базова документація надається у форматі сторінок man та info. У ній "
"містяться сторінки man з <link xlink:href=\"http://www.tldp.org/manpages/man."
@@ -2894,7 +3072,7 @@ msgstr ""
"href=\"http://www.gnu.org/software/coreutils/manual/\">GNU coreutils</link>."
#. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:35
+#: en/minimal-install.xml:48
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
@@ -2906,24 +3084,34 @@ msgstr ""
#. type: Content of: <section><info><title>
#: en/misc-params.xml:3
-msgid "Summary of miscellaneous parameters"
-msgstr "Резюме щодо інших параметрів"
+#, fuzzy
+msgid "Configuration Summary"
+msgstr "Налаштування звуку"
#. Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
+#. 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
#. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:10
+#: en/misc-params.xml:19
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\" align=\"center\"/> </"
+"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> </"
+"imageobject>"
#. type: Content of: <section><para>
-#: en/misc-params.xml:15
+#: en/misc-params.xml:24
+#, fuzzy
msgid ""
"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 <guibutton>Configure</"
-"guibutton>."
+"settings here and change them if you want by pressing <emphasis>Configure</"
+"emphasis>."
msgstr ""
"DrakX намагається правильно визначити налаштування вашої системи відповідно "
"до зробленого вами вибору та виявленого DrakX обладнання. Ви можете "
@@ -2931,7 +3119,7 @@ msgstr ""
"цього достатньо натиснути кнопку <guibutton>Налаштувати</guibutton>."
#. type: Content of: <section><note><para>
-#: en/misc-params.xml:21
+#: en/misc-params.xml:30
msgid ""
"As a general rule, it is recommended that you accept the default settings "
"unless:"
@@ -2940,37 +3128,39 @@ msgstr ""
"нічого не змінювати, окрім таких винятків:"
#. type: Content of: <section><note><para><itemizedlist><listitem><para>
-#: en/misc-params.xml:24
+#: en/misc-params.xml:33
msgid "there are known issues with a default setting"
msgstr "відомі певні недоліки у типових параметрах;"
#. type: Content of: <section><note><para><itemizedlist><listitem><para>
-#: en/misc-params.xml:28
+#: en/misc-params.xml:37
msgid "the default setting has already been tried and it fails"
msgstr "ви спробували типові параметри, і нічого не вийшло;"
#. type: Content of: <section><note><para><itemizedlist><listitem><para>
-#: en/misc-params.xml:32
-msgid ""
-"some other factor mentionned in the detailed sections below is an issue."
+#: en/misc-params.xml:41
+#, fuzzy
+msgid "some other factor mentioned in the detailed sections below is an issue"
msgstr ""
"у розділах із докладною інформацією, наведених нижче, стверджується, що слід "
"вибрати нетипові параметри."
#. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:40
+#: en/misc-params.xml:49
msgid "System parameters"
msgstr "Параметри системи"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:45
-msgid "<guilabel>Timezone</guilabel>"
-msgstr "<guilabel>Часовий пояс</guilabel>"
+#: en/misc-params.xml:54
+#, fuzzy
+msgid "<emphasis role=\"bold\">Timezone</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:47
+#: en/misc-params.xml:56
+#, fuzzy
msgid ""
-"DrakX selects a time zone for you, depending on your preferred language. You "
+"DrakX selects a timezone for you, depending on your preferred language. You "
"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
msgstr ""
"DrakX вибирає часовий пояс на основі вказаної вами бажаної мови. Якщо "
@@ -2978,12 +3168,13 @@ msgstr ""
"\"configureTimezoneUTC\"/>."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:53
-msgid "<guilabel>Country / Region</guilabel>"
-msgstr "<guilabel>Країна / Регіон</guilabel>"
+#: en/misc-params.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Country / Region</emphasis>"
+msgstr "<emphasis role=\"bold\">Робоча станція</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:56
+#: en/misc-params.xml:64
msgid ""
"If the selected country is wrong, it is very important that you correct the "
"setting. See <xref linkend=\"selectCountry\"/>"
@@ -2993,48 +3184,49 @@ msgstr ""
"\"selectCountry\"/>."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:62
-msgid "<guilabel>Bootloader</guilabel>"
-msgstr "<guilabel>Завантажувач</guilabel>"
+#: en/misc-params.xml:70
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:64
-msgid "DrakX has made good choices for the bootloader setting."
+#: en/misc-params.xml:72
+#, fuzzy
+msgid "DrakX proposal for the bootloader setting"
msgstr "DrakX автоматично вибирає належні параметри завантажувача."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
-msgid "Do not change anything, unless you know how to configure GRUB2"
+#: en/misc-params.xml:75
+#, fuzzy
+msgid ""
+"Do not change anything, unless you know how to configure GRUB2. For more "
+"information, see <xref linkend=\"setupBootloader\"/>"
msgstr "Не вносьте ніяких змін, якщо ви не є знавцем з налаштовування GRUB2"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:70
-msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
-msgstr ""
-"Щоб дізнатися більше, зверніться до розділу <xref linkend=\"setupBootloader"
-"\"/>."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
-msgid "<guilabel>User management</guilabel>"
-msgstr "<guilabel>Керування записами користувачів</guilabel>"
+#: en/misc-params.xml:83
+#, fuzzy
+msgid "<emphasis role=\"bold\">User management</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:78
+#: en/misc-params.xml:85
+#, fuzzy
msgid ""
-"You can add extra users here. They will each get their own <literal>/home</"
-"literal> directories."
+"You can add extra users here. They will each be allocated their own "
+"<filename>/home</filename> directories."
msgstr ""
"За допомогою цієї сторінки ви можете додати облікові записи користувачів. У "
"кожного користувача буде власний каталог <literal>/home</literal>."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:84
-msgid "<guilabel>Services</guilabel>:"
-msgstr "<guilabel>Служби</guilabel>:"
+#: en/misc-params.xml:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Services</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:86
+#: en/misc-params.xml:93
msgid ""
"System services refer to those small programs which run in the background "
"(daemons). This tool allows you to enable or disable certain processes."
@@ -3044,33 +3236,29 @@ msgstr ""
"увімкнути або вимкнути деякі з цих служб."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:90
+#: en/misc-params.xml:97
+#, fuzzy
msgid ""
"You should check carefully before changing anything here - a mistake may "
-"prevent your computer from operating correctly."
+"prevent your computer from operating correctly. For more information, see "
+"<xref linkend=\"configureServices\"/>"
msgstr ""
"Вам слід бути обережними у виборі: помилки можуть призвести до неналежної "
"роботи комп’ютера."
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:94
-msgid "For more information, see <xref linkend=\"configureServices\"/>"
-msgstr ""
-"Щоб дізнатися більше, зверніться до розділу <xref linkend=\"configureServices"
-"\"/>."
-
#. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:101
+#: en/misc-params.xml:106
msgid "Hardware parameters"
msgstr "Параметри обладнання"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:106
-msgid "<guilabel>Keyboard</guilabel>:"
-msgstr "<guilabel>Клавіатура</guilabel>:"
+#: en/misc-params.xml:111
+#, fuzzy
+msgid "<emphasis role=\"bold\">Keyboard</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:108
+#: en/misc-params.xml:113
msgid ""
"Configure your keyboard layout according to your location, language and type "
"of keyboard."
@@ -3080,7 +3268,7 @@ msgstr ""
"та типу клавіатури."
#. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:118
msgid ""
"If you notice a wrong keyboard layout and want to change it, keep in mind "
"that your passwords are going to change too."
@@ -3089,12 +3277,13 @@ msgstr ""
"її, не забудьте, що зі зміною розкладки може змінитися і текст вашого пароля."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
-msgid "<guilabel>Mouse</guilabel>:"
-msgstr "<guilabel>Миша</guilabel>:"
+#: en/misc-params.xml:124
+#, fuzzy
+msgid "<emphasis role=\"bold\">Mouse</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:126
msgid ""
"Here you can add or configure other pointing devices, tablets, trackballs "
"etc."
@@ -3103,42 +3292,43 @@ msgstr ""
"пристрої, планшети, кульові маніпулятори тощо."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
-msgid "<guilabel>Sound card</guilabel>:"
-msgstr "<guilabel>Звукова плата</guilabel>:"
+#: en/misc-params.xml:131
+#, fuzzy
+msgid "<emphasis role=\"bold\">Sound card</emphasis>"
+msgstr "<emphasis role=\"bold\">Додатково</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:133
+msgid "The installer will use the default driver if one is available."
+msgstr ""
+
+#. type: Content of: <section><section><para>
+#: en/misc-params.xml:136 en/soundConfig.xml:46
msgid ""
-"The installer uses the default driver - if there is a default one. The "
-"option to select a different driver is only given when there is more than "
-"one driver for your card, but where none of them is the default one."
+"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."
msgstr ""
-"Засобом встановлення буде використано типовий драйвер, якщо такий типовий "
-"драйвер передбачено. Можливість вибору іншого драйвера буде надано, лише "
-"якщо для картки передбачено декілька драйверів, але жоден з них не є типовим."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:137
-msgid "<guilabel>Graphical interface</guilabel>:"
-msgstr "<guilabel>Графічний інтерфейс</guilabel>:"
+#: en/misc-params.xml:144
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical interface</emphasis>"
+msgstr "<emphasis role=\"bold\">Графічне середовище</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:140
-msgid "This section allows you to configure your graphic card(s) and displays."
+#: en/misc-params.xml:146
+#, fuzzy
+msgid ""
+"This section allows you to configure your graphics card(s) and displays. For "
+"more information, see <xref linkend=\"configureX_chooser\"/>"
msgstr ""
"За допомогою цього розділу сторінки ви можете налаштувати параметри роботи "
"ваших графічних карток та дисплеїв."
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:143
-msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
-msgstr ""
-"Щоб дізнатися більше, зверніться до розділу <xref linkend="
-"\"configureX_chooser\"/>."
-
#. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:149
+#: en/misc-params.xml:155
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -3147,21 +3337,23 @@ msgstr ""
"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:157
+#: en/misc-params.xml:163
msgid "Network and Internet parameters"
msgstr "Параметри мережі та роботи у інтернеті"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
-msgid "<guilabel>Network</guilabel>:"
-msgstr "<guilabel>Мережа</guilabel>:"
+#: en/misc-params.xml:169
+#, fuzzy
+msgid "<emphasis role=\"bold\">Network</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:165
+#: en/misc-params.xml:171
+#, fuzzy
msgid ""
"You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, using the <application>Mageia "
-"Control Center</application>, if you have not yet enabled the Nonfree media "
+"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."
msgstr ""
"Цей розділ надасть вам змогу налаштувати мережу. Втім, якщо ви користуєтеся "
@@ -3170,7 +3362,7 @@ msgstr ""
"application>, після вмикання сховищ закритих (Nonfree) пакунків."
#. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:172
+#: en/misc-params.xml:178
msgid ""
"When you add a network card, do not forget to set your firewall to monitor "
"that interface as well."
@@ -3179,15 +3371,17 @@ msgstr ""
"брандмауер (мережевий екран), який стежитиме за відповідним інтерфейсом."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
-msgid "<guilabel>Proxies</guilabel>:"
-msgstr "<guilabel>Проксі</guilabel>:"
+#: en/misc-params.xml:185
+#, fuzzy
+msgid "<emphasis role=\"bold\">Proxies</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:181
+#: en/misc-params.xml:187
+#, fuzzy
msgid ""
"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 "
+"Internet. This section allows you to configure your computer to utilize a "
"proxy service."
msgstr ""
"Проксі-сервер є проміжною ланкою між вашим комп’ютером та інтернетом. За "
@@ -3195,70 +3389,76 @@ msgstr ""
"служб проксі-сервера."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:186
+#: en/misc-params.xml:192
+#, fuzzy
msgid ""
-"You may need to consult your systems administrator to get the parameters you "
-"need to enter here."
+"You may need to consult your systems administrator to obtain the parameters "
+"you need to enter here."
msgstr ""
"Вам варто порадитися з вашим системним адміністратором, щоб дізнатися більше "
"про значення параметрів, які слід вказати у цьому розділі."
#. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:195
+#: en/misc-params.xml:201
msgid "Security"
msgstr "Безпека"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:200
-msgid "<guilabel>Security Level</guilabel>:"
-msgstr "<guilabel>Рівень безпеки</guilabel>:"
+#: en/misc-params.xml:206
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Level</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:203
+#: en/misc-params.xml:208
+#, fuzzy
msgid ""
-"Here you set the Security level for your computer, in most cases the default "
-"setting (Standard) is adequate for general use."
+"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."
msgstr ""
"За допомогою цього розділу ви можете визначити рівень захисту вашого "
"комп’ютера. Здебільшого, типовий варіант (Стандартний) надасть вашому "
"комп’ютеру достатній захист."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:207
-msgid "Check the option which best suits your usage."
-msgstr ""
-"Виберіть той з варіантів, який найкраще відповідає вашому способу "
-"використання системи."
+#: en/misc-params.xml:215
+#, fuzzy
+msgid "<emphasis role=\"bold\">Firewall</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
-msgid "<guilabel>Firewall</guilabel>:"
-msgstr "<guilabel>Захисний шлюз</guilabel>:"
+#: en/misc-params.xml:217
+msgid ""
+"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."
+msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:214
+#: en/misc-params.xml:223
msgid ""
-"A firewall is intended to be a barrier between your important data and the "
-"rascals out there on the internet who would compromise or steal it."
+"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."
msgstr ""
-"Брандмауер або мережевий екран є бар’єром, який убезпечує важливі дані від "
-"доступу до них шахраїв з інтернету, які намагаються викрасти і скористатися "
-"цими даними."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:218
-msgid ""
-"Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for. For more "
-"information, see <xref linkend=\"firewall\"/>."
+#: en/misc-params.xml:229
+#, fuzzy
+msgid "For more information, see <xref linkend=\"firewall\"/>."
msgstr ""
-"Виберіть служби, яким має бути дозволено доступ до вашої системи. Вибір "
-"служб залежатиме від призначення комп’ютера, на якому працює операційна "
-"система. Докладніше про це у розділі <xref linkend=\"firewall\"/>."
+"Щоб дізнатися більше, зверніться до розділу <xref linkend="
+"\"configureX_chooser\"/>."
#. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:224
-msgid "Bear in mind that allowing everything (no firewall) may be very risky."
+#: en/misc-params.xml:232
+#, fuzzy
+msgid ""
+"Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may "
+"be very risky."
msgstr ""
"Пам’ятайте, що вмикання доступу без обмежень (вимикання брандмауера) може "
"значно знизити рівень захисту вашої системи."
@@ -3269,12 +3469,11 @@ msgid "Reboot"
msgstr "Перезавантажити"
#. type: Content of: <section><para>
-#: en/reboot.xml:6
+#: en/reboot.xml:7
+#, fuzzy
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer, click on <emphasis "
-"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
-"asked<emphasis role=\"bold\"> in this order!</emphasis>"
+"computer, remove the live DVD/USB stick and restart the computer."
msgstr ""
"Після встановлення завантажувача програма попросить вас перервати роботу "
"системи, вийняти з лотка компакт-диск, від’єднати від комп’ютера флешку і "
@@ -3282,24 +3481,40 @@ msgstr ""
"\"><guibutton>Завершити</guibutton></emphasis> і виконайте саме ці дії "
"<emphasis role=\"bold\">у вказаному порядку</emphasis>."
+#. type: Content of: <section><important><simpara>
+#: en/reboot.xml:9
+msgid ""
+"Ensure that you follow these shut-down and restart instruction steps in the "
+"<emphasis role=\"bold\">same</emphasis> order."
+msgstr ""
+
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:11
-msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+#: en/reboot.xml:12
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot2.png\"/> </"
+"imageobject>"
msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
-#. type: Content of: <section><para>
-#: en/reboot.xml:15
+#. type: Content of: <section><simpara>
+#: en/reboot.xml:16
+msgid "When you are ready, press <emphasis>Finish</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><simpara>
+#: en/reboot.xml:17
+#, fuzzy
msgid ""
"When you restart, you will see a succession of download progress bars. These "
-"indicate that the software media lists are being downloaded (see Software "
-"management)."
+"indicate that the software media lists are being downloaded (see "
+"<emphasis>Software Management</emphasis>)."
msgstr ""
"Після перезавантаження ви побачите інформацію щодо отримання даних на "
"смужках поступу. Дані цих смужок відповідають процесу отримання даних сховищ "
"із програмним забезпеченням (див. «Керування програмним забезпеченням»)."
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:17
+#: en/reboot.xml:19
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -3329,34 +3544,42 @@ msgstr ""
"application>."
#. type: Content of: <section><info><title>
-#: en/securityLevel.xml:3
+#: en/securityLevel.xml:10
msgid "Security Level"
msgstr "Рівень безпеки"
-#. 2012-12-25 marja - moved this part out of misc-params.xml"
-#. 2013-05-05 marja - added screenshot
+#. 2012-12-25 marja - moved this part out of misc-params.xml"
+#. 2013-05-05 marja - added screenshot
+#. 2018/02/12 apb: Minor wording.
#. type: Content of: <section><mediaobject>
-#: en/securityLevel.xml:11
+#: en/securityLevel.xml:20
+#, fuzzy
msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
-"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-securityLevel.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"securityLevel-im1\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
-"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/securityLevel.xml:16
+#: en/securityLevel.xml:26
msgid ""
"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
msgstr "<emphasis role=\"bold\">Будь ласка, виберіть рівень безпеки</emphasis>"
#. type: Content of: <section><para>
-#: en/securityLevel.xml:19
+#: en/securityLevel.xml:29
+msgid ""
+"<emphasis>Standard</emphasis> is the default, and recommended setting for "
+"the average user."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:32
+#, fuzzy
msgid ""
-"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
-"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
-"setting will create a highly protected system - for instance if the system "
-"is to be used as a public server."
+"<emphasis>Secure</emphasis> will create a highly protected system - for "
+"instance if the system is to be used as a public server."
msgstr ""
"<emphasis role=\"bold\">Standard</emphasis> — типовий рівень, який ми "
"рекомендуємо пересічному користувачеві. За допомогою варіанта <emphasis role="
@@ -3364,12 +3587,12 @@ msgstr ""
"для використання її як загальнодоступного сервера."
#. type: Content of: <section><para>
-#: en/securityLevel.xml:24
+#: en/securityLevel.xml:36
msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
msgstr "<emphasis role=\"bold\">Адміністратор безпеки</emphasis>"
#. type: Content of: <section><para>
-#: en/securityLevel.xml:26
+#: en/securityLevel.xml:38
msgid ""
"This item allows you to configure an email address to which the system will "
"send <emphasis>security alert messages</emphasis> when it detects situations "
@@ -3381,17 +3604,18 @@ msgstr ""
"системи."
#. type: Content of: <section><para>
-#: en/securityLevel.xml:31
+#: en/securityLevel.xml:43
+#, fuzzy
msgid ""
-"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
-"where &lt;user> is the login name of the user to receive these messages."
+"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."
msgstr ""
"Непоганим, простим у реалізації варіантом є введення рядка &lt;"
"користувач>@localhost, де &lt;користувач> — назва облікового запису "
"користувача, який отримуватиме ці повідомлення."
#. type: Content of: <section><note><para>
-#: en/securityLevel.xml:36
+#: en/securityLevel.xml:48
msgid ""
"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
@@ -3403,26 +3627,27 @@ msgstr ""
"повідомлень!"
#. type: Content of: <section><para>
-#: en/securityLevel.xml:41
+#: en/securityLevel.xml:53
+#, fuzzy
msgid ""
-"After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
+"It will always be possible to adjust your security settings post-install in "
+"the <emphasis>Security</emphasis> section of the Mageia Control Center."
msgstr ""
"Після встановлення ви завжди зможете змінити параметри захисту за допомогою "
"модуля <guilabel>Безпека</guilabel> Центру керування Mageia."
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:6
+#: en/SelectAndUseISOs2.xml:15
msgid "Select and use ISOs"
msgstr "Вибір і використання образів ISO"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:18
msgid "Introduction"
msgstr "Вступ"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:10
+#: en/SelectAndUseISOs2.xml:19
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image best suits your needs."
@@ -3432,16 +3657,19 @@ msgstr ""
"потребам."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:12
-msgid "There are two families of media:"
+#: en/SelectAndUseISOs2.xml:21
+#, fuzzy
+msgid "There are three types of installation media:"
msgstr "Існує два сімейства носіїв дистрибутива:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:15
+#: en/SelectAndUseISOs2.xml:24
+#, fuzzy
msgid ""
-"Classical installer: 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"
+"<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."
msgstr ""
"Класичний засіб встановлення: після завантаження з носія системи буде "
"розпочато процедуру, протягом якої ви зможете вибрати компоненти для "
@@ -3450,46 +3678,96 @@ msgstr ""
"вибрати стільничне середовище, яким би ви хотіли користуватися."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:21
+#: en/SelectAndUseISOs2.xml:31
+#, fuzzy
msgid ""
-"LIVE media: This option allows you to try out Mageia without having to "
-"actually install it, or make any changes to your computer. If the "
-"installation is decided, the process is simpler, but you get fewer choices "
-"than offered by the Classical installer"
+"<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."
msgstr ""
"Носій портативної системи: цей варіант надасть вам змогу спробувати Mageia "
"без встановлення на диск і внесення змін до системи вашого комп'ютера. Якщо "
"ви вирішите встановити Mageia за допомогою цього носія, процес встановлення "
"буде простішим, але у вас буде вужчий вибір, порівняно із класичним носієм."
+#. type: Content of: <section><section><itemizedlist><listitem><note><para>
+#: en/SelectAndUseISOs2.xml:37
+msgid ""
+"The Live Installer is simpler compared to the Classical Installer - but you "
+"have fewer configuration options."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><important><para>
+#: en/SelectAndUseISOs2.xml:41
+#, fuzzy
+msgid ""
+"Live ISOs can only be used to create <quote>clean</quote> installations, "
+"they cannot be used to upgrade previously installed Mageia releases."
+msgstr ""
+"<emphasis role=\"bold\">Образами ISO портативних систем можна скористатися "
+"лише для встановлення системи «з нуля». Вони непридатні для оновлення "
+"системи з попередніх випусків.</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:47
+#, fuzzy
+msgid ""
+"<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."
+msgstr ""
+"Кожен з таких малих образів містить лише дані, потрібні для запуску засобу "
+"встановлення drakx та пошуку drakx-installer-stage2 та інших пакунків, за "
+"допомогою яких можна продовжити і завершити встановлення. Такі пакунки "
+"можуть зберігатися на жорсткому диску комп’ютера, локальному диску, у "
+"локальній мережі або у інтернеті."
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:53
+msgid ""
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
+msgstr ""
+"Такі носії є дуже малими (менше за 100 МБ). Ними зручно користуватися, якщо "
+"канал зв’язку у мережі є надто вузьким для отримання повноцінного образу "
+"DVD, на комп’ютерах без пристрою для читання DVD або на комп’ютерах, які не "
+"можуть завантажувати систему із флеш-диска USB."
+
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:27
-msgid "Details are given in the next sections."
+#: en/SelectAndUseISOs2.xml:58
+#, fuzzy
+msgid "More details are given in the next sections."
msgstr "Подробиці наведено у наступних розділах."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:30
+#: en/SelectAndUseISOs2.xml:61
msgid "Media"
msgstr "Носій"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:32
+#: en/SelectAndUseISOs2.xml:63
msgid "Definition"
msgstr "Визначення"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:64
+#, fuzzy
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support (DVD, USB "
-"stick, ...) the ISO file is copied to."
+"install and/or update Mageia and, by extension, any physical medium (DVD, "
+"USB stick, ...) the ISO file is copied to."
msgstr ""
"Тут ми називаємо носієм даних файл образу ISO, за допомогою якого можна "
"встановити і/або оновити Mageia, а також будь-який фізичний носій, де "
"зберігаються дані файла ISO."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:36
+#: en/SelectAndUseISOs2.xml:67
msgid ""
"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
"downloads/\">here</link>."
@@ -3498,231 +3776,213 @@ msgstr ""
"\">тут</link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:70
msgid "Classical installation media"
msgstr "Класичний носій для встановлення"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
-#: en/SelectAndUseISOs2.xml:141
+#: en/SelectAndUseISOs2.xml:72 en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:171
msgid "Common features"
msgstr "Типові можливості"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:44
-msgid "These ISOs use the Classical installer called drakx."
+#: en/SelectAndUseISOs2.xml:75
+#, fuzzy
+msgid "These ISOs use the Classical installer called DrakX"
msgstr ""
"На цих образах ISO використовується традиційний засіб встановлення під "
"назвою drakx."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:47
+#: en/SelectAndUseISOs2.xml:78
+#, fuzzy
msgid ""
"They are used for performing clean installs or to upgrade a previously "
-"installed version of Mageia."
+"installed version of Mageia"
msgstr ""
"Вони придатні для встановлення «з нуля» або оновлення попередніх випусків "
"Mageia."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
-#: en/SelectAndUseISOs2.xml:158
-msgid "Different media for 32 and 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:82 en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:174
+#, fuzzy
+msgid "Different media for 32 and 64-bit architectures"
msgstr "Різні носії для 32-бітової та 64-бітової архітектур."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:54
+#: en/SelectAndUseISOs2.xml:85
+#, fuzzy
msgid ""
-"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
-"Hardware Detection Tool."
+"Some tools are available in the Installer <quote>Welcome</quote> screen: "
+"<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware "
+"Detection Tool</emphasis>"
msgstr ""
"Доступ до деяких з інструментів можна отримати з екран вітання: система "
"відновлення, тест пам’яті, інструмент виявлення обладнання."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:58
-msgid "Each DVD contains many available desktop environments and languages."
+#: en/SelectAndUseISOs2.xml:91
+#, fuzzy
+msgid "Each DVD contains many available desktop environments and languages"
msgstr ""
"На кожному з DVD міститься багато стільничних середовищ та переклади різними "
"мовами."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:62
+#: en/SelectAndUseISOs2.xml:95
+#, fuzzy
msgid ""
-"You'll be given the choice during the installation to add non free software."
+"You'll be given the choice during the installation to add non-free software"
msgstr ""
"Під час встановлення вам буде надано можливість додати джерела невільного "
"програмного забезпечення."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:102
msgid "Live media"
msgstr "Портативний носій"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:74
+#: en/SelectAndUseISOs2.xml:107
+#, fuzzy
msgid ""
"Can be used to preview the Mageia operating system without having to install "
-"it. Can also be used to install Mageia if you wish."
+"it"
msgstr ""
"Можна скористатися для ознайомлення із дистрибутивом без встановлення його "
"на жорсткий диск. Втім, якщо хочеться, за допомогою цього носія можна "
"встановити Mageia на вашому комп’ютері."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
-msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
+#: en/SelectAndUseISOs2.xml:111
+msgid "The Live media also includes an Installer."
msgstr ""
-"Кожен ISO містить лише одне стільничне середовище (Плазму, GNOME або Xfce)."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:86
-msgid ""
-"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade previously installed Mageia "
-"releases.</emphasis>"
+#: en/SelectAndUseISOs2.xml:114
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)"
msgstr ""
-"<emphasis role=\"bold\">Образами ISO портативних систем можна скористатися "
-"лише для встановлення системи «з нуля». Вони непридатні для оновлення "
-"системи з попередніх випусків.</emphasis>"
+"Кожен ISO містить лише одне стільничне середовище (Плазму, GNOME або Xfce)."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:91
-msgid "They contain non free software."
+#: en/SelectAndUseISOs2.xml:121
+#, fuzzy
+msgid "They contain non-free software"
msgstr "Містять невільне програмне забезпечення."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:96
+#: en/SelectAndUseISOs2.xml:126
msgid "Live DVD Plasma"
msgstr "Портативний DVD з Плазмою"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:99
-msgid "Plasma desktop environment only."
+#: en/SelectAndUseISOs2.xml:129
+#, fuzzy
+msgid "Plasma desktop environment only"
msgstr "Лише стільничне середовище Плазми."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
-#: en/SelectAndUseISOs2.xml:130
-msgid "All available languages are present."
+#: en/SelectAndUseISOs2.xml:132 en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:160
+#, fuzzy
+msgid "All available languages are present"
msgstr "Містить переклади усіма мовами."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:105
-msgid "64 bit architecture only."
-msgstr "Лише для 64-бітової архітектури."
+#: en/SelectAndUseISOs2.xml:135 en/SelectAndUseISOs2.xml:149
+#, fuzzy
+msgid "64-bit architecture only"
+msgstr "Лише для 64-бітової архітектури"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:110
+#: en/SelectAndUseISOs2.xml:140
msgid "Live DVD GNOME"
msgstr "Портативний DVD із GNOME"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:113
-msgid "GNOME desktop environment only."
+#: en/SelectAndUseISOs2.xml:143
+#, fuzzy
+msgid "GNOME desktop environment only"
msgstr "Лише стільничне середовище GNOME."
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:119
-msgid "64 bit architecture only"
-msgstr "Лише для 64-бітової архітектури"
-
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:154
msgid "Live DVD Xfce"
msgstr "Портативний DVD з Xfce"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:127
-msgid "Xfce desktop environment only."
+#: en/SelectAndUseISOs2.xml:157
+#, fuzzy
+msgid "Xfce desktop environment only"
msgstr "Лише стільничне середовище Xfce."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:133
-msgid "32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:163
+#, fuzzy
+msgid "32 or 64-bit architectures"
msgstr "32-бітова і 64-бітова архітектури."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:139
+#: en/SelectAndUseISOs2.xml:169
msgid "Net install media"
msgstr "Носій для встановлення з мережі"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:144
-msgid ""
-"These are minimal ISO's containing no more than that which is needed to "
-"start the drakx installer and find drakx-installer-stage2 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."
-msgstr ""
-"Кожен з таких малих образів містить лише дані, потрібні для запуску засобу "
-"встановлення drakx та пошуку drakx-installer-stage2 та інших пакунків, за "
-"допомогою яких можна продовжити і завершити встановлення. Такі пакунки "
-"можуть зберігатися на жорсткому диску комп’ютера, локальному диску, у "
-"локальній мережі або у інтернеті."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
-msgid ""
-"These media are very light (less than 100 MB) and are convenient if "
-"bandwidth is too low to download a full DVD, or if you have a PC without a "
-"DVD drive or is unable to boot from a USB stick."
-msgstr ""
-"Такі носії є дуже малими (менше за 100 МБ). Ними зручно користуватися, якщо "
-"канал зв’язку у мережі є надто вузьким для отримання повноцінного образу "
-"DVD, на комп’ютерах без пристрою для читання DVD або на комп’ютерах, які не "
-"можуть завантажувати систему із флеш-диска USB."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:161
-msgid "First steps are English language only."
+#: en/SelectAndUseISOs2.xml:177
+#, fuzzy
+msgid "First steps are English language only"
msgstr "Перші кроки лише англійською мовою."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:182
msgid "netinstall.iso"
msgstr "netinstall.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:169
+#: en/SelectAndUseISOs2.xml:185
+#, fuzzy
msgid ""
-"Contains only free software, for those people who prefer not to use non-free "
-"software."
+"Contains only free software, for those who prefer to not use non-free "
+"software"
msgstr ""
"Містить лише вільне програмне забезпечення. Призначено для користувачів, які "
"не бажають користуватися невільними пакунками."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:175
+#: en/SelectAndUseISOs2.xml:191
msgid "netinstall-nonfree.iso"
msgstr "netinstall-nonfree.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:194
+#, fuzzy
msgid ""
-"Contains non-free software (mostly drivers, codecs...) for people who need "
-"it."
+"Contains non-free software (mostly drivers, codecs...) for those who need it"
msgstr ""
"Містить невільне програмне забезпечення (здебільшого драйвери, кодеки тощо). "
"Призначено для тих, хто потребує цих компонентів системи."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:186
+#: en/SelectAndUseISOs2.xml:202
msgid "Downloading and Checking Media"
msgstr "Отримання та перевірка носіїв даних"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:204
msgid "Downloading"
msgstr "Отримання"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:189
+#: en/SelectAndUseISOs2.xml:205
+#, fuzzy
msgid ""
"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 if the bandwidth is too low. If "
-"http is chosen, you will also see something regarding checksums."
+"the mirror in use and an option to switch to an alternative if the bandwidth "
+"is too low."
msgstr ""
"Щойно вами буде вибрано потрібний вам файл ISO, ви можете отримати його або "
"за допомогою протоколу http, або за допомогою BitTorrent. У обох випадках у "
@@ -3730,47 +3990,63 @@ msgstr ""
"змінити його, якщо швидкість отримання даних є надто малою. Якщо буде "
"вибрано http, ви побачите щось таке:"
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:209
+msgid ""
+"If http is chosen you will also see some information regarding checksums."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:212
+msgid ""
+"<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."
+msgstr ""
+
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:191
-msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:217
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Checking.png\"/> </"
+"imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:195
-msgid ""
-"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
-"other, and copy the checksum <link linkend=\"integrity\">for later use</"
-"link>. Then a window similar to this one appears:"
+#: en/SelectAndUseISOs2.xml:222
+msgid "In the meantime, a window to download the actual ISO will open:"
msgstr ""
-"md5sum і sha1sum — програми для перевірки цілісності даних у образах ISO. "
-"Для виконання перевірки достатньо встановити лише одну з цих програм. Для "
-"<link linkend=\"integrity\">подальшого використання</link> встановіть одну з "
-"них. Далі, буде показано таке вікно:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:199
-msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:225
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Download.png\"/> </"
+"imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:203
-msgid "Select the Save File option, then, click OK."
-msgstr "Виберіть пункт «Зберегти файл», потім натисніть кнопку «Гаразд»."
+#: en/SelectAndUseISOs2.xml:229
+msgid ""
+"Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>."
+msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
+#: en/SelectAndUseISOs2.xml:233
msgid "Checking the integrity of the downloaded media"
msgstr "Перевірка цілісності отриманих даних образу"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:208
+#: en/SelectAndUseISOs2.xml:235
+#, fuzzy
msgid ""
"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 it is the case, then you should retry the download or attempt "
-"a repair using BitTorrent."
+"match, and if that is the case, then you should retry the download or "
+"attempt a repair using BitTorrent."
msgstr ""
"Обидва шістнадцяткових числа обчислено за допомогою певного алгоритму на "
"основі файла, який має бути отримано. Якщо ви попросите відповідну програму "
@@ -3781,7 +4057,7 @@ msgstr ""
"його за допомогою BitTorrent."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#: en/SelectAndUseISOs2.xml:241
msgid ""
"To generate the checksum for your downloaded ISO, open a console, (no need "
"to be root), and:"
@@ -3790,71 +4066,87 @@ msgstr ""
"імені звичайного користувача) і віддайте таку команду:"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:245
+#, fuzzy
msgid ""
-"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
-"userinput>."
+"To use the md5sum, type: <command>md5sum path/to/the/image/file.iso</command>"
msgstr ""
"Якщо використовується md5sum: <userinput>md5sum шлях/до/файла/образу.iso</"
"userinput>."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:249
+#, fuzzy
+msgid ""
+"To use the sha1sum, type: <command>sha1sum path/to/the/image/file.iso</"
+"command>"
+msgstr ""
+"Якщо використовується sha1sum: <userinput>sha1sum шлях/до/образу.iso</"
+"userinput>."
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:254
+#, fuzzy
msgid ""
-"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
-"userinput>"
+"To use the sha512sum, type: <command>sha512sum path/to/the/image/file.iso</"
+"command>"
msgstr ""
"Якщо використовується sha1sum: <userinput>sha1sum шлях/до/образу.iso</"
"userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:226
+#: en/SelectAndUseISOs2.xml:258
msgid "Example:"
msgstr "Приклад:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:228
-msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:260
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Md5sum.png\"/> </"
+"imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:265
+#, fuzzy
msgid ""
-"and compare the result (you may have to wait for a while) with the checksum "
-"provided by Mageia."
+"then compare the result (you may have to wait for a while) with the ISO "
+"checksum provided by Mageia."
msgstr ""
"і порівняйте отримане числове значення (для його отримання знадобиться "
"певний час) з числом, вказаним на сторінці Mageia. Приклад:"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:237
+#: en/SelectAndUseISOs2.xml:270
msgid "Burn or dump the ISO"
msgstr "Запис образу ISO"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:238
+#: en/SelectAndUseISOs2.xml:271
+#, fuzzy
msgid ""
-"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
-"This is not a standard copy operation as a bootable medium will actually be "
-"created."
+"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."
msgstr ""
"Перевірений образ ISO можна записати на компакт-диск, DVD або флешку USB. "
"Дія із запису не є простим копіюванням, — її призначено для створення "
"придатного до завантаження системи носія даних."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:275
msgid "Burning the ISO to a CD/DVD"
msgstr "Запис образу ISO на компакт-диск або DVD"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:243
+#: en/SelectAndUseISOs2.xml:276
+#, fuzzy
msgid ""
-"Whichever software you use, ensure that the option to burn an <emphasis role="
-"\"bold\">image</emphasis> is used, burn <emphasis role=\"bold\">data</"
-"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. See "
-"<link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images\">the "
-"Mageia wiki</link> for more information."
+"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."
msgstr ""
"Скористайтеся будь-яким пристроєм для записування, але його має бути "
"налаштовано на <emphasis role=\"bold\">запис образу</emphasis>. Просто "
@@ -3863,46 +4155,54 @@ msgstr ""
"Mageia</link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:282
msgid "Dump the ISO to a USB stick"
msgstr "Запис образу ISO на флешку USB"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:283
+#, fuzzy
msgid ""
-"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
-"and then use it to boot and install the system."
+"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."
msgstr ""
"Усі образи ISO Mageia є гібридними, тобто ви можете записувати їх на флешку "
"USB і користуватися нею для завантаження або встановлення системи."
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:286
+#, fuzzy
msgid ""
-"\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any existing data will be lost and the partition capacity "
-"will be reduced to the image size."
+"Dumping an image onto a flash device destroys any previous file-system on "
+"the device and all existing data will be lost."
msgstr ""
"У результаті «запису» образу на диск USB (флешку) усі дані файлової системи "
"на ній буде знищено. Доступ до усіх даних, які не буде знищено, буде "
"втрачено. Розмір диска буде зменшено на розмір образу."
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:256
+#. type: Content of: <section><section><section><note><para>
+#: en/SelectAndUseISOs2.xml:290
msgid ""
-"To recover the original capacity, you must redo partitioning and re-format "
-"the USB stick."
+"Also, the only partition on the flash device will then just be the Mageia "
+"ISO partition."
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/SelectAndUseISOs2.xml:292
+msgid ""
+"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."
msgstr ""
-"Для відновлення початкової місткості диска USB вам згодом доведеться "
-"повторно створити на ньому розділи і виконати форматування."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:299
msgid "Using a graphical tool within Mageia"
msgstr "Використання інструмента із графічним інтерфейсом у Mageia"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#: en/SelectAndUseISOs2.xml:300
msgid ""
"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3912,26 +4212,27 @@ msgstr ""
"IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:263
+#: en/SelectAndUseISOs2.xml:303
msgid "Using a graphical tool within Windows"
msgstr "Використання інструмента із графічним інтерфейсом у Windows"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:304
msgid "You could try:"
msgstr "Ви можете спробувати такі засоби:"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:267
+#: en/SelectAndUseISOs2.xml:307
+#, fuzzy
msgid ""
"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
-"\"ISO image\" option;"
+"\"ISO image\" option"
msgstr ""
"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> за "
"допомогою пункту «ISO image» («образ ISO»);"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:271
+#: en/SelectAndUseISOs2.xml:311
msgid ""
"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
@@ -3940,12 +4241,13 @@ msgstr ""
"Disk Imager</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:277
-msgid "Using Command line within a GNU/Linux system"
+#: en/SelectAndUseISOs2.xml:317
+#, fuzzy
+msgid "Using the Command line within a GNU/Linux system"
msgstr "За допомогою інструментів командного рядка у системі GNU/Linux"
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:279
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"It is potentially *dangerous* to do this by hand. You risk overwriting "
"potentially valuable existing data if you specify the wrong target device."
@@ -3954,60 +4256,75 @@ msgstr ""
"вкажете помилковий ідентифікатор пристрою."
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:325
msgid "Open a console"
msgstr "Відкрийте вікно консолі"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:328
+#, fuzzy
msgid ""
-"Become a root (Administrator) user with the command <userinput>su -</"
-"userinput> (don't forget the final '-' )"
+"Become a <emphasis>root</emphasis> (Administrator) user with the command "
+"<command>su -</command> (don't forget the <command>-</command> )"
msgstr ""
"Отримайте права користувача root за допомогою команди <userinput>su -</"
"userinput> (не забудьте «-» наприкінці команди)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
-msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:332
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Root.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:297
+#: en/SelectAndUseISOs2.xml:338
+#, fuzzy
msgid ""
-"Plug in your USB stick (do not mount it, this also means do not open any "
-"application or file manager that could access or read it)"
+"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)"
msgstr ""
"З’єднайте з комп’ютером ваш диск USB (не монтуйте його, тобто не відкривайте "
"вміст диска у будь-якій програмі, зокрема у програмі для керування файлами, "
"яка може отримати доступ до даних або читати дані)."
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:302
-msgid "Enter the command <userinput>fdisk -l</userinput>"
+#: en/SelectAndUseISOs2.xml:343
+#, fuzzy
+msgid "Enter the command <command>fdisk -l</command>"
msgstr "Віддайте команду <userinput>fdisk -l</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
-msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:345
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Fdisk.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:310
+#: en/SelectAndUseISOs2.xml:351
+#, fuzzy
msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is an 8GB USB stick."
+"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."
msgstr ""
"Назву пристрою можна визначити за розміром. Наприклад, на наведеному вище "
"знімку <code>/dev/sdb</code> це пристрій місткістю 8 ГБ, тобто флешка USB."
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:354
+#, fuzzy
msgid ""
-"Alternatively, you can find the device name with the command <code>dmesg</"
-"code>: towards the end of this example, you can see the device name starting "
-"with <emphasis>sd</emphasis>, and in this case, <emphasis>sdd</emphasis> is "
-"the actual device. You can also see that its size is 2GB:"
+"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:"
msgstr ""
"Крім того, визначити назву пристрою можна за допомогою команди <code>dmesg</"
"code>: наприкінці виведених нею даних буде вказано назву пристрою, що "
@@ -4015,21 +4332,26 @@ msgstr ""
"<emphasis>sdd</emphasis> у нашому випадку:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
-#: en/SelectAndUseISOs2.xml:317
+#: en/SelectAndUseISOs2.xml:360
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
"[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000\n"
-"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3\n"
+"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2,"
+" SerialNumber=3\n"
"[72594.770536] usb 1-1: Product: Mass Storage Device\n"
"[72594.770537] usb 1-1: Manufacturer: JetFlash\n"
"[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB\n"
-"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
-"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
+"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep"
+" desc says 255 microframes\n"
+"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep"
+" desc says 255 microframes\n"
"[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected\n"
"[72594.772447] scsi host8: usb-storage 1-1:1.0\n"
-"[72595.963238] scsi 8:0:0:0: Direct-Access JetFlash Transcend 2GB 1100 PQ: 0 ANSI: 4\n"
-"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)\n"
+"[72595.963238] scsi 8:0:0:0: Direct-Access JetFlash Transcend 2GB 1100"
+" PQ: 0 ANSI: 4\n"
+"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14"
+" GB/2.00 GiB)\n"
"[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off\n"
"[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00\n"
"[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found\n"
@@ -4039,16 +4361,21 @@ msgid ""
msgstr ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
"[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000\n"
-"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3\n"
+"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2,"
+" SerialNumber=3\n"
"[72594.770536] usb 1-1: Product: Mass Storage Device\n"
"[72594.770537] usb 1-1: Manufacturer: JetFlash\n"
"[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB\n"
-"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
-"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
+"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep"
+" desc says 255 microframes\n"
+"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep"
+" desc says 255 microframes\n"
"[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected\n"
"[72594.772447] scsi host8: usb-storage 1-1:1.0\n"
-"[72595.963238] scsi 8:0:0:0: Direct-Access JetFlash Transcend 2GB 1100 PQ: 0 ANSI: 4\n"
-"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)\n"
+"[72595.963238] scsi 8:0:0:0: Direct-Access JetFlash Transcend 2GB 1100"
+" PQ: 0 ANSI: 4\n"
+"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14"
+" GB/2.00 GiB)\n"
"[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off\n"
"[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00\n"
"[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found\n"
@@ -4057,40 +4384,47 @@ msgstr ""
"[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:317
+#: en/SelectAndUseISOs2.xml:360
msgid "<placeholder type=\"screen\" id=\"0\"/>"
msgstr "<placeholder type=\"screen\" id=\"0\"/>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:337
+#: en/SelectAndUseISOs2.xml:380
+#, fuzzy
msgid ""
-"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
-"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
+"Enter the command: <command>dd if=path/to/the/ISO/file of=/dev/"
+"sd<replaceable>X</replaceable> bs=1M</command>"
msgstr ""
"Віддайте таку команду: <userinput>dd if=/шлях/до/файла/ISO of=/dev/sdX "
"bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:340
-msgid "Where X=your device name eg: /dev/sdd"
+#: en/SelectAndUseISOs2.xml:382
+#, fuzzy
+msgid ""
+"Where <replaceable>X</replaceable>=your device name eg: <filename>/dev/sdd</"
+"filename>"
msgstr "де X — назва потрібного вам пристрою. Приклад: /dev/sdd"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:341
+#: en/SelectAndUseISOs2.xml:384
+#, fuzzy
msgid ""
-"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
-"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
+"Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/"
+"sdd bs=1M</literal>"
msgstr ""
"Приклад:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:388
+#, fuzzy
msgid ""
-"It might 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"
+"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"
msgstr ""
"Можливо, корисним буде знати, що <emphasis role=\"bold\">if</emphasis> "
"означає <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
@@ -4098,12 +4432,13 @@ msgstr ""
"\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:349
-msgid "Enter the command: # <userinput>sync</userinput>"
+#: en/SelectAndUseISOs2.xml:392
+#, fuzzy
+msgid "Enter the command: <command>sync</command>"
msgstr "Віддайте таку команду: # <userinput>sync</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:395
msgid "This is the end of the process, and you may now unplug your USB stick."
msgstr "Це кінець процедури. Тепер ви можете від'єднувати вашу флешку USB."
@@ -4113,8 +4448,10 @@ msgid "Select your Country / Region"
msgstr "Вибір країни і регіону"
#. 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.
#. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:9
+#: en/selectCountry.xml:13
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
@@ -4122,48 +4459,51 @@ msgstr ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
-#. type: Content of: <section><para>
-#: en/selectCountry.xml:14
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectCountry.xml:20
+#, fuzzy
msgid ""
-"Select your country or region. This is important for all kinds of settings, "
+"Select your country or region. This is important for all kinds of settings, "
"like the currency and wireless regulatory domain. Setting the wrong country "
-"can lead to not being able to use a Wireless network."
+"can lead to being unable to use a Wireless network."
msgstr ""
"Виберіть країну або регіон. Ваш вибір буде важливим для всіх типів "
"параметрів локалізації системи, зокрема вибору валюти та домену керування "
"бездротовим зв’язком. Помилковий вибір може призвести до неможливості "
"використання бездротового зв’язку."
-#. type: Content of: <section><para>
-#: en/selectCountry.xml:19
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectCountry.xml:27
+#, fuzzy
msgid ""
-"If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> option and choose your country / region there."
+"If your country isn't in the list, click the <emphasis>Other Countries</"
+"emphasis> option and choose your country / region there."
msgstr ""
"Якщо вашої країни немає у списку, натисніть кнопку <guilabel>Інші країни</"
"guilabel> і виберіть країну або регіон за допомогою вікна, яке буде відкрито."
#. type: Content of: <section><note><para>
-#: en/selectCountry.xml:24
+#: en/selectCountry.xml:34
+#, fuzzy
msgid ""
-"If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
-"first list was chosen. Please ignore this, as DrakX will apply your actual "
-"choice."
+"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."
msgstr ""
"Якщо пункт вашої країни є лише у списку <guilabel>Інші країни</guilabel> "
"може здатися, що вибрано країну з першого списку. Будь ласка, не зважайте на "
"це, DrakX вже врахував ваш правильний вибір."
#. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:33
+#: en/selectCountry.xml:42
msgid "Input method"
msgstr "Спосіб введення"
#. type: Content of: <section><section><para>
-#: en/selectCountry.xml:36
+#: en/selectCountry.xml:45
+#, fuzzy
msgid ""
-"In the <guilabel>Other Countries</guilabel> screen you can also select an "
+"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. "
@@ -4180,12 +4520,13 @@ msgstr ""
"вибором пакунків було додано сховища пакунків HTTP/FTP."
#. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:45
+#: en/selectCountry.xml:54
+#, fuzzy
msgid ""
"If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via <emphasis role=\"bold\">Configure "
-"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
-"running localedrake as root."
+"post-install via <menuchoice> <guimenu>Configure your Computer</guimenu> "
+"<guimenuitem>System</guimenuitem> </menuchoice>, or by running "
+"<command>localedrake</command> as <emphasis>root</emphasis>."
msgstr ""
"Якщо спосіб введення потрібен вам після встановлення системи, ви можете "
"отримати доступ до нього після завантаження встановленої системи за "
@@ -4194,57 +4535,64 @@ msgstr ""
"localedrake від імені користувача root."
#. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:14
+#: en/selectInstallClass.xml:29
msgid "Install or Upgrade"
msgstr "Встановлення або оновлення"
#. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:18
+#: en/selectInstallClass.xml:33
+#, fuzzy
msgid ""
-"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
-"selectInstallClass.png\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectInstallClass."
+"png\" format=\"PNG\"/> </imageobject>"
msgstr ""
"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
"selectInstallClass.png\"/> </imageobject>"
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:25
-msgid "Install"
-msgstr "Встановити"
+#: en/selectInstallClass.xml:41
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install</emphasis>"
+msgstr "<emphasis role=\"bold\">Робоча станція</emphasis>"
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:27
+#: en/selectInstallClass.xml:43
+#, fuzzy
msgid ""
-"Use this option to perform a fresh installation of <application>Mageia</"
-"application>. This will format the root partition (/), but can preserve a "
-"separated /home partition."
+"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)."
msgstr ""
"Скористайтеся цим пунктом, щоб виконати встановлення <application>Mageia</"
"application> з нуля. Під час такого встановлення буде форматовано кореневий "
"розділ (/), але може зберегти окремий розділ /home."
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:33
-msgid "Upgrade"
-msgstr "Поновити"
+#: en/selectInstallClass.xml:50
+#, fuzzy
+msgid "<emphasis role=\"bold\">Upgrade</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:35
-msgid ""
-"This can be used to upgrade an existing installation of <application>Mageia</"
-"application>."
+#: en/selectInstallClass.xml:52
+#, fuzzy
+msgid "Use this option to upgrade an existing installation of Mageia."
msgstr ""
"Виберіть жорсткий диск, який слід форматувати для встановлення "
-"<application>Mageia</application>."
+"Mageia."
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:39
+#. type: Content of: <section><important><para>
+#: en/selectInstallClass.xml:58
+#, fuzzy
msgid ""
"Only upgrading from a previous Mageia version that was <emphasis>still "
-"supported</emphasis> when this installer's version was released, has been "
+"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 End Of Life, then it is better to do a clean install instead while "
-"preserving your <literal>/home</literal> partition."
+"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."
msgstr ""
"Командою із забезпечення якості дистрибутива виконано належне тестування "
"лише оновлення з попередньої версії Mageia, підтримку якої ще <emphasis>не "
@@ -4252,36 +4600,15 @@ msgstr ""
"якої вже вичерпано, вам варто виконати звичайну процедуру встановлення з "
"початку, зберігши при цьому вміст розділу <literal>/home</literal>."
-#. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:50
-msgid ""
-"If during install you decide to stop the installation, it is possible to "
-"reboot, but please think twice before you do this. Once a partition has been "
-"formatted or updates have started to be installed, your computer isn't in "
-"the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that, and only if you are very sure "
-"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
-"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
-"Delete</guilabel> simultaneously to reboot."
-msgstr ""
-"Якщо протягом процедури встановлення ви вирішите припинити встановлення, ви "
-"можете перезавантажити комп’ютер. Втім, вам слід ретельно обдумати ваші дії. "
-"Після форматування розділу або початку процедури встановлення оновлень ваш "
-"комп’ютер перебуватиме у проміжному стані. Перезавантаження може призвести "
-"до неможливості користування системою. Якщо, всупереч цим попередженням, ви "
-"хочете перезавантажити систему, перейдіть у текстовий термінал натисканням "
-"комбінації цих трьох клавіш: <guilabel>Alt Ctrl F2</guilabel> одночасно. "
-"Після цього, натисніть комбінацію клавіш <guilabel>Alt Ctrl Delete</"
-"guilabel> одночасно, щоб перезавантажити комп’ютер."
-
#. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:62
+#: en/selectInstallClass.xml:67
+#, fuzzy
msgid ""
"If you have discovered that you forgot to select an additional language, you "
-"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
-"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
-"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
-"later in the install."
+"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."
msgstr ""
"Якщо ви виявите, що забули встановити пакунки додаткової мови, ви можете "
"повернутися зі сторінки <emphasis role=\"bold\">Встановлення або оновлення</"
@@ -4290,39 +4617,41 @@ msgstr ""
"робіть цього під час наступних кроків встановлення."
#. type: Content of: <section><info><title>
-#: en/selectKeyboardLive.xml:3
-msgid "Select keyboard"
+#: en/selectKeyboardLive.xml:14
+#, fuzzy
+msgid "Select Keyboard"
msgstr "Вибір клавіатури"
#. type: Content of: <section><mediaobject>
-#: en/selectKeyboardLive.xml:7
+#: en/selectKeyboardLive.xml:18
+#, fuzzy
msgid ""
-"<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-selectKeyboard.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"selectKeyboardLive-im1\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/selectKeyboardLive.xml:12
+#: en/selectKeyboardLive.xml:24
+msgid "Here you can set the keyboard layout you wish to use with Mageia​​."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/selectKeyboardLive.xml:27
msgid ""
-"You will be required to set the keyboard layout you wish to use in Mageia​​. "
-"The default one is selected according to your language and timezone "
-"previously selected."
+"A suggested keyboard layout (highlighted), has been chosen for you based "
+"upon your previously selected language and timezone choices."
msgstr ""
-"Вам слід вказати розкладку клавіатури, якою ви хочете користуватися у Mageia​​"
-". Типову розкладку буде вибрано за вказаною вами мовою та вибраним раніше "
-"часовим поясом."
#. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:7
+#: en/selectKeyboard.xml:20
msgid "Keyboard"
msgstr "Клавіатура"
#. type: Content of: <section><para>
-#: en/selectKeyboard.xml:10
+#: en/selectKeyboard.xml:23
msgid ""
"DrakX selects an appropriate keyboard for your language. If no suitable "
"keyboard is found it will default to a US keyboard layout."
@@ -4332,16 +4661,17 @@ msgstr ""
"використано типову американську розкладку."
#. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:15
+#: en/selectKeyboard.xml:28
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png\"/"
"> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
-"> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\"/> </imageobject>"
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:35
msgid ""
"Make sure that the selection is correct or choose another keyboard layout. "
"If you don't know which layout your keyboard has, look in the specifications "
@@ -4360,23 +4690,25 @@ msgstr ""
"Розкладка_клавіатури</link>."
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:31
+#: en/selectKeyboard.xml:45
+#, fuzzy
msgid ""
-"If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a fuller list, and select your keyboard there."
+"If your keyboard isn't in the list shown, click on <emphasis>More</emphasis> "
+"to get a fuller list, and select your keyboard there."
msgstr ""
"Якщо пункту вашої клавіатури не буде у показаному списку, натисніть кнопку "
"<guibutton>Ще</guibutton> для ознайомлення з повним списком, з якого ви "
"можете вибрати модель клавіатури."
-#. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:36
+#. type: Content of: <section><itemizedlist><listitem><para><note><para>
+#: en/selectKeyboard.xml:50
+#, fuzzy
msgid ""
-"After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
-"you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this and "
-"continue the installation: the keyboard chosen from the full list will be "
-"applied."
+"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."
msgstr ""
"Після вибору моделі клавіатури за допомогою діалогового вікна <guibutton>Ще</"
"guibutton> ви повернетеся до першого діалогового вікна вибору клавіатури, у "
@@ -4385,7 +4717,7 @@ msgstr ""
"списку."
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:46
+#: en/selectKeyboard.xml:60
msgid ""
"If you choose a keyboard based on non-Latin characters, you will see an "
"extra dialogue screen asking how you would prefer to switch between the "
@@ -4396,123 +4728,128 @@ msgstr ""
"способом перемикання між латинською і нелатинською розкладками."
#. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:34
msgid "Please choose a language to use"
msgstr "Вибір мови"
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:39
msgid ""
"Select your preferred language, by first expanding the list for your "
-"continent. <application>Mageia</application> will use this selection during "
-"the installation and for your installed system."
+"continent. Mageia will use this selection during the installation and for "
+"your installed system."
msgstr ""
"Виберіть бажану мову інтерфейсу системи. Для цього спочатку розгорніть "
-"список країн вашого континенту. <application>Mageia</application> "
+"список країн вашого континенту. Mageia "
"використовуватиме вибрану вами мову під час встановлення та у вже "
"встановленій системі."
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:23
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:45
msgid ""
-"Select your preferred language. <application>Mageia</application> will use "
-"this selection during the installation and for your installed system."
+"Select your preferred language. Mageia will use this selection during the "
+"installation and for your installed system."
msgstr ""
-"Виберіть бажану мову інтерфейсу системи. <application>Mageia</application> "
+"Виберіть бажану мову інтерфейсу системи. Mageia "
"використовуватиме вибрану вами мову під час встановлення та у вже "
"встановленій системі."
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:27
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:50
msgid ""
"If it is likely that you (or others) will require several languages to be "
-"installed on your system, then you should use the <guibutton>Multiple "
-"languages</guibutton> option to add them now. It will be difficult to add "
+"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."
msgstr ""
"Якщо у вашій системі буде використовуватися декілька мов (вами або іншими "
-"користувачами), натисніть кнопку <guibutton>Декілька мов</guibutton> , щоб "
+"користувачами), натисніть кнопку <emphasis>Декілька мов</emphasis>, щоб "
"додати їх. Після встановлення додати підтримку мов буде доволі складно."
#. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:58
+#, fuzzy
msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
-"imageobject>"
+"<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>"
msgstr ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
"imageobject>"
-#. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:43
+#. type: Content of: <section><important><para>
+#: en/selectLanguage.xml:68
+#, fuzzy
msgid ""
"Even if you choose more than one language, you must first choose one as your "
-"preferred language in the first language screen. It will also be marked as "
-"chosen in the multiple languages screen."
+"preferred language from the main list of languages. It will also be marked "
+"as chosen in the <emphasis>Multiple languages</emphasis> screen."
msgstr ""
"Навіть якщо вами було вибрано декілька мов, вам слід слід спочатку вибрати "
"одну з них як основну мову сторінок програми для встановлення. Крім того, цю "
"мову буде позначено і у вікні вибору декількох мов."
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:76
+#, fuzzy
msgid ""
"If your keyboard language is not the same as your preferred language, then "
-"it is advisable to install the language of your keyboard as well."
+"it is advisable to install the required language for your keyboard as well"
msgstr ""
"Якщо розкладка вашої клавіатури не збігається з розкладкою, що "
"використовується для бажаної мови, варто також встановити мовні пакунки для "
"мови, пов’язаної з вибраною розкладкою."
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:56
-msgid "Mageia uses UTF-8 (Unicode) support by default."
-msgstr "Типово, у Mageia використовується кодування UTF-8 (Unicode)."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:58
+#: en/selectLanguage.xml:82
+#, fuzzy
msgid ""
-"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
-"emphasis> screen if you know that it is inappropriate for your language. "
-"Disabling UTF-8 applies to all installed languages."
+"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."
msgstr ""
"Це кодування можна вимкнути за допомогою вікна вибору декількох мов, якщо "
"вам наперед відомо, що Unicode є несумісним з вашою мовою. Вимикання UTF-8 "
"стосуватиметься всіх встановлених мов."
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:64
+#: en/selectLanguage.xml:89
+#, fuzzy
msgid ""
-"You can change the language of your system after installation in the Mageia "
-"Control Center -> System -> Manage localization for your system."
+"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>."
msgstr ""
"Змінити мову інтерфейсу системи після встановлення можна за допомогою Центру "
"керування Mageia (Система -&gt; Налаштувати локалізацію системи)."
#. type: Content of: <section><info><title>
-#: en/selectMouse.xml:4
+#: en/selectMouse.xml:10
msgid "Select mouse"
msgstr "Вибір драйвера миші"
-#. Made by marja on 2012 04 11
-#. NEEDS TO BE REVIEWED!
+#. 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
+#. marja 2012-04-24 adding screenshot
+#. 2018/02/15 apb: Text and typography.
#. type: Content of: <section><mediaobject>
-#: en/selectMouse.xml:16
+#: en/selectMouse.xml:24
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
-"format=\"PNG\" > </imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectMouse.png\" "
+"format=\"PNG\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
-"format=\"PNG\" > </imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/selectMouse.xml:23
+#: en/selectMouse.xml:29
msgid ""
"If you are not happy with how your mouse responds, you can select a "
"different one here."
@@ -4521,26 +4858,29 @@ msgstr ""
"вибрати інший драйвер для миші."
#. type: Content of: <section><para>
-#: en/selectMouse.xml:25
+#: en/selectMouse.xml:32
+#, fuzzy
msgid ""
-"Usually, <guilabel>Universal</guilabel> - <guilabel>Any PS/2 and USB mice</"
-"guilabel> is a good choice."
+"Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and "
+"USB mice</guimenuitem> </menuchoice> is a good choice."
msgstr ""
"Зазвичай, <guilabel>Універсальна</guilabel> — <guilabel>Будь-яка миша PS/2 "
"чи USB</guilabel> є непоганим варіантом."
#. type: Content of: <section><para>
-#: en/selectMouse.xml:27
+#: en/selectMouse.xml:38
+#, fuzzy
msgid ""
-"Select <guilabel>Universal</guilabel> - <guilabel>Force evdev</guilabel> to "
-"configure the buttons that do not work on a mouse with six or more buttons."
+"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."
msgstr ""
"Виберіть пункт <guilabel>Універсальна</guilabel> — <guilabel>Задіяти evdev</"
"guilabel>, щоб налаштувати кнопки, які не працюють на миші з шістьма або "
"більше кнопками."
-#. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloaderAddEntry.xml:7 en/setupBootloader.xml:206
msgid "Add or Modify a Boot Menu Entry"
msgstr "Додавання пункту меню завантаження та внесення змін у такі пункти"
@@ -4566,103 +4906,68 @@ msgstr ""
"mageia.org/en/Grub2-efi_and_Mageia</link>"
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Основні параметри завантажувача"
-
-#. type: Content of: <section><section><title>
#: en/setupBootloader.xml:10
-msgid "Bootloader interface"
+#, fuzzy
+msgid "Bootloader"
msgstr "Інтерфейс завантажувача"
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:11
-msgid "By default, Mageia uses exclusively:"
-msgstr "Типово, Mageia ексклюзивно використовує:"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:14
-msgid ""
-"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:13
+msgid "Grub2"
msgstr ""
-"GRUB2 (з графічним меню або без нього) для застарілих систем із MBR або GPT"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:18
-msgid "GRUB2-efi for a UEFI system."
-msgstr "GRUB2-efi для системи UEFI."
-
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:22
-msgid "The Mageia graphical menus are nice :)"
-msgstr "Графічні меню Mageia виглядають чудово. :)"
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:25
-msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:15
+#, fuzzy
+msgid "Grub2 on Legacy MBR/GPT systems"
msgstr "GRUB2 для застарілих систем із MBR та GPT"
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:27
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:17
+#, fuzzy
msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
-"setupBootloader.png\"/> </imageobject>"
+"GRUB2 (with or without graphical menu) will be used exclusively as the "
+"bootloader for a Legacy/MBR or Legacy/GPT system."
msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
-"setupBootloader.png\"/> </imageobject>"
+"GRUB2 (з графічним меню або без нього) для застарілих систем із MBR або GPT"
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:21
+#, fuzzy
msgid ""
-"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
-"really know what you are doing."
+"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."
msgstr ""
-"Не змінюйте значення параметри <emphasis role=\"bold\">Пристрій "
-"завантаження</emphasis>, якщо у цьому немає нагальної потреби."
+"завантажувач GRUB2 або до MBR (Master Boot Record) вашого першого диска, або "
+"до завантажувального розділу BIOS."
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:38
-msgid "GRUB2-efi on UEFI systems"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:27
+#, fuzzy
+msgid "Grub2-efi on UEFI systems"
msgstr "GRUB2-efi у системах UEFI"
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:39
-msgid ""
-"With a UEFI system, the user interface is slightly different as you cannot "
-"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
-"\"bold\">without graphical menu</emphasis> options."
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:29
+msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
msgstr ""
-"Якщо ви користуєтеся системою з UEFI system, інтерфейс користувача трохи "
-"відрізнятиметься, оскільки ви не зможете вибирати між завантажувачем із "
-"графічним меню і без нього."
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:33
msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"imageobject>"
+"By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
+"System Partition)."
msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"imageobject>"
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:49
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:35
+#, fuzzy
msgid ""
-"If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
-"If there are already UEFI operating systems installed on your computer "
-"(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds GRUB2-efi. Although it is possible to have "
-"several ESPs, only one is required (and advised), whatever the number of "
-"operating systems you have."
+"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."
msgstr ""
"Якщо Mageia є єдиною операційною системою, яку встановлено на вашому "
"комп’ютері, засіб встановлення створить ESP (системний розділ EFI) для "
@@ -4673,155 +4978,89 @@ msgstr ""
"обмежитися одним таким розділом, оскільки його достатньо для довільної "
"кількості встановлених вами операційних систем."
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:61
-msgid "Using a Mageia bootloader"
-msgstr "Користування завантажувачем Mageia"
-
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:62
-msgid ""
-"By default, and according to your system, Mageia writes one of the following:"
-msgstr "Типово, залежно від вашої системи, Mageia записує новий:"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:66
-msgid ""
-"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
-"hard drive or in the BIOS boot partition."
-msgstr ""
-"завантажувач GRUB2 або до MBR (Master Boot Record) вашого першого диска, або "
-"до завантажувального розділу BIOS."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:70
-msgid "a GRUB2-efi bootloader into the ESP"
-msgstr "завантажувач GRUB2-efi до ESP;"
+#. type: Content of: <section><section><info><title>
+#: en/setupBootloader.xml:46
+#, fuzzy
+msgid "Bootloader Setup"
+msgstr "Інтерфейс завантажувача"
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:73
-msgid ""
-"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, "
-"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
-"\"bold\">Probe Foreign OS</emphasis> option."
-msgstr ""
-"Якщо на комп’ютері вже встановлено інші операційні системи, Mageia спробує "
-"додати ці системи до вашого нового меню завантаження Mageia. Якщо вам це не "
-"потрібно, натисніть кнопку <guibutton>Далі</guibutton>, а потім зніміть "
-"позначку з пункту <emphasis role=\"bold\">Зондування сторонньої ОС</"
-"emphasis>."
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:49
+msgid "Bootloader main options"
+msgstr "Основні параметри завантажувача"
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:78
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:51
+#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
-"imageobject>"
+"\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader.png\" xml:id=\"setupBootloader-"
+"im1\"/> </imageobject>"
msgstr ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
"imageobject>"
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:87
-msgid "Using an existing bootloader"
-msgstr "Користування вже встановленим завантажувачем"
-
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:88
-msgid ""
-"The exact procedure for adding your Mageia system 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 and add it automatically. See the documentation for the operating "
-"system in question."
-msgstr ""
-"Повний перелік кроків додавання пункту операційної системи Mageia до меню "
-"вже встановленого завантажувача не є предметом цієї довідкової сторінки. "
-"Втім, здебільшого, ці кроки пов’язано з запуском відповідної програми "
-"встановлення завантажувача, яка має виявити і додати пункт системи у "
-"автоматичному режимі. Відповідні пояснення має бути наведено у документації "
-"до іншої операційної системи."
-
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:95
-msgid "Using chain loading"
-msgstr "Використання ланцюгового завантаження"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:96
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
msgid ""
-"If you don't want a bootable Mageia, but to chain-load it from another OS, "
-"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"This feature is only available to Legacy MBR/BIOS systems. Users of UEFI "
+"systems will not see this option here."
msgstr ""
-"Якщо ви не хочете використовувати завантажувач Mageia, а замість цього "
-"хочете скористатися ланцюговим завантаженням з іншої операційної системи, "
-"натисніть кнопку <guibutton>Далі</guibutton>, потім пункт "
-"<guibutton>Додатково</guibutton> і позначте пункт <guilabel>Не чіпати ESP "
-"або MBR</guilabel>."
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:101
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
-"\"center\"/> </imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
-"\"center\"/> </imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:67
+#, fuzzy
+msgid "<emphasis role=\"bold\">Boot device</emphasis>"
+msgstr "<emphasis role=\"bold\">Додатково</emphasis>"
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:108
-msgid ""
-"You will get a warning that the bootloader is missing, ignore it by clicking "
-"<guibutton>OK</guibutton>."
-msgstr ""
-"Програма попередить вас про те, що у системі не буде завантажувача. "
-"Проігноруйте попередження і натисніть кнопку <guibutton>Гаразд</guibutton>."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing"
+msgstr "Вносьте зміни, лише якщо вам добре відомі наслідки ваших дій."
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:72
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:117
-msgid "Options"
-msgstr "Параметри"
-
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:119
-msgid "First page"
-msgstr "Перша сторінка"
+"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
+msgstr "<emphasis role=\"bold\">Будь ласка, виберіть рівень безпеки</emphasis>"
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:74
+#, fuzzy
msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This lets you "
-"set a delay in seconds before the default operating system is started up."
+"This text box lets you set a delay, in seconds, before the default operating "
+"system is started up."
msgstr ""
"<guilabel>Пауза перед завантаженням основної системи</guilabel>: за "
"допомогою цього пункту ви можете встановити затримку у секундах перед "
"завантаженням типової операційної системи."
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:122
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:78
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:79
+#, fuzzy
msgid ""
-"<guilabel>Security</guilabel>: This allows you to set a password for the "
-"bootloader. This means a username and password will be required when booting "
-"to select a booting entry or change settings. The username is <emphasis role="
-"\"bold\">root</emphasis> and the password is the one chosen here-after."
+"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."
msgstr ""
"<guilabel>Безпека</guilabel>: за допомогою цього розділу ви можете "
"встановити пароль для доступу до завантажувача. Використання пароля "
@@ -4829,36 +5068,52 @@ msgstr ""
"доведеться вводити пароль. Іменем користувача буде <emphasis role=\"bold"
"\">root</emphasis>, а пароль можна буде вибрати на наступному етапі."
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:125
-msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+#, fuzzy
+msgid "Choose a password for the bootloader (optional)"
msgstr ""
"<guilabel>Пароль</guilabel>: за допомогою цього поля для введення тексту ви "
"можете вказати пароль до завантажувача."
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
+msgstr "<emphasis role=\"bold\">Робоча станція</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:92
+#, fuzzy
msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
-"check that it matches with the one above."
+"Retype the password and DrakX will check that it matches with the one set "
+"above"
msgstr ""
"<guilabel>Пароль (ще раз)</guilabel>: повторіть введення пароля користувача "
"у цьому полі. drakx перевірить, чи збігається введений вами повторно пароль "
"з його початковим варіантом."
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#, fuzzy
+msgid "<emphasis>Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">Додатково</emphasis>"
+
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
-msgid "<guilabel>Advanced</guilabel>"
-msgstr "<guilabel>Додатково</guilabel>"
+#: en/setupBootloader.xml:99
+#, fuzzy
+msgid "<emphasis>Enable ACPI</emphasis>"
+msgstr "<emphasis>Загальний</emphasis>:"
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:127
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:100
+#, fuzzy
msgid ""
-"<guilabel>Enable ACPI:</guilabel> 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)."
+"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)."
msgstr ""
"<guilabel>Увімкнути ACPI:</guilabel> ACPI (Advanced Configuration and Power "
"Interface) є стандартом керування живленням комп’ютера. За його допомогою "
@@ -4869,22 +5124,36 @@ msgstr ""
"проблеми у роботі комп’ютера (наприклад неочікувані перезавантаження системи "
"або «замерзання» системи)."
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:133
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:108
+#, fuzzy
+msgid "<emphasis>Enable SMP</emphasis>"
+msgstr "<emphasis>Загальний</emphasis>:"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:109
+#, fuzzy
msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
-"multiprocessing for multi core processors."
+"This option enables/disables symmetric multiprocessing for multi-core "
+"processors"
msgstr ""
"<guilabel>Увімкнути SMP</guilabel>: за допомогою цього пункту можна "
"увімкнути або вимкнути симетричне використання багатьох процесорів, якщо на "
"комп’ютері встановлено багатоядерний процесор."
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:135
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:113
+#, fuzzy
+msgid "<emphasis>Enable APIC</emphasis>"
+msgstr "<emphasis>Загальний</emphasis>:"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:114
+#, fuzzy
msgid ""
-"<guilabel>Enable APIC</guilabel>: 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."
+"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."
msgstr ""
"<guilabel>Увімкнути APIC</guilabel>: позначення цього пункту надає "
"операційній системі доступ до розширеного програмованого контролера "
@@ -4892,94 +5161,240 @@ msgstr ""
"надають змогу використовувати складніші моделі із пріоритетністю процесів та "
"керування розширеними IRQ (запитами щодо переривань)."
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:138
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:120
+#, fuzzy
+msgid "<emphasis>Enable Local APIC</emphasis>"
+msgstr "<emphasis>Загальний</emphasis>:"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:121
+#, fuzzy
msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
-"interrupts for a specific processor in an SMP system."
+"Here you can set Local APIC, which manages all external interrupts for a "
+"specific processor in an SMP system"
msgstr ""
"<guilabel>Увімкнути локальний APIC</guilabel>: за допомогою цього пункту ви "
"можете увімкнути локальний APIC, тобто керування усіма зовнішніми "
"перериваннями для певних процесорів у багатопроцесорних системах."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:143
-msgid "Next page"
-msgstr "Наступна сторінка"
+#: en/setupBootloader.xml:127
+#, fuzzy
+msgid "Bootloader Configuration"
+msgstr "Налаштування звуку"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:129
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-setupBootloader3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-setupBootloader3.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:139
+#, fuzzy
+msgid "<emphasis role=\"bold\">Default</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:146
-msgid "<guilabel>Default:</guilabel> Operating system started up by default"
+#: en/setupBootloader.xml:140
+#, fuzzy
+msgid "The operating system to started up by default"
msgstr ""
"<guilabel>Типовий:</guilabel> типовий варіант операційної системи для "
"завантаження."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:150
+#: en/setupBootloader.xml:143
+#, fuzzy
+msgid "<emphasis role=\"bold\">Append</emphasis>"
+msgstr "<emphasis role=\"bold\">Додатково</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:144
+#, fuzzy
msgid ""
-"<guilabel>Append:</guilabel> This option lets you pass the kernel "
-"information or tell the kernel to give you more information as it boots."
+"This option lets you pass information to the kernel or tell the kernel to "
+"give you more information as it boots"
msgstr ""
"<guilabel>Приєднати:</guilabel> за допомогою цього параметра ви можете "
"передати ядру системи якісь дані або повідомити ядру про те, що слід надати "
"вам більше інформації під час завантаження системи."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:155
+#: en/setupBootloader.xml:148
+msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
+msgstr "<emphasis role=\"bold\">Зондування сторонньої ОС</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:149
+#, fuzzy
+msgid ""
+"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."
+msgstr ""
+"Якщо на комп’ютері вже встановлено інші операційні системи, Mageia спробує "
+"додати ці системи до вашого нового меню завантаження Mageia. Якщо вам це не "
+"потрібно, натисніть кнопку <guibutton>Далі</guibutton>, а потім зніміть "
+"позначку з пункту <emphasis role=\"bold\">Зондування сторонньої ОС</"
+"emphasis>."
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:156
msgid ""
-"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
-"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
msgstr ""
-"<guilabel>Зондування сторонньої ОС</guilabel>: див. вище розділ щодо <link "
-"linkend=\"setupMageiaBootloader\">використання завантажувача Mageia</link>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:166
+msgid "<emphasis>Video mode</emphasis>"
+msgstr "<emphasis>Відеорежим</emphasis>"
-#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:167
msgid ""
-"<guilabel>Video mode:</guilabel> 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."
+"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."
msgstr ""
-"<guilabel>Режим відео:</guilabel> за допомогою цього пункту ви можете "
+"За допомогою цього пункту ви можете "
"вказати розмірності екрана (у пікселях) та глибину кольорів для меню "
"завантаження. Якщо ви натиснете кнопку списку із маленьким трикутничком "
"вістрям униз, програма покаже варіанти розмірностей і глибини кольорів, "
"якими можна скористатися."
-#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:172
+msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
+msgstr "<emphasis>Не чіпати ESP або MBR</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:173
+msgid ""
+"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."
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:188
+#, fuzzy
+msgid "Other Options"
+msgstr "Параметри"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:190
+msgid "Using an existing bootloader"
+msgstr "Користування вже встановленим завантажувачем"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:191
+#, fuzzy
+msgid ""
+"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."
+msgstr ""
+"Повний перелік кроків додавання пункту операційної системи Mageia до меню "
+"вже встановленого завантажувача не є предметом цієї довідкової сторінки. "
+"Втім, здебільшого, ці кроки пов’язано з запуском відповідної програми "
+"встановлення завантажувача, яка має виявити і додати пункт системи у "
+"автоматичному режимі. Відповідні пояснення має бути наведено у документації "
+"до іншої операційної системи."
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:199
+#, fuzzy
+msgid "Installing Without a Bootloader"
+msgstr "Користування завантажувачем Mageia"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:200
+msgid ""
+"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."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:207
+#, fuzzy
+msgid ""
+"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)."
+msgstr ""
+"Для цього вам доведеться внести вручну зміни до /boot/grub2/custom.cfg або "
+"скористатися програмою для налаштовування GRUB (наприклад grub-customizer зі "
+"сховищ Mageia)."
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:212
+#, fuzzy
msgid ""
-"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
-"linkend=\"setupChainLoading\">Using the chain loading</link>"
+"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>"
msgstr ""
-"<emphasis role=\"bold\">Не чіпати ESP або MBR</emphasis>: див. вище розділ "
-"щодо <link linkend=\"setupChainLoading\">використання ланцюгового "
-"завантаження</link>"
+"Щоб дізнатися більше, ознайомтеся із відповідною сторінкою нашої вікі: <link "
+"ns2:href=\"https://wiki.mageia.org/en/Grub2-efi_and_Mageia\">https://wiki."
+"mageia.org/en/Grub2-efi_and_Mageia</link>"
#. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:3
+#: en/setupSCSI.xml:10
msgid "Setup SCSI"
msgstr "Налаштування SCSI"
-#. Made by marja on 2012 04 02
-#. NEEDS TO BE REVIEWED!
-#. JohnR - edited 2012-03-03
-#. SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-)
-#. barjac has re-reviewed and made some minor tweaks. Revisions incremented.
-#. marja 2012-04-24 added screenshot
+#. Made by marja on 2012 04 02
+#. NEEDS TO BE REVIEWED!
+#. JohnR - edited 2012-03-03
+#. SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-)
+#. barjac has re-reviewed and made some minor tweaks. Revisions incremented.
+#. marja 2012-04-24 added screenshot
#. marja 2012-04-25 replacing John's version 1.6 because that one was based on the
-#. Mdv doc instead of on our setupSCSI file
+#. Mdv doc instead of on our setupSCSI file
+#. 2018/02/15 apb: Text and typography.
+#. 2018/0217 apb: Merge 2nd/3rd paras and reword.
#. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:22
+#: en/setupSCSI.xml:33
+#, fuzzy
msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
-"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-setupSCSI.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"setupSCSI-im1\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
-"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/setupSCSI.xml:27
+#: en/setupSCSI.xml:39
msgid ""
"DrakX will normally detect hard disks correctly. However, with some older "
"SCSI controllers it may be unable to determine the correct drivers to use "
@@ -4990,183 +5405,143 @@ msgstr ""
"програма не зможе встановити потрібних драйверів."
#. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:44
+#, fuzzy
msgid ""
-"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
-"you have."
+"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."
msgstr ""
"Якщо вам трапився саме такий контролер, вам доведеться вручну повідомити "
"DrakX, з яким диском SCSI доведеться мати справу."
-#. type: Content of: <section><para>
-#: en/setupSCSI.xml:35
-msgid "DrakX should then be able to configure the drive(s) correctly."
-msgstr ""
-"Після цього, DrakX зможе налаштувати систему на роботу з дисками належним "
-"чином."
-
#. type: Content of: <section><info><title>
-#: en/soundConfig.xml:3
+#: en/soundConfig.xml:10
msgid "Sound Configuration"
msgstr "Налаштування звуку"
#. Lebarhon 20170209 updated SC
+#. 2018/02/13 apb: Text and typography.
+#. 2018/02/17 apb: Centre-align PNG
#. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:9
+#: en/soundConfig.xml:20
+#, fuzzy
msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
-"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-soundConfig.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"soundConfig-im1\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
-"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
-
-#. type: Content of: <section><para>
-#: en/soundConfig.xml:14
-msgid ""
-"In this screen the name of the driver that the installer chose for your "
-"sound card is given, which will be the default driver if one exists."
-msgstr ""
-"На цій сторінці буде показано назву драйвера, який інструмент встановлення "
-"вибрав для вашої звукової картки. Цим драйвером буде типовий драйвер, якщо "
-"такий передбачено для картки."
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/soundConfig.xml:18
+#: en/soundConfig.xml:26
msgid ""
-"The default driver should work without problems. However, if after install "
-"you do encounter problems, then run <command>draksound</command> or start "
-"this tool via MCC (Mageia Control Center), by choosing the "
-"<guilabel>Hardware</guilabel> tab and clicking on <guilabel>Sound "
-"Configuration</guilabel> at the top right of the screen."
+"This screen shows the details of the sound card driver chosen for you by the "
+"installer, and this driver should work without problems."
msgstr ""
-"Типовий драйвер має працювати без проблем. Втім, якщо після встановлення у "
-"вас виникли проблеми зі звуком, віддайте команду <command>draksound</"
-"command> або запустіть відповідний модуль за допомогою Центру керування "
-"Mageia: виберіть сторінку <guilabel>Обладнання</guilabel> і натисніть пункт "
-"<guilabel>Налаштування звуку</guilabel> у верхній правій частині вікна."
#. type: Content of: <section><para>
-#: en/soundConfig.xml:24
+#: en/soundConfig.xml:29
msgid ""
-"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
-"\"bold\">Sound Configuration</emphasis> tool screen, click on "
-"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
-"solve the problem."
+"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."
msgstr ""
-"Після цього у вікні <emphasis role=\"bold\">draksound</emphasis> або "
-"інструмента «Налаштування звуку» натисніть пункт <guibutton>Додатково</"
-"guibutton>, а потім кнопку <guibutton>Вирішення проблем</guibutton>. У "
-"відповідь буде показано варті уваги поради щодо вирішення проблеми."
#. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:30
+#: en/soundConfig.xml:43
msgid "Advanced"
msgstr "Додатково"
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:33
-msgid ""
-"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
-"in this screen, during install, is useful if there is no default driver and "
-"there are several drivers available, but you think the installer selected "
-"the wrong one."
-msgstr ""
-"Кнопкою <emphasis role=\"bold\"><guibutton>Додатково</guibutton></emphasis> "
-"під час встановлення варто користуватися, якщо для картки не передбачено "
-"типового драйвера або якщо існує декілька драйверів, і ви певні, що засобом "
-"встановлення вибрано помилковий драйвер."
-
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:38
-msgid ""
-"In that case you can select a different driver after clicking on <emphasis "
-"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
-msgstr ""
-"У цьому випадку, ви можете вибрати інший драйвер після натискання кнопки "
-"<emphasis role=\"bold\"><guibutton>Дозвольте мені підібрати драйвер</"
-"guibutton></emphasis>."
-
#. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:3
+#: en/takeOverHdConfirm.xml:10
msgid "Confirm hard disk to be formatted"
msgstr "Підтвердження форматування жорсткого диска"
-#. Made by marja on 2012 04 03
-#. test comment - johnr
+#. Made by marja on 2012 04 03
+#. test comment - johnr
#. 2012-04-24 marja - replaced "if you are not sure you selected the correct
#. hard disk." with "if you are not sure about your choice", because I'm sure I
-#. saw this help screen when I had only one HD
-#. 2013-05-05 marja added screenshot
+#. saw this help screen when I had only one HD
+#. 2013-05-05 marja added screenshot
+#. 2018/02/15 apb: Text and typography
+#. 2018/02/20 apb: Change the 2 paras to itemized listitems.
#. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:18
+#: en/takeOverHdConfirm.xml:29
+#, fuzzy
msgid ""
-"<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>"
+"<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>"
msgstr ""
-"<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>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
-#. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:27
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/takeOverHdConfirm.xml:42
+#, fuzzy
msgid ""
-"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
+"Click on <emphasis>Previous</emphasis> if you are at all unsure about your "
"choice."
msgstr ""
"Натисніть кнопку <guibutton>Назад</guibutton>, якщо ви не певні щодо "
"зробленого вибору."
-#. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:31
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/takeOverHdConfirm.xml:48
+#, fuzzy
msgid ""
-"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
-"ok to erase every partition, every operating system and all data that might "
-"be on that hard disk."
+"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."
msgstr ""
"Натисніть кнопку <guibutton>Далі</guibutton>, якщо ви певні і хочете витерти "
"всі розділи, всі операційні системи на диску і всі дані, що зберігаються на "
"цьому диску."
#. type: Content of: <section><info><title>
-#: en/testing.xml:9
+#: en/testing.xml:3
msgid "Testing Mageia as Live system"
msgstr "Тестування Mageia як портативної системи"
#. type: Content of: <section><section><info><title>
-#: en/testing.xml:14
+#: en/testing.xml:8
msgid "Live mode"
msgstr "Портативний режим"
+#. type: Content of: <section><section><para>
+#: en/testing.xml:11
+msgid ""
+"This is the screen you will see if you selected the <emphasis role=\"bold"
+"\">Boot Mageia </emphasis>option from the Live media menu."
+msgstr ""
+
#. type: Content of: <section><section><mediaobject>
-#: en/testing.xml:18
+#: en/testing.xml:14
msgid "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
msgstr ""
"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
-#. type: Content of: <section><section><para>
-#: en/testing.xml:23
-msgid ""
-"You get this screen if you selected \"Boot Mageia\". If not, you get the "
-"\"<link linkend=\"doPartitionDisks\">Partitioning</link> step\""
-msgstr ""
-"Це вікно буде показано, якщо вами було вибрано варіант «Завантажити Mageia». "
-"Якщо вибрано інший варіант, буде показано вікно кроку «<link linkend="
-"\"doPartitionDisks\">Розбиття на розділи</link>»."
-
#. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:28
+#: en/testing.xml:21
msgid "Testing hardware"
msgstr "Тестування обладнання"
#. type: Content of: <section><section><section><para>
-#: en/testing.xml:31
+#: en/testing.xml:24
+#, fuzzy
msgid ""
-"One of the Live mode goals is to test if the hardware is correctly managed "
-"by Mageia. You can check if all devices have a driver in the Hardware "
-"section of the Mageia Control Center. You can test the most current devices:"
+"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:"
msgstr ""
"Одним із призначень портативної системи є перевірка того, чи належним чином "
"працює обладнання комп’ютера під керуванням Mageia. Ви можете перевірити, чи "
@@ -5174,73 +5549,71 @@ msgstr ""
"керування Mageia. Передбачено перевірку найпоширеніших типів пристроїв:"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:38
+#: en/testing.xml:31
msgid "network interface: configure it with net_applet"
msgstr "інтерфейс мережі: його можна налаштувати за допомогою net_applet"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:42
-msgid "graphical card: if you see the previous screen, it's already OK."
+#: en/testing.xml:35
+#, fuzzy
+msgid "graphics card: if you see the previous screen, it's already OK."
msgstr ""
"графічна картка: якщо ви не мали проблем із попередньою сторінкою, все уже "
"налаштовано."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:47
+#: en/testing.xml:40
msgid "webcam:"
msgstr "вебкамера:"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:51
+#: en/testing.xml:44
msgid "sound: a jingle has already been played"
msgstr "звук: музичне вітання вже було відтворено"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:55
-msgid "printer: configure it and print a test page"
+#: en/testing.xml:48
+#, fuzzy
+msgid "printer: configure your printer/s and print a test page"
msgstr "принтер: можете налаштувати принтер і надрукувати тестову сторінку"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:59
+#: en/testing.xml:52
msgid "scanner: scan a document from ..."
msgstr "сканер: спробуйте сканувати документ…"
#. type: Content of: <section><section><section><para>
-#: en/testing.xml:63
+#: en/testing.xml:56
+#, fuzzy
msgid ""
-"If all is OK for you, you can process to the installation. If not, you can "
-"leave with the quit button."
+"If everything is satisfactory, you can proceed with the installation. If "
+"not, you can use the <emphasis>Quit</emphasis> button to exit."
msgstr ""
"Якщо усі перевірки вдало пройдено, ви можете продовжити встановлення. Якщо "
"маєте проблеми, можете перервати встановлення за допомогою кнопки «Вийти»."
-#. type: Content of: <section><section><section><remark>
-#: en/testing.xml:66
-msgid "The configuration settings you made here are kept for the installation."
+#. type: Content of: <section><section><section><note><para>
+#: en/testing.xml:61
+#, fuzzy
+msgid ""
+"The configuration settings you apply here are carried over if you decide to "
+"proceed with the installation."
msgstr ""
"Вказані вами параметри налаштування буде збережено у встановленій системі."
#. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:72
+#: en/testing.xml:68
msgid "Launch installation"
msgstr "Запуск встановлення"
-#. type: Content of: <section><section><section><mediaobject>
-#: en/testing.xml:76
-msgid ""
-"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
-"imageobject>"
-
#. type: Content of: <section><section><section><para>
-#: en/testing.xml:81
+#: en/testing.xml:71
+#, fuzzy
msgid ""
-"To launch the installation of Mageia LiveCD or Live DVD to the hard disc or "
-"SSD drive, simply click on the icon \"Install on Hard Disk\". You will get "
-"this screen, and then the \"<link linkend=\"doPartitionDisks\">Partitioning</"
-"link> step\" as for the direct installation."
+"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."
msgstr ""
"Щоб розпочати встановлення з носія портативної системи Mageia на компакт-"
"диску, DVD або флешці на твердий диск або диск SSD, просто натисніть "
@@ -5249,13 +5622,22 @@ msgstr ""
"\"doPartitionDisks\">Розбиття на розділи</link>», як і під час "
"безпосереднього встановлення."
+#. type: Content of: <section><section><section><mediaobject>
+#: en/testing.xml:77
+msgid ""
+"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
+"imageobject>"
+
#. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:3
+#: en/uninstall-Mageia.xml:10
msgid "Uninstalling Mageia"
msgstr "Вилучення Mageia"
#. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:18
msgid ""
"If Mageia didn't convince you or you can't install it correctly - in short "
"you want get rid of it - that is your right and Mageia also gives you the "
@@ -5267,12 +5649,13 @@ msgstr ""
"можливість можна знайти не у кожній операційній системі."
#. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:14
+#: en/uninstall-Mageia.xml:23
+#, fuzzy
msgid ""
-"After your data backup, reboot your Mageia installation DVD and select "
-"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
-"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
-"have Windows, with no option to choose your operating system."
+"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."
msgstr ""
"Після створення резервної копії даних, перезавантажте систему з DVD Mageia і "
"виберіть пункт <emphasis role=\"bold\">Rescue system</emphasis>, далі "
@@ -5281,14 +5664,18 @@ msgstr ""
"вибору операційної системи."
#. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:19
-msgid ""
-"In Windows to recover the space used by Mageia partitions: click on "
-"<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
-"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
-"size and place on the disk. Right click on each of these partitions and "
-"select <guibutton>Delete</guibutton> to free up the space."
+#: en/uninstall-Mageia.xml:28
+#, fuzzy
+msgid ""
+"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."
msgstr ""
"Щоб скористатися місцем на диску, яке колись було зайнято розділами Mageia, "
"у Windows, скористайтеся пунктом меню <code>Пуск -> Панель керування -> "
@@ -5300,17 +5687,18 @@ msgstr ""
"<guibutton>Вилучити</guibutton>. Після цього місце на диску буде звільнено."
#. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:46
+#, fuzzy
msgid ""
"If you are using Windows XP, you can create a new partition and format it "
-"(FAT32 or NTFS). It will get a partition letter."
+"(FAT32 or NTFS). It will then get a partition letter."
msgstr ""
"Якщо на комп’ютері встановлено Windows XP, ви можете створити новий розділ і "
"виконати його форматування (у FAT32 або NTFS). Система надасть йому "
"відповідну літеру диска."
#. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:30
+#: en/uninstall-Mageia.xml:49
msgid ""
"If you have Vista or 7, you have one more possibility, you can extend the "
"existing partition that is at the left of the freed space. There are other "
@@ -5328,26 +5716,27 @@ msgstr ""
"важливих даних."
#. type: Content of: <section><info><title>
-#: en/unused.xml:9
+#: en/unused.xml:3
msgid "Keep or delete unused material"
msgstr "Зберегти або вилучити невикористані матеріали"
+#. 2018/03/03 apb: Adjusted text and updated SC's to Mga6.
#. type: Content of: <section><mediaobject>
-#: en/unused.xml:13
+#: en/unused.xml:9
+#, fuzzy
msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"unused-im1\" fileref=\"live-"
+"unused.png\" align=\"center\" revision=\"1\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/unused.xml:19
+#: en/unused.xml:14
+#, fuzzy
msgid ""
"In this step, the installer looks for unused locales packages and unused "
-"hardware packages. Then it proposes you to delete them. It is a good idea to "
-"accept, except if you prepare an installation which has to run on different "
-"hardware."
+"hardware packages and you are then given an opportunity to delete them."
msgstr ""
"На цьому кроці засіб встановлення виконає пошук невикористаних пакунків "
"перекладів та забезпечення роботи обладнання. Далі, буде запропоновано "
@@ -5355,8 +5744,23 @@ msgstr ""
"ви не плануєте створити систему, яка працюватиме на обладнанні, відмінному "
"від того, на якому її було встановлено."
+#. type: Content of: <section><para>
+#: en/unused.xml:18
+msgid ""
+"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."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/unused.xml:22
+msgid ""
+"Clicking <emphasis>Advanced</emphasis> will list the unused hardware and "
+"localization files that will be removed if you proceed."
+msgstr ""
+
#. type: Content of: <section><mediaobject>
-#: en/unused.xml:25
+#: en/unused.xml:26
msgid ""
"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
"> </imageobject>"
@@ -5365,15 +5769,893 @@ msgstr ""
"> </imageobject>"
#. type: Content of: <section><para>
-#: en/unused.xml:30
+#: en/unused.xml:31
+#, fuzzy
msgid ""
-"The next step is the copying of files on hard disk. This takes some minutes. "
-"At the end, you get a blank screen for some time, it's normal."
+"The next step is the copying of files to hard disk. This process should just "
+"take a little while to complete. When it is finising you will briefly get a "
+"blank screen - this is normal."
msgstr ""
"На наступному кроці відбудеться копіювання файлів на жорсткий диск. Ця "
"процедура триватиме декілька хвилин. Наприкінці процедури ви певний час "
"бачитимете порожній екран. Це нормально."
+#~ msgid "User and Superuser Management"
+#~ msgstr "Керування обліковими записами користувача і адміністратора"
+
+#~ msgid ""
+#~ "Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+#~ "(capacity, mount point, type).</emphasis>"
+#~ msgstr ""
+#~ "Для кожного з розділів буде показано такі дані: <emphasis role=\"bold"
+#~ "\">Пристрій</emphasis> («Місткість», «Точка монтування», «Тип»)."
+
+#~ msgid ""
+#~ "<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+#~ "\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+#~ "emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+#~ "(for example, <emphasis role=\"bold\">sda5</emphasis>)."
+#~ msgstr ""
+#~ "<emphasis role=\"bold\">Пристрій</emphasis>, складається з таких частин: "
+#~ "<emphasis role=\"bold\">твердий диск</emphasis>, [<emphasis role=\"bold"
+#~ "\">назва твердого диска</emphasis> (літера)], <emphasis role=\"bold"
+#~ "\">номер розділу</emphasis> (приклад: <emphasis role=\"bold\">sda5</"
+#~ "emphasis>)."
+
+#~ msgid "In advanced tab, you will find more options about clock settings."
+#~ msgstr ""
+#~ "На вкладці додаткових параметрів можна знайти додаткові параметри "
+#~ "налаштування годинника."
+
+#~ msgid "From a disc"
+#~ msgstr "З диска"
+
+#~ msgid ""
+#~ "You can boot directly from the media you used to burn your image (CD-ROM, "
+#~ "DVD-ROM...). You usually just need to insert it in your CD/DVD drive for "
+#~ "the bootloader to launch the installation automatically after rebooting "
+#~ "the computer. If that does not happen you may need to reconfigure your "
+#~ "BIOS or press one key that will offer you to choose the peripheral from "
+#~ "which the computer will boot."
+#~ msgstr ""
+#~ "Ви можете завантажити систему безпосередньо із носія, на який було "
+#~ "записано ваш образ (компакт-диска, DVD тощо). Зазвичай, достатньо "
+#~ "вставити його до пристрою зчитування компакт-дисків або DVD, щоб "
+#~ "завантажувач автоматично запустив процедуру встановлення після "
+#~ "перезавантаження комп’ютера. Якщо цього не трапиться, ймовірно, вам "
+#~ "доведеться внести зміни у налаштування BIOS або натиснути якусь клавішу "
+#~ "(підказку буде показано під час завантаження), яка надасть змогу вибрати "
+#~ "пристрій, з якого відбуватиметься завантаження системи на комп’ютері."
+
+#~ msgid ""
+#~ "According to which hardware you have, and how it is configured, you get "
+#~ "either one or another of the two screens below."
+#~ msgstr ""
+#~ "Відповідно до обладнання, на якому ви працюєте, та способу його "
+#~ "налаштування, ви побачите один із наведених нижче двох варіантів "
+#~ "зображення на екрані."
+
+#~ msgid "From a USB device"
+#~ msgstr "З пристрою USB"
+
+#~ msgid ""
+#~ "You can boot from the USB device on which you dumped your image ISO. "
+#~ "According to your BIOS settings, the computer boots perhaps directly on "
+#~ "the USB device already plugged in a port. If that does not happen you may "
+#~ "need to reconfigure your BIOS or press one key that will offer you to "
+#~ "choose the peripheral from which the computer will boot."
+#~ msgstr ""
+#~ "Ви можете завантажити систему із флешки USB, на яку було записано образ "
+#~ "ISO. Відповідно до параметрів роботи BIOS, комп’ютер може завантажуватися "
+#~ "безпосередньо із флешки, яку вставлено у порт USB. Якщо цього не "
+#~ "трапилося одразу, вам доведеться трохи змінити налаштування BIOS або "
+#~ "натиснути клавішу (підказку буде показано під час завантаження), яка "
+#~ "надаться вам змогу вибрати периферійний пристрій, з якого "
+#~ "завантажуватиметься комп’ютер."
+
+#~ msgid ""
+#~ "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+
+#~ msgid "In the middle menu, you have the choice between three actions:"
+#~ msgstr "За допомогою середнього меню ви можете вибрати одну з трьох дій:"
+
+#~ msgid ""
+#~ "Boot from hard disk: This choice allows to boot from hard disk, as usual, "
+#~ "when no media (CD/DVD or USB stick) is connected. (not working with "
+#~ "Mageia 5)."
+#~ msgstr ""
+#~ "Завантажити з твердого диска: за допомогою цього варіанта можна "
+#~ "завантажити систему з твердого диска, як звичайно відбувається, якщо з "
+#~ "комп’ютером не з’єднано додаткових носіїв систем (компакт-дисків, DVD або "
+#~ "флешок USB) (не працює у Mageia 5)."
+
+#~ msgid "In the bottom menu, are the Boot Options:"
+#~ msgstr ""
+#~ "За допомогою нижнього меню можна отримати доступ до параметрів "
+#~ "завантаження:"
+
+#~ msgid ""
+#~ "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
+#~ msgstr "F1 — Довідка. Опис параметрі «splash», «apm», «acpi» та «Ide»"
+
+#~ msgid "F2 - Language. Choose the display language of the screens."
+#~ msgstr "F2 — Мова. Вибір мови інтерфейсу."
+
+#~ msgid ""
+#~ "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
+#~ msgstr ""
+#~ "F3 — Роздільна здатність. Тут можна вибрати один із таких варіантів: "
+#~ "text, 640x400, 800x600, 1024x728"
+
+#~ msgid ""
+#~ "F5 - Driver. Yes or No. The system is aware about the presence of an "
+#~ "optional disk with a driver update and will require its insertion during "
+#~ "installation process."
+#~ msgstr ""
+#~ "F5 — Драйвер. «Yes» («Так») або «No» («Ні»). За допомогою цього пункту "
+#~ "можна повідомити системі про наявність додаткового диска з оновленням "
+#~ "драйвера і наказати їй попросити його вставити під час встановлення."
+
+#~ msgid ""
+#~ "F6 - Kernel options. This is a way to specify options according to your "
+#~ "hardware and the drivers to use."
+#~ msgstr ""
+#~ "F6 — Параметри ядра. За допомогою цього пункту можна вказати параметри, "
+#~ "відповідні до апаратної частини, і драйвери, якими слід скористатися."
+
+#~ msgid "First screen while booting on UEFI system from disk"
+#~ msgstr "Перший екран під час завантаження системи UEFI з диска"
+
+#~ msgid ""
+#~ "You have only the choice to run Mageia in Live mode (first choice) or to "
+#~ "process the installation (second choice)."
+#~ msgstr ""
+#~ "Вам доведеться обирати один з двох варіантів: запустити Mageia у "
+#~ "портативному режимі (перший варіант) або продовжити встановлення (другий "
+#~ "варіант)."
+
+#~ msgid ""
+#~ "In each case, the first steps will be the same to choose language, "
+#~ "timezone and keyboard, then the processes differ, with <link linkend="
+#~ "\"testing\">additional steps in Live mode</link>."
+#~ msgstr ""
+#~ "У всіх варіантах перші кроки будуть однаковими: вибрати мову, часовий "
+#~ "пояс і модель клавіатури. На наступних кроках процедура змінюється, "
+#~ "з’являються <link linkend=\"testing\">додаткові кроки портативного "
+#~ "режиму</link>."
+
+#~ msgid ""
+#~ "Depending on your selection here, you may be offered further screens to "
+#~ "fine-tune your choice."
+#~ msgstr ""
+#~ "Залежно від вибраного вами за допомогою цієї сторінки варіанта "
+#~ "встановлення, програма може запропонувати на подальших сторінка додаткові "
+#~ "можливості остаточного налаштування вашої системи."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "The settings DrakX chose are usually good."
+#~ msgstr "Зазвичай, потреби у зміні налаштувань, вибраних DrakX, немає."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_card_list-"
+#~ "im1\" align=\"center\" fileref=\"dx2-configureX_card_list.png\" revision="
+#~ "\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_card_list-"
+#~ "im1\" align=\"center\" fileref=\"dx2-configureX_card_list.png\" revision="
+#~ "\"1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "The <emphasis role=\"bold\">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."
+#~ msgstr ""
+#~ "Вам слід явним чином увімкнути сховища <emphasis role=\"bold\">Nonfree</"
+#~ "emphasis>, щоб мати до них доступ. Зробити це слід після першого "
+#~ "перезавантаження системи."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+#~ "fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+#~ "fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your "
+#~ "card from the list if needed."
+#~ msgstr ""
+#~ "<emphasis><guibutton>Графічна карта</guibutton></emphasis>: якщо "
+#~ "потрібно, виберіть встановлену на вашому комп’ютері графічну картку зі "
+#~ "списку."
+
+#~ msgid "Incorrect refresh rates may damage your monitor"
+#~ msgstr ""
+#~ "Помилково вказані частоти оновлення зображення можуть призвести до "
+#~ "пошкодження вашого монітора."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+#~ "fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+#~ "fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> "
+#~ "</imageobject>"
+
+#~ msgid "<emphasis>Custom</emphasis>"
+#~ msgstr "<emphasis>Спеціальний</emphasis>"
+
+#~ msgid "<emphasis>Plug 'n Play</emphasis>"
+#~ msgstr "<emphasis>Plug 'n Play</emphasis>"
+
+#~ msgid "the monitor manufacturers name"
+#~ msgstr "назва фірми-виробника монітора"
+
+#~ msgid "the monitor description"
+#~ msgstr "опис монітора"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake."
+#~ "png\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake."
+#~ "png\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Click <guibutton>Done</guibutton> when you're ready."
+#~ msgstr ""
+#~ "Натисніть кнопку <guibutton>Виконано</guibutton>, коли налаштовування "
+#~ "буде завершено."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Use Free Space"
+#~ msgstr "Використовувати вільний простір"
+
+#~ msgid "Use Free Space on a Windows Partition"
+#~ msgstr "Використовувати вільний простір на розділі Microsoft Windows®"
+
+#~ msgid ""
+#~ "If you have unused space on an existing Windows partition, the installer "
+#~ "may offer to use it."
+#~ msgstr ""
+#~ "Цим варіантом можна буде скористатися, якщо на вже створених розділах "
+#~ "Windows є достатньо вільного місця для встановлення нової операційної "
+#~ "системи."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Erase and use Entire Disk."
+#~ msgstr "Стерти і використати весь диск"
+
+#~ msgid ""
+#~ "Note! This will erase ALL data on the selected hard drive. Take care!"
+#~ msgstr ""
+#~ "Зауваження: всіх дані на диску буде у такому разі витерто. Будьте "
+#~ "обережні!"
+
+#~ msgid "Custom disk partitioning"
+#~ msgstr "Нетиповий поділ диска на розділи"
+
+#~ msgid ""
+#~ "That means that from 160 GB or greater available space, the installer "
+#~ "will create three partitions: 50 GB for <emphasis role=\"bold\">/</"
+#~ "emphasis>, 4 GB for <emphasis role=\"bold\">swap</emphasis> and the "
+#~ "remainder for <emphasis role=\"bold\">/home</emphasis>."
+#~ msgstr ""
+#~ "Це означає, що якщо на диску 160 ГБ або більше вільного місця, засобом "
+#~ "встановлення буде створено три розділи: 50 ГБ для <emphasis role=\"bold"
+#~ "\">/</emphasis>, 4 ГБ для резервної пам’яті на диску. Решту місця буде "
+#~ "віддано під <emphasis role=\"bold\">/home</emphasis>."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+#~ "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition="
+#~ "\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+#~ "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition="
+#~ "\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "January 2015"
+#~ msgstr "Січень 2015 року"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<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>"
+#~ msgstr ""
+#~ "<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>"
+
+#~ msgid "Using a Mageia DVD"
+#~ msgstr "За допомогою DVD Mageia"
+
+#~ msgid ""
+#~ "Here are the default welcome screens when using a Mageia DVD, The first "
+#~ "one is what you will see if you have a UEFI system, the second one is for "
+#~ "a Legacy system:"
+#~ msgstr ""
+#~ "Нижче наведено типові вікна вітання DVD Mageia. Перше з них відповідає "
+#~ "системі з UEFI, друге — системі із застарілою системою завантаження:"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+
+#~ msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "From this screen, it is possible to set some preferences (note that the "
+#~ "options <emphasis role=\"bold\">F1</emphasis> to <emphasis role=\"bold"
+#~ "\">F6</emphasis> are available only on Legacy systems):"
+#~ msgstr ""
+#~ "За допомогою цієї сторінки можна вказати деякі налаштування (зауважте, що "
+#~ "пункти від <emphasis role=\"bold\">F1</emphasis> до <emphasis role=\"bold"
+#~ "\">F6</emphasis> доступні лише на застарілих системах):"
+
+#~ msgid ""
+#~ "Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
+#~ "specific language for the installation."
+#~ msgstr ""
+#~ "Натисніть <emphasis role=\"bold\">F2</emphasis>, щоб вибрати мову, якою "
+#~ "засіб встановлення показуватиме повідомлення."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Use the arrow keys to select the language then press <emphasis role=\"bold"
+#~ "\">Enter</emphasis>."
+#~ msgstr ""
+#~ "Скористайтеся клавішами зі стрілками, щоб вибрати потрібний вам пункт у "
+#~ "списку, і натисніть клавішу <emphasis role=\"bold\">Enter</emphasis>."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+
+#~ msgid "Default: It doesn't alter anything in the default options."
+#~ msgstr "Default (типовий): не змінювати нічого у типових параметрах."
+
+#~ msgid ""
+#~ "Safe Settings: Priority is given to the safer options at the price of a "
+#~ "performance detriment."
+#~ msgstr ""
+#~ "Safe Settings (безпечні параметри): перевага безпечності параметрів над "
+#~ "швидкодією."
+
+#~ msgid ""
+#~ "When you select one of these entries, it modifies the default options "
+#~ "displayed in the <guilabel>Boot Options</guilabel> line."
+#~ msgstr ""
+#~ "Вибір одного з пунктів призводить до внесення змін до типових параметрів, "
+#~ "показаних у рядку <guilabel>Параметри завантаження</guilabel>."
+
+#~ msgid ""
+#~ "In some Mageia releases, it may happen that the entries selected with "
+#~ "<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+#~ "Options</guilabel> line, despite this, they will in fact be applied."
+#~ msgstr ""
+#~ "У деяких випусках Mageia параметри, вибрані за допомогою <emphasis role="
+#~ "\"bold\">F6</emphasis>, не буде показано у рядку <guilabel>Параметри "
+#~ "завантаження</guilabel>. Втім, ці параметри буде враховано під час "
+#~ "завантаження системи."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+#~ "various boot options. Select an item with the arrow keys and press "
+#~ "<emphasis role=\"bold\">Enter</emphasis> for more details or press "
+#~ "<emphasis role=\"bold\">Esc</emphasis> to go back to the welcome screen."
+#~ msgstr ""
+#~ "Натискання клавіші <emphasis role=\"bold\">F1</emphasis> відкриває нове "
+#~ "вікно зі списком пунктів. Виберіть один з пунктів за допомогою клавіш зі "
+#~ "стрілками і натисніть клавішу <emphasis role=\"bold\">Enter</emphasis>, "
+#~ "щоб отримати докладнішу довідку, або натисніть клавішу <emphasis role="
+#~ "\"bold\">Esc</emphasis>, щоб повернутися до вікна вітання."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "The detailed view about the splash option. Press <emphasis role=\"bold"
+#~ "\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> "
+#~ "to go back to the options list. These options can be added by hand in the "
+#~ "<guilabel>Boot Options</guilabel> line."
+#~ msgstr ""
+#~ "Нижче наведено знімок вікна з докладним описом параметрів вікна вітання "
+#~ "системи. Натисніть клавішу <emphasis role=\"bold\">Esc</emphasis> або "
+#~ "виберіть пункт <guilabel>Return to Boot Options</guilabel> (Повернутися "
+#~ "до параметрів завантаження), щоб повернутися до списку параметрів. "
+#~ "Описані у вікні параметри можна додати вручну до рядка "
+#~ "<guilabel>Параметри завантаження</guilabel>."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "The help is translated in the chosen language with <emphasis role=\"bold"
+#~ "\">F2</emphasis>."
+#~ msgstr ""
+#~ "Переглянути переклад довідки вибраною мовою можна за допомогою натискання "
+#~ "клавіші <emphasis role=\"bold\">F2</emphasis>."
+
+#~ msgid ""
+#~ "For more information about kernel options on legacy and UEFI systems, "
+#~ "see: <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>"
+#~ msgstr ""
+#~ "Докладніший опис параметрів ядра у застарілих системах та системах з UEFI "
+#~ "можна знайти <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "How_to_set_up_kernel_options\">тут</link>."
+
+#~ msgid "Media Selection (Nonfree)"
+#~ msgstr "Вибір носія (з пакунками, які не є вільними)"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" "
+#~ "align=\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" "
+#~ "align=\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Summary of miscellaneous parameters"
+#~ msgstr "Резюме щодо інших параметрів"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+
+#~ msgid "<guilabel>Timezone</guilabel>"
+#~ msgstr "<guilabel>Часовий пояс</guilabel>"
+
+#~ msgid "<guilabel>Country / Region</guilabel>"
+#~ msgstr "<guilabel>Країна / Регіон</guilabel>"
+
+#~ msgid "<guilabel>Bootloader</guilabel>"
+#~ msgstr "<guilabel>Завантажувач</guilabel>"
+
+#~ msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
+#~ msgstr ""
+#~ "Щоб дізнатися більше, зверніться до розділу <xref linkend="
+#~ "\"setupBootloader\"/>."
+
+#~ msgid "<guilabel>User management</guilabel>"
+#~ msgstr "<guilabel>Керування записами користувачів</guilabel>"
+
+#~ msgid "<guilabel>Services</guilabel>:"
+#~ msgstr "<guilabel>Служби</guilabel>:"
+
+#~ msgid "For more information, see <xref linkend=\"configureServices\"/>"
+#~ msgstr ""
+#~ "Щоб дізнатися більше, зверніться до розділу <xref linkend="
+#~ "\"configureServices\"/>."
+
+#~ msgid "<guilabel>Keyboard</guilabel>:"
+#~ msgstr "<guilabel>Клавіатура</guilabel>:"
+
+#~ msgid "<guilabel>Mouse</guilabel>:"
+#~ msgstr "<guilabel>Миша</guilabel>:"
+
+#~ msgid "<guilabel>Sound card</guilabel>:"
+#~ msgstr "<guilabel>Звукова плата</guilabel>:"
+
+#~ msgid ""
+#~ "The installer uses the default driver - if there is a default one. The "
+#~ "option to select a different driver is only given when there is more than "
+#~ "one driver for your card, but where none of them is the default one."
+#~ msgstr ""
+#~ "Засобом встановлення буде використано типовий драйвер, якщо такий типовий "
+#~ "драйвер передбачено. Можливість вибору іншого драйвера буде надано, лише "
+#~ "якщо для картки передбачено декілька драйверів, але жоден з них не є "
+#~ "типовим."
+
+#~ msgid "<guilabel>Graphical interface</guilabel>:"
+#~ msgstr "<guilabel>Графічний інтерфейс</guilabel>:"
+
+#~ msgid "<guilabel>Network</guilabel>:"
+#~ msgstr "<guilabel>Мережа</guilabel>:"
+
+#~ msgid "<guilabel>Proxies</guilabel>:"
+#~ msgstr "<guilabel>Проксі</guilabel>:"
+
+#~ msgid "<guilabel>Security Level</guilabel>:"
+#~ msgstr "<guilabel>Рівень безпеки</guilabel>:"
+
+#~ msgid "Check the option which best suits your usage."
+#~ msgstr ""
+#~ "Виберіть той з варіантів, який найкраще відповідає вашому способу "
+#~ "використання системи."
+
+#~ msgid "<guilabel>Firewall</guilabel>:"
+#~ msgstr "<guilabel>Захисний шлюз</guilabel>:"
+
+#~ msgid ""
+#~ "A firewall is intended to be a barrier between your important data and "
+#~ "the rascals out there on the internet who would compromise or steal it."
+#~ msgstr ""
+#~ "Брандмауер або мережевий екран є бар’єром, який убезпечує важливі дані "
+#~ "від доступу до них шахраїв з інтернету, які намагаються викрасти і "
+#~ "скористатися цими даними."
+
+#~ msgid ""
+#~ "Select the services that you wish to have access to your system. Your "
+#~ "selections will depend on what you use your computer for. For more "
+#~ "information, see <xref linkend=\"firewall\"/>."
+#~ msgstr ""
+#~ "Виберіть служби, яким має бути дозволено доступ до вашої системи. Вибір "
+#~ "служб залежатиме від призначення комп’ютера, на якому працює операційна "
+#~ "система. Докладніше про це у розділі <xref linkend=\"firewall\"/>."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" "
+#~ "align=\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" "
+#~ "align=\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </"
+#~ "imageobject>"
+
+#~ msgid "64 bit architecture only."
+#~ msgstr "Лише для 64-бітової архітектури."
+
+#~ msgid ""
+#~ "md5sum and sha1sum are tools to check the ISO integrity. Choose one or "
+#~ "the other, and copy the checksum <link linkend=\"integrity\">for later "
+#~ "use</link>. Then a window similar to this one appears:"
+#~ msgstr ""
+#~ "md5sum і sha1sum — програми для перевірки цілісності даних у образах ISO. "
+#~ "Для виконання перевірки достатньо встановити лише одну з цих програм. Для "
+#~ "<link linkend=\"integrity\">подальшого використання</link> встановіть "
+#~ "одну з них. Далі, буде показано таке вікно:"
+
+#~ msgid "Select the Save File option, then, click OK."
+#~ msgstr "Виберіть пункт «Зберегти файл», потім натисніть кнопку «Гаразд»."
+
+#~ msgid ""
+#~ "To recover the original capacity, you must redo partitioning and re-"
+#~ "format the USB stick."
+#~ msgstr ""
+#~ "Для відновлення початкової місткості диска USB вам згодом доведеться "
+#~ "повторно створити на ньому розділи і виконати форматування."
+
+#~ msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+
+#~ msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+
+#~ msgid "Install"
+#~ msgstr "Встановити"
+
+#~ msgid "Upgrade"
+#~ msgstr "Поновити"
+
+#~ msgid ""
+#~ "If during install you decide to stop the installation, it is possible to "
+#~ "reboot, but please think twice before you do this. Once a partition has "
+#~ "been formatted or updates have started to be installed, your computer "
+#~ "isn't in the same state anymore and rebooting it could very well leave "
+#~ "you with an unusable system. If in spite of that, and only if you are "
+#~ "very sure rebooting is what you want, go to a text terminal by pressing "
+#~ "<guilabel>Alt Ctrl F2</guilabel> simultaneously. After that, press "
+#~ "<guilabel>Alt Ctrl Delete</guilabel> simultaneously to reboot."
+#~ msgstr ""
+#~ "Якщо протягом процедури встановлення ви вирішите припинити встановлення, "
+#~ "ви можете перезавантажити комп’ютер. Втім, вам слід ретельно обдумати "
+#~ "ваші дії. Після форматування розділу або початку процедури встановлення "
+#~ "оновлень ваш комп’ютер перебуватиме у проміжному стані. Перезавантаження "
+#~ "може призвести до неможливості користування системою. Якщо, всупереч цим "
+#~ "попередженням, ви хочете перезавантажити систему, перейдіть у текстовий "
+#~ "термінал натисканням комбінації цих трьох клавіш: <guilabel>Alt Ctrl F2</"
+#~ "guilabel> одночасно. Після цього, натисніть комбінацію клавіш "
+#~ "<guilabel>Alt Ctrl Delete</guilabel> одночасно, щоб перезавантажити "
+#~ "комп’ютер."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "You will be required to set the keyboard layout you wish to use in Mageia​​"
+#~ ". The default one is selected according to your language and timezone "
+#~ "previously selected."
+#~ msgstr ""
+#~ "Вам слід вказати розкладку клавіатури, якою ви хочете користуватися у "
+#~ "Mageia​​. Типову розкладку буде вибрано за вказаною вами мовою та вибраним "
+#~ "раніше часовим поясом."
+
+#~ msgid "Mageia uses UTF-8 (Unicode) support by default."
+#~ msgstr "Типово, у Mageia використовується кодування UTF-8 (Unicode)."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
+#~ "format=\"PNG\" > </imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
+#~ "format=\"PNG\" > </imagedata> </imageobject>"
+
+#~ msgid "By default, Mageia uses exclusively:"
+#~ msgstr "Типово, Mageia ексклюзивно використовує:"
+
+#~ msgid "GRUB2-efi for a UEFI system."
+#~ msgstr "GRUB2-efi для системи UEFI."
+
+#~ msgid "The Mageia graphical menus are nice :)"
+#~ msgstr "Графічні меню Mageia виглядають чудово. :)"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref="
+#~ "\"live-setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref="
+#~ "\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless "
+#~ "you really know what you are doing."
+#~ msgstr ""
+#~ "Не змінюйте значення параметри <emphasis role=\"bold\">Пристрій "
+#~ "завантаження</emphasis>, якщо у цьому немає нагальної потреби."
+
+#~ msgid ""
+#~ "With a UEFI system, the user interface is slightly different as you "
+#~ "cannot choose between the <emphasis role=\"bold\">with</emphasis> or "
+#~ "<emphasis role=\"bold\">without graphical menu</emphasis> options."
+#~ msgstr ""
+#~ "Якщо ви користуєтеся системою з UEFI system, інтерфейс користувача трохи "
+#~ "відрізнятиметься, оскільки ви не зможете вибирати між завантажувачем із "
+#~ "графічним меню і без нього."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "By default, and according to your system, Mageia writes one of the "
+#~ "following:"
+#~ msgstr "Типово, залежно від вашої системи, Mageia записує новий:"
+
+#~ msgid "a GRUB2-efi bootloader into the ESP"
+#~ msgstr "завантажувач GRUB2-efi до ESP;"
+
+#~ msgid "Using chain loading"
+#~ msgstr "Використання ланцюгового завантаження"
+
+#~ msgid ""
+#~ "If you don't want a bootable Mageia, but to chain-load it from another "
+#~ "OS, click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
+#~ "guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
+#~ msgstr ""
+#~ "Якщо ви не хочете використовувати завантажувач Mageia, а замість цього "
+#~ "хочете скористатися ланцюговим завантаженням з іншої операційної системи, "
+#~ "натисніть кнопку <guibutton>Далі</guibutton>, потім пункт "
+#~ "<guibutton>Додатково</guibutton> і позначте пункт <guilabel>Не чіпати ESP "
+#~ "або MBR</guilabel>."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid ""
+#~ "You will get a warning that the bootloader is missing, ignore it by "
+#~ "clicking <guibutton>OK</guibutton>."
+#~ msgstr ""
+#~ "Програма попередить вас про те, що у системі не буде завантажувача. "
+#~ "Проігноруйте попередження і натисніть кнопку <guibutton>Гаразд</"
+#~ "guibutton>."
+
+#~ msgid "First page"
+#~ msgstr "Перша сторінка"
+
+#~ msgid "<guilabel>Advanced</guilabel>"
+#~ msgstr "<guilabel>Додатково</guilabel>"
+
+#~ msgid "Next page"
+#~ msgstr "Наступна сторінка"
+
+#~ msgid ""
+#~ "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+#~ "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
+#~ msgstr ""
+#~ "<guilabel>Зондування сторонньої ОС</guilabel>: див. вище розділ щодо "
+#~ "<link linkend=\"setupMageiaBootloader\">використання завантажувача "
+#~ "Mageia</link>"
+
+#~ msgid ""
+#~ "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above "
+#~ "<link linkend=\"setupChainLoading\">Using the chain loading</link>"
+#~ msgstr ""
+#~ "<emphasis role=\"bold\">Не чіпати ESP або MBR</emphasis>: див. вище "
+#~ "розділ щодо <link linkend=\"setupChainLoading\">використання ланцюгового "
+#~ "завантаження</link>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" "
+#~ "align=\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" "
+#~ "align=\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
+
+#~ msgid "DrakX should then be able to configure the drive(s) correctly."
+#~ msgstr ""
+#~ "Після цього, DrakX зможе налаштувати систему на роботу з дисками належним "
+#~ "чином."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
+#~ "xml:id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
+#~ "xml:id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "In this screen the name of the driver that the installer chose for your "
+#~ "sound card is given, which will be the default driver if one exists."
+#~ msgstr ""
+#~ "На цій сторінці буде показано назву драйвера, який інструмент "
+#~ "встановлення вибрав для вашої звукової картки. Цим драйвером буде типовий "
+#~ "драйвер, якщо такий передбачено для картки."
+
+#~ msgid ""
+#~ "The default driver should work without problems. However, if after "
+#~ "install you do encounter problems, then run <command>draksound</command> "
+#~ "or start this tool via MCC (Mageia Control Center), by choosing the "
+#~ "<guilabel>Hardware</guilabel> tab and clicking on <guilabel>Sound "
+#~ "Configuration</guilabel> at the top right of the screen."
+#~ msgstr ""
+#~ "Типовий драйвер має працювати без проблем. Втім, якщо після встановлення "
+#~ "у вас виникли проблеми зі звуком, віддайте команду <command>draksound</"
+#~ "command> або запустіть відповідний модуль за допомогою Центру керування "
+#~ "Mageia: виберіть сторінку <guilabel>Обладнання</guilabel> і натисніть "
+#~ "пункт <guilabel>Налаштування звуку</guilabel> у верхній правій частині "
+#~ "вікна."
+
+#~ msgid ""
+#~ "Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis "
+#~ "role=\"bold\">Sound Configuration</emphasis> tool screen, click on "
+#~ "<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+#~ "solve the problem."
+#~ msgstr ""
+#~ "Після цього у вікні <emphasis role=\"bold\">draksound</emphasis> або "
+#~ "інструмента «Налаштування звуку» натисніть пункт <guibutton>Додатково</"
+#~ "guibutton>, а потім кнопку <guibutton>Вирішення проблем</guibutton>. У "
+#~ "відповідь буде показано варті уваги поради щодо вирішення проблеми."
+
+#~ msgid ""
+#~ "Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></"
+#~ "emphasis> in this screen, during install, is useful if there is no "
+#~ "default driver and there are several drivers available, but you think the "
+#~ "installer selected the wrong one."
+#~ msgstr ""
+#~ "Кнопкою <emphasis role=\"bold\"><guibutton>Додатково</guibutton></"
+#~ "emphasis> під час встановлення варто користуватися, якщо для картки не "
+#~ "передбачено типового драйвера або якщо існує декілька драйверів, і ви "
+#~ "певні, що засобом встановлення вибрано помилковий драйвер."
+
+#~ msgid ""
+#~ "In that case you can select a different driver after clicking on "
+#~ "<emphasis role=\"bold\"><guibutton>Let me pick any driver</guibutton></"
+#~ "emphasis>."
+#~ msgstr ""
+#~ "У цьому випадку, ви можете вибрати інший драйвер після натискання кнопки "
+#~ "<emphasis role=\"bold\"><guibutton>Дозвольте мені підібрати драйвер</"
+#~ "guibutton></emphasis>."
+
+#~ msgid ""
+#~ "<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>"
+#~ msgstr ""
+#~ "<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>"
+
+#~ msgid ""
+#~ "You get this screen if you selected \"Boot Mageia\". If not, you get the "
+#~ "\"<link linkend=\"doPartitionDisks\">Partitioning</link> step\""
+#~ msgstr ""
+#~ "Це вікно буде показано, якщо вами було вибрано варіант «Завантажити "
+#~ "Mageia». Якщо вибрано інший варіант, буде показано вікно кроку «<link "
+#~ "linkend=\"doPartitionDisks\">Розбиття на розділи</link>»."
+
#~ msgid ""
#~ "<guilabel>Password (again)</guilabel>: Retype the user password into this "
#~ "text box and drakx will check you have the same password in each of the "
@@ -5487,15 +6769,6 @@ msgstr ""
#~ "</imagedata> </imageobject>"
#~ msgid ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-#~ "configureX_monitor.png\" format=\"PNG\" revision=\"1\" xml:id="
-#~ "\"configureX_monitor-im1\"/> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-#~ "configureX_monitor.png\" format=\"PNG\" revision=\"1\" xml:id="
-#~ "\"configureX_monitor-im1\"/> </imageobject>"
-
-#~ msgid ""
#~ "There is a tab for every detected hard disk or other storage device, like "
#~ "an USB key. For example sda, sdb and sdc if there are three of them."
#~ msgstr ""
@@ -5526,21 +6799,6 @@ msgstr ""
#~ msgid "\"Free space preceding (MiB)\" \"2\""
#~ msgstr "«Вільне місце перед (МіБ)» «2»"
-#~ msgid ""
-#~ "<imageobject condition='classical'> <imagedata revision=\"1\" fileref="
-#~ "\"dx2-formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-#~ "\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-#~ "condition='live'> <imagedata revision=\"1\" fileref=\"live-"
-#~ "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id=\"live-"
-#~ "formatPartitions-im1\"> </imagedata> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject condition='classical'> <imagedata revision=\"1\" fileref="
-#~ "\"dx2-formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-#~ "\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-#~ "condition='live'> <imagedata revision=\"1\" fileref=\"live-"
-#~ "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id=\"live-"
-#~ "formatPartitions-im1\"> </imagedata> </imageobject>"
-
#~ msgid "From this screen, it is possible to set some personal preferences:"
#~ msgstr "За допомогою цієї сторінки можна вказати деякі особисті уподобання:"
@@ -5633,15 +6891,6 @@ msgstr ""
#~ "imagedata> </imageobject>"
#~ msgid ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection."
-#~ "png\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection."
-#~ "png\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-#~ "imageobject>"
-
-#~ msgid ""
#~ "If selected, \"With X\" will also include IceWM as lightweight desktop "
#~ "environment."
#~ msgstr ""
@@ -5745,9 +6994,6 @@ msgstr ""
#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
#~ "align=\"center\"/> </imageobject>"
-#~ msgid "Custom"
-#~ msgstr "Спеціальний"
-
#~ msgid ""
#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
@@ -5922,13 +7168,6 @@ msgstr ""
#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
#~ msgid ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
-#~ "png\"/> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
-#~ "png\"/> </imageobject>"
-
-#~ msgid ""
#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
#~ msgstr ""
@@ -6205,13 +7444,6 @@ msgstr ""
#~ "\" format=\"PNG\" align=\"center\" xml:id=\"setRootPassword-im1\"></"
#~ "imagedata> </imageobject>"
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> "
-#~ "</imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> "
-#~ "</imageobject>"
-
#~ msgid "Using Windows"
#~ msgstr "За допомогою Windows"