aboutsummaryrefslogtreecommitdiffstats
path: root/docs/docs/stable/installer/pl
diff options
context:
space:
mode:
authorYuri Chornoivan <yurchor@ukr.net>2019-01-15 12:23:28 +0200
committerYuri Chornoivan <yurchor@ukr.net>2019-01-15 12:23:28 +0200
commit5e96bdad29e368040c17aab7422c14f5f3afed5d (patch)
treead2c3709e3c945dfe296d5104ed971dae7eb8a86 /docs/docs/stable/installer/pl
parentb814028edad98984fa4d53e668789c7c20be8d53 (diff)
downloadtools-5e96bdad29e368040c17aab7422c14f5f3afed5d.tar
tools-5e96bdad29e368040c17aab7422c14f5f3afed5d.tar.gz
tools-5e96bdad29e368040c17aab7422c14f5f3afed5d.tar.bz2
tools-5e96bdad29e368040c17aab7422c14f5f3afed5d.tar.xz
tools-5e96bdad29e368040c17aab7422c14f5f3afed5d.zip
Sync all translations
Diffstat (limited to 'docs/docs/stable/installer/pl')
-rw-r--r--docs/docs/stable/installer/pl/DrakLive-cover.xml114
-rw-r--r--docs/docs/stable/installer/pl/DrakLive.xml46
-rw-r--r--docs/docs/stable/installer/pl/DrakX-cover.xml174
-rw-r--r--docs/docs/stable/installer/pl/DrakX-inline.xml138
-rw-r--r--docs/docs/stable/installer/pl/DrakX.xml116
-rw-r--r--docs/docs/stable/installer/pl/SelectAndUseISOs2.xml257
-rw-r--r--docs/docs/stable/installer/pl/acceptLicense.xml41
-rw-r--r--docs/docs/stable/installer/pl/addUser.xml113
-rw-r--r--docs/docs/stable/installer/pl/add_supplemental_media.xml35
-rw-r--r--docs/docs/stable/installer/pl/ask_mntpoint_s.xml86
-rw-r--r--docs/docs/stable/installer/pl/bestTime.xml32
-rw-r--r--docs/docs/stable/installer/pl/bootLive.xml205
-rw-r--r--docs/docs/stable/installer/pl/chooseDesktop.xml62
-rw-r--r--docs/docs/stable/installer/pl/choosePackageGroups.xml5
-rw-r--r--docs/docs/stable/installer/pl/choosePackagesTree.xml18
-rw-r--r--docs/docs/stable/installer/pl/configureServices.xml21
-rw-r--r--docs/docs/stable/installer/pl/configureTimezoneUTC.xml20
-rw-r--r--docs/docs/stable/installer/pl/configureX_card_list.xml54
-rw-r--r--docs/docs/stable/installer/pl/configureX_chooser.xml100
-rw-r--r--docs/docs/stable/installer/pl/configureX_monitor.xml91
-rw-r--r--docs/docs/stable/installer/pl/diskPartitioning.xml16
-rw-r--r--docs/docs/stable/installer/pl/diskdrake.xml127
-rw-r--r--docs/docs/stable/installer/pl/doPartitionDisks.xml278
-rw-r--r--docs/docs/stable/installer/pl/exitInstall.xml19
-rw-r--r--docs/docs/stable/installer/pl/firewall.xml30
-rw-r--r--docs/docs/stable/installer/pl/formatPartitions.xml48
-rw-r--r--docs/docs/stable/installer/pl/graphicalConfiguration.xml22
-rw-r--r--docs/docs/stable/installer/pl/installUpdates.xml40
-rw-r--r--docs/docs/stable/installer/pl/installer.xml315
-rw-r--r--docs/docs/stable/installer/pl/locale.xml14
-rw-r--r--docs/docs/stable/installer/pl/login.xml29
-rw-r--r--docs/docs/stable/installer/pl/media_selection.xml29
-rw-r--r--docs/docs/stable/installer/pl/minimal-install.xml49
-rw-r--r--docs/docs/stable/installer/pl/misc-params.xml123
-rw-r--r--docs/docs/stable/installer/pl/reboot.xml20
-rw-r--r--docs/docs/stable/installer/pl/securityLevel.xml37
-rw-r--r--docs/docs/stable/installer/pl/selectCountry.xml37
-rw-r--r--docs/docs/stable/installer/pl/selectInstallClass.xml78
-rw-r--r--docs/docs/stable/installer/pl/selectKeyboard.xml49
-rw-r--r--docs/docs/stable/installer/pl/selectKeyboardLive.xml33
-rw-r--r--docs/docs/stable/installer/pl/selectLanguage.xml89
-rw-r--r--docs/docs/stable/installer/pl/selectMouse.xml32
-rw-r--r--docs/docs/stable/installer/pl/setupBootloader.xml272
-rw-r--r--docs/docs/stable/installer/pl/setupSCSI.xml28
-rw-r--r--docs/docs/stable/installer/pl/software.xml22
-rw-r--r--docs/docs/stable/installer/pl/soundConfig.xml57
-rw-r--r--docs/docs/stable/installer/pl/takeOverHdConfirm.xml40
-rw-r--r--docs/docs/stable/installer/pl/testing.xml45
-rw-r--r--docs/docs/stable/installer/pl/uninstall-Mageia.xml39
-rw-r--r--docs/docs/stable/installer/pl/unused.xml31
50 files changed, 2444 insertions, 1332 deletions
diff --git a/docs/docs/stable/installer/pl/DrakLive-cover.xml b/docs/docs/stable/installer/pl/DrakLive-cover.xml
index 21b6f203..6a805673 100644
--- a/docs/docs/stable/installer/pl/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/pl/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="pl" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="pl" xml:id="DrakLive-installer"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xhtml"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
+
+
<info>
- <title>Instalacja z trybu Live</title>
- <publisher> <publishername>Mageia.org</publishername> </publisher>
- <revhistory>
- <revision>
- <date>Styczeń 2015</date>
+ <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>Instalacja z trybu Live</title>
+
+ <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+ <revhistory>
+ <revision>
+ <date>March 2016</date>
+
<revremark>Mageia 5</revremark>
- </revision>
- </revhistory>
+ </revision>
+ </revhistory>
+
<cover>
- <para role="tagline">Oficjalna Dokumentacja dla Mageia</para>
+ <para role="tagline">Oficjalna Dokumentacja dla Mageia</para>
+
<mediaobject>
<imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
- <para>Tekst oraz zrzuty ekranu są dostępne na licencji CC BY-SA 3.0 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
- </para>
- <para>Ten dokument został stworzony przy pomocy <link
+
+ <para>Tekst oraz zrzuty ekranu są dostępne na licencji CC BY-SA 3.0 <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+ <para>Ten dokument został stworzony przy pomocy <link
ns6:href="http://www.calenco.com">Calenco CMS</link> rozwijanego przez <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.
- </para>
- <para>Dokumentacja została napisana przez wolontariuszy w ich wolnym czasie. Jeśli
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+ <para>Dokumentacja została napisana przez wolontariuszy w ich wolnym czasie. Jeśli
chcesz pomóc poprawić dokumentację skontaktuj się z <link
ns6:href="https://wiki.mageia.org/en/Documentation_team">Zespołem
-Dokumentacji</link>, </para>
+Dokumentacji</link>, </para>
</cover>
</info>
+
<article>
<title>Instalacja z trybu Live</title>
- <para><note>
- <para>Nikt nie zobaczy wszystkich zrzutów ekranu zaprezentowanych w tym
+
+ <para><note>
+ <para>Nikt nie zobaczy wszystkich zrzutów ekranu zaprezentowanych w tym
manualu. To które ekrany zobaczysz zależy od tego jaki posiadasz sprzęt oraz
jakich wyborów dokonasz podczas instalacji.</para>
- </note></para>
- <xi:include href="SelectAndUseISOs2.xml"/>
+ </note></para>
+
+ <xi:include href="SelectAndUseISOs2.xml"/>
+
+ <xi:include href="bootLive.xml"/>
+
+ <xi:include href="selectLanguage.xml"/>
- <xi:include href="bootLive.xml"/>
+ <xi:include href="acceptLicense.xml"/>
- <xi:include href="selectLanguage.xml"/>
+ <xi:include href="configureTimezoneUTC.xml"/>
- <xi:include href="acceptLicense.xml"/>
+ <xi:include href="bestTime.xml"/>
- <xi:include href="configureTimezoneUTC.xml"/>
+ <xi:include href="selectKeyboardLive.xml"/>
- <xi:include href="bestTime.xml"/>
+ <xi:include href="testing.xml"/>
- <xi:include href="selectKeyboardLive.xml"/>
+ <xi:include href="diskPartitioning.xml"/>
- <xi:include href="testing.xml"/>
+
- <xi:include href="doPartitionDisks.xml"/>
+ <!-- <xi:include href="doPartitionDisks.xml"/>
- <xi:include href="ask_mntpoint_s.xml"/>
- <xi:include href="takeOverHdConfirm.xml"/>
+ <xi:include href="ask_mntpoint_s.xml"/>
- <xi:include href="diskdrake.xml"/>
+ <xi:include href="takeOverHdConfirm.xml"/>
- <xi:include href="formatPartitions.xml"/>
+ <xi:include href="diskdrake.xml"/>
- <xi:include href="unused.xml"/>
+ <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
- <xi:include href="setupBootloader.xml"/>
+ <xi:include href="setupBootloader.xml"/>
- <xi:include href="setupBootloaderAddEntry.xml"/>
+
- <xi:include href="reboot.xml"/>
+ <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
- <xi:include href="addUser.xml"/>
+ <xi:include href="addUser.xml"/>
- <xi:include href="login.xml"/>
+ <xi:include href="login.xml"/>
- <xi:include href="uninstall-Mageia.xml"/>
- </article>
-</book> \ No newline at end of file
+ <xi:include href="uninstall-Mageia.xml"/>
+ </article>
+</book>
diff --git a/docs/docs/stable/installer/pl/DrakLive.xml b/docs/docs/stable/installer/pl/DrakLive.xml
index b4fdde6f..6f2c2470 100644
--- a/docs/docs/stable/installer/pl/DrakLive.xml
+++ b/docs/docs/stable/installer/pl/DrakLive.xml
@@ -1,6 +1,21 @@
-<?xml version='1.0' encoding='utf-8'?><article xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pl" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="pl" xml:id="Quick-Startup"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xhtml"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
+
+
<info>
- <title>Instalacja z trybu Live</title>
+ <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>Instalacja z trybu Live</title>
<cover>
<para><note>
@@ -16,10 +31,9 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
ns6:href="http://www.calenco.com">Calenco CMS</link> rozwijanego przez <link
ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
- <para>Dokumentacja została napisana przez wolontariuszy w ich wolnym czasie. Jeśli
-chcesz pomóc poprawić dokumentację skontaktuj się z <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Zespołem
-Dokumentacji</link>, </para>
+ <para>It was written by volunteers in their free time. Please contact the <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
+Team</link>, if you would like to help improve this manual.</para>
</cover>
</info>
@@ -39,7 +53,12 @@ Dokumentacji</link>, </para>
<xi:include href="testing.xml"/>
- <xi:include href="doPartitionDisks.xml"/>
+ <xi:include href="diskPartitioning.xml"/>
+
+
+
+ <!-- <xi:include href="doPartitionDisks.xml"/>
+
<xi:include href="ask_mntpoint_s.xml"/>
@@ -49,17 +68,18 @@ Dokumentacji</link>, </para>
<xi:include href="formatPartitions.xml"/>
- <xi:include href="unused.xml"/>
-
- <xi:include href="setupBootloader.xml"/>
+ <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
- <xi:include href="setupBootloaderAddEntry.xml"/>
+
- <xi:include href="reboot.xml"/>
+ <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
<xi:include href="addUser.xml"/>
<xi:include href="login.xml"/>
<xi:include href="uninstall-Mageia.xml"/>
-</article> \ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/pl/DrakX-cover.xml b/docs/docs/stable/installer/pl/DrakX-cover.xml
index 8ab850c2..28f33efb 100644
--- a/docs/docs/stable/installer/pl/DrakX-cover.xml
+++ b/docs/docs/stable/installer/pl/DrakX-cover.xml
@@ -1,115 +1,154 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pl" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="pl" xml:id="Quick-Startup"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:ns62="http://docbook.org/ns/transclusion"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xhtml"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
<info>
<title>Instalacja za pomocą DrakX</title>
- <publisher> <publishername>Mageia.org</publishername> </publisher>
- <revhistory>
- <revision>
- <date>Luty 2014</date>
+
+ <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+ <revhistory>
+ <revision>
+ <date>Luty 2014</date>
+
<revremark>Mageia 4</revremark>
- </revision>
- </revhistory>
+ </revision>
+ </revhistory>
+
<cover>
- <para role="tagline">Oficjalna Dokumentacja dla Mageia</para>
+ <para role="tagline">Oficjalna Dokumentacja dla Mageia</para>
+
<mediaobject>
<imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
- <para>Tekst oraz zrzuty ekranu są dostępne na licencji CC BY-SA 3.0 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
- </para>
- <para>Ten dokument został stworzony przy pomocy <link
+
+ <para>Tekst oraz zrzuty ekranu są dostępne na licencji CC BY-SA 3.0 <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+ <para>Ten dokument został stworzony przy pomocy <link
ns6:href="http://www.calenco.com">Calenco CMS</link> rozwijanego przez <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.
- </para>
- <para>Dokumentacja została napisana przez wolontariuszy w ich wolnym czasie. Jeśli
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+ <para>Dokumentacja została napisana przez wolontariuszy w ich wolnym czasie. Jeśli
chcesz pomóc poprawić dokumentację skontaktuj się z <link
ns6:href="https://wiki.mageia.org/en/Documentation_team">Zespołem
-Dokumentacji</link>, </para>
+Dokumentacji</link>, </para>
</cover>
</info>
+
<article>
-
+
+
+
+
+
-<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+
+
+ <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
<!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
<title>Instalacja za pomocą DrakX</title>
- <para><note>
- <para>Nikt nie zobaczy wszystkich zrzutów ekranu zaprezentowanych w tym
+
+ <para><note>
+ <para>Nikt nie zobaczy wszystkich zrzutów ekranu zaprezentowanych w tym
manualu. To które ekrany zobaczysz zależy od tego jaki posiadasz sprzęt oraz
jakich wyborów dokonasz podczas instalacji.</para>
- </note></para>
-
-
+ </note></para>
- <!-- <xi:include href="drakx-intro.xml"/>
+
+
+ <!-- <xi:include href="drakx-intro.xml"/>
-->
<xi:include href="SelectAndUseISOs2.xml"/>
- <xi:include href="installer.xml"/>
+ <xi:include href="installer.xml"/>
- <xi:include href="selectLanguage.xml"/>
+ <xi:include href="selectLanguage.xml"/>
- <xi:include href="acceptLicense.xml"/>
+ <xi:include href="acceptLicense.xml"/>
- <xi:include href="setupSCSI.xml"/>
+ <xi:include href="setupSCSI.xml"/>
- <xi:include href="selectInstallClass.xml"/>
+ <xi:include href="selectInstallClass.xml"/>
- <xi:include href="selectKeyboard.xml"/>
+ <xi:include href="selectKeyboard.xml"/>
- <xi:include href="doPartitionDisks.xml"/>
+
-
+
- <!-- <xi:include href="resizeFATChoose.xml"/>
+
+ <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
- <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
-<xi:include href="takeOverHdConfirm.xml"/>
+ <xi:include href="ask_mntpoint_s.xml"/>
+
+ <xi:include href="takeOverHdChoose.xml"/>
+
+ <xi:include href="takeOverHdConfirm.xml"/>
<xi:include href="diskdrake.xml"/>
- <xi:include href="formatPartitions.xml"/>
+ <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
-<xi:include href="add_supplemental_media.xml"/>
-<xi:include href="media_selection.xml"/>
+ <xi:include href="media_selection.xml"/>
-<xi:include href="chooseDesktop.xml"/>
+ <xi:include href="chooseDesktop.xml"/>
-<xi:include href="choosePackageGroups.xml"/>
+ <xi:include href="choosePackageGroups.xml"/>
-<xi:include href="minimal-install.xml"/>
+ <xi:include href="minimal-install.xml"/>
-<xi:include href="choosePackagesTree.xml"/>
+ <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
-
+ <xi:include href="software.xml"/>
+
+
- <!-- <xi:include href="setRootPassword.xml">
+ <!-- <xi:include href="setRootPassword.xml">
</xi:include> -->
<xi:include href="addUser.xml"/>
- <xi:include href="configureX_chooser.xml"/>
+ <xi:include href="graphicalConfiguration.xml"/>
- <xi:include href="configureX_card_list.xml"/>
+
- <xi:include href="configureX_monitor.xml"/>
+ <!-- <xi:include href="configureX_card_list.xml"/>
- <xi:include href="setupBootloader.xml"/>
- <xi:include href="setupBootloaderAddEntry.xml"/>
+ <xi:include href="configureX_chooser.xml"/>
-
+ <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+
- <!-- <xi:include href="setupYabootGeneral.xml">
+
+
+ <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
</xi:include>
<xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -117,29 +156,32 @@ jakich wyborów dokonasz podczas instalacji.</para>
<xi:include href="summary.xml"></xi:include> -->
<xi:include href="misc-params.xml"/>
-<xi:include href="configureTimezoneUTC.xml"/>
-
-<xi:include href="selectCountry.xml"/>
+ <xi:include href="locale.xml"/>
-<xi:include href="configureServices.xml"/>
+
+
+ <!-- <xi:include href="configureTimezoneUTC.xml"/>
-<xi:include href="selectMouse.xml"/>
-<xi:include href="soundConfig.xml"/>
+ <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
- <xi:include href="securityLevel.xml"/>
+ <xi:include href="selectMouse.xml"/>
- <xi:include href="firewall.xml"/>
+ <xi:include href="soundConfig.xml"/>
+ <xi:include href="securityLevel.xml"/>
-
+ <xi:include href="firewall.xml"/>
- <!-- <xi:include href="configureNetwork.xml">
+
+
+ <!-- <xi:include href="configureNetwork.xml">
</xi:include> -->
<xi:include href="installUpdates.xml"/>
- <xi:include href="exitInstall.xml"/>
-
- <xi:include href="uninstall-Mageia.xml"/>
+ <xi:include href="exitInstall.xml"/>
+
+ <xi:include href="uninstall-Mageia.xml"/>
</article>
</book>
diff --git a/docs/docs/stable/installer/pl/DrakX-inline.xml b/docs/docs/stable/installer/pl/DrakX-inline.xml
new file mode 100644
index 00000000..93ba30c9
--- /dev/null
+++ b/docs/docs/stable/installer/pl/DrakX-inline.xml
@@ -0,0 +1,138 @@
+<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pl" xml:id="Quick-Startup">
+ <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+ <title>Instalacja za pomocą DrakX</title>
+
+ <cover>
+ <para><note>
+ <para>Nikt nie zobaczy wszystkich zrzutów ekranu zaprezentowanych w tym
+manualu. To które ekrany zobaczysz zależy od tego jaki posiadasz sprzęt oraz
+jakich wyborów dokonasz podczas instalacji.</para>
+ </note></para>
+
+ <para xml:id="CC_BY-SA">Tekst oraz zrzuty ekranu są dostępne na licencji CC BY-SA 3.0 <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+ <para>Ten dokument został stworzony przy pomocy <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> rozwijanego przez <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+ <para>Dokumentacja została napisana przez wolontariuszy w ich wolnym czasie. Jeśli
+chcesz pomóc poprawić dokumentację skontaktuj się z <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">Zespołem
+Dokumentacji</link>, </para>
+ </cover>
+ </info>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <xi:include href="SelectAndUseISOs2.xml"/>
+
+ <xi:include href="installer.xml"/>
+
+ <xi:include href="selectLanguage.xml"/>
+
+ <xi:include href="acceptLicense.xml"/>
+
+ <xi:include href="setupSCSI.xml"/>
+
+ <xi:include href="selectInstallClass.xml"/>
+
+ <xi:include href="selectKeyboard.xml"/>
+
+ <xi:include href="doPartitionDisks.xml"/>
+
+
+
+ <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+ <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+ <xi:include href="takeOverHdConfirm.xml"/>
+
+ <xi:include href="diskdrake.xml"/>
+
+ <xi:include href="formatPartitions.xml"/>
+
+ <xi:include href="add_supplemental_media.xml"/>
+
+ <xi:include href="media_selection.xml"/>
+
+ <xi:include href="chooseDesktop.xml"/>
+
+ <xi:include href="choosePackageGroups.xml"/>
+
+ <xi:include href="minimal-install.xml"/>
+
+ <xi:include href="choosePackagesTree.xml"/>
+
+
+
+ <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+ <xi:include href="configureX_chooser.xml"/>
+
+ <xi:include href="configureX_card_list.xml"/>
+
+ <xi:include href="configureX_monitor.xml"/>
+
+ <xi:include href="setupBootloader.xml"/>
+
+ <xi:include href="setupBootloaderAddEntry.xml"/>
+
+
+
+ <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+
+ <xi:include href="setupYabootAddEntry.xml"></xi:include>
+
+ <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+ <xi:include href="configureTimezoneUTC.xml"/>
+
+ <xi:include href="selectCountry.xml"/>
+
+ <xi:include href="configureServices.xml"/>
+
+ <xi:include href="selectMouse.xml"/>
+
+ <xi:include href="soundConfig.xml"/>
+
+ <xi:include href="securityLevel.xml"/>
+
+
+
+ <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+ <xi:include href="exitInstall.xml"/>
+
+ <xi:include href="uninstall-Mageia.xml"/>
+</article> \ No newline at end of file
diff --git a/docs/docs/stable/installer/pl/DrakX.xml b/docs/docs/stable/installer/pl/DrakX.xml
index 5b16ce2e..5b168c0a 100644
--- a/docs/docs/stable/installer/pl/DrakX.xml
+++ b/docs/docs/stable/installer/pl/DrakX.xml
@@ -1,15 +1,53 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<article xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pl" xml:id="Quick-Startup">
- <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="pl" xml:id="Quick-Startup"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:ns62="http://docbook.org/ns/transclusion"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xhtml"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+ <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
<!--2013-12-08 add soundConfig.xml -->
<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
-<!-- <xi:include href="drakx-intro.xml"/>
- -->
-<info>
- <title>Instalacja za pomocą DrakX</title>
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+ Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+ b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>Instalacja za pomocą DrakX</title>
<cover>
<para><note>
@@ -34,18 +72,6 @@ Dokumentacji</link>, </para>
-
-
-
-
-
-
-
-
-
-
-
-
<xi:include href="SelectAndUseISOs2.xml"/>
<xi:include href="installer.xml"/>
@@ -60,23 +86,28 @@ Dokumentacji</link>, </para>
<xi:include href="selectKeyboard.xml"/>
- <xi:include href="doPartitionDisks.xml"/>
+
+
+
<!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
- <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
+ <xi:include href="ask_mntpoint_s.xml"/>
+
+ <xi:include href="takeOverHdChoose.xml"/>
- <xi:include href="takeOverHdConfirm.xml"/>
+ <xi:include href="takeOverHdConfirm.xml"/>
<xi:include href="diskdrake.xml"/>
- <xi:include href="formatPartitions.xml"/>
+ <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
- <xi:include href="add_supplemental_media.xml"/>
<xi:include href="media_selection.xml"/>
@@ -86,7 +117,10 @@ Dokumentacji</link>, </para>
<xi:include href="minimal-install.xml"/>
- <xi:include href="choosePackagesTree.xml"/>
+ <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+ <xi:include href="software.xml"/>
@@ -94,19 +128,25 @@ Dokumentacji</link>, </para>
</xi:include> -->
<xi:include href="addUser.xml"/>
- <xi:include href="configureX_chooser.xml"/>
+ <xi:include href="graphicalConfiguration.xml"/>
- <xi:include href="configureX_card_list.xml"/>
+
- <xi:include href="configureX_monitor.xml"/>
+ <!-- <xi:include href="configureX_chooser.xml"/>
- <xi:include href="setupBootloader.xml"/>
+
+ <xi:include href="configureX_card_list.xml"/>
- <xi:include href="setupBootloaderAddEntry.xml"/>
+ <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
- <!-- <xi:include href="setupYabootGeneral.xml">
+
+
+ <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
</xi:include>
<xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -114,11 +154,15 @@ Dokumentacji</link>, </para>
<xi:include href="summary.xml"></xi:include> -->
<xi:include href="misc-params.xml"/>
- <xi:include href="configureTimezoneUTC.xml"/>
+ <xi:include href="locale.xml"/>
+
+
+
+ <!-- <xi:include href="configureTimezoneUTC.xml"/>
- <xi:include href="selectCountry.xml"/>
- <xi:include href="configureServices.xml"/>
+ <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
<xi:include href="selectMouse.xml"/>
@@ -137,4 +181,4 @@ Dokumentacji</link>, </para>
<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/pl/SelectAndUseISOs2.xml b/docs/docs/stable/installer/pl/SelectAndUseISOs2.xml
index 54732a4f..0d057019 100644
--- a/docs/docs/stable/installer/pl/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/pl/SelectAndUseISOs2.xml
@@ -1,39 +1,73 @@
<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="pl" xml:id="Select-and-use-ISOs">
+
+
+
+
+
+
<info>
<!-- Made by Lebarhon 2014 03 26
Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+ a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+ b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+ c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
<title xml:id="Select-and-use-ISOs-ti1">Wybierz i użyj obrazu ISO</title>
</info>
<section>
<title>Wprowadzenie</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>Nośnik</title>
<section>
<title>Definicja</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>
+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>
@@ -43,24 +77,25 @@ ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
<title>Powszechne możliwości</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>
+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>
+ <para>Each DVD contains many available desktop environments and languages</para>
</listitem>
<listitem>
- <para>Dostaniesz wybór podczas instalacji aby dodać niewolne oprogramowanie.</para>
+ <para>You'll be given the choice during the installation to add non-free software</para>
</listitem>
</itemizedlist>
</section>
@@ -72,21 +107,19 @@ Hardware Detection Tool.</para>
<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>
+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>Zawierają one niewolne oprogramowanie.</para>
+ <para>They contain non-free software</para>
</listitem>
</itemizedlist>
</section>
@@ -94,13 +127,13 @@ releases.</emphasis></para>
<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>
@@ -108,13 +141,13 @@ releases.</emphasis></para>
<title>Live DVD GNOME</title>
<itemizedlist>
<listitem>
- <para>Tylko środowisko graficzne GNOME.</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>
@@ -122,13 +155,13 @@ releases.</emphasis></para>
<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>
@@ -139,22 +172,10 @@ releases.</emphasis></para>
<title>Powszechne możliwości</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>
@@ -162,8 +183,8 @@ DVD drive or is unable to boot from a USB stick.</para>
<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>
@@ -171,8 +192,7 @@ software.</para>
<title>netinstall-nonfree.iso</title>
<itemizedlist>
<listitem>
- <para>Contains non-free software (mostly drivers, codecs...) for people who need
-it.</para>
+ <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
</listitem>
</itemizedlist>
</section>
@@ -184,16 +204,23 @@ it.</para>
<title>Pobieranie</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>
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+ <para>If http is chosen you will also see some information regarding checksums.</para>
+
+ <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
<mediaobject>
-<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
- <para>md5sum 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>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+ <para>In the meantime, a window to download the actual ISO will open:</para>
<mediaobject>
-<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
- <para>Select the Save File option, then, click OK.</para>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+ <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
</section>
<section>
<title xml:id="integrity">Checking the integrity of the downloaded media</title>
@@ -201,52 +228,63 @@ use</link>. Then a window similar to this one appears:</para>
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>
+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"/> </imageobject></mediaobject>
- <para>and compare the result (you may have to wait for a while) with the checksum
-provided by Mageia.</para>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+ <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
</section>
</section>
<section>
<title>Wypal lub zrzuć obraz 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
+ <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>Wypalenie obrazu ISO na 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
+ <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>Zrzuć obraz ISO na pamięci USB</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>Używanie graficznych narzędzi w Magei</title>
<para>You can use a graphical tool like <link
@@ -258,7 +296,7 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
<itemizedlist>
<listitem>
<para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
-"ISO image" option;</para>
+"ISO image" option</para>
</listitem>
<listitem>
<para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
@@ -267,7 +305,7 @@ Imager</link></para>
</itemizedlist>
</section>
<section>
- <title>Użycie linii poleceń w systemie GNU/Linux</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 wrong target device.</para>
@@ -277,27 +315,27 @@ potentially valuable existing data if you specify the wrong target device.</para
<para>Otwórz konsolę</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"/> </imageobject></mediaobject>
+<imageobject> <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>Wpisz polecenie <userinput>fdisk -l</userinput></para>
+ <para>Enter the command <command>fdisk -l</command></para>
<mediaobject>
-<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
</listitem>
<listitem>
<para>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>
+<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
+<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
@@ -319,21 +357,22 @@ size is 2GB:</para>
[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
-if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/sdd
-bs=1M</userinput></emphasis></para>
+ <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+ <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+ <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
<tip>
- <para>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>Wpisz polecenie: # <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 USB stick.</para>
@@ -342,4 +381,4 @@ role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para>
</section>
</section>
</section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/pl/acceptLicense.xml b/docs/docs/stable/installer/pl/acceptLicense.xml
index d15b809f..13cc86b8 100644
--- a/docs/docs/stable/installer/pl/acceptLicense.xml
+++ b/docs/docs/stable/installer/pl/acceptLicense.xml
@@ -17,6 +17,12 @@
+
+
+
+
+
+
<info>
<!-- Made by marja on 2012 03 27 -->
<!-- NEEDS TO BE REVIEWED! -->
@@ -31,6 +37,9 @@
<!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not
sure what is causing the corruption -->
<!-- JohnR 2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
<title xml:id="acceptLicense-ti1">Licencja oraz informacje o wydaniu</title>
</info>
@@ -46,19 +55,26 @@ align="center" condition="live"/> </imageobject></mediaobject>
<title xml:id="license-ti1">Umowa Licencyjna</title>
</info>
- <para>Przed instalacją <application>Mageia</application>, proszę przeczytać
-uważnie warunki umowy licencyjnej.</para>
+ <itemizedlist>
+ <listitem>
+ <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+ </listitem>
- <para>Warunki umowy licencyjnej odnoszą się do całej dystrybucji
-<application>Mageia</application> i muszą być zaakceptowane przed
-kontynuacją instalacji.</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>Jeśli zdecydujesz że nie zgadzasz się na warunki licencji, dziękujemy za
-zainteresowanie. Kliknięcie <guibutton>Zakończ</guibutton> spowoduje ponowne
-uruchomienie komputera.</para>
+ <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
<!-- if you want two sections in a file, both need to be nested in a third section -
@@ -76,8 +92,7 @@ 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/pl/addUser.xml b/docs/docs/stable/installer/pl/addUser.xml
index a2edc324..095f9ba3 100644
--- a/docs/docs/stable/installer/pl/addUser.xml
+++ b/docs/docs/stable/installer/pl/addUser.xml
@@ -1,32 +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:lang="pl" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" 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">Zarządzanie użytkownikami</title>
+ <title xml:id="addUser-ti1">User Management</title>
</info>
+
+
+
+
+
+
+
+
<mediaobject>
<!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+ Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
<section xml:id="root-password">
<info>
<title xml:id="root-password-ti2">Ustawienie hasła administratora (root):</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 letters
+ <para>All passwords are case-sensitive. It is best to use a mixture of letters
(upper and lower case), numbers and other characters in a password.</para>
</note>
</section>
@@ -36,43 +55,46 @@ underneath, to check that the first entry was not mistyped.</para>
<title xml:id="enterUser-ti3">Dodaj użytkownika</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>Ikona</guibutton>: użycie tego przycisku zmieni ikonę
-użytkownika.</para>
- </listitem>
+ <para><emphasis role="bold">Icon</emphasis></para>
- <listitem>
- <para><guilabel>Imię i nazwisko</guilabel>: Wpisz swoje imię i nazwisko do tego
-pola tekstowego</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
@@ -82,32 +104,31 @@ management</emphasis>.</para>
</note>
</section>
- <section xml:id="addUserAdvanced" condition="classical">
+ <section condition="classical" xml:id="addUserAdvanced">
<info>
- <title xml:id="addUserAdvanced-ti3">Zaawansowane Zarządzanie Użytkownikami</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 change the
+ <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>
+<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/pl/add_supplemental_media.xml b/docs/docs/stable/installer/pl/add_supplemental_media.xml
index ecf6fa06..5f9db51a 100644
--- a/docs/docs/stable/installer/pl/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/pl/add_supplemental_media.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="pl">
<info>
- <title xml:id="add_supplemental_media-ti1">Wybór nośników (konfiguracja dodatkowych nośników instalacyjnych)</title>
+ <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
</info>
@@ -9,44 +9,49 @@
+
+
+
+
<mediaobject>
<!-- papoteur 2013-04-13 - created -->
<!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
<!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
<imageobject> <imagedata format="PNG"
fileref="dx2-add_supplemental_media.png"
xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
</imageobject></mediaobject>
- <para>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>Dla nośników sieciowych, wymagane są dwa kroki:</para>
<orderedlist>
<listitem>
- <para>Wybór i aktywacja połączenia sieciowego, jeśli jeszcze nie zostało
-ustanowione.</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
+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
+ <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>
+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/pl/ask_mntpoint_s.xml b/docs/docs/stable/installer/pl/ask_mntpoint_s.xml
index 8c4b1816..ed1df261 100644
--- a/docs/docs/stable/installer/pl/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/pl/ask_mntpoint_s.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="ask_mntpoint_s" version="5.0" xml:lang="pl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" 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">Wybierz punkty montowania</title>
</info>
@@ -21,6 +28,10 @@
+
+
+
+
<mediaobject>
<!-- Made by marja on 2012 03 28 -->
<!-- NEEDS TO BE REVIEWED! -->
@@ -33,43 +44,35 @@
write "it's type". And you're right about the redundant part, too, I removed it-->
<!-- And JohnR says the Americans are WRONG! :-)) -->
<!-- 2012-04-19 Language proofreading done -->
-<imageobject condition="classical"> <imagedata format="PNG"
-xml:id="chooseMountPoints-im1" align="center"
-fileref="dx2-chooseMountpoints.png" revision="1"/> </imageobject>
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-chooseMountpoints.png" align="center"
-xml:id="live-chooseMountPoints-im1" revision="1"/> </imageobject></mediaobject>
-
- <para>Tutaj zobaczysz partycje Linux, które zostały znalezione na Twoim
-komputerze. Jeśli nie zgadzasz się z sugestiami <application>instalatora
-DrakX</application>, możesz zmienić punkty montowania.</para>
-
- <note>
- <para>If you change anything, make sure you still have a <emphasis
-role="bold"><literal>/</literal></emphasis> (root) partition.</para>
- </note>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
+
+ <para>Here you see the Linux partitions that have been found on your computer. If
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
<itemizedlist>
<listitem>
- <para>Every partition is shown to the left as: <emphasis role="bold">Device
-(capacity, mount point, type).</emphasis></para>
+ <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
</listitem>
<listitem>
- <para><emphasis role="bold">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>
- </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>
+ <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
</listitem>
<listitem>
@@ -79,12 +82,17 @@ mount point field blank.</para>
</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>
- <para>Jeśli jesteś pewny że punkty montowania są dobrze ustawione, kliknij
-<guibutton>Dalej</guibutton>, by zdecydować które partycje sformatować.</para>
-</section> \ No newline at end of file
+ <tip>
+ <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+ </tip>
+
+ <para>If you are sure the mount points are correct, click on
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
+</section>
diff --git a/docs/docs/stable/installer/pl/bestTime.xml b/docs/docs/stable/installer/pl/bestTime.xml
index 4f46792d..59341385 100644
--- a/docs/docs/stable/installer/pl/bestTime.xml
+++ b/docs/docs/stable/installer/pl/bestTime.xml
@@ -1,21 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="pl" xml:id="bestTime"
- xmlns="http://docbook.org/ns/docbook"
- xmlns:ns6="http://www.w3.org/1999/xlink"
- xmlns:ns5="http://www.w3.org/1999/xhtml"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1998/Math/MathML"
- xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="pl" xml:id="bestTime">
+
+
<info>
- <title xml:id="bestTime-ti1">Ustawienia zegara</title>
+ <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
</info>
-
<mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-bestTime.png"
-format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
-
- <para>W tym kroku, musisz wybrać w jakim czasie jest ustawiony twój zegar, czas
-lokalny czy czas UTC.</para>
-
- <para>W sekcji zaawansowane znajdziesz więcej opcji o ustawieniach zegara.</para>
-</section>
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+ <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+ <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/pl/bootLive.xml b/docs/docs/stable/installer/pl/bootLive.xml
index 335f02d3..bdc63aee 100644
--- a/docs/docs/stable/installer/pl/bootLive.xml
+++ b/docs/docs/stable/installer/pl/bootLive.xml
@@ -1,29 +1,176 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="pl"><info><title xml:id="bootLive-ti1">Uruchom Mageia jako wersję Live</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Uruchamianie medium</title></info><section><info><title xml:id="bootLive11-ti1">Z płyty</title></info><para>Możesz uruchomić prosto z urządznia, którego użyłeś do wypalenia obrazu
-(CD-ROM, DVD-ROM...). Zwykle musisz tylko włożyć płytę aby uruchomić
-instalację automatycznie po zresetowaniu komputera. Jeżeli to nie następuje
-musisz zmodyfikować ustawienia w BIOSie, lub kliknąć klawisz pozwalajcy ci
-na wybór urządzenia, z którego komputer uruchomi się.</para><para>Odnosząc się do posiadanego przez ciebie sprzętu oraz tego, jak jest
-skonfigurowany, otrzymasz pierwszy albo drugi z ekranów poniżej.</para></section><section><info><title xml:id="bootLive12-ti1">Z urządzenia USB</title></info><para>Możesz uruchomić z urządzenia USB, na który wypaliłeś obraz ISO. Odnosząc
-się do twoich ustawień BIOS komputer może uruchomić się prosto z urządzenia
-USB podłączonego do portu. Jeżeli to nie następuje powinieneś zmodyfikować
-ustawienia w BIOS lub kliknąć klawisz pozwalający ci na wybór urządzenia, z
-którego komputer się uruchomi.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">W trybie BIOS/CSM/Legacy</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Pierwszy ekran podczas uruchamiania w trybie BIOS</para></caption></mediaobject><para>W środkowym menu, masz wybór pomiędzy trzema akcjami:</para><itemizedlist><listitem><para>Uruchom Mageia: Mageia 5 uruchomi się z podłączonego medium (CD/DVD lub
-urządzenia USB) bez interwencji na twardym dysku, więc spodziewaj się
-wolnego działania systemu. Po uruchomieniu, możesz przejść do instalacji na
-dysku twardym.</para></listitem><listitem><para>Zainstaluj Mageia: Ten wybór zainstaluje Mageia bezpośrednio na dysku
-twardym.</para></listitem><listitem><para>Uruchomienie z dysku twardego: Ten wybór pozwoli ci uruchomić system z dysku
-twardego, jak zwykle, gdy żadne media (CD/DVD lub urządzenie USB) nie są
-podłączone. (nie działa z mageia 5).</para></listitem></itemizedlist><para>W dolnym menu, są Opcje Bootowania:</para><itemizedlist><listitem><para>F1 - Pomoc. Wyjaśnij opcje "splash", "apm", "acpi" i "Ide"</para></listitem><listitem><para>F2 - Język. Wybierz język wyświetlany na ekranach.</para></listitem><listitem><para>F3 - Rozdzielczość obrazu. Wybierz z pośród tekst, 640x400, 800x600,
-1024x728</para></listitem><listitem><para>F4 - CD-ROM. CD-ROM lub Inny. Normalnie instalacja odbywa się z
-zamontowanego medium instalacyjnego. Tutaj wybierz inne źródła, takie jak
-serwer FTP lub NFS. Jeżeli instalacja odbywa się w sieci z serwerem SLP
-wybierz jedno ze źródeł instalacyjnych dostępnych na serwerze za pomocą tej
-opcji.</para></listitem><listitem><para>F5 - Sterownik. Tak lub Nie. System jest świadomy dostępności dysku
-opcjonalnego z aktualizacją sterownika i będzie wymagał jego zamontowania
-podczas procesu instalacji.</para></listitem><listitem><para>F6 - Opcje jądra. Jest to możliwość wybrania opcji według twojego sprzętu
-oraz sterowniki do użycia.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">W trybie UEFI</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>Pierwszy ekran podczas uruchamiania w systemie UEFI z dysku</para></caption></mediaobject><para>Masz tylko opcje do uruchomienia Magei w trybie Live (pierwszy wybór), lub
-proces instalacji (drugi wybór).</para><para>Jeżeli uruchomiłeś z urządzenia USB, otrzymasz dwie dodatkowe linie będące
-duplikatem poprzednich z dopiskiem "USB". Musisz wybrać którąś z nich.</para><para>W każdym przypadku, pierwsze kroki będą takie same aby wybrać język, strefę
-czasową oraz klawiaturę, później proces różni się, z <link
-linkend="testing"> dodatkowych kroków w trybie Live</link>.</para></section></section> \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <info>
+ <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">Uruchom Mageia jako wersję Live</title>
+ </info>
+
+ <section xml:id="bootLive-1">
+ <info>
+ <title xml:id="bootLive1-ti1">Uruchamianie 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">W trybie BIOS/CSM/Legacy</title>
+ </info>
+
+ <mediaobject>
+ <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+ <caption>
+ <para>Pierwszy ekran podczas uruchamiania w trybie BIOS</para>
+ </caption>
+ </mediaobject>
+
+ <itemizedlist>
+ <title>Menu</title>
+
+ <listitem>
+ <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+ <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+ <para>Once the boot is done, you can proceed to the installation.</para>
+
+ <itemizedlist>
+ <listitem>
+ <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+ <para>Boot the Mageia Live system using non-free video drivers</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+ <para>This option will install Mageia to a hard disk.</para>
+
+ <itemizedlist>
+ <listitem>
+ <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+ <para>Install Mageia using non-free video drivers</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para><emphasis role="bold">Memory Test</emphasis></para>
+
+ <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+ <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+ </listitem>
+ </itemizedlist>
+ </section>
+
+ <section xml:id="uefimode">
+ <info>
+ <title xml:id="uefimode-ti1">W trybie UEFI</title>
+ </info>
+
+ <mediaobject condition="live">
+ <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+ <caption>
+ <para>First screen while booting in UEFI mode</para>
+ </caption>
+ </mediaobject>
+
+ <itemizedlist>
+ <title>Menu</title>
+
+ <listitem>
+ <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+ <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS). Once the
+boot is done, you can proceed to the installation</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+ <para>This option will install Mageia to a hard disk.</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+ <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+ </listitem>
+ </itemizedlist>
+
+ <note>
+ <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+ </note>
+ </section>
+</section>
diff --git a/docs/docs/stable/installer/pl/chooseDesktop.xml b/docs/docs/stable/installer/pl/chooseDesktop.xml
index 651d578f..11ee1294 100644
--- a/docs/docs/stable/installer/pl/chooseDesktop.xml
+++ b/docs/docs/stable/installer/pl/chooseDesktop.xml
@@ -1,28 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pl" xml:id="chooseDesktop">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="chooseDesktop"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xlink"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
+
+
+
+
<!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
<info>
- <title xml:id="chooseDesktop-ti1">Wybór pulpitu</title>
+ <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">Wybór pulpitu</title>
</info>
- <para>Depending on your selection here, you may be offered further screens to
-fine-tune your choice.</para>
+
+
+ <para>Some choices made here will open other screens with related options.</para>
- <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>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
<mediaobject>
-<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png"
-align="center"/> </imageobject></mediaobject>
-
- <para>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
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+ <itemizedlist>
+ <listitem>
+ <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+ </listitem>
+
+ <listitem>
+ <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+ </listitem>
+ </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/pl/choosePackageGroups.xml b/docs/docs/stable/installer/pl/choosePackageGroups.xml
index 027ec384..9cf33496 100644
--- a/docs/docs/stable/installer/pl/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/pl/choosePackageGroups.xml
@@ -1,12 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pl" xml:id="choosePackageGroups">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pl" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
<info>
<title xml:id="choosePackageGroups-ti1">Wybór grup pakietów</title>
</info>
+
+
<mediaobject>
<!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
<imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
align="center"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/pl/choosePackagesTree.xml b/docs/docs/stable/installer/pl/choosePackagesTree.xml
index 2f985fba..62b14777 100644
--- a/docs/docs/stable/installer/pl/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/pl/choosePackagesTree.xml
@@ -1,21 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" version="5.0" xml:lang="pl">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="pl">
<info>
<title xml:id="choosePackagesTree-ti1">Samodzielny wybór pakietów</title>
</info>
+
+
+
+
<mediaobject>
<!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
<imageobject> <imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
align="center"/> </imageobject></mediaobject>
<para>Here you can add or remove any extra packages to customize your
installation.</para>
- <para>Po dokonaniu wyboru, możesz kliknąć na <guibutton>ikonę
-dyskietki</guibutton> na dole okna, aby zachować swój wybór pakietów
-(zapisywanie na dysku USB także działa). Możesz użyć tego pliku do
-instalacji tych samych pakietów na innym komputerze, naciskając tą samą
-ikonę i wybierając wczytanie pliku.</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/pl/configureServices.xml b/docs/docs/stable/installer/pl/configureServices.xml
index bbf660aa..cf3ce41d 100644
--- a/docs/docs/stable/installer/pl/configureServices.xml
+++ b/docs/docs/stable/installer/pl/configureServices.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pl" xml:id="configureServices">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="pl" xml:id="configureServices">
<info>
<title xml:id="configureServices-ti1">Konfiguracja usług</title>
</info>
@@ -7,20 +7,31 @@
+
+
+
+
<mediaobject>
<!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
<!-- 2013-05-05 marja - added screenshot -->
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
<imageobject> <imagedata format="PNG" fileref="dx2-configureServices.png"
xml:id="configureServices-im1" align="center" revision="1"/> </imageobject></mediaobject>
<para xml:id="configureServices-pa1" revision="1">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>
+ <itemizedlist>
+ <listitem>
+ <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+ </listitem>
- <para xml:id="configureServices-pa4" revision="1">Jeżeli zaznaczysz usługę, niektóre informacje o niej pokażą w okienku
+ <listitem>
+ <para xml:id="configureServices-pa4" revision="1">Jeżeli zaznaczysz usługę, niektóre informacje o niej pokażą w okienku
poniżej.</para>
+ </listitem>
+ </itemizedlist>
<para xml:id="configureServices-pa5" revision="1">Zmień to tylko i wyłącznie wtedy, kiedy wiesz co robisz.</para>
</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/pl/configureTimezoneUTC.xml b/docs/docs/stable/installer/pl/configureTimezoneUTC.xml
index cbfc0277..e12b9203 100644
--- a/docs/docs/stable/installer/pl/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/pl/configureTimezoneUTC.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureTimezoneUTC" version="5.0" xml:lang="pl">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="pl">
<info>
<title xml:id="configureTimezoneUTC-ti6">Konfiguruj strefę czasową</title>
</info>
@@ -7,17 +7,27 @@
+
+
+
+
<mediaobject>
<!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
<!-- 2013-05-05 marja - added screenshot -->
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
<imageobject condition="classical"> <imagedata format="PNG"
xml:id="configureTimezoneUTC-im1" align="center"
fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
-<imageobject> <imagedata format="PNG" fileref="live-timeZone.png"
-condition="live"/> </imageobject></mediaobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
- <para xml:id="configureTimezoneUTC-pa1" revision="1">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 UTC.</para>
diff --git a/docs/docs/stable/installer/pl/configureX_card_list.xml b/docs/docs/stable/installer/pl/configureX_card_list.xml
index f1fa18b4..625ac299 100644
--- a/docs/docs/stable/installer/pl/configureX_card_list.xml
+++ b/docs/docs/stable/installer/pl/configureX_card_list.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_card_list" version="5.0" xml:lang="pl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="configureX_card_list"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns2="http://www.w3.org/1999/xlink"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
+
+
@@ -15,13 +26,15 @@
<!-- tproof -->
<!-- lproof -->
<!-- Done corrections accordind to tmb remarks. Papoteur -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
<title xml:id="configureX_card_list-ti1">Wybierz System Graficzny (Skonfiguruj swoją Kartę Graficzną)</title>
</info>
<mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_card_list-im1"
-align="center" fileref="dx2-configureX_card_list.png" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
<para>DrakX posiada bardzo szeroką bazę danych kart wideo, oraz zwykle
zidentyfikuje twoje urządzenie wideo poprawnie.</para>
@@ -29,33 +42,34 @@ zidentyfikuje twoje urządzenie wideo poprawnie.</para>
<para>Jeżeli instalator nie wykrył twojej karty graficznej poprawnie i wiesz, jaką
kartę posiadasz, możesz wybrać jedną za pomocą: <itemizedlist>
<listitem>
- <para>dostawca</para>
+ <para>Vendor</para>
</listitem>
<listitem>
- <para>następnie nazwa karty</para>
+ <para>then the make of your card</para>
</listitem>
<listitem>
- <para>oraz typ karty</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
+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/pl/configureX_chooser.xml b/docs/docs/stable/installer/pl/configureX_chooser.xml
index 992a6b04..7a4efdda 100644
--- a/docs/docs/stable/installer/pl/configureX_chooser.xml
+++ b/docs/docs/stable/installer/pl/configureX_chooser.xml
@@ -1,62 +1,92 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_chooser" version="5.0" xml:lang="pl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" 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">Konfiguracja Karty Graficznej i Monitora</title>
</info>
+
+
+
+
+
+
+
+
<mediaobject>
<!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
-<imageobject> <imagedata format="PNG" xml:id="configureX_chooser-im1"
-fileref="dx2-configureX_chooser.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
<para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
-you chose for this install of <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>
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+ <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
<itemizedlist>
<listitem>
- <para xml:id="configureX_chooser-pa2" revision="1"><emphasis><guibutton>Karta graficzna</guibutton></emphasis>: Wybierz swoją
-kartę graficzną z listy.</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">Niepoprawna wartość odświeżania może uszkodzić 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> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
</listitem>
<listitem>
- <para xml:id="configureX_chooser-pa4" revision="1"><emphasis><guibutton>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 to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
</listitem>
<listitem>
- <para xml:id="configureX_chooser-pa6" revision="1"><emphasis><guibutton>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>
+</section>
diff --git a/docs/docs/stable/installer/pl/configureX_monitor.xml b/docs/docs/stable/installer/pl/configureX_monitor.xml
index fbf1f49c..d52232e5 100644
--- a/docs/docs/stable/installer/pl/configureX_monitor.xml
+++ b/docs/docs/stable/installer/pl/configureX_monitor.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_monitor" version="5.0" xml:lang="pl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="configureX_monitor"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns2="http://www.w3.org/1999/xlink"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
+
+
@@ -12,64 +23,82 @@
<!-- Further text JohnR 2012-08-30 -->
<!-- tproof -->
<!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
<title xml:id="configureX_monitor-ti1">Wybór monitora</title>
</info>
- <para xml:id="configureX_monitor-pa1" revision="1">DrakX has a very comprehensive database of monitors and will usually
+ <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
+ <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>
</warning>
<mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_monitor-im1"
-fileref="dx2-configureX_monitor.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
+format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
- <para xml:id="configureX_monitor-pa2" revision="1"><emphasis>Własny</emphasis></para>
+ <variablelist spacing="compact">
+ <varlistentry>
+ <term revision="1" xml:id="configureX_monitor-pa2">Własne</term>
- <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters, the vertical refresh
+ <listitem>
+ <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
rate and the horizontal sync rate. Vertical refresh determines how often the
screen is refreshed and horizontal sync is the rate at which scan lines are
displayed.</para>
- <para revision="1" xml:id="configureX_monitor-pa4">It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor
+ <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>
- <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>Dostawca</emphasis></para>
+ <varlistentry>
+ <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</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>dostawca</para>
+ <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
</listitem>
+ </varlistentry>
- <listitem>
- <para>nazwa producenta monitora</para>
- </listitem>
+ <varlistentry>
+ <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
<listitem>
- <para>Opis monitora</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/pl/diskPartitioning.xml b/docs/docs/stable/installer/pl/diskPartitioning.xml
new file mode 100644
index 00000000..4e494c3e
--- /dev/null
+++ b/docs/docs/stable/installer/pl/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="pl" version="5.0" xml:lang="pl">
+
+
+ <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+ <xi:include href="doPartitionDisks.xml"/>
+
+ <xi:include href="ask_mntpoint_s.xml"/>
+
+ <xi:include href="takeOverHdConfirm.xml"/>
+
+ <xi:include href="diskdrake.xml"/>
+
+ <xi:include href="formatPartitions.xml"/>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/pl/diskdrake.xml b/docs/docs/stable/installer/pl/diskdrake.xml
index b2d83904..1b414120 100644
--- a/docs/docs/stable/installer/pl/diskdrake.xml
+++ b/docs/docs/stable/installer/pl/diskdrake.xml
@@ -1,65 +1,108 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pl" xml:id="diskdrake">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xreflabel="DiskDrake" xml:id="diskdrake"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1999/xhtml"
+ xmlns:ns2="http://www.w3.org/1999/xlink"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
+
+
+
+
+
+
<info>
<!-- Lebarhon 2016 12 16 updated for Mageia 6
Lebarhon 20170902 added SC-->
-<title xml:id="diskdrake-ti1">Zaawansowany podział na partycje za pomocą DiskDrake</title>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
</info>
<mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
- <warning>
- <para revision="3" xml:id="diskdrake-pa1">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>
- </warning>
+ <itemizedlist>
+ <listitem>
+ <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+ </listitem>
- <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>
+ <listitem>
+ <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+ </listitem>
- <para xml:id="diskdrake-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>
+ <listitem>
+ <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+or choose a filesystem and a mount point, resize it or wipe
+it. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+ </listitem>
- <para xml:id="diskdrake-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>
+ <listitem>
+ <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+ </listitem>
+ </itemizedlist>
- <para xml:id="diskdrake-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>
+ <warning>
+ <orderedlist>
+ <listitem>
+ <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+ </listitem>
- <para xml:id="diskdrake-pa6a" revision="1">Continue until you have adjusted everything to your satisfaction.</para>
+ <listitem>
+ <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+ </listitem>
+ </orderedlist>
+ </warning>
+
+ <important>
+ <itemizedlist>
+ <listitem>
+ <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+ </listitem>
- <para xml:id="diskdrake-pa7" revision="1">Jeśli wszystko zostało już ustawione kliknij <guibutton>Gotowe</guibutton>.</para>
+ <listitem>
+ <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+ </listitem>
+ </itemizedlist>
+ </important>
- <note>
- <para>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>
+ <figure>
+ <title>EFI System Partition</title>
- <para><mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake2.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></para>
- </note>
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
- <note>
- <para>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>
+<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
- </note>
-</section> \ No newline at end of file
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/pl/doPartitionDisks.xml b/docs/docs/stable/installer/pl/doPartitionDisks.xml
index 6f283297..099ee181 100644
--- a/docs/docs/stable/installer/pl/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/pl/doPartitionDisks.xml
@@ -1,171 +1,213 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pl" xml:id="doPartitionDisks">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="doPartitionDisks"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1999/xhtml"
+ xmlns:ns="http://docbook.org/ns/docbook">
- <info>
- <!---->
-<!-- lebarhon 20161216 updated for Mageia 6
+
+
+
+
+
+
+
+
+
+ <info>
+ <!--lebarhon 20161216 updated for Mageia 6
+
lebarhon 20170209 added SC-->
-<title xml:id="doPartitionDisks-ti1">Partycjonowanie</title>
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC,
+ but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
</info>
- <para xml:id="doPartitionDisks-pa1" revision="1">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>
+ <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
- <para xml:id="doPartitionDisks-pa2" revision="1">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"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
- <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist>
- <listitem>
- <para revision="1" xml:id="doPartitionDisks-pa4">Użyj istniejących partycji</para>
+ <itemizedlist>
+ <title>Main Options</title>
+
+ <listitem>
+ <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
- <para xml:id="doPartitionDisks-pa5" revision="1">Jeśli dostępna jest ta opcja, oznacza to że zostały znalezione partycje
+ <para revision="1" xml:id="doPartitionDisks-pa5">Jeśli dostępna jest ta opcja, oznacza to że zostały znalezione partycje
linuksowe i mogą być użyte do instalacji.</para>
- </listitem>
+ </listitem>
- <listitem>
- <para xml:id="doPartitionDisks-pa6" revision="1">Wykorzystaj wolne miejsce</para>
+ <listitem>
+ <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
- <para xml:id="doPartitionDisks-pa7" revision="1">Jeśli posiadasz nieużywane miejsce na dysku (niesformatowane), może być ono
+ <para revision="1" xml:id="doPartitionDisks-pa7">Jeśli posiadasz nieużywane miejsce na dysku (niesformatowane), może być ono
wykorzystane do instalacji Magei.</para>
- </listitem>
+ </listitem>
- <listitem>
- <para xml:id="doPartitionDisks-pa8" revision="1">Wykorzystaj wolne miejsce na partycji Windows</para>
+ <listitem>
+ <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
- <para xml:id="doPartitionDisks-pa9" revision="1">Jeśli masz niewykorzystane miejsce na partycji Windows, instalator
-zaproponuje, aby je wykorzystać.</para>
+ <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
- <para xml:id="doPartitionDisks-pa10" revision="2">To może być użyteczne rozwiązanie, aby przygotować miejsce na instalację
-Magei, jest to jednak ryzykowna operacja więc powinieneś się upewnić że masz
-kopię zapasową ważnych plików!</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">Zauważ, że ta metoda spowoduje zmniejszenie rozmiaru partycji
Windows. Partycja musi być "czysta", co oznacza, że Windows musi być
poprawnie zamknięty za ostatnim razem gdy był używany. Musi być także
zdefragmentowany, choć to nie daje pewności że wszystkie pliki zostały
przesunięte poza obszar dysku, który zostanie użyty. Dlatego też bardzo
wskazane jest zrobienie kopii zapasowej ważnych plików.</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">Wymaż i wykorzystaj cały dysk</para>
-
- <para xml:id="doPartitionDisks-pa13" revision="1">This option will allocate the entire drive for Mageia.</para>
+ <listitem>
+ <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
- <para xml:id="doPartitionDisks-pa14" revision="1">Zauważ! WSZYSTKIE dane z wybranego dysku zostaną wymazane. Uważaj!</para>
+ <para revision="1" xml:id="doPartitionDisks-pa17">Ta opcja daje Ci całkowitą kontrolę nad sposobem przeprowadzenia instalacji.</para>
+ </listitem>
+ </itemizedlist>
- <para xml:id="doPartitionDisks-pa15" revision="1">Jeśli chcesz używać części tego dysku do czegoś innego, albo już masz na
-dysku dane, których nie chcesz stracić, nie używaj tej opcji.</para>
- </listitem>
- </itemizedlist><itemizedlist>
- <listitem>
- <para xml:id="doPartitionDisks-pa16" revision="1">Custom disk partitioning</para>
+ <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+ <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root) partition.</para>
+ </listitem>
+
+ <listitem>
+ <para>If the total available space is greater than 50 GB, then three partitions
+are created</para>
- <para xml:id="doPartitionDisks-pa17" revision="1">Ta opcja daje Ci całkowitą kontrolę nad sposobem przeprowadzenia instalacji.</para>
- </listitem>
- </itemizedlist></para>
+ <itemizedlist>
+ <listitem>
+ <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+ </listitem>
- <para><emphasis role="bold">Partition sizing:</emphasis></para>
+ <listitem>
+ <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+ </listitem>
- <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>
+ <listitem>
+ <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ </itemizedlist>
- <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>
+ <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
- <listitem>
- <para>If the total available space is greater than 50 GB, then three partitions
-are created</para>
+ <itemizedlist>
+ <listitem>
+ <para>50 GB for <filename>/</filename></para>
+ </listitem>
- <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 przestrzeni zostanie przydzielona jako swap, jednak maksimum wynosi 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>
+ <listitem>
+ <para>4 GB for <filename>swap</filename></para>
+ </listitem>
- <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>
+ <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 partitioning</emphasis>
-option is the only one that allows to check it has been correctly done</para>
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+ <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+ <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
</note>
- <note>
- <para>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>
+ <mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
- <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
-</imageobject></mediaobject>
- </note>
+ <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
- <warning>
+ <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>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
+settings:</para>
- <para><emphasis role="bold">Align to</emphasis> = MiB</para>
+ <itemizedlist>
+ <listitem>
+ <para><emphasis>Align to</emphasis> = MiB</para>
+ </listitem>
- <para><emphasis role="bold">Free space preceding (MiB)</emphasis> = 2</para>
+ <listitem>
+ <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+ </listitem>
+ </itemizedlist>
<para>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/pl/exitInstall.xml b/docs/docs/stable/installer/pl/exitInstall.xml
index 17248838..b9e4edbe 100644
--- a/docs/docs/stable/installer/pl/exitInstall.xml
+++ b/docs/docs/stable/installer/pl/exitInstall.xml
@@ -5,23 +5,28 @@
+
+
+
+
<mediaobject>
<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
<imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
- <para xml:id="exitInstall-pa1" revision="2">Instalacja i konfiguracja <application>Magei</application>została
-zakończona, teraz można bezpiecznie usunąć nośnik instalacyjny i uruchomić
-komputer ponownie.</para>
+ <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
- <para xml:id="exitInstall-pa2" revision="2">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 selected and started.</para>
<para xml:id="exitInstall-pa4" revision="1">Enjoy!</para>
- <para xml:id="exitInstall-pa5" revision="1">Jeśli masz jakieś pytania, bądź chciał(a)byś dołączyć do pojektu Mageia -
-odwiedź www.mageia.org</para>
+ <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/pl/firewall.xml b/docs/docs/stable/installer/pl/firewall.xml
index 479c0c49..068e910c 100644
--- a/docs/docs/stable/installer/pl/firewall.xml
+++ b/docs/docs/stable/installer/pl/firewall.xml
@@ -1,6 +1,12 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="pl">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="pl" xreflabel="Firewall">
+
+
+
+
<info>
- <title xml:id="firewall-ti1">Firewall</title>
+ <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">Firewall</title>
</info>
<para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
@@ -9,22 +15,22 @@ target system. This, in turn, allows the corresponding services on the
system to be accessible from the 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
+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>
+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
+ <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/pl/formatPartitions.xml b/docs/docs/stable/installer/pl/formatPartitions.xml
index 6f07bba9..6a0dfd2c 100644
--- a/docs/docs/stable/installer/pl/formatPartitions.xml
+++ b/docs/docs/stable/installer/pl/formatPartitions.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="formatPartitions" version="5.0" xml:lang="pl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" 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">Formatowanie</title>
</info>
@@ -11,33 +18,36 @@
+
+
<mediaobject>
<!-- Made by marja on 2012 03 29 -->
<!-- NEEDS TO BE REVIEWED! -->
<!-- marja 2012-04-24 added screenshot -->
<!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-formatPartitions.png" xml:id="formatPartitions-im1"
-align="center" revision="1"/> </imageobject> <imageobject condition="live">
-<imagedata format="PNG" xml:id="live-formatPartitions-im1" align="center"
-fileref="live-formatPartitions.png" revision="1"/> </imageobject></mediaobject>
-
- <para xml:id="formatPartitions-pa1" revision="2">Here you can choose which partition(s) you wish to format. Any data on
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
+
+ <para revision="2" xml:id="formatPartitions-pa1">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">Zazwyczaj przynajmniej te partycje, które zaznaczył instalator, powinny być
-sformatowane</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">Kliknij na <guibutton>Zaawansowane</guibutton> aby wybrać, które partycje
-mają zostać sprawdzone na obecnoś tzw. <emphasis>bad bloków</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 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>
+ <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
</tip>
- <para xml:id="formatPartitions-pa5" revision="1">Jeśli jesteś zadowolony ze swojego wyboru, kliknij
-<guibutton>Dalej</guibutton> aby kontynuować.</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/pl/graphicalConfiguration.xml b/docs/docs/stable/installer/pl/graphicalConfiguration.xml
new file mode 100644
index 00000000..25224cc5
--- /dev/null
+++ b/docs/docs/stable/installer/pl/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="graphicalConfiguration"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xlink"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
+ <info>
+ <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+ </info>
+
+ <xi:include href="configureX_chooser.xml"/>
+
+ <xi:include href="configureX_card_list.xml"/>
+
+ <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/pl/installUpdates.xml b/docs/docs/stable/installer/pl/installUpdates.xml
index ea79e373..3279d681 100644
--- a/docs/docs/stable/installer/pl/installUpdates.xml
+++ b/docs/docs/stable/installer/pl/installUpdates.xml
@@ -1,7 +1,5 @@
<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="pl">
- <info>
- <title xml:id="installUpdates-ti1">Aktualizacje</title>
- </info>
+
@@ -11,20 +9,38 @@
- <mediaobject>
-<!-- Made by marja on 2012 03 30 -->
+
+
+ <info>
+ <!-- Made by marja on 2012 03 30 -->
<!-- NEEDS TO BE REVIEWED! -->
-<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
<!-- marja, 2012-04-24 added screenshot -->
-<imageobject> <imagedata format="PNG" fileref="dx2-installUpdates.png"
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">Aktualizacje</title>
+ </info>
+
+ <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
- <para xml:id="installUpdates-pa1" revision="1">Od czasu gdy ta wersja <application>Magei</application> została
-udostępniona, niektóre pakiety zostały zaktualizowane lub poprawione.</para>
+ <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+ <itemizedlist>
+ <listitem>
+ <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+ </listitem>
- <para xml:id="installUpdates-pa2" revision="1">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
+ <listitem>
+ <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
aren't connected to the Internet</para>
+ </listitem>
- <para xml:id="installUpdates-pa3" revision="1">Press <guibutton>Next</guibutton> to continue</para>
+ <listitem>
+ <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+ </listitem>
+ </itemizedlist>
</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/pl/installer.xml b/docs/docs/stable/installer/pl/installer.xml
index ba7f5c62..8ade0558 100644
--- a/docs/docs/stable/installer/pl/installer.xml
+++ b/docs/docs/stable/installer/pl/installer.xml
@@ -6,166 +6,164 @@
xmlns:ns3="http://www.w3.org/1999/xhtml"
xmlns:ns2="http://www.w3.org/1999/xlink"
xmlns:ns="http://docbook.org/ns/docbook">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
<info>
- <title xml:id="installer-ti1">DrakX instalator Mageia</title>
+ <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+ Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+ So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">DrakX instalator Mageia</title>
</info>
<para>Niezależnie czy jesteś początkującym, czy zaawansowanym użytkownikiem
GNU-Linuxa, instalator Magei jest zaprojektowany tak, aby uczynić instalację
lub aktualizację łatwą i przyjemną. </para>
- <para>Pierwszy ekran instalatora zawiera różne opcje,jednak opcja zaznaczona
-domyślnie rozpoczyna instalację i zazwyczaj będzie to wszystko czego
-potrzebujesz.</para>
+ <section>
+ <title>Etapy instalacji</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>Ekran powitalny instalatora</title>
- <section>
- <title>Using a Mageia DVD</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>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>
+ <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>Legacy (BIOS) Systems</title>
<mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</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>
- <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome.png"/> </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>
+ <listitem>
+ <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+ <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis role="bold">Rescue System</emphasis></para>
+
+ <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis role="bold">Memory Test</emphasis></para>
+
+ <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis role="bold">F2: Language</emphasis></para>
+
+ <para>Press F2 for alternative languages.</para>
+ </listitem>
+ </itemizedlist>
</section>
- </section>
- <section>
- <title>Etapy instalacji</title>
+ <section>
+ <title>UEFI Systems</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>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>
- <para>Each step has one or more screens which may also have
-<guibutton>Advanced</guibutton> sections with extra, less commonly required,
-options.</para>
+ <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
- <para>Most screens have <guibutton>Help</guibutton> buttons for further details
-about the particular step.</para>
+ <itemizedlist>
+ <title>Menu</title>
- <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>
+ <listitem>
+ <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+ </section>
</section>
<section>
@@ -176,19 +174,20 @@ rebooting is what you want, go to a text terminal by pressing the three keys
<itemizedlist>
<listitem>
- <para>Po ekranie powitalnym nie wyświetla się ekran wyboru języka. To może się
-zdarzyć dla niektórych kart graficznych lub starszych komputerów. Spróbuj
-użyć niskiej rozdzielczości wpisując w linii komend <code>vgalo</code>.</para>
+ <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
</listitem>
<listitem>
<para>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>
+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>
@@ -196,10 +195,11 @@ text mode.</para>
<section>
<title>Zawieszenie się instalacji</title>
- <para>Jeśli system zawiesi się podczas instalacji, może to oznaczać problem z
-detekcją sprzętu. W tym przypadku automatyczna detekcja sprzętu może zostać
-pominięta. Wpisz w linii komend <code>noauto</code>. Ta opcja może być
-łączona z innymi opcjami jeśli zajdzie taka potrzeba.</para>
+ <para>If the system appeared to freeze during the installation, this may be a
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
</section>
<section>
@@ -207,17 +207,18 @@ pominięta. Wpisz w linii komend <code>noauto</code>. Ta opcja może być
<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>
+<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>Dynamiczne partycje</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
+ <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
</section>
</section>
diff --git a/docs/docs/stable/installer/pl/locale.xml b/docs/docs/stable/installer/pl/locale.xml
new file mode 100644
index 00000000..301ea8f0
--- /dev/null
+++ b/docs/docs/stable/installer/pl/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns:m="http://www.w3.org/1998/Math/MathML"
+ xmlns:html="http://www.w3.org/1999/xhtml"
+ xmlns:db="http://docbook.org/ns/docbook">
+ <title>Locale</title>
+
+ <xi:include href="configureTimezoneUTC.xml"/>
+
+ <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/pl/login.xml b/docs/docs/stable/installer/pl/login.xml
index bbdb44f5..c8dc5e3e 100644
--- a/docs/docs/stable/installer/pl/login.xml
+++ b/docs/docs/stable/installer/pl/login.xml
@@ -1,7 +1,22 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="pl"><info><title xml:id="label-to-adapt-ti1">Ekran logowania</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
-fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>Ekran logowania KDM</para></caption></mediaobject><para>Finally, you will come to the login screen.</para><para>Wprowadź twoją nazwę użytkownika oraz hasło, i w ciągu kilku sekund
-powinieneś znaleźć się na załadowanym pulpicie KDE lub GNOME, w zależności
-od tego, które medium live zostało użyte. Możesz teraz zacząć używać twojej
-instalacji Magei.</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" xml:lang="pl">
+
+ <info>
+ <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+ </info>
+ <mediaobject condition="live">
+ <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+ <caption>
+ <para>SDDM login screen</para>
+ </caption>
+ </mediaobject>
+ <para>Finally, you will come to the desktop login screen.</para>
+ <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+ <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/pl/media_selection.xml b/docs/docs/stable/installer/pl/media_selection.xml
index b9ccdde0..45f077ea 100644
--- a/docs/docs/stable/installer/pl/media_selection.xml
+++ b/docs/docs/stable/installer/pl/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="pl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="media_selection"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xlink"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
<info>
- <title xml:id="media_selection-ti1">Wybór nośników (Nonfree)</title>
+ <title xml:id="media_selection-ti1">Nonfree Media</title>
</info>
@@ -11,14 +18,16 @@
+
+
<mediaobject>
<!-- papoteur 2013-04-11 - created -->
<!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
<!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
<!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
-<imageobject> <imagedata format="PNG" xml:id="media_selection-im1"
-align="center" revision="1" fileref="dx2-media_selection.png"/>
-</imageobject></mediaobject>
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
+<imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
+format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
<para>Tutaj jest lista dostępnych repozytoriów. Nie wszystkie repozytoria są
dostępne, zależy to od nośników jakie wykorzystujesz do instalacji. Wybór
@@ -32,11 +41,11 @@ zawiera ono podstawowe pakiety dystrybucji.</para>
</listitem>
<listitem>
- <para>Repozytorium <emphasis>Nonfree</emphasis> zawiera pakiety wolne od opłat,
-które mogą być udostępniane przez Mageię, lecz zawierają oprogramowanie do
-którego źródła nie są dostępne (stąd nazwa - Nonfree). To repozytorium
-zawiera np. własnościowe sterowniki do kart graficznych nVidia oraz ATI,
-firmware dla niektórych kart WIFI, itp.</para>
+ <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
+free-of-charge, i.e. Mageia may redistribute them, but they contain
+closed-source software (hence the name - Nonfree). For example this
+repository includes nVidia and AMD graphics card proprietary drivers,
+firmware for various WiFi cards, etc.</para>
</listitem>
<listitem>
diff --git a/docs/docs/stable/installer/pl/minimal-install.xml b/docs/docs/stable/installer/pl/minimal-install.xml
index dcb7b7e9..44a445c8 100644
--- a/docs/docs/stable/installer/pl/minimal-install.xml
+++ b/docs/docs/stable/installer/pl/minimal-install.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" version="5.0" xml:lang="pl">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="pl">
<!--2012-12-26 marja - exported this section from choosePackages.xml to
start a new page-->
<!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
<info>
<title xml:id="minimal-install-ti1">Minimalna instalacja</title>
</info>
@@ -10,26 +13,40 @@
- <para>You can choose a Minimal Installation by de-selecting everything in the
-Package Group Selection screen, see <xref linkend="choosePackageGroups"/>.</para>
-
- <para>If desired, you can additionally tick the <emphasis role="bold">Individual
-package selection</emphasis> option in the same screen.</para>
+
- <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>
+
- <para>If <emphasis role="bold">With X</emphasis> is chosen, then IceWM (a
+ <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 man and info pages. It
-contains the man pages from the <link
+ <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
diff --git a/docs/docs/stable/installer/pl/misc-params.xml b/docs/docs/stable/installer/pl/misc-params.xml
index 5ed15193..87770360 100644
--- a/docs/docs/stable/installer/pl/misc-params.xml
+++ b/docs/docs/stable/installer/pl/misc-params.xml
@@ -1,18 +1,34 @@
<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pl" 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>
+
+
+
+
+
+
+
+
+
+
<mediaobject>
<!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject>
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
<para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
the choices you made and on the hardware detected. You can check the
settings here and change them if you want by pressing
-<guibutton>Configure</guibutton>.</para>
+<emphasis>Configure</emphasis>.</para>
<note>
<para>As a general rule, it is recommended that you accept the default settings
@@ -26,7 +42,7 @@ unless:<itemizedlist>
</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>
@@ -38,46 +54,47 @@ unless:<itemizedlist>
<itemizedlist>
<listitem>
- <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Strefa czasowa</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
+ <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
</listitem>
<listitem>
- <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Kraj / 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. See <xref linkend="selectCountry"/></para>
</listitem>
<listitem>
- <para revision="1" xml:id="misc-params-system-pa4"><guilabel>System rozruchowy</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-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
- <para xml:id="misc-params-system-pa4c" revision="2">For more information, see <xref linkend="setupBootloader"/></para>
- </listitem>
+
+ <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
<listitem>
- <para xml:id="misc-params-system-pa5" revision="1"><guilabel>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>
+ <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
</listitem>
<listitem>
- <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Usługi</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). This tool allows you to enable or disable certain processes.</para>
<para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
-prevent your computer from operating correctly.</para>
-
- <para>For more information, see <xref linkend="configureServices"/></para>
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
</listitem>
</itemizedlist>
</section>
@@ -89,7 +106,7 @@ prevent your computer from operating correctly.</para>
<itemizedlist>
<listitem>
- <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Klawiatura</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 keyboard.</para>
@@ -101,27 +118,32 @@ that your passwords are going to change too.</para>
</listitem>
<listitem>
- <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Mysz</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>Karta dźwiękowa</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>
+ <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+ <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
</listitem>
<listitem>
- <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>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>
+ <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
- <para xml:id="misc-params-hardware-pa4b" revision="1">For more information, see <xref linkend="configureX_chooser"/>.</para>
- </listitem>
+
+ <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
</itemizedlist>
<mediaobject>
@@ -136,11 +158,11 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me
<itemizedlist>
<listitem>
- <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Sieć</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
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
repositories.</para>
<warning>
@@ -150,14 +172,14 @@ that interface as well.</para>
</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. 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.</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>
+ <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
</listitem>
</itemizedlist>
</section>
@@ -169,26 +191,31 @@ need to enter here.</para>
<itemizedlist>
<listitem>
- <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Poziom Bezpieczeństwa</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>
+ <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
</warning>
</listitem>
</itemizedlist>
diff --git a/docs/docs/stable/installer/pl/reboot.xml b/docs/docs/stable/installer/pl/reboot.xml
index c5f8593b..1392ae3f 100644
--- a/docs/docs/stable/installer/pl/reboot.xml
+++ b/docs/docs/stable/installer/pl/reboot.xml
@@ -1,18 +1,24 @@
<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="pl" xml:id="reboot">
<!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
<info>
<title xml:id="reboot-ti1">Uruchom ponownie</title>
</info>
+
<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>
+computer, remove the live DVD/USB stick and restart the computer.</para>
+ <important>
+ <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+ </important>
<mediaobject>
-<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
- <para>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>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+ <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+ <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
<mediaobject condition="live">
<imageobject> <imagedata format="PNG" xml:id="reboot-im1"
fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/pl/securityLevel.xml b/docs/docs/stable/installer/pl/securityLevel.xml
index 97ebc93e..ba5fb17e 100644
--- a/docs/docs/stable/installer/pl/securityLevel.xml
+++ b/docs/docs/stable/installer/pl/securityLevel.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pl" xml:id="securityLevel">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" 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">Poziom bezpieczeństwa</title>
</info>
@@ -7,27 +14,31 @@
+
+
<mediaobject>
<!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
<!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata format="PNG" xml:id="securityLevel-im1"
-align="center" fileref="dx2-securityLevel.png" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
<para><emphasis role="bold">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 configure an email address to which the system will
+ <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 receive these messages.</para>
+ <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
<note>
<para>The system sends such messages as <emphasis role="bold">Unix Mailspool
@@ -35,6 +46,6 @@ messages</emphasis>, not as "ordinary" SMTP mail: this user must 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/pl/selectCountry.xml b/docs/docs/stable/installer/pl/selectCountry.xml
index 268efd4b..853ab1ed 100644
--- a/docs/docs/stable/installer/pl/selectCountry.xml
+++ b/docs/docs/stable/installer/pl/selectCountry.xml
@@ -1,27 +1,38 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="pl">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="pl">
<info>
<title xml:id="selectCountry-ti1">Wybierz twój Kraj / Region</title>
</info>
+
+
+
+
<mediaobject>
<!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
<imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
- <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
+ <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 not being able to use a Wireless network.</para>
+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>
+ <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
</note>
<section xml:id="inputMethod">
@@ -29,7 +40,7 @@ choice.</para>
<title xml:id="inputMethod-ti7">Metoda wejścia</title>
</info>
- <para xml:id="selectCountry-pa4" revision="1">In the <guilabel>Other Countries</guilabel> screen you can also select an
+ <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
@@ -39,9 +50,9 @@ selection.</para>
<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>
+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/pl/selectInstallClass.xml b/docs/docs/stable/installer/pl/selectInstallClass.xml
index 6a43c20b..0aa0b522 100644
--- a/docs/docs/stable/installer/pl/selectInstallClass.xml
+++ b/docs/docs/stable/installer/pl/selectInstallClass.xml
@@ -1,4 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pl" xml:id="selectInstallClass">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="selectInstallClass"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xhtml"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
+
+
+
+
+
+
@@ -16,54 +31,49 @@
"you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
<!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
<!-- 2013-05-05 marja, corrected typo in screenshot name, removed -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
<title xml:id="selectInstallClass-ti1">Instalacja czy uaktualnienie</title>
</info>
<mediaobject>
-<imageobject> <imagedata format="PNG" align="center"
-fileref="dx2-selectInstallClass.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
- <itemizedlist>
+ <itemizedlist spacing="compact">
<listitem>
- <para>Zainstaluj</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>Uaktualnienie</para>
-
- <para>This can be used to upgrade an existing installation of
-<application>Mageia</application>.</para>
+ <para><emphasis role="bold">Upgrade</emphasis></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>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>
+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/pl/selectKeyboard.xml b/docs/docs/stable/installer/pl/selectKeyboard.xml
index 13c42eee..7d49aef4 100644
--- a/docs/docs/stable/installer/pl/selectKeyboard.xml
+++ b/docs/docs/stable/installer/pl/selectKeyboard.xml
@@ -1,4 +1,17 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectKeyboard" version="5.0" xml:lang="pl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="selectKeyboard"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
+
+
+
+
@@ -6,20 +19,23 @@
<info>
<!-- Started by marja on 2012 03 31 -->
<!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
<title xml:id="selectKeyboard-ti1">Klawiatura</title>
</info>
- <para xml:id="selectKeyboard-pa1" revision="1">DrakX wybiera odpowiedni układ klawiatury do twojego języka. Jeśli nie
+ <para revision="1" xml:id="selectKeyboard-pa1">DrakX wybiera odpowiedni układ klawiatury do twojego języka. Jeśli nie
znaleziono odpowiedniego układu klawiatury, wybrany będzie domyślny układ
klawiatury US.</para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-selectKeyboard.png" align="center"/>
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
</imageobject></mediaobject>
<itemizedlist>
<listitem>
- <para xml:id="selectKeyboard-pa2" revision="1">Upewnij się, że zaproponowany wybór jest odpowiedni lub wybierz inny układ
+ <para revision="1" xml:id="selectKeyboard-pa2">Upewnij się, że zaproponowany wybór jest odpowiedni lub wybierz inny układ
klawiatury. Jeśli nie wiesz jaki układ jest odpowiedni dla twojej
klawiatury, sprawdź dokumentację lub zapytaj dostawcę sprzętu. Może się
zdarzyć że na klawiaturze znajdziesz etykietę z potrzebną informacją. Możesz
@@ -28,23 +44,22 @@ xlink:href="http://en.wikipedia.org/wiki/Keyboard_layout">en.wikipedia.org/wiki/
</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"><warning>
- <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 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>
+ <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+ <para revision="1"><note>
+ <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+ </note></para>
</listitem>
<listitem>
- <para xml:id="selectKeyboard-pa4" revision="1">If you choose a keyboard based on non-Latin characters, you will see an
+ <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/pl/selectKeyboardLive.xml b/docs/docs/stable/installer/pl/selectKeyboardLive.xml
index ae6ed61e..df7be47e 100644
--- a/docs/docs/stable/installer/pl/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/pl/selectKeyboardLive.xml
@@ -1,14 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pl" xml:id="selectKeyboardLive">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="selectKeyboardLive"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
+
+
<info>
- <title xml:id="selectKeyboardLive-ti1">Wybierz klawiaturę</title>
+ <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
</info>
<mediaobject>
-<imageobject> <imagedata xml:id="selectKeyboardLive-im1" revision="1"
-align="center" format="PNG" fileref="live-selectKeyboard.png"/>
-</imageobject></mediaobject>
-
- <para>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
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+ <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
+
+ <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/pl/selectLanguage.xml b/docs/docs/stable/installer/pl/selectLanguage.xml
index c0a11971..02d0fd76 100644
--- a/docs/docs/stable/installer/pl/selectLanguage.xml
+++ b/docs/docs/stable/installer/pl/selectLanguage.xml
@@ -1,4 +1,23 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pl" xml:id="selectLanguage">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="selectLanguage"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
+
+
+
+
+
+
+
+
+
+
@@ -17,51 +36,65 @@
code in figure, marja, 20120409 -->
<!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
<title xml:id="selectLanguage-ti1">Wybór języka</title>
</info>
- <para condition="classical">Wybierz preferowany język, najpierw rozwijając listę dla swojego
-kontynentu. <application>Mageia</application> będzie używać wybranego języka
-zarówno podczas instalacji jak i w zainstalowanym systemie.</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
+ <listitem condition="classical">
+ <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
extra language support after installation.</para>
+ </listitem>
+ </itemizedlist>
<mediaobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-selectLanguage.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata fileref="live-language.png"
-format=""/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
- <warning condition="classical">
+ <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>
+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>Jeśli język twojej klawiatury nie jest taki sam jak język, który wybierasz
-jako domyślny, należy zainstalować także język odpowiedni do twojej
-klawiatury.</para>
+ <para>If your keyboard language is not the same as your preferred language, then
+it is advisable to install the required language for your keyboard as well</para>
</listitem>
<listitem>
- <para>Mageia używa wsparcia UTF-8 (Unicode) domyślnie.</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>Po instalacji możesz zmienic domyslny język uzywany w systemie za pomocą
-Centrum Sterowania Mageia -> System -> Zarządzanie lokalizacją systemu</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/pl/selectMouse.xml b/docs/docs/stable/installer/pl/selectMouse.xml
index 7fb2a1d6..6b61ca45 100644
--- a/docs/docs/stable/installer/pl/selectMouse.xml
+++ b/docs/docs/stable/installer/pl/selectMouse.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectMouse" version="5.0" xml:lang="pl">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" 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">Wybierz mysz</title>
</info>
@@ -7,25 +13,29 @@
+
+
+
-
-
- <mediaobject>
+
+ <mediaobject>
<!-- Made by marja on 2012 04 11 -->
<!-- NEEDS TO BE REVIEWED! -->
<!-- adding some "real" text now that we know the page shows up in the right place-->
<!-- marja 2012-04-24 adding screenshot -->
-<imageobject> <imagedata fileref="dx2-selectMouse.png" align="center"
-format="PNG" > </imagedata> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
+format="PNG"/> </imageobject></mediaobject>
<para revision="2" xml:id="selectMouse-pa1">Jeżeli nie jesteś zadowolony z tego, jak mysz reaguje, możesz wybrać inną
tutaj.</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-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
- <para revision="2" xml:id="selectMouse-pa3">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>
+ <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
</section>
diff --git a/docs/docs/stable/installer/pl/setupBootloader.xml b/docs/docs/stable/installer/pl/setupBootloader.xml
index e646bd7b..2e165380 100644
--- a/docs/docs/stable/installer/pl/setupBootloader.xml
+++ b/docs/docs/stable/installer/pl/setupBootloader.xml
@@ -1,146 +1,198 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="pl" xml:id="setupBootloader">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="pl" xml:id="setupBootloader">
+
+
+
+
<info>
- <!---->
-<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
-
+ <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<title xml:id="setupBootloader-ti1">Podstawowe opcje programu rozruchowego</title>
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
</info>
<section>
- <title>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>
- <section>
- <title>GRUB2 on Legacy/MBR and Legacy/GPT systems</title>
- <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
-fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
- <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you
-really know what you are doing.</para>
- </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>
- <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">Używanie bootloader'a Magei</title>
- <para>By default, and according to your system, Mageia writes one of the
-following:</para>
<itemizedlist>
+ <title>Grub2-efi on UEFI systems</title>
<listitem>
- <para>a GRUB2 bootloader either into the MBR (Master Boot Record) of your first
-hard drive or in the BIOS boot partition.</para>
+ <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
</listitem>
<listitem>
- <para>a GRUB2-efi bootloader into the ESP</para>
+ <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+ <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
- <para>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"/> </imageobject></mediaobject>
</section>
<section>
- <title>Użyj istniejącego bootloader'a.</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>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader4.png" align="center"/> </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"/>
-</imageobject></mediaobject>
- </section>
- <section>
- <title>Opcje</title>
+ <info>
+ <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+ </info>
<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>
+ <title>Podstawowe opcje programu rozruchowego</title>
+ <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+ <itemizedlist>
+ <listitem>
+ <para><emphasis role="bold">Bootloader to use</emphasis></para>
+ <para>This feature is only available to Legacy MBR/BIOS systems. Users of UEFI
+systems will not see this option here.</para>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">Boot device</emphasis></para>
+ <para>Don't change this unless you really know what you are doing</para>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+ <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">Security</emphasis></para>
+ <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">Password</emphasis></para>
+ <para>Choose a password for the bootloader (optional)</para>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">Password (again)</emphasis></para>
+ <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+ </listitem>
+ </itemizedlist>
+ <para><emphasis>Advanced</emphasis></para>
+ <itemizedlist>
+ <listitem>
+ <para><emphasis>Enable ACPI</emphasis></para>
+ <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
+could be useful if, for example, your computer does not support ACPI or if
+you think the ACPI implementation might cause some problems (for instance
+random reboots or system lockups).</para>
+ </listitem>
+ <listitem>
+ <para><emphasis>Enable SMP</emphasis></para>
+ <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+ </listitem>
+ <listitem>
+ <para><emphasis>Enable APIC</emphasis></para>
+ <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request) management.</para>
+ </listitem>
+ <listitem>
+ <para><emphasis>Enable Local APIC</emphasis></para>
+ <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+ </listitem>
+ </itemizedlist>
</section>
<section>
- <title>Next page</title>
+ <title>Bootloader Configuration</title>
+ <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
- <para><guilabel>Default:</guilabel> Operating system started up by default</para>
+ <para><emphasis role="bold">Default</emphasis></para>
+ <para>The operating system to started up by default</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>
+ <para><emphasis role="bold">Append</emphasis></para>
+ <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
</listitem>
<listitem>
- <para><guilabel>Probe foreign OS</guilabel>: see above <link
-linkend="setupMageiaBootloader">Using a Mageia bootloader</link></para>
+ <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+ <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
</listitem>
+ </itemizedlist>
+ <para><emphasis>Advanced</emphasis></para>
+ <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+ <itemizedlist>
<listitem>
- <para><guilabel>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>Video mode</emphasis></para>
+ <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+ </listitem>
+ <listitem>
+ <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+ <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+ <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+ </section>
+ </section>
+ <section>
+ <title>Other Options</title>
+ <section>
+ <title>Użyj istniejącego bootloader'a.</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>Dodaj lub zmodyfikuj wpis Boot Menu</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/pl/setupSCSI.xml b/docs/docs/stable/installer/pl/setupSCSI.xml
index 90d92adc..99bb9558 100644
--- a/docs/docs/stable/installer/pl/setupSCSI.xml
+++ b/docs/docs/stable/installer/pl/setupSCSI.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupSCSI" version="5.0" xml:lang="pl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" 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">Wykrywanie SCSI</title>
</info>
@@ -17,6 +24,10 @@
+
+
+
+
<mediaobject>
<!-- Made by marja on 2012 04 02 -->
<!-- NEEDS TO BE REVIEWED! -->
@@ -26,15 +37,16 @@
<!-- marja 2012-04-24 added screenshot -->
<!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
Mdv doc instead of on our setupSCSI file -->
-<imageobject> <imagedata format="PNG" fileref="dx2-setupSCSI.png"
-align="center" xml:id="setupSCSI-im1" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
<para revision="3.1" xml:id="setupSCSI-pa1">DrakX will normally detect hard disks correctly. However, with some older
SCSI controllers it may be unable 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 powinien być wtedy w stanie odpowiednio skonfigurować dysk(i).</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/pl/software.xml b/docs/docs/stable/installer/pl/software.xml
new file mode 100644
index 00000000..f6d0209c
--- /dev/null
+++ b/docs/docs/stable/installer/pl/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="pl" xreflabel="Software">
+
+
+ <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+ <section>
+ <title>Media Selection</title>
+
+ <xi:include href="add_supplemental_media.xml"/>
+
+ <xi:include href="media_selection.xml"/>
+ </section>
+
+ <xi:include href="chooseDesktop.xml"/>
+
+ <xi:include href="choosePackageGroups.xml"/>
+
+ <xi:include href="minimal-install.xml"/>
+
+ <xi:include href="choosePackagesTree.xml"/>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/pl/soundConfig.xml b/docs/docs/stable/installer/pl/soundConfig.xml
index bc8c0726..d26789b2 100644
--- a/docs/docs/stable/installer/pl/soundConfig.xml
+++ b/docs/docs/stable/installer/pl/soundConfig.xml
@@ -1,40 +1,47 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="pl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" 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">Konfiguracja dźwięku</title>
</info>
- <mediaobject>
-<!-- Lebarhon 20170209 updated SC-->
-<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png"
-xml:id="soundConfig-im1" revision="1"/> </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>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>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.</para>
+ <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+ <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+ <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
<section xml:id="soundConfig-Advanced">
<info>
<title xml:id="soundConfig-Advanced-ti1">Zaawansowane</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/pl/takeOverHdConfirm.xml b/docs/docs/stable/installer/pl/takeOverHdConfirm.xml
index 94ee46eb..93865f05 100644
--- a/docs/docs/stable/installer/pl/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/pl/takeOverHdConfirm.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="takeOverHdConfirm" version="5.0" xml:lang="pl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" 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">Formatowanie twardego dysku</title>
</info>
@@ -11,6 +18,10 @@
+
+
+
+
<mediaobject>
<!-- Made by marja on 2012 04 03 -->
<!-- test comment - johnr -->
@@ -18,15 +29,24 @@
hard disk." with "if you are not sure about your choice", because I'm sure I
saw this help screen when I had only one HD -->
<!-- 2013-05-05 marja added screenshot -->
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-takeOverHdConfirm.png" align="center"/> </imageobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-takeOverHdConfirm.png" align="center"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
- <para xml:id="takeOverHdConfirm-pa1" revision="1">Click on <guibutton>Previous</guibutton> if you are at all unsure about your
+ <itemizedlist>
+ <listitem>
+ <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
choice.</para>
+ </listitem>
- <para xml:id="takeOverHdConfirm-pa2" revision="1">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
+ <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/pl/testing.xml b/docs/docs/stable/installer/pl/testing.xml
index 7956d601..35935860 100644
--- a/docs/docs/stable/installer/pl/testing.xml
+++ b/docs/docs/stable/installer/pl/testing.xml
@@ -5,8 +5,11 @@
xmlns:ns4="http://www.w3.org/2000/svg"
xmlns:ns3="http://www.w3.org/1998/Math/MathML"
xmlns:ns="http://docbook.org/ns/docbook">
+
+
<info>
- <title xml:id="testing-ti1">Testowanie Magei w systemie Live</title>
+ <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Testowanie Magei w systemie Live</title>
</info>
<section xml:id="testing-1">
@@ -14,20 +17,20 @@
<title xml:id="testing1-ti1">Tryb Live</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">Testowanie sprzętu</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>
@@ -35,11 +38,7 @@ section of the Mageia Control Center. You can test the most current devices:</pa
</listitem>
<listitem>
- <para>karta graficzna: jeżeli widzisz poprzedni ekran, wszystko jest OK</para>
- </listitem>
-
- <listitem>
- <para>kamera internetowa:</para>
+ <para>graphics card: if you see the previous screen, it's already OK.</para>
</listitem>
<listitem>
@@ -47,7 +46,7 @@ section of the Mageia Control Center. You can test the most current devices:</pa
</listitem>
<listitem>
- <para>drukarka: skonfiguruj ją oraz wydrukuj stronę testową</para>
+ <para>printer: configure your printer/s and print a test page</para>
</listitem>
<listitem>
@@ -55,10 +54,13 @@ section of the Mageia Control Center. You can test the most current devices:</pa
</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>Ustawienia konfiguracyjny, które dokonałeś tutaj pozostają dla instalacji.</remark>
+ <note>
+ <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+ </note>
</section>
<section>
@@ -66,15 +68,14 @@ leave with the quit button.</para>
<title xml:id="testing3-ti1">Uruchom instalację</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>
diff --git a/docs/docs/stable/installer/pl/uninstall-Mageia.xml b/docs/docs/stable/installer/pl/uninstall-Mageia.xml
index 4d053e67..7d1efd45 100644
--- a/docs/docs/stable/installer/pl/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/pl/uninstall-Mageia.xml
@@ -1,30 +1,43 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="pl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="uninstall-Mageia"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1999/xhtml"
+ xmlns:ns2="http://www.w3.org/1999/xlink"
+ xmlns:ns="http://docbook.org/ns/docbook">
<!--Lebarhon 2015-07-06 Not true with UEFI
Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
<info>
<title xml:id="uninstall-Mageia-ti1">Usuwanie Magei</title>
</info>
+
+
<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
-<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>
+ <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
<para>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>
+(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
@@ -32,4 +45,4 @@ 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/pl/unused.xml b/docs/docs/stable/installer/pl/unused.xml
index a72f5ac1..001d28d6 100644
--- a/docs/docs/stable/installer/pl/unused.xml
+++ b/docs/docs/stable/installer/pl/unused.xml
@@ -1,27 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="pl" xml:id="unused" xmlns="http://docbook.org/ns/docbook"
- xmlns:ns6="http://www.w3.org/1999/xlink"
- xmlns:ns5="http://www.w3.org/1999/xhtml"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1998/Math/MathML"
- xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="pl">
<info>
<title xml:id="unused-ti1">Zostaw lub usuń nieużywany materiał</title>
</info>
+
+
<mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-unused.png"
-format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
<para>In this step, the installer looks for unused locales packages and unused
-hardware packages. 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>
+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> <imagedata fileref="../live-unused-InstallationProgress.png"/>
</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>
+ <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
</section>