aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuri Chornoivan <yurchor@ukr.net>2016-07-17 12:12:57 +0300
committerYuri Chornoivan <yurchor@ukr.net>2016-07-17 12:12:57 +0300
commit254def2f5f66e3616a198b661985f555994db245 (patch)
tree890338e265d4fbf917ca6dada1a5c2fbd6e0cbb2
parentcd5ace950073bba19bc6d5b40d368c59140cc5c2 (diff)
downloadtools-254def2f5f66e3616a198b661985f555994db245.tar
tools-254def2f5f66e3616a198b661985f555994db245.tar.gz
tools-254def2f5f66e3616a198b661985f555994db245.tar.bz2
tools-254def2f5f66e3616a198b661985f555994db245.tar.xz
tools-254def2f5f66e3616a198b661985f555994db245.zip
Update XML
-rw-r--r--docs/installer/ca/bootLive.xml132
-rw-r--r--docs/installer/ca/login.xml27
-rw-r--r--docs/installer/ca/setupBootloader.xml29
-rw-r--r--docs/installer/ca/setupBootloaderAddEntry.xml16
-rw-r--r--docs/installer/ca/unused.xml2
-rw-r--r--docs/installer/cs/bootLive.xml132
-rw-r--r--docs/installer/cs/login.xml26
-rw-r--r--docs/installer/cs/setupBootloader.xml29
-rw-r--r--docs/installer/cs/setupBootloaderAddEntry.xml16
-rw-r--r--docs/installer/cs/unused.xml2
-rw-r--r--docs/installer/de/bootLive.xml138
-rw-r--r--docs/installer/de/login.xml26
-rw-r--r--docs/installer/de/setupBootloader.xml29
-rw-r--r--docs/installer/de/setupBootloaderAddEntry.xml16
-rw-r--r--docs/installer/de/unused.xml2
-rw-r--r--docs/installer/el/bootLive.xml134
-rw-r--r--docs/installer/el/login.xml26
-rw-r--r--docs/installer/el/setupBootloader.xml29
-rw-r--r--docs/installer/el/setupBootloaderAddEntry.xml16
-rw-r--r--docs/installer/el/unused.xml2
-rw-r--r--docs/installer/eo/DrakLive-cover.xml75
-rw-r--r--docs/installer/eo/DrakLive.xml64
-rw-r--r--docs/installer/eo/SelectAndUseISOs2.xml121
-rw-r--r--docs/installer/eo/acceptLicense.xml23
-rw-r--r--docs/installer/eo/addUser.xml36
-rw-r--r--docs/installer/eo/ask_mntpoint_s.xml9
-rw-r--r--docs/installer/eo/bestTime.xml21
-rw-r--r--docs/installer/eo/bootLive.xml29
-rw-r--r--docs/installer/eo/configureTimezoneUTC.xml44
-rw-r--r--docs/installer/eo/diskdrake.xml14
-rw-r--r--docs/installer/eo/doPartitionDisks.xml84
-rw-r--r--docs/installer/eo/formatPartitions.xml9
-rw-r--r--docs/installer/eo/login.xml6
-rw-r--r--docs/installer/eo/reboot.xml20
-rw-r--r--docs/installer/eo/selectKeyboardLive.xml14
-rw-r--r--docs/installer/eo/selectLanguage.xml34
-rw-r--r--docs/installer/eo/setupBootloader.xml117
-rw-r--r--docs/installer/eo/setupBootloaderAddEntry.xml71
-rw-r--r--docs/installer/eo/takeOverHdConfirm.xml9
-rw-r--r--docs/installer/eo/testing.xml80
-rw-r--r--docs/installer/eo/uninstall-Mageia.xml2
-rw-r--r--docs/installer/eo/unused.xml27
-rw-r--r--docs/installer/es/bootLive.xml134
-rw-r--r--docs/installer/es/login.xml26
-rw-r--r--docs/installer/es/setupBootloader.xml29
-rw-r--r--docs/installer/es/setupBootloaderAddEntry.xml16
-rw-r--r--docs/installer/es/unused.xml2
-rw-r--r--docs/installer/et/bootLive.xml132
-rw-r--r--docs/installer/et/login.xml26
-rw-r--r--docs/installer/et/setupBootloader.xml29
-rw-r--r--docs/installer/et/setupBootloaderAddEntry.xml16
-rw-r--r--docs/installer/et/unused.xml2
-rw-r--r--docs/installer/eu/bootLive.xml134
-rw-r--r--docs/installer/eu/login.xml27
-rw-r--r--docs/installer/eu/setupBootloader.xml29
-rw-r--r--docs/installer/eu/setupBootloaderAddEntry.xml16
-rw-r--r--docs/installer/eu/unused.xml2
-rw-r--r--docs/installer/fr/bootLive.xml136
-rw-r--r--docs/installer/fr/login.xml26
-rw-r--r--docs/installer/fr/setupBootloader.xml29
-rw-r--r--docs/installer/fr/setupBootloaderAddEntry.xml16
-rw-r--r--docs/installer/fr/unused.xml2
-rw-r--r--docs/installer/hr/DrakLive-cover.xml76
-rw-r--r--docs/installer/hr/DrakLive.xml65
-rw-r--r--docs/installer/hr/SelectAndUseISOs2.xml121
-rw-r--r--docs/installer/hr/acceptLicense.xml20
-rw-r--r--docs/installer/hr/addUser.xml38
-rw-r--r--docs/installer/hr/ask_mntpoint_s.xml9
-rw-r--r--docs/installer/hr/bestTime.xml21
-rw-r--r--docs/installer/hr/bootLive.xml29
-rw-r--r--docs/installer/hr/configureTimezoneUTC.xml44
-rw-r--r--docs/installer/hr/diskdrake.xml8
-rw-r--r--docs/installer/hr/doPartitionDisks.xml84
-rw-r--r--docs/installer/hr/formatPartitions.xml9
-rw-r--r--docs/installer/hr/login.xml6
-rw-r--r--docs/installer/hr/reboot.xml20
-rw-r--r--docs/installer/hr/selectKeyboardLive.xml14
-rw-r--r--docs/installer/hr/selectLanguage.xml34
-rw-r--r--docs/installer/hr/setupBootloader.xml123
-rw-r--r--docs/installer/hr/setupBootloaderAddEntry.xml71
-rw-r--r--docs/installer/hr/takeOverHdConfirm.xml9
-rw-r--r--docs/installer/hr/testing.xml80
-rw-r--r--docs/installer/hr/uninstall-Mageia.xml2
-rw-r--r--docs/installer/hr/unused.xml27
-rw-r--r--docs/installer/id/DrakLive-cover.xml75
-rw-r--r--docs/installer/id/DrakLive.xml64
-rw-r--r--docs/installer/id/SelectAndUseISOs2.xml123
-rw-r--r--docs/installer/id/acceptLicense.xml20
-rw-r--r--docs/installer/id/addUser.xml36
-rw-r--r--docs/installer/id/ask_mntpoint_s.xml9
-rw-r--r--docs/installer/id/bestTime.xml21
-rw-r--r--docs/installer/id/bootLive.xml29
-rw-r--r--docs/installer/id/configureTimezoneUTC.xml44
-rw-r--r--docs/installer/id/diskdrake.xml8
-rw-r--r--docs/installer/id/doPartitionDisks.xml82
-rw-r--r--docs/installer/id/formatPartitions.xml9
-rw-r--r--docs/installer/id/login.xml6
-rw-r--r--docs/installer/id/reboot.xml20
-rw-r--r--docs/installer/id/selectKeyboardLive.xml14
-rw-r--r--docs/installer/id/selectLanguage.xml31
-rw-r--r--docs/installer/id/setupBootloader.xml118
-rw-r--r--docs/installer/id/setupBootloaderAddEntry.xml73
-rw-r--r--docs/installer/id/takeOverHdConfirm.xml9
-rw-r--r--docs/installer/id/testing.xml80
-rw-r--r--docs/installer/id/uninstall-Mageia.xml2
-rw-r--r--docs/installer/id/unused.xml27
-rw-r--r--docs/installer/it/acceptLicense.xml2
-rw-r--r--docs/installer/it/bootLive.xml132
-rw-r--r--docs/installer/it/login.xml27
-rw-r--r--docs/installer/it/setupBootloader.xml29
-rw-r--r--docs/installer/it/setupBootloaderAddEntry.xml16
-rw-r--r--docs/installer/it/unused.xml2
-rw-r--r--docs/installer/ja/bootLive.xml132
-rw-r--r--docs/installer/ja/login.xml26
-rw-r--r--docs/installer/ja/setupBootloader.xml29
-rw-r--r--docs/installer/ja/setupBootloaderAddEntry.xml16
-rw-r--r--docs/installer/ja/unused.xml2
-rw-r--r--docs/installer/nl/bootLive.xml134
-rw-r--r--docs/installer/nl/login.xml26
-rw-r--r--docs/installer/nl/setupBootloader.xml29
-rw-r--r--docs/installer/nl/setupBootloaderAddEntry.xml16
-rw-r--r--docs/installer/nl/unused.xml2
-rw-r--r--docs/installer/pl/DrakLive-cover.xml76
-rw-r--r--docs/installer/pl/DrakLive.xml65
-rw-r--r--docs/installer/pl/SelectAndUseISOs2.xml123
-rw-r--r--docs/installer/pl/acceptLicense.xml20
-rw-r--r--docs/installer/pl/addUser.xml36
-rw-r--r--docs/installer/pl/ask_mntpoint_s.xml9
-rw-r--r--docs/installer/pl/bestTime.xml21
-rw-r--r--docs/installer/pl/bootLive.xml29
-rw-r--r--docs/installer/pl/configureTimezoneUTC.xml44
-rw-r--r--docs/installer/pl/diskdrake.xml8
-rw-r--r--docs/installer/pl/doPartitionDisks.xml84
-rw-r--r--docs/installer/pl/formatPartitions.xml9
-rw-r--r--docs/installer/pl/login.xml6
-rw-r--r--docs/installer/pl/reboot.xml20
-rw-r--r--docs/installer/pl/selectKeyboardLive.xml14
-rw-r--r--docs/installer/pl/selectLanguage.xml33
-rw-r--r--docs/installer/pl/setupBootloader.xml123
-rw-r--r--docs/installer/pl/setupBootloaderAddEntry.xml71
-rw-r--r--docs/installer/pl/takeOverHdConfirm.xml9
-rw-r--r--docs/installer/pl/testing.xml80
-rw-r--r--docs/installer/pl/uninstall-Mageia.xml2
-rw-r--r--docs/installer/pl/unused.xml27
-rw-r--r--docs/installer/pt_BR/bootLive.xml134
-rw-r--r--docs/installer/pt_BR/login.xml26
-rw-r--r--docs/installer/pt_BR/setupBootloader.xml29
-rw-r--r--docs/installer/pt_BR/setupBootloaderAddEntry.xml16
-rw-r--r--docs/installer/pt_BR/unused.xml2
-rw-r--r--docs/installer/ro/DrakLive-cover.xml77
-rw-r--r--docs/installer/ro/DrakLive.xml66
-rw-r--r--docs/installer/ro/SelectAndUseISOs2.xml123
-rw-r--r--docs/installer/ro/acceptLicense.xml20
-rw-r--r--docs/installer/ro/addUser.xml35
-rw-r--r--docs/installer/ro/ask_mntpoint_s.xml9
-rw-r--r--docs/installer/ro/bestTime.xml21
-rw-r--r--docs/installer/ro/bootLive.xml29
-rw-r--r--docs/installer/ro/configureTimezoneUTC.xml44
-rw-r--r--docs/installer/ro/diskdrake.xml8
-rw-r--r--docs/installer/ro/doPartitionDisks.xml82
-rw-r--r--docs/installer/ro/formatPartitions.xml9
-rw-r--r--docs/installer/ro/login.xml6
-rw-r--r--docs/installer/ro/reboot.xml20
-rw-r--r--docs/installer/ro/selectKeyboardLive.xml14
-rw-r--r--docs/installer/ro/selectLanguage.xml35
-rw-r--r--docs/installer/ro/setupBootloader.xml124
-rw-r--r--docs/installer/ro/setupBootloaderAddEntry.xml72
-rw-r--r--docs/installer/ro/takeOverHdConfirm.xml9
-rw-r--r--docs/installer/ro/testing.xml80
-rw-r--r--docs/installer/ro/uninstall-Mageia.xml2
-rw-r--r--docs/installer/ro/unused.xml27
-rw-r--r--docs/installer/ru/DrakLive-cover.xml77
-rw-r--r--docs/installer/ru/DrakLive.xml66
-rw-r--r--docs/installer/ru/SelectAndUseISOs2.xml126
-rw-r--r--docs/installer/ru/acceptLicense.xml20
-rw-r--r--docs/installer/ru/addUser.xml36
-rw-r--r--docs/installer/ru/ask_mntpoint_s.xml9
-rw-r--r--docs/installer/ru/bestTime.xml21
-rw-r--r--docs/installer/ru/bootLive.xml29
-rw-r--r--docs/installer/ru/configureTimezoneUTC.xml44
-rw-r--r--docs/installer/ru/diskdrake.xml8
-rw-r--r--docs/installer/ru/doPartitionDisks.xml82
-rw-r--r--docs/installer/ru/formatPartitions.xml9
-rw-r--r--docs/installer/ru/login.xml6
-rw-r--r--docs/installer/ru/reboot.xml20
-rw-r--r--docs/installer/ru/selectKeyboardLive.xml14
-rw-r--r--docs/installer/ru/selectLanguage.xml35
-rw-r--r--docs/installer/ru/setupBootloader.xml118
-rw-r--r--docs/installer/ru/setupBootloaderAddEntry.xml75
-rw-r--r--docs/installer/ru/takeOverHdConfirm.xml9
-rw-r--r--docs/installer/ru/testing.xml80
-rw-r--r--docs/installer/ru/uninstall-Mageia.xml2
-rw-r--r--docs/installer/ru/unused.xml27
-rw-r--r--docs/installer/sk/bootLive.xml132
-rw-r--r--docs/installer/sk/login.xml26
-rw-r--r--docs/installer/sk/selectLanguage.xml4
-rw-r--r--docs/installer/sk/setupBootloader.xml29
-rw-r--r--docs/installer/sk/setupBootloaderAddEntry.xml16
-rw-r--r--docs/installer/sk/unused.xml2
-rw-r--r--docs/installer/sl/bootLive.xml134
-rw-r--r--docs/installer/sl/login.xml27
-rw-r--r--docs/installer/sl/setupBootloader.xml29
-rw-r--r--docs/installer/sl/setupBootloaderAddEntry.xml16
-rw-r--r--docs/installer/sl/unused.xml2
-rw-r--r--docs/installer/sq/bootLive.xml132
-rw-r--r--docs/installer/sq/login.xml27
-rw-r--r--docs/installer/sq/setupBootloader.xml29
-rw-r--r--docs/installer/sq/setupBootloaderAddEntry.xml16
-rw-r--r--docs/installer/sq/unused.xml2
-rw-r--r--docs/installer/sv/bootLive.xml134
-rw-r--r--docs/installer/sv/login.xml26
-rw-r--r--docs/installer/sv/setupBootloader.xml29
-rw-r--r--docs/installer/sv/setupBootloaderAddEntry.xml16
-rw-r--r--docs/installer/sv/unused.xml2
-rw-r--r--docs/installer/tr/bootLive.xml134
-rw-r--r--docs/installer/tr/login.xml26
-rw-r--r--docs/installer/tr/setupBootloader.xml29
-rw-r--r--docs/installer/tr/setupBootloaderAddEntry.xml16
-rw-r--r--docs/installer/tr/unused.xml2
-rw-r--r--docs/installer/uk/bootLive.xml136
-rw-r--r--docs/installer/uk/login.xml26
-rw-r--r--docs/installer/uk/setupBootloader.xml29
-rw-r--r--docs/installer/uk/setupBootloaderAddEntry.xml16
-rw-r--r--docs/installer/uk/unused.xml2
-rw-r--r--docs/installer/zh_CN/bootLive.xml118
-rw-r--r--docs/installer/zh_CN/login.xml24
-rw-r--r--docs/installer/zh_CN/selectInstallClass.xml2
-rw-r--r--docs/installer/zh_CN/setupBootloader.xml29
-rw-r--r--docs/installer/zh_CN/setupBootloaderAddEntry.xml16
-rw-r--r--docs/installer/zh_CN/unused.xml2
230 files changed, 4937 insertions, 4438 deletions
diff --git a/docs/installer/ca/bootLive.xml b/docs/installer/ca/bootLive.xml
index 653ff692..91f311b9 100644
--- a/docs/installer/ca/bootLive.xml
+++ b/docs/installer/ca/bootLive.xml
@@ -1,135 +1,29 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="bootLive" version="5.0" xml:lang="ca">
- <info>
- <title xml:id="bootLive-ti1">Boot Mageia as Live system</title>
- </info>
-
- <section xml:id="bootLive-1">
- <info>
- <title xml:id="bootLive1-ti1">Booting the medium</title>
- </info>
-
- <section>
- <info>
- <title xml:id="bootLive11-ti1">From a disc</title>
- </info>
-
- <para>You can boot directly from the media you used to burn your image (CD-ROM,
+<?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="ca"><info><title xml:id="bootLive-ti1">Boot Mageia as Live system</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Booting the medium</title></info><section><info><title xml:id="bootLive11-ti1">From a disc</title></info><para>You can boot directly from the media you used to burn your image (CD-ROM,
DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the
bootloader to launch the installation automatically after rebooting the
computer. If that does not happen you may need to reconfigure your BIOS or
press one key that will offer you to choose the peripheral from which the
-computer will boot.</para>
-
- <para>According to which hardware you have, and how it is configured, you get
-either one or another of the two screens below.</para>
- </section>
-
- <section>
- <info>
- <title xml:id="bootLive12-ti1">From a USB device</title>
- </info>
-
- <para>You can boot from the USB device on which you dumped your image
+computer will boot.</para><para>According to which hardware you have, and how it is configured, you get
+either one or another of the two screens below.</para></section><section><info><title xml:id="bootLive12-ti1">From a USB device</title></info><para>You can boot from the USB device on which you dumped your image
ISO. According to your BIOS settings, the computer boots perhaps directly on
the USB device already plugged in a port. If that does not happen you may
need to reconfigure your BIOS or press one key that will offer you to choose
-the peripheral from which the computer will boot.</para>
- </section>
- </section>
-
- <section xml:id="biosmode">
- <info>
- <title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title>
- </info>
-
- <mediaobject>
- <imageobject> <imagedata fileref="live-bootCSM.png"/> </imageobject>
-
- <caption>
- <para>First screen while booting in BIOS mode</para>
- </caption>
- </mediaobject>
-
- <para>In the middle menu, you have the choice between three actions:</para>
-
- <itemizedlist>
- <listitem>
- <para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
+the peripheral from which the computer will boot.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>First screen while booting in BIOS mode</para></caption></mediaobject><para>In the middle menu, you have the choice between three actions:</para><itemizedlist><listitem><para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
or USB stick) without writing anything on the disk, so expect a very slow
system. Once the boot is done, you can proceed to the installation on a hard
-disk.</para>
- </listitem>
-
- <listitem>
- <para>Install Mageia: This choice will directly install Mageia on a hard disk.</para>
- </listitem>
-
- <listitem>
- <para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
+disk.</para></listitem><listitem><para>Install Mageia: This choice will directly install Mageia on a hard disk.</para></listitem><listitem><para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
when no media (CD/DVD or USB stick) is connected. (not working with Mageia
-5).</para>
- </listitem>
- </itemizedlist>
-
- <para>In the bottom menu, are the Boot Options:</para>
-
- <itemizedlist>
- <listitem>
- <para>F1 - Help. Explain the options "splash", "apm", "acpi" and "Ide"</para>
- </listitem>
-
- <listitem>
- <para>F2 - Language. Choose the display language of the screens.</para>
- </listitem>
-
- <listitem>
- <para>F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728</para>
- </listitem>
-
- <listitem>
- <para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
+5).</para></listitem></itemizedlist><para>In the bottom menu, are the Boot Options:</para><itemizedlist><listitem><para>F1 - Help. Explain the options "splash", "apm", "acpi" and "Ide"</para></listitem><listitem><para>F2 - Language. Choose the display language of the screens.</para></listitem><listitem><para>F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
the inserted installation medium. Here, select other sources, like FTP or
NFS servers. If the installation is carried out in a network with an SLP
server, select one of the installation sources available on the server with
-this option.</para>
- </listitem>
-
- <listitem>
- <para>F5 - Driver. Yes or No. The system is aware about the presence of an
+this option.</para></listitem><listitem><para>F5 - Driver. Yes or No. The system is aware about the presence of an
optional disk with a driver update and will require its insertion during
-installation process.</para>
- </listitem>
-
- <listitem>
- <para>F6 - Kernel options. This is a way to specify options according to your
-hardware and the drivers to use.</para>
- </listitem>
- </itemizedlist>
- </section>
-
- <section xml:id="uefimode">
- <info>
- <title xml:id="uefimode-ti1">In UEFI mode</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center"
-fileref="live-bootUEFI.png" format="PNG" xml:id="bootUEFI-im1"/>
-</imageobject>
-
- <caption>
- <para>First screen while booting on UEFI system from disk</para>
- </caption>
- </mediaobject>
-
- <para>You have only the choice to run Mageia in Live mode (first choice) or to
-process the installation (second choice).</para>
- <para>If you booted from a USB stick, you get two supplemental lines which are a
+installation process.</para></listitem><listitem><para>F6 - Kernel options. This is a way to specify options according to your
+hardware and the drivers to use.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">In UEFI mode</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
+align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>First screen while booting on UEFI system from disk</para></caption></mediaobject><para>You have only the choice to run Mageia in Live mode (first choice) or to
+process the installation (second choice).</para><para>If you booted from a USB stick, you get two supplemental lines which are a
duplicata of the previous lines suffixed with "USB". You have to choose
-them.</para>
-
- <para>In each case, the first steps will be the same to choose language, timezone
+them.</para><para>In each case, the first steps will be the same to choose language, timezone
and keyboard, then the processes differ, with <link
-linkend="testing">additional steps in Live mode</link>.</para>
- </section>
-</section> \ No newline at end of file
+linkend="testing">additional steps in Live mode</link>.</para></section></section> \ No newline at end of file
diff --git a/docs/installer/ca/login.xml b/docs/installer/ca/login.xml
index f3572bb3..c5356bd4 100644
--- a/docs/installer/ca/login.xml
+++ b/docs/installer/ca/login.xml
@@ -1,24 +1,5 @@
-<?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="login" version="5.0" xml:lang="ca">
- <info>
- <title xml:id="label-to-adapt-ti1">Login screen</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center" xml:id="login-im1"
-format="PNG" fileref="live-login.png"/> </imageobject>
-
- <caption>
- <para>KDM login screen</para>
- </caption>
- </mediaobject>
-
- <para>Finally, you will come to the login screen.</para>
-
- <para>Enter your user name and user password, and in a few seconds you will find
+<?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="ca"><info><title xml:id="label-to-adapt-ti1">Login screen</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM login screen</para></caption></mediaobject><para>Finally, you will come to the login screen.</para><para>Enter your user name and user password, and in a few seconds you will find
yourself with a loaded KDE or GNOME desktop, depending on which live medium
-you used. You can now start using your Mageia installation.</para>
-
- <para>You can find another part of our documentation in <link
-linkend="https://wiki.mageia.org/en/Category:Documentation">the Mageia
-wiki</link>.</para>
-</section> \ No newline at end of file
+you used. You can now start using your Mageia installation.</para><para>Els podeu trobar <link
+linkend="https://wiki.mageia.org/en/Category:Documentation">aquí</link>.</para></section> \ No newline at end of file
diff --git a/docs/installer/ca/setupBootloader.xml b/docs/installer/ca/setupBootloader.xml
index a9c85aad..5cd600a6 100644
--- a/docs/installer/ca/setupBootloader.xml
+++ b/docs/installer/ca/setupBootloader.xml
@@ -10,9 +10,11 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
-format="PNG"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="setupBootloader-im1"
+format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata
+xml:id="setupBootloader-im1" format="PNG" align="center" revision="1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<section>
<title>With a Bios system</title>
@@ -33,7 +35,7 @@ permetre a Mageia que en creï un de nou.</para>
<title xml:id="usingMageiaBootloader-ti2">Ús del gestor d'arrencada de Mageia</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa4">By default, Mageia writes a new GRUB (legacy) bootloader into the MBR
+ <para xml:id="setupBootloader-pa4" revision="3">By default, Mageia writes a new GRUB (legacy) bootloader into the MBR
(Master Boot Record) of your first hard drive. If you already have other
operating systems installed, Mageia attempts to add them to your new Mageia
boot menu.</para>
@@ -42,7 +44,7 @@ boot menu.</para>
l'antic GRUB i Lilo.</para>
<warning>
- <para revision="3" xml:id="setupBootloader-pa6">Linux systems which use the GRUB2 bootloader are not currently supported by
+ <para xml:id="setupBootloader-pa6" revision="3">Linux systems which use the GRUB2 bootloader are not currently supported by
GRUB (legacy) and will not be recognized if the default GRUB bootloader is
used.</para>
@@ -53,15 +55,15 @@ disponible a la pàgina de resum durant la instal·lació.</para>
<section xml:id="usingExistingBootloader">
<info>
- <title revision="2" xml:id="usingExistingBootloader-ti4">Ús d'un gestor d'arrencada existent</title>
+ <title xml:id="usingExistingBootloader-ti4" revision="2">Ús d'un gestor d'arrencada existent</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa46">Si decidiu fer servir un gestor d'arrencada existent, llavors haureu de
+ <para xml:id="setupBootloader-pa46" revision="3">Si decidiu fer servir un gestor d'arrencada existent, llavors haureu de
pensar a fer ATURA a la pàgina del resum durant la instal·lació, i fer clic
el botó de <guibutton>Configuració</guibutton> del gestor d'arrencada, que
us permetrà canviar-ne la localització.</para>
- <para revision="1" xml:id="setupBootloader-pa47">Do not select a device e.g."sda", or you will overwrite your existing
+ <para xml:id="setupBootloader-pa47" revision="1">Do not select a device e.g."sda", or you will overwrite your existing
MBR. You must select the root partition that you chose during the
partitioning phase earlier, e.g. sda7.</para>
@@ -73,7 +75,7 @@ on és la partició <literal>/</literal> (root). Ctrl+Alt+F7 us torna a la
pantalla d'instal·lació.</para>
</tip>
- <para revision="2" xml:id="setupBootloader-pa49">El procediment exacte per a afegir Mageia a un gestor d'arrencada ja
+ <para xml:id="setupBootloader-pa49" revision="2">El procediment exacte per a afegir Mageia a un gestor d'arrencada ja
existent està fora de l'abast d'aquesta ajuda, tot i que normalment
implicarà executar el programa d'instal·lació del gestor d'arrencada en
qüestió, que el detectarà i afegirà automàticament. Vegeu la documentació
@@ -82,10 +84,10 @@ del sistema operatiu corresponent.</para>
<section xml:id="advancedOptionBootloader">
<info>
- <title revision="2" xml:id="advancedOptionBootloader-ti5">Opció avançada del gestor d'arrencada</title>
+ <title xml:id="advancedOptionBootloader-ti5" revision="2">Opció avançada del gestor d'arrencada</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa52">Si l'espai de disc per a la partició <literal>/</literal> que conté
+ <para xml:id="setupBootloader-pa52" revision="3">Si l'espai de disc per a la partició <literal>/</literal> que conté
<literal>/tmp</literal> és molt limitat, cliqueu a
<guibutton>Avançat</guibutton> i marqueu la casella <guilabel>Neteja /tmp en
cada arrencada</guilabel>. Això ajudarà a mantenir espai lliure.</para>
@@ -99,7 +101,10 @@ cada arrencada</guilabel>. Això ajudarà a mantenir espai lliure.</para>
choose the boot loader since only Grub2-efi is available. </para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader2.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader2.png"/>
+</imageobject></mediaobject>
<para>If Mageia is the first system installed on your computer, the installer
created an ESP (EFI System Partition) to receive the bootloader
diff --git a/docs/installer/ca/setupBootloaderAddEntry.xml b/docs/installer/ca/setupBootloaderAddEntry.xml
index 03791c5d..15ceb44f 100644
--- a/docs/installer/ca/setupBootloaderAddEntry.xml
+++ b/docs/installer/ca/setupBootloaderAddEntry.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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="ca">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ca" xml:id="setupBootloaderAddEntry">
<info>
@@ -7,9 +7,13 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
-xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="dx2-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="live-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject></mediaobject>
<section>
<title>With a Bios system</title>
@@ -26,8 +30,8 @@ instead.</para>
</note>
<mediaobject>
-<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
-align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1"
+align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
</imageobject></mediaobject>
<para>Algunes coses que es poden fer sense perill són canviar l'etiqueta d'una
diff --git a/docs/installer/ca/unused.xml b/docs/installer/ca/unused.xml
index 2f1de8f8..59205b1e 100644
--- a/docs/installer/ca/unused.xml
+++ b/docs/installer/ca/unused.xml
@@ -19,7 +19,7 @@ accept, except if you prepare an installation which has to run on different
hardware.</para>
<mediaobject>
-<imageobject> <imagedata fileref="live-unused-InstallationProgress.png"/>
+<imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
</imageobject></mediaobject>
<para>The next step is the copying of files on hard disk. This takes some
diff --git a/docs/installer/cs/bootLive.xml b/docs/installer/cs/bootLive.xml
index 22c66581..e4eaf74e 100644
--- a/docs/installer/cs/bootLive.xml
+++ b/docs/installer/cs/bootLive.xml
@@ -1,133 +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" xml:id="bootLive" version="5.0" xml:lang="cs">
- <info>
- <title xml:id="bootLive-ti1">Zavést Mageiu jako živý systém</title>
- </info>
-
- <section xml:id="bootLive-1">
- <info>
- <title xml:id="bootLive1-ti1">Zavedení z datového nosiče</title>
- </info>
-
- <section>
- <info>
- <title xml:id="bootLive11-ti1">Z disku</title>
- </info>
-
- <para>Systém můžete zavést z nosiče, na který jste vypálili svůj obrazový soubor
+<?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="cs"><info><title xml:id="bootLive-ti1">Zavést Mageiu jako živý systém</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Zavedení z datového nosiče</title></info><section><info><title xml:id="bootLive11-ti1">Z disku</title></info><para>Systém můžete zavést z nosiče, na který jste vypálili svůj obrazový soubor
(CD, DVD...). Obyčejně jej stačí jen vložit do vaší CD/DVD mechaniky, aby
zavaděč spustil instalaci automaticky po restartu počítače. pokud se to
nestane, možná potřebujete přenastavit BIOS anebo stisknout jednu klávesu,
-která vám nabídne vybrat si zařízení, ze kterého se počítač zavede.</para>
-
- <para>Podle toho, jaké máte vybavení počítače a jak je nastaveno, objeví se buď
-jedna anebo druhá ze dvou níže uvedených obrazovek.</para>
- </section>
-
- <section>
- <info>
- <title xml:id="bootLive12-ti1">Ze zařízení USB</title>
- </info>
-
- <para>Počítač můžete spustit ze zařízení USB, na kterém je zaznamenán obraz
+která vám nabídne vybrat si zařízení, ze kterého se počítač zavede.</para><para>Podle toho, jaké máte vybavení počítače a jak je nastaveno, objeví se buď
+jedna anebo druhá ze dvou níže uvedených obrazovek.</para></section><section><info><title xml:id="bootLive12-ti1">Ze zařízení USB</title></info><para>Počítač můžete spustit ze zařízení USB, na kterém je zaznamenán obraz
ISO. Vzhledem k nastavení vašeho BIOSu se počítač možná už zavádí přímo ze
zařízení USB zastrčeného v přípojném místě (portu) počítače. Pokud se tak
neděje, možná potřebujete přenastavit BIOS anebo stisknout jednu klávesu,
-která vám nabídne výběr zařízení, z něhož se počítač spustí.</para>
- </section>
- </section>
-
- <section xml:id="biosmode">
- <info>
- <title xml:id="biosmode-ti1">V zastaralém režimu BIOS/CSM</title>
- </info>
-
- <mediaobject>
- <imageobject> <imagedata fileref="live-bootCSM.png"/> </imageobject>
-
- <caption>
- <para>První obrazovka během spouštění v režimu BIOS</para>
- </caption>
- </mediaobject>
-
- <para>V prostřední nabídce máte volbu mezi třemi činnostmi:</para>
-
- <itemizedlist>
- <listitem>
- <para>Zavést Mageiu: Toto znamená, že Mageia 5 se spustí z připojeného nosiče
+která vám nabídne výběr zařízení, z něhož se počítač spustí.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">V zastaralém režimu BIOS/CSM</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>První obrazovka během spouštění v režimu BIOS</para></caption></mediaobject><para>V prostřední nabídce máte volbu mezi třemi činnostmi:</para><itemizedlist><listitem><para>Zavést Mageiu: Toto znamená, že Mageia 5 se spustí z připojeného nosiče
(CD/DVD anebo zařízení USB) bez jakéhokoli zapisování na disk, takže
očekávejte velmi pomalý systém. Jakmile se zavádění dokončí, můžete
-přikročit i k instalací na pevný disk.</para>
- </listitem>
-
- <listitem>
- <para>Nainstalovat Mageiu: Tato volba Mageiu přímo nainstaluje na pevný disk.</para>
- </listitem>
-
- <listitem>
- <para>Spustit z pevného disku: Tato volba dovoluje systém zavést z pevného disku,
+přikročit i k instalací na pevný disk.</para></listitem><listitem><para>Nainstalovat Mageiu: Tato volba Mageiu přímo nainstaluje na pevný disk.</para></listitem><listitem><para>Spustit z pevného disku: Tato volba dovoluje systém zavést z pevného disku,
tak jako obyčejně, když není připojen žádný datový nosič (CD/DVD anebo
-zařízení USB). (nepracuje s Mageiou 5).</para>
- </listitem>
- </itemizedlist>
-
- <para>Ve spodní nabídce jsou Volby zavedení systému:</para>
-
- <itemizedlist>
- <listitem>
- <para>F1 - Nápověda. Vysvětluje volby "splash", "apm", "acpi" a "Ide"</para>
- </listitem>
-
- <listitem>
- <para>F2 - Jazyk. Vyberte si pro zobrazení jazyka obrazovek.</para>
- </listitem>
-
- <listitem>
- <para>F3 - Rozlišení obrazovky. Volba mezi textem, 640x400, 800x600, 1024x728</para>
- </listitem>
-
- <listitem>
- <para>F4 - CD-Rom. CD-Rom anebo Další. Normálně se instalace vykoná z vloženého
+zařízení USB). (nepracuje s Mageiou 5).</para></listitem></itemizedlist><para>Ve spodní nabídce jsou Volby zavedení systému:</para><itemizedlist><listitem><para>F1 - Nápověda. Vysvětluje volby "splash", "apm", "acpi" a "Ide"</para></listitem><listitem><para>F2 - Jazyk. Vyberte si pro zobrazení jazyka obrazovek.</para></listitem><listitem><para>F3 - Rozlišení obrazovky. Volba mezi textem, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom anebo Další. Normálně se instalace vykoná z vloženého
instalačního média. Zde si vybíráte jiné zdroje, jakými jsou FTP anebo
servery NFS. Pokud se instalace vykonává v síti se serverem SLP, při této
-volbě si vyberte jeden z instalačních zdrojů dostupných na serveru.</para>
- </listitem>
-
- <listitem>
- <para>F5 - Ovladač. Ano nebo Ne. Systém si je vědom přítomnosti volitelného disku
+volbě si vyberte jeden z instalačních zdrojů dostupných na serveru.</para></listitem><listitem><para>F5 - Ovladač. Ano nebo Ne. Systém si je vědom přítomnosti volitelného disku
s aktualizací ovladače a bude požadovat jeho vložení během procesu
-instalace.</para>
- </listitem>
-
- <listitem>
- <para>F6 - Volby jádra. Toto je cesta pro zadání voleb vztahujících se k vybavení
-počítače a ovladačům, které se použijí.</para>
- </listitem>
- </itemizedlist>
- </section>
-
- <section xml:id="uefimode">
- <info>
- <title xml:id="uefimode-ti1">V režimu UEFI</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center"
-fileref="live-bootUEFI.png" format="PNG" xml:id="bootUEFI-im1"/>
-</imageobject>
-
- <caption>
- <para>První obrazovka během spuštění z disku na systémech UEFI</para>
- </caption>
- </mediaobject>
-
- <para>Zde máte jen možnost spustit Mageiu v Živém režimu (první volba) nebo
-spustit instalaci (druhá volba).</para>
- <para>Pokud jste počítač spustili ze zařízení USB, dostanete dva doplňující řádky,
+instalace.</para></listitem><listitem><para>F6 - Volby jádra. Toto je cesta pro zadání voleb vztahujících se k vybavení
+počítače a ovladačům, které se použijí.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">V režimu 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>První obrazovka během spuštění z disku na systémech UEFI</para></caption></mediaobject><para>Zde máte jen možnost spustit Mageiu v Živém režimu (první volba) nebo
+spustit instalaci (druhá volba).</para><para>Pokud jste počítač spustili ze zařízení USB, dostanete dva doplňující řádky,
které jsou duplikáty předchozích řádků zakončených zkratkou "USB". Máte je
-vybrat.</para>
-
- <para>V každém případě budou první kroky stejné - vybrat si jazyk, časovou zónu a
+vybrat.</para><para>V každém případě budou první kroky stejné - vybrat si jazyk, časovou zónu a
klávesnici; potom se postupy odlišují v <link linkend="testing">dodatečných
-krocích v Živém režimu</link>.</para>
- </section>
-</section> \ No newline at end of file
+krocích v Živém režimu</link>.</para></section></section> \ No newline at end of file
diff --git a/docs/installer/cs/login.xml b/docs/installer/cs/login.xml
index 7e4eeca2..45ed736b 100644
--- a/docs/installer/cs/login.xml
+++ b/docs/installer/cs/login.xml
@@ -1,24 +1,6 @@
-<?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="login" version="5.0" xml:lang="cs">
- <info>
- <title xml:id="label-to-adapt-ti1">Přihlašovací obrazovka</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center" xml:id="login-im1"
-format="PNG" fileref="live-login.png"/> </imageobject>
-
- <caption>
- <para>Přihlašovací obrazovka KDM</para>
- </caption>
- </mediaobject>
-
- <para>Nakonec se dostanete k přihlašovací obrazovce</para>
-
- <para>Vložte své uživatelské jméno a uživatelské heslo a za pár sekund se, podle
+<?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="cs"><info><title xml:id="label-to-adapt-ti1">Přihlašovací obrazovka</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>Přihlašovací obrazovka KDM</para></caption></mediaobject><para>Nakonec se dostanete k přihlašovací obrazovce</para><para>Vložte své uživatelské jméno a uživatelské heslo a za pár sekund se, podle
toho který živý datový nosič jste použili, ocitnete v nahraném prostředí KDE
-nebo GNOME. Nyní můžete začít používat vaši instalaci Mageii.</para>
-
- <para>Další část naší dokumentace můžete najít na <link
+nebo GNOME. Nyní můžete začít používat vaši instalaci Mageii.</para><para>Další část naší dokumentace můžete najít na <link
linkend="https://wiki.mageia.org/en/Category:Documentation">Mageia
-wiki</link>.</para>
-</section> \ No newline at end of file
+wiki</link>.</para></section> \ No newline at end of file
diff --git a/docs/installer/cs/setupBootloader.xml b/docs/installer/cs/setupBootloader.xml
index 4a8bbb3e..95069860 100644
--- a/docs/installer/cs/setupBootloader.xml
+++ b/docs/installer/cs/setupBootloader.xml
@@ -10,9 +10,11 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
-format="PNG"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="setupBootloader-im1"
+format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata
+xml:id="setupBootloader-im1" format="PNG" align="center" revision="1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<section>
<title>Se systémem BIOS</title>
@@ -33,7 +35,7 @@ zavaděči, nebo Mageie dovolíte vytvořit nový zavaděč.</para>
<title xml:id="usingMageiaBootloader-ti2">Použití zavaděče Mageii</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa4">Ve výchozím nastavení Mageia zapisuje nový zavaděč (zastaralého) GRUBa do
+ <para xml:id="setupBootloader-pa4" revision="3">Ve výchozím nastavení Mageia zapisuje nový zavaděč (zastaralého) GRUBa do
MBR (Hlavního spouštěcího záznamu) vašeho prvního pevného disku. Pokud už
máte nainstalovány jiné operační systémy, Mageia se pokusí o jejich přidání
do vaší nové spouštěcí nabídky Mageii.</para>
@@ -42,7 +44,7 @@ do vaší nové spouštěcí nabídky Mageii.</para>
GRUBu a Lilu.</para>
<warning>
- <para revision="3" xml:id="setupBootloader-pa6">Linuxové systémy, které používají zavaděč GRUB2, nejsou v současnosti
+ <para xml:id="setupBootloader-pa6" revision="3">Linuxové systémy, které používají zavaděč GRUB2, nejsou v současnosti
podporovány (zastaralým) GRUBem a nebudou rozpoznány, pokud je použit
výchozí zavaděč GRUB.</para>
@@ -53,15 +55,15 @@ souhrnné stránce během instalace.</para>
<section xml:id="usingExistingBootloader">
<info>
- <title revision="2" xml:id="usingExistingBootloader-ti4">Použití už existujícího zavaděče</title>
+ <title xml:id="usingExistingBootloader-ti4" revision="2">Použití už existujícího zavaděče</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa46">Pokud se rozhodnete použít už existující zavaděč, potom se potřebujete během
+ <para xml:id="setupBootloader-pa46" revision="3">Pokud se rozhodnete použít už existující zavaděč, potom se potřebujete během
instalace ZASTAVIT na souhrnné stránce a klepnout na tlačítko zavaděče
<guibutton>Nastavit</guibutton>, které vám dovolí změnit instalační umístění
zavaděče.</para>
- <para revision="1" xml:id="setupBootloader-pa47">Nevybírejte si zařízení jako je např. "sda", nebo přepíšete váš existující
+ <para xml:id="setupBootloader-pa47" revision="1">Nevybírejte si zařízení jako je např. "sda", nebo přepíšete váš existující
MBR. Musíte si vybrat kořenový oddíl, který jste si vybrali dříve během fáze
dělení disku, jako je např. sda7.</para>
@@ -74,7 +76,7 @@ zkontrolování, kde je umístěn váš <literal>/</literal> (kořenový)
oddíl. Ctrl+Alt+F7 vás dostane nazpět na obrazovku instalátoru.</para>
</tip>
- <para revision="2" xml:id="setupBootloader-pa49">Přesný postup pro přidání vašeho systému Mageia k existujícímu zavaděči
+ <para xml:id="setupBootloader-pa49" revision="2">Přesný postup pro přidání vašeho systému Mageia k existujícímu zavaděči
přesahuje oblast této nápovědy, avšak ve většině případů bude zahrnovat
spuštění příslušného programu na instalaci zavaděče, který by ho měl
rozpoznat a přidat automaticky. Podívejte se na dokumentaci k operačnímu
@@ -83,10 +85,10 @@ systému, o nějž jde.</para>
<section xml:id="advancedOptionBootloader">
<info>
- <title revision="2" xml:id="advancedOptionBootloader-ti5">Pokročilé parametry zavaděče</title>
+ <title xml:id="advancedOptionBootloader-ti5" revision="2">Pokročilé parametry zavaděče</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa52">pokud máte velmi omezený diskový prostor pro <literal>/</literal> oddíl,
+ <para xml:id="setupBootloader-pa52" revision="3">pokud máte velmi omezený diskový prostor pro <literal>/</literal> oddíl,
který obsahuje adresář <literal>/tmp</literal>, klepněte na tlačítko
<guibutton>Pokročilé</guibutton> a zkontrolujte políčko <guilabel>Vyčistit
/tmp před každým zavedením systému</guilabel>. Toto pomůže udržet trochu
@@ -101,7 +103,10 @@ volného místa.</para>
zvolit zavaděč systému, jelikož je dostupný jen Grub2-efi. </para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader2.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader2.png"/>
+</imageobject></mediaobject>
<para>Pokud je Mageia prvním systémem nainstalovaným na váš počítač, instalátor
vytvořil ESP (systémový oddíl EFI) pro zapsání zavaděče (Grub2-efi). Pokud
diff --git a/docs/installer/cs/setupBootloaderAddEntry.xml b/docs/installer/cs/setupBootloaderAddEntry.xml
index b585914b..73cdb710 100644
--- a/docs/installer/cs/setupBootloaderAddEntry.xml
+++ b/docs/installer/cs/setupBootloaderAddEntry.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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="cs">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="cs" xml:id="setupBootloaderAddEntry">
<info>
@@ -7,9 +7,13 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
-xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="dx2-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="live-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject></mediaobject>
<section>
<title>Se systémem BIOS</title>
@@ -26,8 +30,8 @@ použít <code>grub-customizer</code>.</para>
</note>
<mediaobject>
-<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
-align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1"
+align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
</imageobject></mediaobject>
<para>Některými věcmi, které mohou být vykonány bez jakéhokoli nebezpečí, jsou
diff --git a/docs/installer/cs/unused.xml b/docs/installer/cs/unused.xml
index dd131b5f..16b3d291 100644
--- a/docs/installer/cs/unused.xml
+++ b/docs/installer/cs/unused.xml
@@ -19,7 +19,7 @@ přijmout to, kromě případu, že připravujete instalaci, která má běžet
odlišném počítačovém vybavení.</para>
<mediaobject>
-<imageobject> <imagedata fileref="live-unused-InstallationProgress.png"/>
+<imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
</imageobject></mediaobject>
<para>Dalším krokem je kopírování souborů na pevný disk. Toto zabere několik
diff --git a/docs/installer/de/bootLive.xml b/docs/installer/de/bootLive.xml
index 31c67004..067eda77 100644
--- a/docs/installer/de/bootLive.xml
+++ b/docs/installer/de/bootLive.xml
@@ -1,143 +1,37 @@
-<?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="bootLive" version="5.0" xml:lang="de">
- <info>
- <title xml:id="bootLive-ti1">Mageia als Live-System starten</title>
- </info>
-
- <section xml:id="bootLive-1">
- <info>
- <title xml:id="bootLive1-ti1">Vom Medium starten</title>
- </info>
-
- <section>
- <info>
- <title xml:id="bootLive11-ti1">Von einem optischen Laufwerk</title>
- </info>
-
- <para>Sie können direkt von dem Datenträger, auf dem Sie das Image gebrannt haben
+<?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="de"><info><title xml:id="bootLive-ti1">Mageia als Live-System starten</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Vom Medium starten</title></info><section><info><title xml:id="bootLive11-ti1">Von einem optischen Laufwerk</title></info><para>Sie können direkt von dem Datenträger, auf dem Sie das Image gebrannt haben
(CD-ROM, DVD-ROM...), starten. Sie müssen nur die CD/DVD in Ihr Laufwerk
einlegen, damit der Bootloader die Installation automatisch nach dem
Neustart Ihres Computers beginnt. Falls dies nicht funktioniert, müssen Sie
womöglich die Bootreihenfolge der Laufwerke im BIOS umstellen oder beim
Start eine Taste drücken, wodurch Sie eine Auswahl erhalten, von der Sie
-wählen können, von welchem Laufwerk Ihr Computer starten soll.</para>
-
- <para>Abhängig davon, welche Hardware Sie besitzen und wie diese konfiguriert ist,
-erhalten Sie einen der beiden unten angezeigten Screenshots.</para>
- </section>
-
- <section>
- <info>
- <title xml:id="bootLive12-ti1">Von einem USB Gerät</title>
- </info>
-
- <para>Sie können von dem USB-Gerät, auf welchem Sie das ISO Image übertragen
+wählen können, von welchem Laufwerk Ihr Computer starten soll.</para><para>Abhängig davon, welche Hardware Sie besitzen und wie diese konfiguriert ist,
+erhalten Sie einen der beiden unten angezeigten Screenshots.</para></section><section><info><title xml:id="bootLive12-ti1">Von einem USB Gerät</title></info><para>Sie können von dem USB-Gerät, auf welchem Sie das ISO Image übertragen
haben, starten. Abhängig von den BIOS Einstellungen startet der Computer
möglicherweise direkt von dem bereits eingesteckten USB-Gerät. Falls dies
nicht geschieht, müssen Sie entweder in Ihren BIOS Einstellungen die
Bootreihenfolge ändern, oder eine Taste während dem Startvorgang Ihres
Computers drücken, damit eine Auswahl angezeigt wird, in der Sie auswählen
-können von welchem Laufwerk Sie ihren Computer starten möchten.</para>
- </section>
- </section>
-
- <section xml:id="biosmode">
- <info>
- <title xml:id="biosmode-ti1">Im BIOS/CSM/Legacy Modus</title>
- </info>
-
- <mediaobject>
- <imageobject> <imagedata fileref="live-bootCSM.png"/> </imageobject>
-
- <caption>
- <para>Der erste Bildschirm beim starten im BIOS Modus</para>
- </caption>
- </mediaobject>
-
- <para>Im mittleren Menü haben Sie die Auswahl zwischen drei Möglichkeiten:</para>
-
- <itemizedlist>
- <listitem>
- <para>Mageia starten: Dies bedeutet, dass Mageia 5 vom verwendeten Medium (CD/DVD
+können von welchem Laufwerk Sie ihren Computer starten möchten.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">Im BIOS/CSM/Legacy Modus</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Der erste Bildschirm beim starten im BIOS Modus</para></caption></mediaobject><para>Im mittleren Menü haben Sie die Auswahl zwischen drei Möglichkeiten:</para><itemizedlist><listitem><para>Mageia starten: Dies bedeutet, dass Mageia 5 vom verwendeten Medium (CD/DVD
oder USB-Stick) gestartet wird, ohne dass etwas auf das Laufwerk geschrieben
wird. Das System ist hierbei sehr langsam. Sobald der Startvorgang beendet
-ist können Sie mit der Installation auf der Festplatte fortfahren.</para>
- </listitem>
-
- <listitem>
- <para>Mageia installieren: Diese Auswahl wird Mageia direkt auf eine Festplatte
-installieren.</para>
- </listitem>
-
- <listitem>
- <para>Von der Festplatte starten: Diese Auswahl erlaubt Ihnen das System von der
+ist können Sie mit der Installation auf der Festplatte fortfahren.</para></listitem><listitem><para>Mageia installieren: Diese Auswahl wird Mageia direkt auf eine Festplatte
+installieren.</para></listitem><listitem><para>Von der Festplatte starten: Diese Auswahl erlaubt Ihnen das System von der
Festplatte zu starten, so als wäre kein Medium (CD/DVD oder USB-Stick)
-angeschlossen. (Funktioniert nicht mit Mageia 5).</para>
- </listitem>
- </itemizedlist>
-
- <para>Im unteren Menü sind die Startoptionen:</para>
-
- <itemizedlist>
- <listitem>
- <para>F1 - Hilfe. Beschreibt die Optionen "splash", "apm", "acpi" und "Ide"</para>
- </listitem>
-
- <listitem>
- <para>F2 - Sprache. Hier können Sie die angezeigte Sprache für den Bildschirm
-auswählen</para>
- </listitem>
-
- <listitem>
- <para>F3 - Bildschirmauflösung. Wähle zwischen Text, 640x400, 800x600, 1024x728</para>
- </listitem>
-
- <listitem>
- <para>F4 - CD-Rom. CD-Rom oder Other. Normalerweise wird die Installation vom
+angeschlossen. (Funktioniert nicht mit Mageia 5).</para></listitem></itemizedlist><para>Im unteren Menü sind die Startoptionen:</para><itemizedlist><listitem><para>F1 - Hilfe. Beschreibt die Optionen "splash", "apm", "acpi" und "Ide"</para></listitem><listitem><para>F2 - Sprache. Hier können Sie die angezeigte Sprache für den Bildschirm
+auswählen</para></listitem><listitem><para>F3 - Bildschirmauflösung. Wähle zwischen Text, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom oder Other. Normalerweise wird die Installation vom
eingelegten Installations-Datenträger durchgeführt. Hier können andere
Quellen, wie FTP oder NFS Server ausgewählt werden. Falls die
Installationsdaten von einem SLP Server im Netzwerk zur Verfügung gestellt
werden, wähle eine der verfügbaren Installationsquellen auf dem Server, mit
-dieser Option aus.</para>
- </listitem>
-
- <listitem>
- <para>F5 - Treiber. Ja oder Nein. Dem System wird dadurch gemeldet, das ein
+dieser Option aus.</para></listitem><listitem><para>F5 - Treiber. Ja oder Nein. Dem System wird dadurch gemeldet, das ein
weiterer, optionaler, Datenträger mit einer Treiberaktualisierung zur
Verfügung steht und diese wird dann während dem Installationsvorgang
-verlangt.</para>
- </listitem>
-
- <listitem>
- <para>F6 - Kernel-Optionen. Auf diesem Weg können Sie Optionen, abhängig von Ihrer
-Hardware und die dafür zu verwendeten Treiber, festlegen.</para>
- </listitem>
- </itemizedlist>
- </section>
-
- <section xml:id="uefimode">
- <info>
- <title xml:id="uefimode-ti1">Im UEFI Modus</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center"
-fileref="live-bootUEFI.png" format="PNG" xml:id="bootUEFI-im1"/>
-</imageobject>
-
- <caption>
- <para>Der erste Bildschirm beim starten auf einem UEFI System von einem
-Datenträger</para>
- </caption>
- </mediaobject>
-
- <para>Sie haben nur die Auswahlmöglichkeit Mageia im Live Modus zu starten (erste
-Auswahl) oder die Installation zu beginnen (zweite Auswahl).</para>
- <para>Falls Sie von einem USB-Stick starten, werden Ihnen zwei zusätzliche Zeilen
+verlangt.</para></listitem><listitem><para>F6 - Kernel-Optionen. Auf diesem Weg können Sie Optionen, abhängig von Ihrer
+Hardware und die dafür zu verwendeten Treiber, festlegen.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">Im UEFI Modus</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
+align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>Der erste Bildschirm beim starten auf einem UEFI System von einem
+Datenträger</para></caption></mediaobject><para>Sie haben nur die Auswahlmöglichkeit Mageia im Live Modus zu starten (erste
+Auswahl) oder die Installation zu beginnen (zweite Auswahl).</para><para>Falls Sie von einem USB-Stick starten, werden Ihnen zwei zusätzliche Zeilen
angezeigt, welche Duplikate der vorrigen Zeilen sind, mit dem zusätzlichen
-Suffix "USB". Sie müssen diese Auswählen.</para>
-
- <para>In jedem Fall sind die ersten Schritte die gleichen, um die Sprache,
+Suffix "USB". Sie müssen diese Auswählen.</para><para>In jedem Fall sind die ersten Schritte die gleichen, um die Sprache,
Zeitzone und Tastatur auszuwählen. Danach unterscheiden diese sich durch
-<link linkend="testing">zusätzliche Schritte im Live Modus</link>.</para>
- </section>
-</section> \ No newline at end of file
+<link linkend="testing">zusätzliche Schritte im Live Modus</link>.</para></section></section> \ No newline at end of file
diff --git a/docs/installer/de/login.xml b/docs/installer/de/login.xml
index a0ba365f..64b04af2 100644
--- a/docs/installer/de/login.xml
+++ b/docs/installer/de/login.xml
@@ -1,25 +1,7 @@
-<?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="login" version="5.0" xml:lang="de">
- <info>
- <title xml:id="label-to-adapt-ti1">Anmeldebildschirm</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center" xml:id="login-im1"
-format="PNG" fileref="live-login.png"/> </imageobject>
-
- <caption>
- <para>KDM Anmeldebildschirm</para>
- </caption>
- </mediaobject>
-
- <para>Schließlich kommen Sie zum Anmeldebildschirm.</para>
-
- <para>Geben Sie Ihren Benutzernamen und das Benutzerpasswort ein und in wenigen
+<?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="de"><info><title xml:id="label-to-adapt-ti1">Anmeldebildschirm</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM Anmeldebildschirm</para></caption></mediaobject><para>Schließlich kommen Sie zum Anmeldebildschirm.</para><para>Geben Sie Ihren Benutzernamen und das Benutzerpasswort ein und in wenigen
Sekunden befinden Sie sich auf dem geladenen KDE oder GNOME Desktop,
abhängig davon, welches Live Medium verwendet wurde. Nun können Sie Ihre
-Mageia Installation verwenden.</para>
-
- <para>Sie können weitere Teile unserer Dokumentation im <link
+Mageia Installation verwenden.</para><para>Sie können weitere Teile unserer Dokumentation im <link
linkend="https://wiki.mageia.org/de/Kategorie:Dokumentation">Mageia
-Wiki</link> finden.</para>
-</section> \ No newline at end of file
+Wiki</link> finden.</para></section> \ No newline at end of file
diff --git a/docs/installer/de/setupBootloader.xml b/docs/installer/de/setupBootloader.xml
index 543c6cdc..aa965694 100644
--- a/docs/installer/de/setupBootloader.xml
+++ b/docs/installer/de/setupBootloader.xml
@@ -10,9 +10,11 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
-format="PNG"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="setupBootloader-im1"
+format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata
+xml:id="setupBootloader-im1" format="PNG" align="center" revision="1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<section>
<title>Mit einem BIOS System</title>
@@ -35,7 +37,7 @@ werden soll, einen neuen Bootloader zu erstellen.</para>
<title xml:id="usingMageiaBootloader-ti2">Verwenden des Mageia Bootloaders</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa4">Als Vorgabe schreibt Mageia einen neuen GRUB (legacy)-Bootloader in den MBR
+ <para xml:id="setupBootloader-pa4" revision="3">Als Vorgabe schreibt Mageia einen neuen GRUB (legacy)-Bootloader in den MBR
(Master Boot Record) Ihres ersten Laufwerks. Sind bereits andere
Betriebssysteme installiert, versucht Mageia, diese in das neue
Mageia-Startmenü einzufügen.</para>
@@ -43,7 +45,7 @@ Mageia-Startmenü einzufügen.</para>
<para revision="3">Mageia bietet jetzt neben GRUB legacy optional auch GRUB2 als Bootloader an.</para>
<warning>
- <para revision="3" xml:id="setupBootloader-pa6">Linux Systeme die GRUB2 als Bootloader verwenden, werden im Augenblick nicht
+ <para xml:id="setupBootloader-pa6" revision="3">Linux Systeme die GRUB2 als Bootloader verwenden, werden im Augenblick nicht
von GRUB (legacy) unterstützt und werden auch nicht vom GRUB legacy
Bootloader erkannt.</para>
@@ -54,16 +56,16 @@ Zusammenfassungs-Seite empfohlen wird.</para>
<section xml:id="usingExistingBootloader">
<info>
- <title revision="2" xml:id="usingExistingBootloader-ti4">Verwenden eines bestehenden Bootloaders</title>
+ <title xml:id="usingExistingBootloader-ti4" revision="2">Verwenden eines bestehenden Bootloaders</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa46">Wenn Sie sich dafür entscheiden, einen bestehenden Bootloader zu verwenden,
+ <para xml:id="setupBootloader-pa46" revision="3">Wenn Sie sich dafür entscheiden, einen bestehenden Bootloader zu verwenden,
dann dürfen Sie nicht vergessen, während der Installation an der Seite
"Zusammenfassung" zu STOPPEN und auf den Knopf <guibutton>Bootloader
einrichten</guibutton> zu klicken, der es Ihnen erlaubt, den
Installationsort des Bootloaders zu ändern.</para>
- <para revision="1" xml:id="setupBootloader-pa47">Wählen Sie kein Gerät, wie z.B."sda", oder Sie überschreiben Ihren
+ <para xml:id="setupBootloader-pa47" revision="1">Wählen Sie kein Gerät, wie z.B."sda", oder Sie überschreiben Ihren
bestehenden MBR. Sie müssen die Wurzel-Partition wählen, die Sie zuvor
während der Partitionierungsphase gewählt haben, z.B. sda7.</para>
@@ -78,7 +80,7 @@ ist. <emphasis role="bold">Strg+Alt+F7</emphasis> bringt Sie wieder zum
Installationsbildschirm zurück.</para>
</tip>
- <para revision="2" xml:id="setupBootloader-pa49">Die exakte Prozedur zum Hinzufügen Ihres Mageia-Systems zu einem bestehenden
+ <para xml:id="setupBootloader-pa49" revision="2">Die exakte Prozedur zum Hinzufügen Ihres Mageia-Systems zu einem bestehenden
Bootloader finden Sie weiter unten in dieser Hilfe, wobei es in den meisten
Fällen nötig ist, das entsprechende Bootloader-Ladeprogramm auszuführen, das
dann den Eintrag für Mageia automatisch finden und hinzufügen sollte. Sehen
@@ -88,10 +90,10 @@ offen sind.</para>
<section xml:id="advancedOptionBootloader">
<info>
- <title revision="2" xml:id="advancedOptionBootloader-ti5">Erweiterte Optionen für den Bootloader</title>
+ <title xml:id="advancedOptionBootloader-ti5" revision="2">Erweiterte Optionen für den Bootloader</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa52">Besitzen Sie für das Wurzelverzeichnis ( / ) nur einen sehr eingeschränkten
+ <para xml:id="setupBootloader-pa52" revision="3">Besitzen Sie für das Wurzelverzeichnis ( / ) nur einen sehr eingeschränkten
Platz auf dem Laufwerk, worin <literal>/tmp</literal> enthalten ist, klicken
Sie auf <guibutton>Fortgeschritten</guibutton> und markieren Sie das
Ankreuzfeld für <guilabel>"/tmp" bei jedem Systemstart
@@ -106,7 +108,10 @@ säubern</guilabel>. Dies hilft Ihnen, mehr Platz frei zu halten.</para>
Bootloader nicht auswählen können weil nur Grub2-efi verfügbar ist. </para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader2.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader2.png"/>
+</imageobject></mediaobject>
<para>Falls Mageia das Betriebssystem ist, welches als erstes auf Ihrem Computer
installiert wurde, wird das Installationsprogramm ein ESP (EFI System
diff --git a/docs/installer/de/setupBootloaderAddEntry.xml b/docs/installer/de/setupBootloaderAddEntry.xml
index d173a837..7eb7d381 100644
--- a/docs/installer/de/setupBootloaderAddEntry.xml
+++ b/docs/installer/de/setupBootloaderAddEntry.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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="de">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="de" xml:id="setupBootloaderAddEntry">
<info>
@@ -7,9 +7,13 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
-xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="dx2-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="live-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject></mediaobject>
<section>
<title>Mit einem BIOS System</title>
@@ -27,8 +31,8 @@ editieren oder <code>grub-customizer</code> verwenden.</para>
</note>
<mediaobject>
-<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
-align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1"
+align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
</imageobject></mediaobject>
<para>Einige risikofreie Dinge ändern die Bezeichnung eines Eintrags und
diff --git a/docs/installer/de/unused.xml b/docs/installer/de/unused.xml
index fb75dc92..12b954d0 100644
--- a/docs/installer/de/unused.xml
+++ b/docs/installer/de/unused.xml
@@ -19,7 +19,7 @@ sinnvoll dies zu tun, außer Sie haben vor, die durchgeführte Installation
auch auf anderer Hardware zu verwenden.</para>
<mediaobject>
-<imageobject> <imagedata fileref="live-unused-InstallationProgress.png"/>
+<imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
</imageobject></mediaobject>
<para>Der nächste Schritt ist das kopieren der Dateien auf die Festplatte. Dies
diff --git a/docs/installer/el/bootLive.xml b/docs/installer/el/bootLive.xml
index cccd6943..c656cfa8 100644
--- a/docs/installer/el/bootLive.xml
+++ b/docs/installer/el/bootLive.xml
@@ -1,139 +1,33 @@
-<?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="bootLive" version="5.0" xml:lang="el">
- <info>
- <title xml:id="bootLive-ti1">Εκκίνηση της Mageia ως σύστημα Live</title>
- </info>
-
- <section xml:id="bootLive-1">
- <info>
- <title xml:id="bootLive1-ti1">Εκκίνηση του μέσου</title>
- </info>
-
- <section>
- <info>
- <title xml:id="bootLive11-ti1">Από τον δίσκο</title>
- </info>
-
- <para>Μπορείτε να εκκινήσετε απευθείας από το μέσο που χρησιμοποιήθηκε για την
+<?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="el"><info><title xml:id="bootLive-ti1">Εκκίνηση της Mageia ως σύστημα Live</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Εκκίνηση του μέσου</title></info><section><info><title xml:id="bootLive11-ti1">Από τον δίσκο</title></info><para>Μπορείτε να εκκινήσετε απευθείας από το μέσο που χρησιμοποιήθηκε για την
εγγραφή της εικόνας (CD-ROM, DVD-ROM...). Συνήθως χρειάζεται απλά να το
εισαγάγετε στον οδηγό CD/DVD και το πρόγραμμα εκκίνησης θα εκτελέσει την
εγκατάσταση αυτόματα μετά την επανεκκίνηση του υπολογιστή. Αν αυτό δεν
συμβεί θα πρέπει να διαμορφώσετε κατάλληλα το BIOS ή να πιέσετε ένα πλήκτρο
που θα σας επιτρέψει να επιλέξετε το περιφερειακό που θα χρησιμοποιήσει ο
-υπολογιστής στην εκκίνηση.</para>
-
- <para>Αναλόγως το υλικό που διαθέτετε, και την διαμόρφωσή του, θα λάβετε μια εκ
-των δυο παρακάτω οθονών.</para>
- </section>
-
- <section>
- <info>
- <title xml:id="bootLive12-ti1">Από μια συσκευή USB</title>
- </info>
-
- <para>Μπορείτε να εκκινήσετε από την συσκευή USB στην οποία αποτυπώσατε την εικόνα
+υπολογιστής στην εκκίνηση.</para><para>Αναλόγως το υλικό που διαθέτετε, και την διαμόρφωσή του, θα λάβετε μια εκ
+των δυο παρακάτω οθονών.</para></section><section><info><title xml:id="bootLive12-ti1">Από μια συσκευή USB</title></info><para>Μπορείτε να εκκινήσετε από την συσκευή USB στην οποία αποτυπώσατε την εικόνα
ISO. Αναλόγως τις ρυθμίσεις του BIOS, ο υπολογιστής πιθανώς να εκκινήσει
απευθείας από την συσκευή USB συνδεδεμένη σε μια θύρα. Αν αυτό δεν συμβεί
ίσως θα πρέπει να διαμορφώσετε καταλλήλως το BIOS ή να πιέσετε σε ένα
πλήκτρο που θα σας επιτρέψει να επιλέξετε το περιφερειακό από το οποίο θα
-εκκινηθεί ο υπολογιστής.</para>
- </section>
- </section>
-
- <section xml:id="biosmode">
- <info>
- <title xml:id="biosmode-ti1">Στο BIOS/CSM/Λειτουργία παλαιού τύπου</title>
- </info>
-
- <mediaobject>
- <imageobject> <imagedata fileref="live-bootCSM.png"/> </imageobject>
-
- <caption>
- <para>Η πρώτη οθόνη εκκινώντας σε λειτουργία BIOS</para>
- </caption>
- </mediaobject>
-
- <para>Στο μεσαίο μενού, μπορείτε να επιλέξετε μεταξύ τριών ενεργειών:</para>
-
- <itemizedlist>
- <listitem>
- <para>Εκκίνηση της Mageia: Η Mageia 5 θα εκκινηθεί από το συνδεδεμένο μέσο (CD/DVD
+εκκινηθεί ο υπολογιστής.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">Στο BIOS/CSM/Λειτουργία παλαιού τύπου</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Η πρώτη οθόνη εκκινώντας σε λειτουργία BIOS</para></caption></mediaobject><para>Στο μεσαίο μενού, μπορείτε να επιλέξετε μεταξύ τριών ενεργειών:</para><itemizedlist><listitem><para>Εκκίνηση της Mageia: Η Mageia 5 θα εκκινηθεί από το συνδεδεμένο μέσο (CD/DVD
ή κλειδί USB) χωρίς καμιά εγγραφή στον δίσκο, που συνεπάγεται ότι θα πρέπει
να αναμένετε ένα αργό σύστημα. Μετά το πέρας της εκκίνησης, μπορείτε να
-προχωρήσετε στην εγκατάσταση στον σκληρό δίσκο.</para>
- </listitem>
-
- <listitem>
- <para>Εγκατάσταση της Mageia: Απευθείας εγκατάσταση της Mageia στον σκληρό δίσκο.</para>
- </listitem>
-
- <listitem>
- <para>Εγκατάσταση από τον σκληρό δίσκο: Αυτή η επιλογή επιτρέπει την συνήθης
+προχωρήσετε στην εγκατάσταση στον σκληρό δίσκο.</para></listitem><listitem><para>Εγκατάσταση της Mageia: Απευθείας εγκατάσταση της Mageia στον σκληρό δίσκο.</para></listitem><listitem><para>Εγκατάσταση από τον σκληρό δίσκο: Αυτή η επιλογή επιτρέπει την συνήθης
εκκίνηση από τον σκληρό δίσκο, όταν δεν υπάρχει κάποιο συνδεδεμένο μέσο
-(CD/DVD ή ένα κλειδί USB) (δεν δουλεύει στην Mageia 5).</para>
- </listitem>
- </itemizedlist>
-
- <para>Στο μενού στην βάση υπάρχουν οι επιλογές εκκίνησης:</para>
-
- <itemizedlist>
- <listitem>
- <para>F1 - Βοήθεια. Επεξηγεί τις επιλογές "splash", "apm", "acpi" και "Ide"</para>
- </listitem>
-
- <listitem>
- <para>F2 - Γλώσσα. Επιλέξτε την γλώσσα εμφάνισης της οθόνης.</para>
- </listitem>
-
- <listitem>
- <para>F3 - Ανάλυση της οθόνης. Επιλέξτε μεταξύ κειμένου, 640x400, 800x600,
-1024x728</para>
- </listitem>
-
- <listitem>
- <para>F4 - CD-Rom. CD-Rom ή Άλλο. Κανονικά, η εγκατάσταση πραγματοποιείται από το
+(CD/DVD ή ένα κλειδί USB) (δεν δουλεύει στην Mageia 5).</para></listitem></itemizedlist><para>Στο μενού στην βάση υπάρχουν οι επιλογές εκκίνησης:</para><itemizedlist><listitem><para>F1 - Βοήθεια. Επεξηγεί τις επιλογές "splash", "apm", "acpi" και "Ide"</para></listitem><listitem><para>F2 - Γλώσσα. Επιλέξτε την γλώσσα εμφάνισης της οθόνης.</para></listitem><listitem><para>F3 - Ανάλυση της οθόνης. Επιλέξτε μεταξύ κειμένου, 640x400, 800x600,
+1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom ή Άλλο. Κανονικά, η εγκατάσταση πραγματοποιείται από το
εισηγμένο μέσο εγκατάστασης. Εδώ μπορείτε να επιλέξετε άλλες πηγές όπως
διακομιστές FTP ή NFS. Αν η εγκατάσταση πραγματοποιήθηκε σε ένα δίκτυο με
διακομιστή SLP, μέσω αυτής της επιλογής μπορείτε να επιλέξτε μια από τις
-διαθέσιμες πηγές στον διακομιστή.</para>
- </listitem>
-
- <listitem>
- <para>F5 - Οδηγός. Ναι ή Όχι. Το σύστημα λαμβάνει υπόψιν την ύπαρξη ενός
+διαθέσιμες πηγές στον διακομιστή.</para></listitem><listitem><para>F5 - Οδηγός. Ναι ή Όχι. Το σύστημα λαμβάνει υπόψιν την ύπαρξη ενός
προαιρετικού δίσκου με μια ενημέρωση ενός οδηγού και θα αιτήσει την εισαγωγή
-του κατά την διαδικασία της εγκατάστασης.</para>
- </listitem>
-
- <listitem>
- <para>F6 - Επιλογές του πυρήνα. Από εδώ μπορείτε να καθορίσετε τις επιλογές
-ανάλογα με το υλικό σας και τους οδηγούς προς χρήση.</para>
- </listitem>
- </itemizedlist>
- </section>
-
- <section xml:id="uefimode">
- <info>
- <title xml:id="uefimode-ti1">Σε λειτουργία UEFI</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center"
-fileref="live-bootUEFI.png" format="PNG" xml:id="bootUEFI-im1"/>
-</imageobject>
-
- <caption>
- <para>Η πρώτη οθόνη εκκινώντας από τον δίσκο σε σύστημα UEFI</para>
- </caption>
- </mediaobject>
-
- <para>Διαθέτετε μόνο την επιλογή να εκτελέσετε την Mageia σε λειτουργία Live
-(πρώτη επιλογή) ή την διαδικασία της εγκατάστασης (δεύτερη επιλογή).</para>
- <para>Αν η εκκίνηση έγινε από ένα κλειδί USB, θα λάβετε δυο επιπλέον γραμμές οι
+του κατά την διαδικασία της εγκατάστασης.</para></listitem><listitem><para>F6 - Επιλογές του πυρήνα. Από εδώ μπορείτε να καθορίσετε τις επιλογές
+ανάλογα με το υλικό σας και τους οδηγούς προς χρήση.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">Σε λειτουργία 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>Η πρώτη οθόνη εκκινώντας από τον δίσκο σε σύστημα UEFI</para></caption></mediaobject><para>Διαθέτετε μόνο την επιλογή να εκτελέσετε την Mageia σε λειτουργία Live
+(πρώτη επιλογή) ή την διαδικασία της εγκατάστασης (δεύτερη επιλογή).</para><para>Αν η εκκίνηση έγινε από ένα κλειδί USB, θα λάβετε δυο επιπλέον γραμμές οι
οποίες είναι διπλότυπες των προηγούμενων γραμμών με την κατάληξη «USB». Θα
-πρέπει να τις επιλέξετε.</para>
-
- <para>Σε κάθε περίπτωση, τα πρώτα βήματα θα είναι τα ίδια με την επιλογή της
+πρέπει να τις επιλέξετε.</para><para>Σε κάθε περίπτωση, τα πρώτα βήματα θα είναι τα ίδια με την επιλογή της
γλώσσας, της ωρολογιακής ζώνης και του πληκτρολογίου. Στην συνέχεια η
διαδικασία διαφέρει με <link linkend="testing">επιπλέον βήματα της
-λειτουργίας Live</link>.</para>
- </section>
-</section> \ No newline at end of file
+λειτουργίας Live</link>.</para></section></section> \ No newline at end of file
diff --git a/docs/installer/el/login.xml b/docs/installer/el/login.xml
index d1b9c0a8..e14de107 100644
--- a/docs/installer/el/login.xml
+++ b/docs/installer/el/login.xml
@@ -1,24 +1,6 @@
-<?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="login" version="5.0" xml:lang="el">
- <info>
- <title xml:id="label-to-adapt-ti1">Οθόνη εισόδου</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center" xml:id="login-im1"
-format="PNG" fileref="live-login.png"/> </imageobject>
-
- <caption>
- <para>Οθόνη εισόδου KDM</para>
- </caption>
- </mediaobject>
-
- <para>Εν τέλει, θα βρεθείτε στην οθόνη εισόδου.</para>
-
- <para>Εισαγάγετε το όνομα του χρήστη και τον κωδικό πρόσβασης, και σε μερικά
+<?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="el"><info><title xml:id="label-to-adapt-ti1">Οθόνη εισόδου</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>Οθόνη εισόδου KDM</para></caption></mediaobject><para>Εν τέλει, θα βρεθείτε στην οθόνη εισόδου.</para><para>Εισαγάγετε το όνομα του χρήστη και τον κωδικό πρόσβασης, και σε μερικά
δευτερόλεπτα θα βρεθείτε στο περιβάλλον εργασίας KDE ή GNOME ανάλογα με το
-μέσο που χρησιμοποιήσατε. Μπορείτε εφεξής να χρησιμοποιήσετε την Mageia.</para>
-
- <para>Μπορείτε να βρείτε ένα άλλο τμήμα της τεκμηρίωσης στο <link
+μέσο που χρησιμοποιήσατε. Μπορείτε εφεξής να χρησιμοποιήσετε την Mageia.</para><para>Μπορείτε να βρείτε ένα άλλο τμήμα της τεκμηρίωσης στο <link
ns4:href="https://wiki.mageia.org/en/Category:Documentation">Mageia
-wiki</link>.</para>
-</section> \ No newline at end of file
+wiki</link>.</para></section> \ No newline at end of file
diff --git a/docs/installer/el/setupBootloader.xml b/docs/installer/el/setupBootloader.xml
index 179e5645..8350ebc4 100644
--- a/docs/installer/el/setupBootloader.xml
+++ b/docs/installer/el/setupBootloader.xml
@@ -10,9 +10,11 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
-format="PNG"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="setupBootloader-im1"
+format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata
+xml:id="setupBootloader-im1" format="PNG" align="center" revision="1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<section>
<title>Με ένα σύστημα Bios</title>
@@ -34,7 +36,7 @@ format="PNG"/> </imageobject></mediaobject>
<title xml:id="usingMageiaBootloader-ti2">Χρησιμοποιώντας το πρόγραμμα εκκίνησης της Mageia</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa4">Από προεπιλογή η Mageia δημιουργεί ένα νέο πρόγραμμα εκκίνησης GRUB (legacy)
+ <para xml:id="setupBootloader-pa4" revision="3">Από προεπιλογή η Mageia δημιουργεί ένα νέο πρόγραμμα εκκίνησης GRUB (legacy)
στο MBR (Master Boot Record) του πρώτου σας σκληρού δίσκου. Αν έχετε ήδη
εγκατεστημένα άλλα λειτουργικά συστήματα, η Mageia προσπαθεί να τα
συμπεριλάβει στο νέο μενού εκκίνησης της Mageia.</para>
@@ -43,7 +45,7 @@ format="PNG"/> </imageobject></mediaobject>
επιπρόσθετα του GRUB legacy και του Lilo.</para>
<warning>
- <para revision="3" xml:id="setupBootloader-pa6">Τα συστήματα Linux που χρησιμοποιούν GRUB2 δεν υποστηρίζονται αυτή τη στιγμή
+ <para xml:id="setupBootloader-pa6" revision="3">Τα συστήματα Linux που χρησιμοποιούν GRUB2 δεν υποστηρίζονται αυτή τη στιγμή
από το GRUB (legacy) και δεν θα αναγνωριστούν αν χρησιμοποιείτε το
προκαθορισμένο GRUB.</para>
@@ -54,16 +56,16 @@ format="PNG"/> </imageobject></mediaobject>
<section xml:id="usingExistingBootloader">
<info>
- <title revision="2" xml:id="usingExistingBootloader-ti4">Χρήση ενός υπάρχοντος μενού εκκίνησης</title>
+ <title xml:id="usingExistingBootloader-ti4" revision="2">Χρήση ενός υπάρχοντος μενού εκκίνησης</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa46">Αν αποφασίσετε να χρησιμοποιήσετε ένα υπάρχον μενού εκκίνησης τότε θα πρέπει
+ <para xml:id="setupBootloader-pa46" revision="3">Αν αποφασίσετε να χρησιμοποιήσετε ένα υπάρχον μενού εκκίνησης τότε θα πρέπει
να θυμηθείτε να ΣΤΑΜΑΤΗΣΕΤΕ στη σελίδα σύνοψης κατά την εγκατάσταση και να
κάνετε κλικ στο κουμπί <guibutton>Διαμόρφωσης</guibutton> του προγράμματος
εκκίνησης, το οποίο θα σας επιτρέψει να αλλάξετε την τοποθεσία εγκατάστασης
του προγράμματος εκκίνησης.</para>
- <para revision="1" xml:id="setupBootloader-pa47">Μην επιλέξετε μια συσκευή π.χ. «sda», διαφορετικά θα αντικαταστήσετε το
+ <para xml:id="setupBootloader-pa47" revision="1">Μην επιλέξετε μια συσκευή π.χ. «sda», διαφορετικά θα αντικαταστήσετε το
υπάρχον σας MBR. Πρέπει να επιλέξετε την κατάτμηση root που επιλέξατε κατά
τον διαμερισμό νωρίτερα π.χ. sda7.</para>
@@ -75,7 +77,7 @@ format="PNG"/> </imageobject></mediaobject>
Ctrl+Alt+F7 επιστρέφετε στην οθόνη εγκατάστασης.</para>
</tip>
- <para revision="2" xml:id="setupBootloader-pa49">Η ακριβής διαδικασία για να προσθέσετε το σύστημά σας Mageia σε ένα υπάρχον
+ <para xml:id="setupBootloader-pa49" revision="2">Η ακριβής διαδικασία για να προσθέσετε το σύστημά σας Mageia σε ένα υπάρχον
πρόγραμμα εκκίνησης δεν είναι το αντικείμενο σε αυτήν τη Βοήθεια, ωστόσο
στις περισσότερες περιπτώσεις αυτό θα επιφέρει την εκτέλεση του προγράμματος
εγκατάστασης του εν λόγω μενού εκκίνησης, το οποίο θα πρέπει να εντοπίσει
@@ -85,10 +87,10 @@ Ctrl+Alt+F7 επιστρέφετε στην οθόνη εγκατάστασης.
<section xml:id="advancedOptionBootloader">
<info>
- <title revision="2" xml:id="advancedOptionBootloader-ti5">Προχωρημένη λειτουργία του προγράμματος εκκίνησης</title>
+ <title xml:id="advancedOptionBootloader-ti5" revision="2">Προχωρημένη λειτουργία του προγράμματος εκκίνησης</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa52">Αν έχετε περιορισμένο χώρο στο δίσκο για την κατάτμηση <literal>/</literal>
+ <para xml:id="setupBootloader-pa52" revision="3">Αν έχετε περιορισμένο χώρο στο δίσκο για την κατάτμηση <literal>/</literal>
που περιέχει <literal>/tmp</literal>, κάντε κλικ στο <guibutton>Για
προχωρημένους</guibutton> και επιλέξτε το πλαίσιο για <guilabel>Καθαρισμό
του /tmp σε κάθε εκκίνηση</guilabel>. Αυτό βοηθά στη διατήρηση κάποιου
@@ -104,7 +106,10 @@ Ctrl+Alt+F7 επιστρέφετε στην οθόνη εγκατάστασης.
είναι διαθέσιμο. </para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader2.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader2.png"/>
+</imageobject></mediaobject>
<para>Αν η Mageia είναι το πρώτο σύστημα εγκατεστημένο στον υπολογιστή σας, το
πρόγραμμα εγκατάστασης δημιούργησε μια κατάτμηση ESP (EFI System Partition)
diff --git a/docs/installer/el/setupBootloaderAddEntry.xml b/docs/installer/el/setupBootloaderAddEntry.xml
index 8cae5268..7a205a2a 100644
--- a/docs/installer/el/setupBootloaderAddEntry.xml
+++ b/docs/installer/el/setupBootloaderAddEntry.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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="el">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="el" xml:id="setupBootloaderAddEntry">
<info>
@@ -7,9 +7,13 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
-xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="dx2-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="live-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject></mediaobject>
<section>
<title>Με ένα σύστημα Bios</title>
@@ -28,8 +32,8 @@ xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
</note>
<mediaobject>
-<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
-align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1"
+align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
</imageobject></mediaobject>
<para>Μερικά πράγματα που μπορούν να γίνουν χωρίς κίνδυνο, είναι η αλλαγή της
diff --git a/docs/installer/el/unused.xml b/docs/installer/el/unused.xml
index 4b4383fe..7190e665 100644
--- a/docs/installer/el/unused.xml
+++ b/docs/installer/el/unused.xml
@@ -19,7 +19,7 @@ format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
χρήση ενός επιπλέον υλικού ή τοπικότητας.</para>
<mediaobject>
-<imageobject> <imagedata fileref="live-unused-InstallationProgress.png"/>
+<imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
</imageobject></mediaobject>
<para>Το επόμενο βήμα είναι η αντιγραφή των αρχείων στον σκληρό δίσκο. Αυτή η
diff --git a/docs/installer/eo/DrakLive-cover.xml b/docs/installer/eo/DrakLive-cover.xml
new file mode 100644
index 00000000..3e5b555d
--- /dev/null
+++ b/docs/installer/eo/DrakLive-cover.xml
@@ -0,0 +1,75 @@
+<?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="eo" xml:id="Quick-Startup">
+ <info>
+ <title>Installation from LIVE medium</title>
+ <publisher> <publishername>Mageia.org</publishername> </publisher>
+ <revhistory>
+ <revision>
+ <date>January 2015</date>
+ <revremark>Mageia 5</revremark>
+ </revision>
+ </revhistory>
+ <cover>
+ <para role="tagline">The Official Documentation for Mageia</para>
+ <mediaobject>
+<imageobject> <imagedata fileref="mageia-2013.png"/> </imageobject></mediaobject>
+ <para>La tekstoj kaj la ekranbildoj en ĉi helpo estas sub licenco 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>Tiu ĉi helpo estas skribita kun helpo de <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> kreita per <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>
+ </para>
+ <para>It was written by volunteers in their free time. Please contact <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
+Team</link>, if you would like to help improve this manual.</para>
+ </cover>
+ </info>
+ <article>
+ <title>Installation from LIVE medium</title>
+ <para><note>
+ <para>Neniu vidos ĉiujn ekranojn, kiujn vi vidas en ĉi helpo. Tio kiujn ekranojn
+vi vidos, dependas de via komputilo kaj viaj elektoj dum instalado.</para>
+ </note></para>
+ <xi:include href="SelectAndUseISOs2.xml"/>
+
+ <xi:include href="bootLive.xml"/>
+
+ <xi:include href="selectLanguage.xml"/>
+
+ <xi:include href="acceptLicense.xml"/>
+
+ <xi:include href="configureTimezoneUTC.xml"/>
+
+ <xi:include href="bestTime.xml"/>
+
+ <xi:include href="selectKeyboardLive.xml"/>
+
+ <xi:include href="testing.xml"/>
+
+ <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"/>
+
+ <xi:include href="unused.xml"/>
+
+ <xi:include href="setupBootloader.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>
+</book> \ No newline at end of file
diff --git a/docs/installer/eo/DrakLive.xml b/docs/installer/eo/DrakLive.xml
new file mode 100644
index 00000000..46d59863
--- /dev/null
+++ b/docs/installer/eo/DrakLive.xml
@@ -0,0 +1,64 @@
+<?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="eo" xml:id="Quick-Startup">
+ <info>
+ <title>Installation from LIVE medium</title>
+
+ <cover>
+ <para><note>
+ <para>Neniu vidos ĉiujn ekranojn, kiujn vi vidas en ĉi helpo. Tio kiujn ekranojn
+vi vidos, dependas de via komputilo kaj viaj elektoj dum instalado.</para>
+ </note></para>
+
+ <para xml:id="CC_BY-SA">La tekstoj kaj la ekranbildoj en ĉi helpo estas sub licenco 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>Tiu ĉi helpo estas skribita kun helpo de <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> kreita per <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
+
+ <para>It was written by volunteers in their free time. Please contact <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
+Team</link>, if you would like to help improve this manual.</para>
+ </cover>
+ </info>
+
+ <xi:include href="SelectAndUseISOs2.xml"/>
+
+ <xi:include href="bootLive.xml"/>
+
+ <xi:include href="selectLanguage.xml"/>
+
+ <xi:include href="acceptLicense.xml"/>
+
+ <xi:include href="configureTimezoneUTC.xml"/>
+
+ <xi:include href="bestTime.xml"/>
+
+ <xi:include href="selectKeyboardLive.xml"/>
+
+ <xi:include href="testing.xml"/>
+
+ <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"/>
+
+ <xi:include href="unused.xml"/>
+
+ <xi:include href="setupBootloader.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
diff --git a/docs/installer/eo/SelectAndUseISOs2.xml b/docs/installer/eo/SelectAndUseISOs2.xml
index a9df02e2..f17cc465 100644
--- a/docs/installer/eo/SelectAndUseISOs2.xml
+++ b/docs/installer/eo/SelectAndUseISOs2.xml
@@ -7,6 +7,32 @@
</info>
<section>
+ <title>Introduction</title>
+
+ <para>Mageia is distributed via ISO images. This page will help you to choose
+which image match your needs.</para>
+
+ <para>There is two families of media:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Classical installer: After booting the media, it will follow a process
+allowing to choose what to install and how to configure your target
+system. This give you the maximal flexibility for a customized installation,
+in particular to choose which Desktop Environment you will install.</para>
+ </listitem>
+
+ <listitem>
+ <para>LIVE media: you can boot the media in a real Mageia system without
+installing it, to see what you will get after installation. The
+installation process is simpler, but you get lesser choices.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>Details are given in the next sections.</para>
+ </section>
+
+ <section>
<title>Media</title>
<section>
@@ -260,12 +286,8 @@ http is chosen, you may also see something like</para>
<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
<para>md5sum and sha1sum are tools to check the ISO integrity. Use only one of
-them. Both hexadecimal numbers have been calculated by an algorithm from the
-file to be downloaded. When you ask these algorithms to recalculate this
-number from your downloaded file, either you have the same number and your
-downloaded file is correct, or the number is different and you have a
-failure. A failure infers that you should retry the download.Then this
-window appears:</para>
+them. Keep one of them <link linkend="integrity">for further
+usage</link>. Then this window appears:</para>
<mediaobject>
<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
@@ -274,7 +296,13 @@ window appears:</para>
</section>
<section>
- <title>Checking the downloaded media integrity</title>
+ <title xml:id="integrity">Checking the downloaded media integrity</title>
+
+ <para>Both checksums are hexadecimal numbers calculated by an algorithm from the
+file to be downloaded. When you ask these algorithms to recalculate this
+number from your downloaded file, either you have the same number and your
+downloaded file is correct, or the number is different and you have a
+failure. A failure infers that you should retry the download.</para>
<para>Open a console, no need to be root, and:</para>
@@ -323,13 +351,35 @@ the device; any other data will be lost and the partition capacity will be
reduced to the image size.</para>
</warning>
- <para>To recover the original capacity, you must re-format the USB stick.</para>
+ <para>To recover the original capacity, you must redo partitioning and re-format
+the USB stick.</para>
<section>
- <title>Using Mageia</title>
+ <title>Using a graphical tool within Mageia</title>
<para>You can use a graphical tool like <link
ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks">IsoDumper</link></para>
+ </section>
+
+ <section>
+ <title>Using a graphical tool within Windows</title>
+
+ <para>You could try:</para>
+
+ <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
+"ISO image" option;</para>
+
+ <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
+Disk Imager</link></para>
+ </section>
+
+ <section>
+ <title>Using Command line within a GNU/Linux system</title>
+
+ <warning>
+ <para>It is potentially *dangerous* to do this by hand. You risk to overwrite a
+disc partition if you get the device-ID wrong.</para>
+ </warning>
<para>You can also use the dd tool in a console:</para>
@@ -356,11 +406,34 @@ application or file manager that could access or read it)</para>
<mediaobject>
<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
+
+ <para>Alternatively, you can get the device name with the command
+<code>dmesg</code>: at end, you see the device name starting with
+<emphasis>sd</emphasis>, and <emphasis>sdd</emphasis> in this case:</para>
+
+ <screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
+[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
+[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
+[72594.770536] usb 1-1: Product: Mass Storage Device
+[72594.770537] usb 1-1: Manufacturer: JetFlash
+[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB
+[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes
+[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes
+[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected
+[72594.772447] scsi host8: usb-storage 1-1:1.0
+[72595.963238] scsi 8:0:0:0: Direct-Access JetFlash Transcend 2GB 1100 PQ: 0 ANSI: 4
+[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)
+[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off
+[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00
+[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found
+[72595.965031] sd 8:0:0:0: [sdd] Assuming drive cache: write through
+[72595.967251] <emphasis>sdd</emphasis>: sdd1
+[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen>
</listitem>
<listitem>
- <para>Find the device name for your USB stick (by its size), for example /dev/sdb
-in the screenshot above, it is a 8Go USB stick.</para>
+ <para>Find the device name for your USB stick (by its size), for example
+<code>/dev/sdb</code> in the screenshot above, it is a 8GB USB stick.</para>
</listitem>
<listitem>
@@ -382,30 +455,6 @@ of=/dev/sdb bs=1M</userinput></para>
</listitem>
</orderedlist>
</section>
-
- <section>
- <title>Using Windows</title>
-
- <para>You could try:</para>
-
- <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link></para>
-
- <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
-Disk Imager</link></para>
-
- <para/>
- </section>
</section>
</section>
-
- <section>
- <title>Mageia Installation</title>
-
- <para>This step is detailed in <link ns4:href="http://www.mageia.org/en/doc/">the
-Mageia documentation</link>.</para>
-
- <para>More information is available in <link
-ns4:href="https://wiki.mageia.org/en/Category:Documentation">the Mageia
-wiki</link>.</para>
- </section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/installer/eo/acceptLicense.xml b/docs/installer/eo/acceptLicense.xml
index 961898be..a5783d56 100644
--- a/docs/installer/eo/acceptLicense.xml
+++ b/docs/installer/eo/acceptLicense.xml
@@ -1,11 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eo" xml:id="acceptLicense"
- 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="acceptLicense" version="5.0" xml:lang="eo">
@@ -41,10 +34,12 @@
<title xml:id="acceptLicense-ti1">Licenco kaj publikig-notoj</title>
</info>
- <mediaobject condition="expert">
-<imageobject> <imagedata revision="1" fileref="dx2-license.png" width="800"
-align="center" format="PNG" depth="600"
-xml:id="acceptLicense-im1"></imagedata> </imageobject></mediaobject>
+ <mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="acceptLicense-im1"
+revision="4" align="center" format="PNG" fileref="dx2-license.png"/>
+</imageobject> <imageobject> <imagedata xml:id="acceptLicense-im2"
+revision="5" align="center" condition="live" format="PNG"
+fileref="live-license.png"/> </imageobject></mediaobject>
<section xml:id="license">
<info>
@@ -83,6 +78,6 @@ Release Notes</para>
<para>Por vidi kio estas nova en ĉi tiu versio de
<application>Magejo</application>, klaku sur la butono
-<guibutton>Publikig-notoj (Release Notes) </guibutton>.</para>
+<guibutton>Publikig-notoj (Release Notes)</guibutton>.</para>
</section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/installer/eo/addUser.xml b/docs/installer/eo/addUser.xml
index f909c16a..5bc1f60e 100644
--- a/docs/installer/eo/addUser.xml
+++ b/docs/installer/eo/addUser.xml
@@ -1,5 +1,4 @@
-<?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="addUser" version="5.0" xml:lang="eo">
-
+<?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="addUser" version="5.0" xml:lang="eo">
<info>
<title xml:id="addUser-ti1">Uzula kaj superuzula administrado</title>
</info>
@@ -15,10 +14,12 @@
+
+
-
- <mediaobject>
+
+ <mediaobject>
<!-- Started by marja,using Led43's text, on 2012 03 27 -->
<!-- NEEDS TO BE REVIEWED! -->
<!-- SimonNZG 2012-04-03 has taken a look but needs to come back -->
@@ -31,10 +32,11 @@
"rbash" in the xguest warning - is that correct? -->
<!-- JohnR 2012-04-19 Language proofreading -->
<!-- marja 2012-04-24 Added screenshot -->
-<!-- marja 2013-04-26 added new note -->
-<imageobject> <imagedata revision="1" fileref="dx2-setRootPassword.png"
-width="800" depth="600" format="PNG" align="center"
-xml:id="setRootPassword-im1"></imagedata> </imageobject></mediaobject>
+<!-- marja 2013-04-26 added new note-->
+<imageobject condition="classical"> <imagedata revision="1" align="center"
+xml:id="setRootPassword-im1" fileref="dx2-setRootPassword.png"
+format="PNG"/> </imageobject> <imageobject> <imagedata format="PNG"
+fileref="live-user1.png"/> </imageobject></mediaobject>
<section xml:id="root-password">
<info>
@@ -86,7 +88,7 @@ minuskloj.</emphasis></para>
<listitem>
<para><guilabel>Pasvorto</guilabel>: En ĉi tiu teksta skatolo vi devus tajpi la
uzulan pasvorton. Estas kampo je la fino de la teksto-skatolo indikanta la
-forton de la pasvorto. (Vidu ankaŭ <xref linkend="givePassword"></xref>)</para>
+forton de la pasvorto. (Vidu ankaŭ <xref linkend="givePassword"/>)</para>
</listitem>
<listitem>
@@ -96,7 +98,7 @@ uzulaj pasvortaj teksto-skatoloj.</para>
</listitem>
</itemizedlist>
- <note>
+ <note>
<para>Any user you add while installing Mageia, will have a world readable (but
write protected) home directory.</para>
@@ -112,27 +114,27 @@ extra needed users in the <emphasis>Configuration - Summary</emphasis> step
during the install. Choose <emphasis>User management</emphasis>.</para>
<para>The access permissions can also be changed after the install.</para>
- </note>
-
+ </note>
</section>
- <section xml:id="addUserAdvanced">
+ <section condition="classical" xml:id="addUserAdvanced">
<info>
<title xml:id="addUserAdvanced-ti3">Sperta uzulo-administrado</title>
</info>
<para>Se la <guibutton>Progresinta</guibutton> butono estas klakita aperos ekrano
-ebliganta eldoni la konfiguron de la aldonata uzulo. Krome, vi povas
-aktivigi aŭ malaktivigi gastan konton.</para>
+ebliganta eldoni la konfiguron de la aldonata uzulo.</para>
- <warning>
+ <para condition="classical">Additionally, you can disable or enable a guest account.</para>
+
+ <warning condition="classical">
<para>Ĉio konservita de gasto uzanta defaŭltan <emphasis>rbash-an</emphasis>
gastan konton en la dosierujo /home estos forigita post la elsaluto. La
gasto devus konservi gravajn dosierojn en USB-ŝlosilo.</para>
</warning>
<itemizedlist>
- <listitem>
+ <listitem condition="classical">
<para><guilabel>Aktivigi gastan konton (Enable guest account)</guilabel>: Ĉi tie
vi povas aktivigi aŭ malaktivigi gastan konton. Gasta konto ebligos gaston
ensaluti kaj uzi la komputilon, sed ĝi havas pli da limigoj ol tiu de
diff --git a/docs/installer/eo/ask_mntpoint_s.xml b/docs/installer/eo/ask_mntpoint_s.xml
index 21364f97..03c34df5 100644
--- a/docs/installer/eo/ask_mntpoint_s.xml
+++ b/docs/installer/eo/ask_mntpoint_s.xml
@@ -33,9 +33,12 @@
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> <imagedata revision="1" fileref="dx2-chooseMountpoints.png"
-align="center" width="100%" format="PNG" depth="600"
-xml:id="chooseMountPoints-im1"></imagedata> </imageobject></mediaobject>
+<imageobject condition='classical'> <imagedata revision="1"
+fileref="dx2-chooseMountpoints.png" align="center" format="PNG"
+xml:id="chooseMountPoints-im1"></imagedata> </imageobject> <imageobject
+condition='live'> <imagedata revision="1"
+fileref="live-chooseMountpoints.png" align="center" format="PNG"
+xml:id="live-chooseMountPoints-im1"></imagedata> </imageobject></mediaobject>
<para>Ĉi tie vi vidas la linuksajn subdiskojn kiuj estis trovitaj en via
komputilo. Se vi ne akordas kun la sugestoj de
diff --git a/docs/installer/eo/bestTime.xml b/docs/installer/eo/bestTime.xml
new file mode 100644
index 00000000..bf18e542
--- /dev/null
+++ b/docs/installer/eo/bestTime.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" 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">
+ <info>
+ <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>In this step, you have to select on which time your internal clock is set,
+either local time or UTC time.</para>
+
+ <para>In advanced tab, you will find more options about clock settings.</para>
+</section>
diff --git a/docs/installer/eo/bootLive.xml b/docs/installer/eo/bootLive.xml
new file mode 100644
index 00000000..cc964324
--- /dev/null
+++ b/docs/installer/eo/bootLive.xml
@@ -0,0 +1,29 @@
+<?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="eo"><info><title xml:id="bootLive-ti1">Boot Mageia as Live system</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Booting the medium</title></info><section><info><title xml:id="bootLive11-ti1">From a disc</title></info><para>You can boot directly from the media you used to burn your image (CD-ROM,
+DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the
+bootloader to launch the installation automatically after rebooting the
+computer. If that does not happen you may need to reconfigure your BIOS or
+press one key that will offer you to choose the peripheral from which the
+computer will boot.</para><para>According to which hardware you have, and how it is configured, you get
+either one or another of the two screens below.</para></section><section><info><title xml:id="bootLive12-ti1">From a USB device</title></info><para>You can boot from the USB device on which you dumped your image
+ISO. According to your BIOS settings, the computer boots perhaps directly on
+the USB device already plugged in a port. If that does not happen you may
+need to reconfigure your BIOS or press one key that will offer you to choose
+the peripheral from which the computer will boot.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>First screen while booting in BIOS mode</para></caption></mediaobject><para>In the middle menu, you have the choice between three actions:</para><itemizedlist><listitem><para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
+or USB stick) without writing anything on the disk, so expect a very slow
+system. Once the boot is done, you can proceed to the installation on a hard
+disk.</para></listitem><listitem><para>Install Mageia: This choice will directly install Mageia on a hard disk.</para></listitem><listitem><para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
+when no media (CD/DVD or USB stick) is connected. (not working with Mageia
+5).</para></listitem></itemizedlist><para>In the bottom menu, are the Boot Options:</para><itemizedlist><listitem><para>F1 - Help. Explain the options "splash", "apm", "acpi" and "Ide"</para></listitem><listitem><para>F2 - Language. Choose the display language of the screens.</para></listitem><listitem><para>F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
+the inserted installation medium. Here, select other sources, like FTP or
+NFS servers. If the installation is carried out in a network with an SLP
+server, select one of the installation sources available on the server with
+this option.</para></listitem><listitem><para>F5 - Driver. Yes or No. The system is aware about the presence of an
+optional disk with a driver update and will require its insertion during
+installation process.</para></listitem><listitem><para>F6 - Kernel options. This is a way to specify options according to your
+hardware and the drivers to use.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">In UEFI mode</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
+align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>First screen while booting on UEFI system from disk</para></caption></mediaobject><para>You have only the choice to run Mageia in Live mode (first choice) or to
+process the installation (second choice).</para><para>If you booted from a USB stick, you get two supplemental lines which are a
+duplicata of the previous lines suffixed with "USB". You have to choose
+them.</para><para>In each case, the first steps will be the same to choose language, timezone
+and keyboard, then the processes differ, with <link
+linkend="testing">additional steps in Live mode</link>.</para></section></section> \ No newline at end of file
diff --git a/docs/installer/eo/configureTimezoneUTC.xml b/docs/installer/eo/configureTimezoneUTC.xml
index e470a981..6680322d 100644
--- a/docs/installer/eo/configureTimezoneUTC.xml
+++ b/docs/installer/eo/configureTimezoneUTC.xml
@@ -1,37 +1,29 @@
-<?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="eo">
+<?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="eo" xml:id="configureTimezoneUTC">
+ <info>
+ <title xml:id="configureTimezoneUTC-ti6">Konfiguru vian horzonon</title>
+ </info>
+
- <info>
- <title xml:id="configureTimezoneUTC-ti6">Konfiguru vian horzonon</title>
- </info>
+
-
-
-
-<mediaobject>
+ <mediaobject>
<!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
<!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-configureTimezoneUTC.png"
-align="center" format="PNG" xml:id="configureTimezoneUTC-im1"></imagedata>
-</imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+xml:id="configureTimezoneUTC-im1" revision="1"
+fileref="dx2-configureTimezoneUTC.png" align="center" format="PNG"/>
+</imageobject> <imageobject> <imagedata fileref="live-timeZone.png"
+condition="live" format="PNG"/> </imageobject></mediaobject>
- <para revision="1" xml:id="configureTimezoneUTC-pa1">Elektu vian horzonon selektante vian landon aŭ urbon proksiman kiu troviĝu
+ <para revision="1" xml:id="configureTimezoneUTC-pa1">Elektu vian horzonon selektante vian landon aŭ urbon proksiman kiu troviĝu
en la sama tempo-zono.</para>
- <para revision="1" xml:id="configureTimezoneUTC-pa2">En la sekva ekrano vi povas alĝustigi vian sisteman horloĝon je la loka horo
+ <para revision="1" xml:id="configureTimezoneUTC-pa2">En la sekva ekrano vi povas alĝustigi vian sisteman horloĝon je la loka horo
aŭ je GTM, ankaŭ konata kiel UTC.</para>
- <note>
- <para revision="1" xml:id="configureTimezoneUTC-pa3">Se vi havas pli ol unu operacia sistemo en via komputilo, certiĝu pri tio ke
+ <note>
+ <para revision="1" xml:id="configureTimezoneUTC-pa3">Se vi havas pli ol unu operacia sistemo en via komputilo, certiĝu pri tio ke
ili estas alĝustigitaj ĉiuj je la loka horo aŭ je UTC/GTM.</para>
- </note>
- </section>
-
+ </note>
+</section> \ No newline at end of file
diff --git a/docs/installer/eo/diskdrake.xml b/docs/installer/eo/diskdrake.xml
index bff741b6..c039e029 100644
--- a/docs/installer/eo/diskdrake.xml
+++ b/docs/installer/eo/diskdrake.xml
@@ -29,8 +29,9 @@
</info>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-diskdrake.png" align="center"/>
-</imageobject></mediaobject>
+<imageobject condition='classical'> <imagedata fileref="dx2-diskdrake.png"
+align="center"/> </imageobject> <imageobject condition='live' > <imagedata
+fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
<warning>
<para revision="3" xml:id="diskdrake-pa1">Se vi volas utiligi ĉifradon en via subdisko <literal>/</literal> vi devas
@@ -39,9 +40,9 @@ subdisko <literal>/boot</literal> ne devas esti selektita, alie via sistemo
ne startos.</para>
</warning>
- <para revision="2" xml:id="diskdrake-pa3">Adjust the layout of your disk(s) here. You can remove or create
-partitions, change the filesystem of a partition or change its size and even
-view what is in them before you start.</para>
+ <para revision="2" xml:id="diskdrake-pa3">Agordu via(j)n disko(j)n ĉi tie. Vi povas forigi aŭ krei subdiskojn, ŝanĝi
+la dosiersistemon de subdisko aŭ ŝanĝi ĝian grandon kaj eĉ vidi kio estas en
+ĝi antaŭ ol komenci.</para>
<para revision="1" xml:id="diskdrake-pa4">Estas langeto por ĉiu trovita fiksita disko aŭ alispeca stor-aparato kiel
USB-ŝlosilo. Ekzemple sda, sdb kaj sdc se estas tri.</para>
@@ -63,5 +64,4 @@ System Partition) is present and correctly mounted on /boot/EFI (see above)</par
<para><mediaobject>
<imageobject> <imagedata fileref="dx2-diskdrake2.png"/> </imageobject></mediaobject></para>
</note>
-</section>
-
+</section> \ No newline at end of file
diff --git a/docs/installer/eo/doPartitionDisks.xml b/docs/installer/eo/doPartitionDisks.xml
index 4d3d4f04..dca1e69c 100644
--- a/docs/installer/eo/doPartitionDisks.xml
+++ b/docs/installer/eo/doPartitionDisks.xml
@@ -3,35 +3,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
<info>
- <!-- Started by marja on 2012 03 29 -->
-<!-- NEEDS TO BE WRITTEN AND THEN REVIEWED! -->
-<!-- JohnR 2012-04-10 - tidy up module formatting -->
-<!-- barjac 2012-04-20 Yes I agree with Lebarhon - reference to home partition removed -->
-<!-- Simonnzg - doing anything to a Windows partition is DANGEROUS. I would prefer
- if this was not an option, but... -->
-<!-- marja 2012-04-24 put the para xml id's back. -->
-<!-- marja 2012-04-29 changed text as discussed on the ml and with papoteur's approval
- lebarhon: 2012-08-18 warning added-->
-<!-- marja 2013-04-05 changed warning to text suggested by Dave Hodgings in bug 9594 -->
-<!-- marja 2013-04-05 adjusted last line of warning as suggested by obgr_seneca -->
-<!-- lebarhon 2013-04-11 adjusted last line of warning as suggested by Dave Hodgins/Marja-->
+ <!---->
+<!-- lebarhon 2015-07-03 Suggested updates for Mageia 5 -->
<title xml:id="doPartitionDisks-ti1">Kreo de subdiskoj</title>
</info>
@@ -80,7 +54,7 @@ personaj dosieroj.</para>
<para>With this option, the installer displays the remaining Windows partition in
light blue and the future Mageia partition in dark blue with their intended
sizes just under. You have the possibility to adapt these sizes by clicking
-and draging the gap between both partitions. See the screen-shot below.</para>
+and dragging the gap between both partitions. See the screen-shot below.</para>
<mediaobject>
<imageobject> <imagedata fileref="dx2-doPartitionDisks2.png"/>
@@ -98,7 +72,7 @@ zorgema!</para>
<para revision="1" xml:id="doPartitionDisks-pa15">Se vi volas uzi parton de la disko por alia celo aŭ vi havas datumojn en la
disko kiujn vi ne volas perdi, ne elektu ĉi tion.</para>
</listitem>
- </itemizedlist> <itemizedlist>
+ </itemizedlist><itemizedlist>
<listitem>
<para revision="1" xml:id="doPartitionDisks-pa16">Subdiskigo</para>
@@ -107,6 +81,47 @@ fiksita(j) disko(j).</para>
</listitem>
</itemizedlist></para>
+ <para><emphasis role="bold">Partitions sizing:</emphasis></para>
+
+ <para>The installer will share the available place out according to the following
+rules:</para>
+
+ <para><itemizedlist>
+ <listitem>
+ <para>If the total available place is lower than 50 GB, only one partition is
+created for /, there is no separate partition for /home.</para>
+ </listitem>
+
+ <listitem>
+ <para>If the total available place is over 50 GB, then three partitions are
+created</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>6/19 of the total available place is allocated to / with a maximum of 50 GB</para>
+ </listitem>
+
+ <listitem>
+ <para>1/19 is allocated to swap with a maximum of 4 GB</para>
+ </listitem>
+
+ <listitem>
+ <para>the rest (at least 12/19) is allocated to /home</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ </itemizedlist></para>
+
+ <para>That means that from 160 GB and over of available place, the installer will
+create three partitions: 50 GB for /, 4 GB for swap and the rest for /home.</para>
+
+ <note>
+ <para>If you are using an 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 "Custom" option is the only one that allows to check it has
+been correctly done</para>
+ </note>
+
<warning>
<para>Some newer drives are now using 4096 byte logical sectors, instead of the
previous standard of 512 byte logical sectors. Due to lack of available
@@ -114,13 +129,12 @@ hardware, the partitioning tool used in the installer has not been tested
with such a drive. Also some ssd drives now use an erase block size over 1
MB. We suggest to pre-partition the drive, using an alternative partitioning
tool like gparted, if you own such a device, and to use the following
-settings: </para>
+settings:</para>
- <para>"Align to" "MiB" </para>
+ <para>"Align to" "MiB"</para>
- <para>"Free space preceding (MiB)" "2" </para>
+ <para>"Free space preceding (MiB)" "2"</para>
<para>Also make sure all partitions are created with an even number of megabytes.</para>
</warning>
-</section>
-
+</section> \ No newline at end of file
diff --git a/docs/installer/eo/formatPartitions.xml b/docs/installer/eo/formatPartitions.xml
index 6a6590f9..775dfa99 100644
--- a/docs/installer/eo/formatPartitions.xml
+++ b/docs/installer/eo/formatPartitions.xml
@@ -19,9 +19,12 @@
<!-- NEEDS TO BE REVIEWED! -->
<!-- marja 2012-04-24 added screenshot -->
<!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject> <imagedata revision="1" fileref="dx2-formatPartitions.png"
-width="800" depth="600" format="PNG" align="center"
-xml:id="formatPartitions-im1"></imagedata> </imageobject></mediaobject>
+<imageobject condition='classical'> <imagedata revision="1"
+fileref="dx2-formatPartitions.png" format="PNG" align="center"
+xml:id="formatPartitions-im1"> </imagedata> </imageobject> <imageobject
+condition='live'> <imagedata revision="1"
+fileref="live-formatPartitions.png" format="PNG" align="center"
+xml:id="live-formatPartitions-im1"> </imagedata> </imageobject></mediaobject>
<para revision="2" xml:id="formatPartitions-pa1">Ĉi tie vi povas elekti kiu(j)n subdisko(j)n vi ŝatus strukturi. Iu ajn
datumo en subdisko(j) <emphasis>ne</emphasis> markita(j) por strukturado
diff --git a/docs/installer/eo/login.xml b/docs/installer/eo/login.xml
new file mode 100644
index 00000000..d47e4324
--- /dev/null
+++ b/docs/installer/eo/login.xml
@@ -0,0 +1,6 @@
+<?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="eo"><info><title xml:id="label-to-adapt-ti1">Login screen</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM login screen</para></caption></mediaobject><para>Finally, you will come to the login screen.</para><para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE or GNOME desktop, depending on which live medium
+you used. You can now start using your Mageia installation.</para><para>You can find another part of our documentation in <link
+linkend="https://wiki.mageia.org/en/Category:Documentation">the Mageia
+wiki</link>.</para></section> \ No newline at end of file
diff --git a/docs/installer/eo/reboot.xml b/docs/installer/eo/reboot.xml
new file mode 100644
index 00000000..b2fe9c83
--- /dev/null
+++ b/docs/installer/eo/reboot.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" xml:id="reboot" 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="reboot-ti1">Reboot</title>
+ </info>
+
+ <mediaobject condition="live">
+<imageobject> <imagedata align="center" fileref="live-reboot.png"
+format="PNG" revision="1" xml:id="reboot-im1"/> </imageobject></mediaobject>
+
+ <para>Once the bootloader has been installed, you will be prompted to halt your
+computer, remove the live CD and restart the computer. When you restart, you
+will see a succession of download progress bars. These indicate that the
+software media are being downloaded (see Software management).</para>
+</section>
diff --git a/docs/installer/eo/selectKeyboardLive.xml b/docs/installer/eo/selectKeyboardLive.xml
new file mode 100644
index 00000000..1b75d8d8
--- /dev/null
+++ b/docs/installer/eo/selectKeyboardLive.xml
@@ -0,0 +1,14 @@
+<?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="eo" xml:id="selectKeyboardLive">
+ <info>
+ <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
diff --git a/docs/installer/eo/selectLanguage.xml b/docs/installer/eo/selectLanguage.xml
index cf6e03a2..26591366 100644
--- a/docs/installer/eo/selectLanguage.xml
+++ b/docs/installer/eo/selectLanguage.xml
@@ -1,12 +1,4 @@
-<?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="eo" xml:id="selectLanguage">
-
+<?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="selectLanguage" version="5.0" xml:lang="eo">
@@ -32,36 +24,40 @@
listo. <application>Magejo</application> uzos ĉi tiun selekton dum la
instalado kaj por la instalita sistemo.</para>
- <para>Se vi bezonas instali en via sistemo plurajn lingvojn por vi aŭ aliaj
+ <para condition="classical">Se vi bezonas instali en via sistemo plurajn lingvojn por vi aŭ aliaj
uzuloj, tiam vi devas utiligi la butonon <guibutton>Multaj lingvoj (Multiple
languages)</guibutton> por aldoni ilin nun. Estos malfacile aldoni plian
lingvan eltenon post la instalo.</para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-selectLanguage.png" align="center"
-width="800" format="PNG" depth="600"></imagedata> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-language.png" format=""/>
+</imageobject></mediaobject>
- <warning>
+ <warning condition="classical">
<para>Se vi elektas pli ol unu lingvon, vi devas selekti unu el ili kiel vian
preferatan lingvon en la komenca lingva ekrano. Ĝi markiĝos ankaŭ en la
plurlingva ekrano .</para>
</warning>
<itemizedlist>
- <listitem>
+ <listitem condition="classical">
<para>Se via klavara lingvo ne estas la sama kiel via preferata lingvo, tiam estas
rekomendinde instali la lingvon de via klavaro ankaŭ.</para>
</listitem>
<listitem>
- <para>Magejo uzas UTF-8 (Unikodon) defaŭlte. Ĉi tio povas esti malŝaltita en la
-plurlingva ekrano se vi certas pri tio ke ĝi estas neadekvata por via
-lingvo. Malŝalti unikodon havos konsekvencojn sur ĉiuj instalitaj lingvoj.</para>
+ <para>Mageia uses UTF-8 (Unicode) support by default.</para>
+
+ <para condition="classical">Ĉi tio povas esti malŝaltita en la plurlingva ekrano se vi certas pri tio ke
+ĝi estas neadekvata por via lingvo. Malŝalti unikodon havos konsekvencojn
+sur ĉiuj instalitaj lingvoj.</para>
</listitem>
<listitem>
<para>Vi povas ŝanĝi la lingvon de via sistemo post la instalo per la Kontrolilo
-de Magejo -&gt; Sistemo -&gt; Agordi skrib-sistemojn.</para>
+de Magejo -> Sistemo -> Agordi skrib-sistemojn.</para>
</listitem>
</itemizedlist>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/installer/eo/setupBootloader.xml b/docs/installer/eo/setupBootloader.xml
index dcca4a95..a7c91607 100644
--- a/docs/installer/eo/setupBootloader.xml
+++ b/docs/installer/eo/setupBootloader.xml
@@ -1,92 +1,117 @@
<?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="eo" xml:id="setupBootloader">
- <info>
- <title xml:id="setupBootloader-ti1">Lanĉilaj ĉefaj elektoj</title>
- </info>
+
- <mediaobject>
-<!-- 2012-08-12 Copied this page, setupBootloader.xml, from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.
+ <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-->
+<title xml:id="setupBootloader-ti1">Lanĉilaj ĉefaj elektoj</title>
+ </info>
- 2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist-->
-<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
-format="PNG"/> </imageobject></mediaobject>
+ <mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="setupBootloader-im1"
+format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata
+xml:id="setupBootloader-im1" format="PNG" align="center" revision="1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
- <para><note>
- <para>With an UEFI system, the user interface is slightly different as you cannot
-choose the boot loader (first drop down list) since only one is available</para>
- </note></para>
+ <section>
+ <title>With a Bios system</title>
- <para xml:id="setupBootloader-pa1" revision="4">Se vi preferas malsaman lanĉilan konfiguron al tiu elektita aŭtomate fare de
+ <para xml:id="setupBootloader-pa1" revision="4">Se vi preferas malsaman lanĉilan konfiguron al tiu elektita aŭtomate fare de
la instalilo, vi povas ŝanĝi ĝin ĉi tie.</para>
- <para xml:id="setupBootloader-pa2" revision="4">Eble vi havas jam alian operacian sistemon en via maŝino, tiukaze vi devas
+ <para xml:id="setupBootloader-pa2" revision="4">Eble vi havas jam alian operacian sistemon en via maŝino, tiukaze vi devas
decidi ĉu vi volas aldoni Magejon al via ekzistanta lanĉilo aŭ ebligi al
Magejo krei novan.</para>
- <tip>
- <para revision="2" xml:id="setupBootloader-pa3">La grafika menuo de Magejo estas bela :)</para>
- </tip>
+ <tip>
+ <para>La grafika menuo de Magejo estas bela :)</para>
+ </tip>
- <section xml:id="usingMageiaBootloader">
- <info>
- <title xml:id="usingMageiaBootloader-ti2">Uzi la lanĉilon de Magejo</title>
- </info>
+ <section xml:id="usingMageiaBootloader">
+ <info>
+ <title xml:id="usingMageiaBootloader-ti2">Uzi la lanĉilon de Magejo</title>
+ </info>
- <para revision="3" xml:id="setupBootloader-pa4">Defaŭlte Magejo skribas novan GRUB-lanĉilon en la MBR de via unua fiksita
+ <para xml:id="setupBootloader-pa4" revision="3">Defaŭlte Magejo skribas novan GRUB-lanĉilon en la MBR de via unua fiksita
disko. Se vi jam havas aliajn operaciajn sistemojn, Magejo provos aldoni
ilin al via nova Mageja lanĉilo.</para>
- <para revision="3">Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB
+ <para revision="3">Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB
legacy and Lilo.</para>
- <warning>
- <para revision="3" xml:id="setupBootloader-pa6">Linux systems which use the GRUB2 bootloader are not currently supported by
+ <warning>
+ <para xml:id="setupBootloader-pa6" revision="3">Linux systems which use the GRUB2 bootloader are not currently supported by
GRUB (legacy) and will not be recognised if the default GRUB bootloader is
used.</para>
- <para revision="3">The best solution here is to use the GRUB2 bootloader which is available at
+ <para revision="3">The best solution here is to use the GRUB2 bootloader which is available at
the Summary page during installation.</para>
- </warning>
- </section>
+ </warning>
+ </section>
- <section xml:id="usingExistingBootloader">
- <info>
- <title revision="2" xml:id="usingExistingBootloader-ti4">Uzi ekzistantan lanĉilon</title>
- </info>
+ <section xml:id="usingExistingBootloader">
+ <info>
+ <title xml:id="usingExistingBootloader-ti4" revision="2">Uzi ekzistantan lanĉilon</title>
+ </info>
- <para revision="3" xml:id="setupBootloader-pa46">Se vi decidas uzi ekzistantan lanĉilon tiam vi devos klaki sur la lanĉila
+ <para xml:id="setupBootloader-pa46" revision="3">Se vi decidas uzi ekzistantan lanĉilon tiam vi devos klaki sur la lanĉila
butono <guibutton>Konfiguru</guibutton>, kiu ebligos vin ŝanĝi la
instal-lokon de la lanĉilo.</para>
- <para revision="1" xml:id="setupBootloader-pa47">Ne selektu aparaton kiel "sda" aŭ vi anstataŭigos la ekzistantan MBR. Vi
+ <para xml:id="setupBootloader-pa47" revision="1">Ne selektu aparaton kiel "sda" aŭ vi anstataŭigos la ekzistantan MBR. Vi
devas selekti la saman radikan subdiskon kiun vi elektis dum la subdiskigo,
ekzemple sda7.</para>
- <para xml:id="setupBootloader-pa48" revision="1">Klarigcele, sda estas aparato, sda7 subdisko.</para>
+ <para xml:id="setupBootloader-pa48" revision="1">Klarigcele, sda estas aparato, sda7 subdisko.</para>
- <tip>
- <para revision="1" xml:id="setupBootloader-pa48a">Iru al tty2 per la premo de Ctrl+Alt+F2 kaj tajpu <literal>df</literal> por
+ <tip>
+ <para revision="1" xml:id="setupBootloader-pa48a">Iru al tty2 per la premo de Ctrl+Alt+F2 kaj tajpu <literal>df</literal> por
vidi kie estas via radika subdisko <literal>/</literal>. Ctrl+Alt+F7 venigos
vin ree al la instal-ekrano.</para>
- </tip>
+ </tip>
- <para revision="2" xml:id="setupBootloader-pa49">La ĝusta procezo por aldoni vian Magejan sistemon al ekzistanta lanĉilo
+ <para xml:id="setupBootloader-pa49" revision="2">La ĝusta procezo por aldoni vian Magejan sistemon al ekzistanta lanĉilo
estas preter la celo de tiu ĉi helpilo, tamen en la plimulto el la kazoj
estos necese lanĉi lanĉilan instal-programon kiu devus detekti kaj konfiguri
ĝin aŭtomate. Vidu la dokumentaron por la konkreta operacia sistemo.</para>
- </section>
+ </section>
- <section xml:id="advancedOptionBootloader">
- <info>
- <title revision="2" xml:id="advancedOptionBootloader-ti5">Lanĉila sperta elekto</title>
- </info>
+ <section xml:id="advancedOptionBootloader">
+ <info>
+ <title xml:id="advancedOptionBootloader-ti5" revision="2">Lanĉila sperta elekto</title>
+ </info>
- <para revision="3" xml:id="setupBootloader-pa52">Se vi havas tre limigitan spacon en via disko por subdisko
+ <para xml:id="setupBootloader-pa52" revision="3">Se vi havas tre limigitan spacon en via disko por subdisko
<literal>/</literal> enhavanta samtempe la dosierujon
<literal>/tmp</literal>, klaku sur <guibutton>Progresinta</guibutton> kaj
aktivigu la skatolon dirantan <guilabel>Purigu /tmp dum ĉiuj
startadoj</guilabel>. Tio helpos teni iom da libera spaco.</para>
+ </section>
+ </section>
+
+ <section>
+ <title>With an UEFI system</title>
+
+ <para>With an UEFI system, the user interface is slightly different as you cannot
+choose the boot loader since only Grub2-efi is available. </para>
+
+ <mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader2.png"/>
+</imageobject></mediaobject>
+
+ <para>If Mageia is the first system installed on your computer, the installer
+created an ESP (EFI System Partition) to receive the bootloader
+(Grub2-efi). If there was already UEFI operating systems previously
+installed on your computer (Windows 8 for example), the Mageia installer
+detected the existing ESP created by Windows and added grub2-efi. Although
+it is possible to have several ESPs, only one is advised and enough whatever
+the number of operating systems you have.</para>
+
+ <para>Don't modify the "Boot Device" unless really knowing what you do.</para>
</section>
</section> \ No newline at end of file
diff --git a/docs/installer/eo/setupBootloaderAddEntry.xml b/docs/installer/eo/setupBootloaderAddEntry.xml
index 22ee604e..41e831dd 100644
--- a/docs/installer/eo/setupBootloaderAddEntry.xml
+++ b/docs/installer/eo/setupBootloaderAddEntry.xml
@@ -1,39 +1,68 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="eo">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eo" xml:id="setupBootloaderAddEntry">
+
+
<info>
- <title xml:id="setupBootloaderAddEntry-ti1">Add or Modify a Boot Menu Entry</title>
+ <!--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-->
+<title xml:id="setupBootloaderAddEntry-ti1">Add or Modify a Boot Menu Entry</title>
</info>
<mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
-xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="dx2-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="live-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject></mediaobject>
+
+ <section>
+ <title>With a Bios system</title>
- <para>You can add an entry or modify the one you select first, by pressing the
+ <para>You can add an entry or modify the one you select first, by pressing the
relevant button in the <emphasis>Bootloader Configuration</emphasis> screen
and editing the screen that pops up on top of it.</para>
- <note>
- <para>If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for
-UEFI systems, you cannot use this tool to edit entries at this step, press
-'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use
-<code>grub-customizer</code> instead.</para>
- </note>
+ <note>
+ <para>If you have chosen <code>Grub 2</code> as your bootloader, you cannot use
+this tool to edit entries at this step, press 'Next'. You need to manually
+edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code>
+instead.</para>
+ </note>
- <mediaobject>
-<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
-align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+ <mediaobject>
+<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1"
+align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
</imageobject></mediaobject>
- <para>Some things that can be done without any risk, are changing the label of an
+ <para>Some things that can be done without any risk, are changing the label of an
entry and ticking the box to make an entry the default one.</para>
- <para>You can add the proper version number of an entry, or rename it completely.</para>
+ <para>You can add the proper version number of an entry, or rename it completely.</para>
- <para>The default entry is the one the systems boots into if you don't make a
+ <para>The default entry is the one the systems boots into if you don't make a
choice while booting up.</para>
- <warning>
- <para>Editing other things can leave you with an unbootable system. Please don't
+ <warning>
+ <para>Editing other things can leave you with an unbootable system. Please don't
just try something without knowing what you are doing.</para>
- </warning>
+ </warning>
+ </section>
+
+ <section>
+ <title>With an UEFI system</title>
+
+ <para>In this case you are using Grub2-efi and you cannot use this tool to edit
+entries at this step. To do that you need to manually edit
+<code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code>
+instead. All you can do here, is to choose the default entry in the drop
+down list.</para>
+
+ <para>After a click on the <guibutton>Next</guibutton> button, another drop down
+list allows to choose the video resolution for Grub2 which is a graphical
+boot loader.</para>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="dx2-bootloaderConfiguration2.png"/>
+</imageobject></mediaobject>
+ </section>
</section> \ No newline at end of file
diff --git a/docs/installer/eo/takeOverHdConfirm.xml b/docs/installer/eo/takeOverHdConfirm.xml
index 122889ca..f6b70f35 100644
--- a/docs/installer/eo/takeOverHdConfirm.xml
+++ b/docs/installer/eo/takeOverHdConfirm.xml
@@ -12,15 +12,18 @@
-<mediaobject>
+ <mediaobject>
<!-- Made by marja on 2012 04 03 -->
<!-- test comment - johnr -->
<!-- 2012-04-24 marja - replaced "if you are not sure you selected the correct
hard disk." with "if you are not sure about your choice", because I'm sure I
saw this help screen when I had only one HD -->
<!-- 2013-05-05 marja added screenshot -->
-<imageobject> <imagedata fileref="dx2-takeOverHdConfirm.png" format="PNG"
-align="center" ></imagedata> </imageobject></mediaobject>
+<imageobject condition='live'> <imagedata
+fileref="live-takeOverHdConfirm.png" format="PNG" align="center"
+></imagedata> </imageobject> <imageobject condition='classical'> <imagedata
+fileref="dx2-takeOverHdConfirm.png" format="PNG" align="center"
+></imagedata> </imageobject></mediaobject>
<para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <guibutton>Previous</guibutton> if you are not sure about your
choice.</para>
diff --git a/docs/installer/eo/testing.xml b/docs/installer/eo/testing.xml
new file mode 100644
index 00000000..d098402e
--- /dev/null
+++ b/docs/installer/eo/testing.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" xml:id="testing" xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns="http://docbook.org/ns/docbook">
+ <info>
+ <title xml:id="testing-ti1">Testing Mageia as Live system</title>
+ </info>
+
+ <section xml:id="testing-1">
+ <info>
+ <title xml:id="testing1-ti1">Live mode</title>
+ </info>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
+
+ <para>You get this screen if you selected "Boot Mageia". If not, you get the
+"<link linkend="doPartitionDisks">Partitioning</link> step"</para>
+
+ <section>
+ <info>
+ <title xml:id="testing2-ti1">Testing hardware</title>
+ </info>
+
+ <para>One of the Live mode goals is to test if the hardware is correctly managed
+by Mageia. You can check if all devices have a driver in the Hardware
+section of the Mageia Control Center. You can test the most current devices:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>network interface: configure it with net_applet</para>
+ </listitem>
+
+ <listitem>
+ <para>graphical card: if you see the previous screen, it's already OK.</para>
+ </listitem>
+
+ <listitem>
+ <para>webcam:</para>
+ </listitem>
+
+ <listitem>
+ <para>sound: a jingle has already been played</para>
+ </listitem>
+
+ <listitem>
+ <para>printer: configure it and print a test page</para>
+ </listitem>
+
+ <listitem>
+ <para>scanner: scan a document from ...</para>
+ </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>
+
+ <remark>The configuration settings you made here are kept for the installation.</remark>
+ </section>
+
+ <section>
+ <info>
+ <title xml:id="testing3-ti1">Launch installation</title>
+ </info>
+
+ <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/installer/eo/uninstall-Mageia.xml b/docs/installer/eo/uninstall-Mageia.xml
index 2022fa83..ea9245b2 100644
--- a/docs/installer/eo/uninstall-Mageia.xml
+++ b/docs/installer/eo/uninstall-Mageia.xml
@@ -1,5 +1,5 @@
<?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="eo" xml:id="uninstall-Mageia">
- <!-- -->
+ <!--Lebarhon 2015-07-06 Not true with UEFI -->
<info>
<title xml:id="uninstall-Mageia-ti1">Uninstalling Mageia</title>
</info>
diff --git a/docs/installer/eo/unused.xml b/docs/installer/eo/unused.xml
new file mode 100644
index 00000000..87dee252
--- /dev/null
+++ b/docs/installer/eo/unused.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" 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">
+ <info>
+ <title xml:id="unused-ti1">Keep or delete unused material</title>
+ </info>
+
+ <mediaobject condition="live">
+<imageobject> <imagedata align="center" fileref="live-unused.png"
+format="PNG" revision="1" xml:id="unused-im1"/> </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>
+
+ <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>
+</section>
diff --git a/docs/installer/es/bootLive.xml b/docs/installer/es/bootLive.xml
index 01ef5922..bbb363bc 100644
--- a/docs/installer/es/bootLive.xml
+++ b/docs/installer/es/bootLive.xml
@@ -1,136 +1,30 @@
-<?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="bootLive" version="5.0" xml:lang="es">
- <info>
- <title xml:id="bootLive-ti1">Iniciar Mageia en modo Live</title>
- </info>
-
- <section xml:id="bootLive-1">
- <info>
- <title xml:id="bootLive1-ti1">Arrancando el medio</title>
- </info>
-
- <section>
- <info>
- <title xml:id="bootLive11-ti1">Desde un disco</title>
- </info>
-
- <para>Puede arrancar directamente desde el CD o DVD en el que grabó la imagen
+<?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="es"><info><title xml:id="bootLive-ti1">Iniciar Mageia en modo Live</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Arrancando el medio</title></info><section><info><title xml:id="bootLive11-ti1">Desde un disco</title></info><para>Puede arrancar directamente desde el CD o DVD en el que grabó la imagen
ISO. Normalmente tiene que insertarlo en el lector de CD/DVD para que se
lance el instalador automáticamente cuando reinicie su ordenador. Si eso no
ocurre, tendrá que configurar la BIOS o pulsar una tecla durante el
-arranque, y que le ofrecerá un menú arranque donde escoger. </para>
-
- <para>De acuerdo al hardware que tiene, y cómo está configurado, se obtiene una de
-las dos pantallas siguientes.</para>
- </section>
-
- <section>
- <info>
- <title xml:id="bootLive12-ti1">Desde un dispositivo USB</title>
- </info>
-
- <para>Puede arrancar desde el dispositivo USB en el que volcó su imagen ISO. De
+arranque, y que le ofrecerá un menú arranque donde escoger. </para><para>De acuerdo al hardware que tiene, y cómo está configurado, se obtiene una de
+las dos pantallas siguientes.</para></section><section><info><title xml:id="bootLive12-ti1">Desde un dispositivo USB</title></info><para>Puede arrancar desde el dispositivo USB en el que volcó su imagen ISO. De
acuerdo a la configuración de su BIOS, quizás la computadora arranque
directamente en el dispositivo USB que ya está conectado al puerto. Si esto
no ocurre, puede que tenga que volver a configurar su BIOS o presionar una
tecla que le de la posibilidad de elegir el periférico desde el cual
-arrancará la computadora.</para>
- </section>
- </section>
-
- <section xml:id="biosmode">
- <info>
- <title xml:id="biosmode-ti1">En modo BIOS/CSM/Legacy</title>
- </info>
-
- <mediaobject>
- <imageobject> <imagedata fileref="live-bootCSM.png"/> </imageobject>
-
- <caption>
- <para>Primera pantalla al arrancar en modo BIOS</para>
- </caption>
- </mediaobject>
-
- <para>En el menú del medio, tiene que elegir entre tres acciones:</para>
-
- <itemizedlist>
- <listitem>
- <para>Arrancar Mageia: Esto significa que Mageia 5 arrancará desde el medio
+arrancará la computadora.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">En modo BIOS/CSM/Legacy</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Primera pantalla al arrancar en modo BIOS</para></caption></mediaobject><para>En el menú del medio, tiene que elegir entre tres acciones:</para><itemizedlist><listitem><para>Arrancar Mageia: Esto significa que Mageia 5 arrancará desde el medio
conectado (CD/DVD o memoria USB) sin escribir nada en el disco, por lo que
se espera que el sistema sea muy lento. Una vez realizado el arranque, puede
-seguir con la instalación en el disco rígido.</para>
- </listitem>
-
- <listitem>
- <para>Instalar Mageia: Esta opción instalará Mageia directamente en un disco
-rígido.</para>
- </listitem>
-
- <listitem>
- <para>Arrancar desde el disco rígido: Esta opción permite arrancar desde el disco
+seguir con la instalación en el disco rígido.</para></listitem><listitem><para>Instalar Mageia: Esta opción instalará Mageia directamente en un disco
+rígido.</para></listitem><listitem><para>Arrancar desde el disco rígido: Esta opción permite arrancar desde el disco
rígido, como de costumbre, cuando ningún medio (CD/DVD o memoria USB) está
-conectado (no funciona con Mageia 5).</para>
- </listitem>
- </itemizedlist>
-
- <para>En el menú inferior, las Opciones de Inicio son:</para>
-
- <itemizedlist>
- <listitem>
- <para>F1 - Ayuda. Explicar las opciones "splash", "apm", "acpi" e "Ide"</para>
- </listitem>
-
- <listitem>
- <para>F2 - Idioma. Elegir el idioma de visualización de las pantallas.</para>
- </listitem>
-
- <listitem>
- <para>F3 - Resolución de pantalla. Elegir entre texto, 640x400, 800x600, 1024x728</para>
- </listitem>
-
- <listitem>
- <para>F4 - CD-Rom. CD-Rom u otro. Normalmente, la instalación se realiza desde el
+conectado (no funciona con Mageia 5).</para></listitem></itemizedlist><para>En el menú inferior, las Opciones de Inicio son:</para><itemizedlist><listitem><para>F1 - Ayuda. Explicar las opciones "splash", "apm", "acpi" e "Ide"</para></listitem><listitem><para>F2 - Idioma. Elegir el idioma de visualización de las pantallas.</para></listitem><listitem><para>F3 - Resolución de pantalla. Elegir entre texto, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom u otro. Normalmente, la instalación se realiza desde el
medio de instalación insertado. Aquí seleccionar otras fuentes, como
servidores de FTP o NFS. Si la instalación se lleva a cabo en una red con un
servidor SLP, seleccione con esta opción una de las fuentes de instalación
-disponibles en el servidor.</para>
- </listitem>
-
- <listitem>
- <para>F5 - Controlador. Si o No. El sistema sabe de la presencia de un disco
+disponibles en el servidor.</para></listitem><listitem><para>F5 - Controlador. Si o No. El sistema sabe de la presencia de un disco
opcional con una actualización del controlador y requerirá su inserción
-durante el proceso de instalación.</para>
- </listitem>
-
- <listitem>
- <para>F6 - Opciones del Kernel. Esta es la manera de especificar las opciones de
-acuerdo a su hardware y los controladores a usar.</para>
- </listitem>
- </itemizedlist>
- </section>
-
- <section xml:id="uefimode">
- <info>
- <title xml:id="uefimode-ti1">En modo UEFI</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center"
-fileref="live-bootUEFI.png" format="PNG" xml:id="bootUEFI-im1"/>
-</imageobject>
-
- <caption>
- <para>Primera pantalla durante el arranque del sistema UEFI desde el disco</para>
- </caption>
- </mediaobject>
-
- <para>Ud solamente tiene la opción de ejecutar Mageia en modo Live (primera
-opción) o procesar la instalación (segunda opción).</para>
- <para>If you booted from a USB stick, you get two supplemental lines which are a
+durante el proceso de instalación.</para></listitem><listitem><para>F6 - Opciones del Kernel. Esta es la manera de especificar las opciones de
+acuerdo a su hardware y los controladores a usar.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">En modo 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>Primera pantalla durante el arranque del sistema UEFI desde el disco</para></caption></mediaobject><para>Ud solamente tiene la opción de ejecutar Mageia en modo Live (primera
+opción) o procesar la instalación (segunda opción).</para><para>If you booted from a USB stick, you get two supplemental lines which are a
duplicata of the previous lines suffixed with "USB". You have to choose
-them.</para>
-
- <para>In each case, the first steps will be the same to choose language, timezone
+them.</para><para>In each case, the first steps will be the same to choose language, timezone
and keyboard, then the processes differ, with <link
-linkend="testing">additional steps in Live mode</link>.</para>
- </section>
-</section> \ No newline at end of file
+linkend="testing">additional steps in Live mode</link>.</para></section></section> \ No newline at end of file
diff --git a/docs/installer/es/login.xml b/docs/installer/es/login.xml
index ec76b3bb..7cc6ba6b 100644
--- a/docs/installer/es/login.xml
+++ b/docs/installer/es/login.xml
@@ -1,24 +1,6 @@
-<?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="login" version="5.0" xml:lang="es">
- <info>
- <title xml:id="label-to-adapt-ti1">Pantalla de inicio de sesión</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center" xml:id="login-im1"
-format="PNG" fileref="live-login.png"/> </imageobject>
-
- <caption>
- <para>Pantalla de inicio de sesión de KDM</para>
- </caption>
- </mediaobject>
-
- <para>Por último, se llega a la pantalla de inicio de sesión.</para>
-
- <para>Ingrese su nombre de usuario y contraseña, y en pocos segundos se encontrará
+<?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="es"><info><title xml:id="label-to-adapt-ti1">Pantalla de inicio de sesión</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>Pantalla de inicio de sesión de KDM</para></caption></mediaobject><para>Por último, se llega a la pantalla de inicio de sesión.</para><para>Ingrese su nombre de usuario y contraseña, y en pocos segundos se encontrará
con un escritorio KDE o GNOME cargado, dependiendo del medio live que
-usó. Ahora puede comenzar a utilizar la instalación de Mageia.</para>
-
- <para>Puede encontrar otra parte de nuestra documentación en <link
+usó. Ahora puede comenzar a utilizar la instalación de Mageia.</para><para>Puede encontrar otra parte de nuestra documentación en <link
linkend="https://wiki.mageia.org/en/Category:Documentation">la wiki de
-Mageia</link>.</para>
-</section> \ No newline at end of file
+Mageia</link>.</para></section> \ No newline at end of file
diff --git a/docs/installer/es/setupBootloader.xml b/docs/installer/es/setupBootloader.xml
index e4783efc..e4c51947 100644
--- a/docs/installer/es/setupBootloader.xml
+++ b/docs/installer/es/setupBootloader.xml
@@ -10,9 +10,11 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
-format="PNG"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="setupBootloader-im1"
+format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata
+xml:id="setupBootloader-im1" format="PNG" align="center" revision="1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<section>
<title>Con un sistema BIOS</title>
@@ -33,7 +35,7 @@ permitir a Mageia crear uno nuevo.</para>
<title xml:id="usingMageiaBootloader-ti2">Usando el cargador de arranque de Mageia</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa4">By default, Mageia writes a new GRUB (legacy) bootloader into the MBR
+ <para xml:id="setupBootloader-pa4" revision="3">By default, Mageia writes a new GRUB (legacy) bootloader into the MBR
(Master Boot Record) of your first hard drive. If you already have other
operating systems installed, Mageia attempts to add them to your new Mageia
boot menu.</para>
@@ -42,7 +44,7 @@ boot menu.</para>
opcionalademás del tradicional GRUB y de Lilo.</para>
<warning>
- <para revision="3" xml:id="setupBootloader-pa6">Linux systems which use the GRUB2 bootloader are not currently supported by
+ <para xml:id="setupBootloader-pa6" revision="3">Linux systems which use the GRUB2 bootloader are not currently supported by
GRUB (legacy) and will not be recognized if the default GRUB bootloader is
used.</para>
@@ -53,15 +55,15 @@ en la página de resumen durante la instación.</para>
<section xml:id="usingExistingBootloader">
<info>
- <title revision="2" xml:id="usingExistingBootloader-ti4">Usando un cargador de arranque existente</title>
+ <title xml:id="usingExistingBootloader-ti4" revision="2">Usando un cargador de arranque existente</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa46">Si decide usar un cargador de arranque existente, tendrá que acordarse de
+ <para xml:id="setupBootloader-pa46" revision="3">Si decide usar un cargador de arranque existente, tendrá que acordarse de
PARAR en la página del resumen durante la instalación y pulsar el botón de
<guibutton>Configuración</guibutton> del Cargador de Arranque, que le
permitirá cambiar el lugar de instalación del cargador de arranque.</para>
- <para revision="1" xml:id="setupBootloader-pa47">Do not select a device e.g."sda", or you will overwrite your existing
+ <para xml:id="setupBootloader-pa47" revision="1">Do not select a device e.g."sda", or you will overwrite your existing
MBR. You must select the root partition that you chose during the
partitioning phase earlier, e.g. sda7.</para>
@@ -73,7 +75,7 @@ donde está su partición <literal>/</literal> (root). Ctrl+Alt+F7 le devuelve
al instalador.</para>
</tip>
- <para revision="2" xml:id="setupBootloader-pa49">El proceso exacto para añadir su sistema operativo Mageia al cargador de
+ <para xml:id="setupBootloader-pa49" revision="2">El proceso exacto para añadir su sistema operativo Mageia al cargador de
arranque existente están fuera del alcance de este manual, pero normalmente
consiste en ejecutar el programa de instalación del cargador de arranque que
debería detectarlo y añadirlo automáticamente. Vea la documentación del
@@ -82,10 +84,10 @@ sistema operativo en cuestión.</para>
<section xml:id="advancedOptionBootloader">
<info>
- <title revision="2" xml:id="advancedOptionBootloader-ti5">Opción avanzada del cargador de arranque</title>
+ <title xml:id="advancedOptionBootloader-ti5" revision="2">Opción avanzada del cargador de arranque</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa52">Si tiene el espacio del disco muy limitado para la partición
+ <para xml:id="setupBootloader-pa52" revision="3">Si tiene el espacio del disco muy limitado para la partición
<literal>/</literal> que contiene <literal>/tmp</literal>, haga click en
<guibutton>Avanzado</guibutton> y marque la casilla para <guilabel>Limpiar
/tmp en cada arranque</guilabel>. Esto ayuda a mantener algo de espacio
@@ -101,7 +103,10 @@ se puede elegir el cargador de arranque, debido a que solamente Grub2-efi
está disponible. </para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader2.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader2.png"/>
+</imageobject></mediaobject>
<para>If Mageia is the first system installed on your computer, the installer
created an ESP (EFI System Partition) to receive the bootloader
diff --git a/docs/installer/es/setupBootloaderAddEntry.xml b/docs/installer/es/setupBootloaderAddEntry.xml
index d3bf0716..3dd066e2 100644
--- a/docs/installer/es/setupBootloaderAddEntry.xml
+++ b/docs/installer/es/setupBootloaderAddEntry.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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="es">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="es" xml:id="setupBootloaderAddEntry">
<info>
@@ -7,9 +7,13 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
-xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="dx2-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="live-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject></mediaobject>
<section>
<title>Con un sistema BIOS</title>
@@ -26,8 +30,8 @@ lugar.</para>
</note>
<mediaobject>
-<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
-align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1"
+align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
</imageobject></mediaobject>
<para>Unas cosas que se pueden hacer sin peligro son cambiar la etiqueta de una
diff --git a/docs/installer/es/unused.xml b/docs/installer/es/unused.xml
index efa9ca71..6cfd893a 100644
--- a/docs/installer/es/unused.xml
+++ b/docs/installer/es/unused.xml
@@ -19,7 +19,7 @@ accept, except if you prepare an installation which has to run on different
hardware.</para>
<mediaobject>
-<imageobject> <imagedata fileref="live-unused-InstallationProgress.png"/>
+<imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
</imageobject></mediaobject>
<para>El siguiente paso es copiar los archivos al disco rígido. Esto toma algunos
diff --git a/docs/installer/et/bootLive.xml b/docs/installer/et/bootLive.xml
index 2c2748e5..ce9ec21b 100644
--- a/docs/installer/et/bootLive.xml
+++ b/docs/installer/et/bootLive.xml
@@ -1,133 +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" xml:id="bootLive" version="5.0" xml:lang="et">
- <info>
- <title xml:id="bootLive-ti1">Mageia laadimine Live-süsteemina</title>
- </info>
-
- <section xml:id="bootLive-1">
- <info>
- <title xml:id="bootLive1-ti1">Käivitamine andmekandjalt</title>
- </info>
-
- <section>
- <info>
- <title xml:id="bootLive11-ti1">Kettalt</title>
- </info>
-
- <para>Algkäivituse võib teha otse andmekandjalt, millele olete kirjutanud oma
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="et"><info><title xml:id="bootLive-ti1">Mageia laadimine Live-süsteemina</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Käivitamine andmekandjalt</title></info><section><info><title xml:id="bootLive11-ti1">Kettalt</title></info><para>Algkäivituse võib teha otse andmekandjalt, millele olete kirjutanud oma
tõmmise (CD-ROM, DVD-ROM vms). Tavaliselt tuleb andmekandja lihtsalt asetada
CD/DVD-seadmesse ning alglaadur käivitab arvuti taaskäivitamise järel
paigaldamise automaatselt. Kui seda ei juhtu, võib olla vajalik BIOS ümber
seadistada või vajutada vastavat klahvi, mis võimaldab valida lisaseadme,
-millest arvuti käivitada.</para>
-
- <para>Sõltuvalt teie riistvarast ja selle kehtivast seadistusest näete üht kahest
-alltoodud ekraanist.</para>
- </section>
-
- <section>
- <info>
- <title xml:id="bootLive12-ti1">USB-pulgalt</title>
- </info>
-
- <para>Algkäivituse saab teha USB-pulgalt, millele kirjutasite
+millest arvuti käivitada.</para><para>Sõltuvalt teie riistvarast ja selle kehtivast seadistusest näete üht kahest
+alltoodud ekraanist.</para></section><section><info><title xml:id="bootLive12-ti1">USB-pulgalt</title></info><para>Algkäivituse saab teha USB-pulgalt, millele kirjutasite
ISO-tõmmise. Sõltuvalt BIOS-e seadistusest võib arvuti otse käivituda
USB-pulgalt, mis on masinaga ühendatud. Kui seda ei juhtu, võib olla vajalik
BIOS ümber seadistada või vajutada vastavat klahvi, mis võimaldab valida
-lisaseadme, millest arvuti käivitada. </para>
- </section>
- </section>
-
- <section xml:id="biosmode">
- <info>
- <title xml:id="biosmode-ti1">BIOS-e/CSM-i/Pärandrežiimis</title>
- </info>
-
- <mediaobject>
- <imageobject> <imagedata fileref="live-bootCSM.png"/> </imageobject>
-
- <caption>
- <para>Esimene ekraan BIOS-e režiimis algkäivitusel</para>
- </caption>
- </mediaobject>
-
- <para>Keskel asuvas menüüs saab valida kolme võimaluse vahel:</para>
-
- <itemizedlist>
- <listitem>
- <para>Mageia laadimine: see tähendab, et Mageia 5 käivitatakse ühendatud
+lisaseadme, millest arvuti käivitada. </para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">BIOS-e/CSM-i/Pärandrežiimis</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Esimene ekraan BIOS-e režiimis algkäivitusel</para></caption></mediaobject><para>Keskel asuvas menüüs saab valida kolme võimaluse vahel:</para><itemizedlist><listitem><para>Mageia laadimine: see tähendab, et Mageia 5 käivitatakse ühendatud
andmekandjalt (CD/DVD või USB-pulk) ilma midagi kettale kirjutamata, mis
ühtlasi tähendab, et kõik võib olla väga aeglane. Kui käivitamine on läbi,
-võite ka süsteemi kõvakettale paigaldada.</para>
- </listitem>
-
- <listitem>
- <para>Mageia paigaldamine: sel juhul paigaldatakse Mageia kohe kõvakettale.</para>
- </listitem>
-
- <listitem>
- <para>Alglaadimine kõvakettalt: sel juhul käivitatakse süsteem kõvakettal, nagu
+võite ka süsteemi kõvakettale paigaldada.</para></listitem><listitem><para>Mageia paigaldamine: sel juhul paigaldatakse Mageia kohe kõvakettale.</para></listitem><listitem><para>Alglaadimine kõvakettalt: sel juhul käivitatakse süsteem kõvakettal, nagu
seda tehakse ka siis, kui andmekandjat (CD/DVD või USB-pulk) pole masinaga
-ühendatud (Mageia 5 puhul see ei toimi).</para>
- </listitem>
- </itemizedlist>
-
- <para>Allservas asuvas menüüs leiab alglaadimisvalikud:</para>
-
- <itemizedlist>
- <listitem>
- <para>F1 - Abi. Selgitab valikuid "splash", "apm", "acpi" ja "Ide".</para>
- </listitem>
-
- <listitem>
- <para>F2 - keel. Ekraanil nähtava keele valimine.</para>
- </listitem>
-
- <listitem>
- <para>F3 - ekraanilahutus. Valida on tekst, 640x400, 800x600, 1024x728.</para>
- </listitem>
-
- <listitem>
- <para>F4 - CD-Rom. CD-Rom või Muu. Tavaliselt sooritatakse paigaldamine ühendatud
+ühendatud (Mageia 5 puhul see ei toimi).</para></listitem></itemizedlist><para>Allservas asuvas menüüs leiab alglaadimisvalikud:</para><itemizedlist><listitem><para>F1 - Abi. Selgitab valikuid "splash", "apm", "acpi" ja "Ide".</para></listitem><listitem><para>F2 - keel. Ekraanil nähtava keele valimine.</para></listitem><listitem><para>F3 - ekraanilahutus. Valida on tekst, 640x400, 800x600, 1024x728.</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom või Muu. Tavaliselt sooritatakse paigaldamine ühendatud
paigaldusandmekandjalt. Siin saab valida ka muu allika, näiteks FTP- või
NFS-serveri. Kui paigaldus sooritatakse SLP-serveriga võrgus, tuleb selle
-korral valida serveril saada olev paigaldusandmekandja.</para>
- </listitem>
-
- <listitem>
- <para>F6 - draiver. Jah või Ei. Süsteem on teadlik draiveriuuendusega lisaketta
-olemasolust ning nõuab selle paigaldamise käigus selle ühendamist.</para>
- </listitem>
-
- <listitem>
- <para>F6 - kerneli võtmed. Siin saab määrata konkreetseid võtmeid, mida vajavad
-teie riistvara ja kasutatavad draiverid.</para>
- </listitem>
- </itemizedlist>
- </section>
-
- <section xml:id="uefimode">
- <info>
- <title xml:id="uefimode-ti1">UEFI režiimis</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center"
-fileref="live-bootUEFI.png" format="PNG" xml:id="bootUEFI-im1"/>
-</imageobject>
-
- <caption>
- <para>Esimene ekraan UEFI süsteemi käivitamisel kettalt</para>
- </caption>
- </mediaobject>
-
- <para>Siin on ainult kaks valikut: Mageia käivitamine live-režiimis (esimene
-valik) või paigaldamine (teine valik).</para>
- <para>Kui olete süsteemi laadinud USB-pulgalt, näeb veel kaht rida, mis on muidu
+korral valida serveril saada olev paigaldusandmekandja.</para></listitem><listitem><para>F6 - draiver. Jah või Ei. Süsteem on teadlik draiveriuuendusega lisaketta
+olemasolust ning nõuab selle paigaldamise käigus selle ühendamist.</para></listitem><listitem><para>F6 - kerneli võtmed. Siin saab määrata konkreetseid võtmeid, mida vajavad
+teie riistvara ja kasutatavad draiverid.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">UEFI režiimis</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
+align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>Esimene ekraan UEFI süsteemi käivitamisel kettalt</para></caption></mediaobject><para>Siin on ainult kaks valikut: Mageia käivitamine live-režiimis (esimene
+valik) või paigaldamine (teine valik).</para><para>Kui olete süsteemi laadinud USB-pulgalt, näeb veel kaht rida, mis on muidu
samasugused nagu kaks esimest, ainult et lisatud on "USB". Siis tuleb valida
-üks neist.</para>
-
- <para>Kõigil juhtudel on esimesteks sammudeks ühtmoodi keele, ajavööndi ja
+üks neist.</para><para>Kõigil juhtudel on esimesteks sammudeks ühtmoodi keele, ajavööndi ja
klaviatuuri valimine, seejärel aga lähevad asjad lahku <link
-linkend="testing">Live-režiimi lisasammude</link> tõttu.</para>
- </section>
-</section> \ No newline at end of file
+linkend="testing">Live-režiimi lisasammude</link> tõttu.</para></section></section> \ No newline at end of file
diff --git a/docs/installer/et/login.xml b/docs/installer/et/login.xml
index 2694cc7b..c4cc6632 100644
--- a/docs/installer/et/login.xml
+++ b/docs/installer/et/login.xml
@@ -1,24 +1,6 @@
-<?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="login" version="5.0" xml:lang="et">
- <info>
- <title xml:id="label-to-adapt-ti1">Sisselogimisekraan</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center" xml:id="login-im1"
-format="PNG" fileref="live-login.png"/> </imageobject>
-
- <caption>
- <para>KDM-i sisselogimisekraan</para>
- </caption>
- </mediaobject>
-
- <para>Lõpuks ilmub sisselogimisekraan.</para>
-
- <para>Kirjutage oma kasutajanimi ja parool ning mõne hetke pärast ilmub teie ette
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="et"><info><title xml:id="label-to-adapt-ti1">Sisselogimisekraan</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM-i sisselogimisekraan</para></caption></mediaobject><para>Lõpuks ilmub sisselogimisekraan.</para><para>Kirjutage oma kasutajanimi ja parool ning mõne hetke pärast ilmub teie ette
juba KDE või GNOME töölaud vastavalt sellele, millist live-andmekandjat te
-kasutate. Nüüd võite oma vastset Mageiat kasutama hakata.</para>
-
- <para>Rohkem teavet leiab <link
+kasutate. Nüüd võite oma vastset Mageiat kasutama hakata.</para><para>Rohkem teavet leiab <link
linkend="https://wiki.mageia.org/en/Category:Documentation">Mageia
-wikist</link>.</para>
-</section> \ No newline at end of file
+wikist</link>.</para></section> \ No newline at end of file
diff --git a/docs/installer/et/setupBootloader.xml b/docs/installer/et/setupBootloader.xml
index af97749f..888eab8a 100644
--- a/docs/installer/et/setupBootloader.xml
+++ b/docs/installer/et/setupBootloader.xml
@@ -10,9 +10,11 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
-format="PNG"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="setupBootloader-im1"
+format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata
+xml:id="setupBootloader-im1" format="PNG" align="center" revision="1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<section>
<title>BIOS-e süsteemiga</title>
@@ -33,7 +35,7 @@ Mageial luua uus.</para>
<title xml:id="usingMageiaBootloader-ti2">Mageia alglaaduri kasutamine</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa4">Vaikimisi kirjutab Mageia uue GRUBi alglaaduri teie esimese kõvaketta MBR
+ <para xml:id="setupBootloader-pa4" revision="3">Vaikimisi kirjutab Mageia uue GRUBi alglaaduri teie esimese kõvaketta MBR
(Master Boot Record) sektsiooni. Kui teil on juba paigaldatud teisi
operatsioonisüsteeme, üritab Mageia lisada need uude Mageia
alglaadimismenüüsse.</para>
@@ -42,7 +44,7 @@ alglaadimismenüüsse.</para>
uuemat alglaadurit GRUB2.</para>
<warning>
- <para revision="3" xml:id="setupBootloader-pa6">Linuxi süsteeme, mis kasutavad GRUB2 alglaadurit, vanem GRUB praegu ei toeta
+ <para xml:id="setupBootloader-pa6" revision="3">Linuxi süsteeme, mis kasutavad GRUB2 alglaadurit, vanem GRUB praegu ei toeta
ega tunne neid ära, kui kasutada vaikimisi GRUBi alglaadurit.</para>
<para revision="3">Sel juhul on parim lahendus kasutada GRUB2 alglaadurit, mille saab valida
@@ -52,15 +54,15 @@ paigaldamise ajal kokkuvõtteleheküljel.</para>
<section xml:id="usingExistingBootloader">
<info>
- <title revision="2" xml:id="usingExistingBootloader-ti4">Olemasoleva alglaaduri kasutamine</title>
+ <title xml:id="usingExistingBootloader-ti4" revision="2">Olemasoleva alglaaduri kasutamine</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa46">Kui otsustate kasutada olemasolevat alglaadurit, peate meeles pidama, et
+ <para xml:id="setupBootloader-pa46" revision="3">Kui otsustate kasutada olemasolevat alglaadurit, peate meeles pidama, et
teeksite paigaldamise ajal kokkuvõtteleheküljel peatuse ning klõpsaksite
alglaaduri juures nupule <guibutton>Seadista</guibutton>, mis võimaldab
muuta alglaaduri paigaldamise asukohta.</para>
- <para revision="1" xml:id="setupBootloader-pa47">Ärge valige seadet, nt "sda", sest nii kirjutate üle olemasoleva MBR
+ <para xml:id="setupBootloader-pa47" revision="1">Ärge valige seadet, nt "sda", sest nii kirjutate üle olemasoleva MBR
sektsiooni. Peate valima juurpartitsiooni, mille valisite varasemal
partitsioneerimisetapil, nt sda7.</para>
@@ -73,7 +75,7 @@ partitsioneerimisetapil, nt sda7.</para>
ekraanile.</para>
</tip>
- <para revision="2" xml:id="setupBootloader-pa49">Täpne protseduur, kuidas lisada Mageia süsteem olemasolevale alglaadurile,
+ <para xml:id="setupBootloader-pa49" revision="2">Täpne protseduur, kuidas lisada Mageia süsteem olemasolevale alglaadurile,
väljub käesoleva abiteksti raamest, kuid enamasti tähendab see asjakohase
alglaaduri paigaldamise programmi käivitamist, mis tuvastab ja lisab selle
automaatselt. Uurige selle kohta lähemalt vastava operatsioonisüsteemi
@@ -82,10 +84,10 @@ dokumentatsiooni.</para>
<section xml:id="advancedOptionBootloader">
<info>
- <title revision="2" xml:id="advancedOptionBootloader-ti5">Alglaaduri täpsemad valikud</title>
+ <title xml:id="advancedOptionBootloader-ti5" revision="2">Alglaaduri täpsemad valikud</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa52">Kui teie juurpartitsioonil <literal>/</literal> on väga vähe ruumi ja selle
+ <para xml:id="setupBootloader-pa52" revision="3">Kui teie juurpartitsioonil <literal>/</literal> on väga vähe ruumi ja selle
peal asub ka <literal>/tmp</literal>, klõpsake <guibutton>Muud
valikud</guibutton> ja märkige ära kastike <guilabel>/tmp puhastatakse igal
käivitumisel</guilabel>. See aitab ruumi mõnevõrra kokku hoida.</para>
@@ -99,7 +101,10 @@ käivitumisel</guilabel>. See aitab ruumi mõnevõrra kokku hoida.</para>
valida alglaadurit, kuna saadaval on ainult Grub2-efi. </para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader2.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader2.png"/>
+</imageobject></mediaobject>
<para>Kui Mageia on esimene süsteem, mis teie arvutisse paigaldatakse, loob
paigaldusprogramm ESP (EFI süsteemse partitsiooni) alglaaduri (Grub2-efi)
diff --git a/docs/installer/et/setupBootloaderAddEntry.xml b/docs/installer/et/setupBootloaderAddEntry.xml
index 995e5bf6..faedacc6 100644
--- a/docs/installer/et/setupBootloaderAddEntry.xml
+++ b/docs/installer/et/setupBootloaderAddEntry.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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="et">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="setupBootloaderAddEntry">
<info>
@@ -7,9 +7,13 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
-xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="dx2-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="live-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject></mediaobject>
<section>
<title>BIOS-e süsteemiga</title>
@@ -26,8 +30,8 @@ tööriista <code>grub-customizer</code>.</para>
</note>
<mediaobject>
-<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
-align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1"
+align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
</imageobject></mediaobject>
<para>Mõningaid asju võib muuta vähese riskiga, näiteks kirje nimi ja märge
diff --git a/docs/installer/et/unused.xml b/docs/installer/et/unused.xml
index bae23a97..bf075f8a 100644
--- a/docs/installer/et/unused.xml
+++ b/docs/installer/et/unused.xml
@@ -19,7 +19,7 @@ hea mõte, kui te just ei valmistu paigalduseks sootuks teistsugusel
riistvaral.</para>
<mediaobject>
-<imageobject> <imagedata fileref="live-unused-InstallationProgress.png"/>
+<imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
</imageobject></mediaobject>
<para>Järgmisel sammul kopeeritakse failid kõvakettale. See võtab mõne minuti
diff --git a/docs/installer/eu/bootLive.xml b/docs/installer/eu/bootLive.xml
index 3af9371f..8f23b3de 100644
--- a/docs/installer/eu/bootLive.xml
+++ b/docs/installer/eu/bootLive.xml
@@ -1,136 +1,30 @@
-<?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="bootLive" version="5.0" xml:lang="eu">
- <info>
- <title xml:id="bootLive-ti1">Abiatu Mageia Zuzeneko sistema bezala</title>
- </info>
-
- <section xml:id="bootLive-1">
- <info>
- <title xml:id="bootLive1-ti1">Euskarria abiarazten</title>
- </info>
-
- <section>
- <info>
- <title xml:id="bootLive11-ti1">Diskotik</title>
- </info>
-
- <para>You can boot directly from the media you used to burn your image (CD-ROM,
+<?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="eu"><info><title xml:id="bootLive-ti1">Abiatu Mageia Zuzeneko sistema bezala</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Euskarria abiarazten</title></info><section><info><title xml:id="bootLive11-ti1">Diskotik</title></info><para>You can boot directly from the media you used to burn your image (CD-ROM,
DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the
bootloader to launch the installation automatically after rebooting the
computer. If that does not happen you may need to reconfigure your BIOS or
press one key that will offer you to choose the peripheral from which the
-computer will boot.</para>
-
- <para>According to which hardware you have, and how it is configured, you get
-either one or another of the two screens below.</para>
- </section>
-
- <section>
- <info>
- <title xml:id="bootLive12-ti1">USB gailu batetik</title>
- </info>
-
- <para>You can boot from the USB device on which you dumped your image
+computer will boot.</para><para>According to which hardware you have, and how it is configured, you get
+either one or another of the two screens below.</para></section><section><info><title xml:id="bootLive12-ti1">USB gailu batetik</title></info><para>You can boot from the USB device on which you dumped your image
ISO. According to your BIOS settings, the computer boots perhaps directly on
the USB device already plugged in a port. If that does not happen you may
need to reconfigure your BIOS or press one key that will offer you to choose
-the peripheral from which the computer will boot.</para>
- </section>
- </section>
-
- <section xml:id="biosmode">
- <info>
- <title xml:id="biosmode-ti1">BIOS/CSM/Legacy moduan</title>
- </info>
-
- <mediaobject>
- <imageobject> <imagedata fileref="live-bootCSM.png"/> </imageobject>
-
- <caption>
- <para>Lehen pantaila BIOS moduan abiarazten den bitartean</para>
- </caption>
- </mediaobject>
-
- <para>In the middle menu, you have the choice between three actions:</para>
-
- <itemizedlist>
- <listitem>
- <para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
+the peripheral from which the computer will boot.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">BIOS/CSM/Legacy moduan</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Lehen pantaila BIOS moduan abiarazten den bitartean</para></caption></mediaobject><para>In the middle menu, you have the choice between three actions:</para><itemizedlist><listitem><para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
or USB stick) without writing anything on the disk, so expect a very slow
system. Once the boot is done, you can proceed to the installation on a hard
-disk.</para>
- </listitem>
-
- <listitem>
- <para>Install Mageia: This choice will directly install Mageia on a hard disk.</para>
- </listitem>
-
- <listitem>
- <para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
+disk.</para></listitem><listitem><para>Install Mageia: This choice will directly install Mageia on a hard disk.</para></listitem><listitem><para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
when no media (CD/DVD or USB stick) is connected. (not working with Mageia
-5).</para>
- </listitem>
- </itemizedlist>
-
- <para>Menuaren azpikaldean, Abio Aukerak daude:</para>
-
- <itemizedlist>
- <listitem>
- <para>F1 - Laguntza. Azaldu aukerak "splash", "APM", "acpi" eta "Ide"</para>
- </listitem>
-
- <listitem>
- <para>F2 - Hizkuntza. Aukeratu pantailen hizkuntza.</para>
- </listitem>
-
- <listitem>
- <para>F3 - Pantailaren bereizmena. Aukeratu testua, 640x400, 800x600, 1024x728
-artean</para>
- </listitem>
-
- <listitem>
- <para>F4 - CD-Rom. CD-Rom edo besteak. Normalean, instalazioa txertatuko
+5).</para></listitem></itemizedlist><para>Menuaren azpikaldean, Abio Aukerak daude:</para><itemizedlist><listitem><para>F1 - Laguntza. Azaldu aukerak "splash", "APM", "acpi" eta "Ide"</para></listitem><listitem><para>F2 - Hizkuntza. Aukeratu pantailen hizkuntza.</para></listitem><listitem><para>F3 - Pantailaren bereizmena. Aukeratu testua, 640x400, 800x600, 1024x728
+artean</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom edo besteak. Normalean, instalazioa txertatuko
instalazio euskarri batetik egiten da. Hemen, hautatu beste iturri bat, FTP
edo NFS zerbitzariak bezalakoa. Instalazioa zabaltzen baditu SLP zerbitzari
batekin sare batean, hautatu instalazio iturria aukera honekin zerbitzarian
-eskuragarri.</para>
- </listitem>
-
- <listitem>
- <para>F5 - Driver. Bai edo Ez. Sistemak disko optikoak ontrolatzailea
+eskuragarri.</para></listitem><listitem><para>F5 - Driver. Bai edo Ez. Sistemak disko optikoak ontrolatzailea
eguneraketarik duen jakitun da eta instalazio prozesuan zehar txertatzeko
-eskatzen du.</para>
- </listitem>
-
- <listitem>
- <para>F6 - Kernel aukera. Hau zure hardware eta gidarien erabileraren araberako
-aukerak zehazteko modu bat da.</para>
- </listitem>
- </itemizedlist>
- </section>
-
- <section xml:id="uefimode">
- <info>
- <title xml:id="uefimode-ti1">UEFI moduan</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center"
-fileref="live-bootUEFI.png" format="PNG" xml:id="bootUEFI-im1"/>
-</imageobject>
-
- <caption>
- <para>Lehen pantaila diskotik UEFI sistema abiaraztean</para>
- </caption>
- </mediaobject>
-
- <para>You have only the choice to run Mageia in Live mode (first choice) or to
-process the installation (second choice).</para>
- <para>If you booted from a USB stick, you get two supplemental lines which are a
+eskatzen du.</para></listitem><listitem><para>F6 - Kernel aukera. Hau zure hardware eta gidarien erabileraren araberako
+aukerak zehazteko modu bat da.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">UEFI moduan</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
+align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>Lehen pantaila diskotik UEFI sistema abiaraztean</para></caption></mediaobject><para>You have only the choice to run Mageia in Live mode (first choice) or to
+process the installation (second choice).</para><para>If you booted from a USB stick, you get two supplemental lines which are a
duplicata of the previous lines suffixed with "USB". You have to choose
-them.</para>
-
- <para>In each case, the first steps will be the same to choose language, timezone
+them.</para><para>In each case, the first steps will be the same to choose language, timezone
and keyboard, then the processes differ, with <link
-linkend="testing">additional steps in Live mode</link>.</para>
- </section>
-</section> \ No newline at end of file
+linkend="testing">additional steps in Live mode</link>.</para></section></section> \ No newline at end of file
diff --git a/docs/installer/eu/login.xml b/docs/installer/eu/login.xml
index e4c74293..4ec5e376 100644
--- a/docs/installer/eu/login.xml
+++ b/docs/installer/eu/login.xml
@@ -1,24 +1,5 @@
-<?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="login" version="5.0" xml:lang="eu">
- <info>
- <title xml:id="label-to-adapt-ti1">Sarrera pantaila</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center" xml:id="login-im1"
-format="PNG" fileref="live-login.png"/> </imageobject>
-
- <caption>
- <para>KDM sarrera pantaila</para>
- </caption>
- </mediaobject>
-
- <para>Azkenik, saio hasiera pantailara zatoz.</para>
-
- <para>Enter your user name and user password, and in a few seconds you will find
+<?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="eu"><info><title xml:id="label-to-adapt-ti1">Sarrera pantaila</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM sarrera pantaila</para></caption></mediaobject><para>Azkenik, saio hasiera pantailara zatoz.</para><para>Enter your user name and user password, and in a few seconds you will find
yourself with a loaded KDE or GNOME desktop, depending on which live medium
-you used. You can now start using your Mageia installation.</para>
-
- <para>You can find another part of our documentation in <link
-linkend="https://wiki.mageia.org/en/Category:Documentation">the Mageia
-wiki</link>.</para>
-</section> \ No newline at end of file
+you used. You can now start using your Mageia installation.</para><para>Aurki ditzakezu <link
+linkend="https://wiki.mageia.org/en/Category:Documentation">hemen</link>.</para></section> \ No newline at end of file
diff --git a/docs/installer/eu/setupBootloader.xml b/docs/installer/eu/setupBootloader.xml
index ffbd6bca..ab8ebf28 100644
--- a/docs/installer/eu/setupBootloader.xml
+++ b/docs/installer/eu/setupBootloader.xml
@@ -10,9 +10,11 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
-format="PNG"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="setupBootloader-im1"
+format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata
+xml:id="setupBootloader-im1" format="PNG" align="center" revision="1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<section>
<title>Bios sistemarekin</title>
@@ -33,7 +35,7 @@ sortzea erabaki behar duzu.</para>
<title xml:id="usingMageiaBootloader-ti2">Mageia abio kargatzailea erabiliz</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa4">By default, Mageia writes a new GRUB (legacy) bootloader into the MBR
+ <para xml:id="setupBootloader-pa4" revision="3">By default, Mageia writes a new GRUB (legacy) bootloader into the MBR
(Master Boot Record) of your first hard drive. If you already have other
operating systems installed, Mageia attempts to add them to your new Mageia
boot menu.</para>
@@ -42,7 +44,7 @@ boot menu.</para>
abioko kargatzailea gisa.</para>
<warning>
- <para revision="3" xml:id="setupBootloader-pa6">Linux systems which use the GRUB2 bootloader are not currently supported by
+ <para xml:id="setupBootloader-pa6" revision="3">Linux systems which use the GRUB2 bootloader are not currently supported by
GRUB (legacy) and will not be recognized if the default GRUB bootloader is
used.</para>
@@ -53,15 +55,15 @@ kargatzailea hemen erabiltzea da konponbiderik onena.</para>
<section xml:id="usingExistingBootloader">
<info>
- <title revision="2" xml:id="usingExistingBootloader-ti4">Existitzen den abio kargatzaile bat erabiliz</title>
+ <title xml:id="usingExistingBootloader-ti4" revision="2">Existitzen den abio kargatzaile bat erabiliz</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa46">Existitzen den abio kargatzaile bat erabili nahi baduzu, instalazioan zehar
+ <para xml:id="setupBootloader-pa46" revision="3">Existitzen den abio kargatzaile bat erabili nahi baduzu, instalazioan zehar
gogoratu beharko duzu laburpen orrian GELDITZEA eta Abio Kargatzailearen
<guibutton>Ezarpen</guibutton> botoia sakatzea, abio kargatzailearen
instalazio tokia aldatzen utziko dizu.</para>
- <para revision="1" xml:id="setupBootloader-pa47">Do not select a device e.g."sda", or you will overwrite your existing
+ <para xml:id="setupBootloader-pa47" revision="1">Do not select a device e.g."sda", or you will overwrite your existing
MBR. You must select the root partition that you chose during the
partitioning phase earlier, e.g. sda7.</para>
@@ -73,7 +75,7 @@ partitioning phase earlier, e.g. sda7.</para>
instalatzailera itzuliarazten dizu.</para>
</tip>
- <para revision="2" xml:id="setupBootloader-pa49">Zure Mageia sistema erabilea existitzen den abiarazlera gehitzeko prozedura
+ <para xml:id="setupBootloader-pa49" revision="2">Zure Mageia sistema erabilea existitzen den abiarazlera gehitzeko prozedura
zehatza eskuliburu honen esparrutik kanpo dago, baina normalean abio
kargatzaile instalazioak antzeman eta gehitu beharko luke. Ikusi kasuko
sistema eragilearen dokumentazioa.</para>
@@ -81,10 +83,10 @@ sistema eragilearen dokumentazioa.</para>
<section xml:id="advancedOptionBootloader">
<info>
- <title revision="2" xml:id="advancedOptionBootloader-ti5">Abioko kargatzailearen aukera aurreratuak</title>
+ <title xml:id="advancedOptionBootloader-ti5" revision="2">Abioko kargatzailearen aukera aurreratuak</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa52"><literal>/tmp</literal> duen <literal>/</literal> partizioarentzat toki
+ <para xml:id="setupBootloader-pa52" revision="3"><literal>/tmp</literal> duen <literal>/</literal> partizioarentzat toki
gutxi baldin baduzu, klikatu <guibutton>Aurreratua</guibutton> eta
<guilabel>/tmp abio bakoitzean garbitu</guilabel> laukia marka ezazu. Honek
toki libre apur bat mantentzen laguntzen du.</para>
@@ -98,7 +100,10 @@ toki libre apur bat mantentzen laguntzen du.</para>
choose the boot loader since only Grub2-efi is available. </para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader2.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader2.png"/>
+</imageobject></mediaobject>
<para>If Mageia is the first system installed on your computer, the installer
created an ESP (EFI System Partition) to receive the bootloader
diff --git a/docs/installer/eu/setupBootloaderAddEntry.xml b/docs/installer/eu/setupBootloaderAddEntry.xml
index 6ef9558c..011be008 100644
--- a/docs/installer/eu/setupBootloaderAddEntry.xml
+++ b/docs/installer/eu/setupBootloaderAddEntry.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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="eu">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eu" xml:id="setupBootloaderAddEntry">
<info>
@@ -7,9 +7,13 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
-xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="dx2-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="live-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject></mediaobject>
<section>
<title>Bios sistemarekin</title>
@@ -26,8 +30,8 @@ hau ezin duzu erabili sarrerak aldatzeko urrats honetan, sakatu
</note>
<mediaobject>
-<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
-align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1"
+align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
</imageobject></mediaobject>
<para>Segurtasunez egin daitezkeen gauza batzuk sarrera bati etiketa aldatzea eta
diff --git a/docs/installer/eu/unused.xml b/docs/installer/eu/unused.xml
index 07f89b9c..55b19436 100644
--- a/docs/installer/eu/unused.xml
+++ b/docs/installer/eu/unused.xml
@@ -19,7 +19,7 @@ accept, except if you prepare an installation which has to run on different
hardware.</para>
<mediaobject>
-<imageobject> <imagedata fileref="live-unused-InstallationProgress.png"/>
+<imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
</imageobject></mediaobject>
<para>The next step is the copying of files on hard disk. This takes some
diff --git a/docs/installer/fr/bootLive.xml b/docs/installer/fr/bootLive.xml
index e73ed489..625d8ab6 100644
--- a/docs/installer/fr/bootLive.xml
+++ b/docs/installer/fr/bootLive.xml
@@ -1,139 +1,33 @@
-<?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="bootLive" version="5.0" xml:lang="fr">
- <info>
- <title xml:id="bootLive-ti1">Démarrer Mageia comme système Live</title>
- </info>
-
- <section xml:id="bootLive-1">
- <info>
- <title xml:id="bootLive1-ti1">Démarrer le médium</title>
- </info>
-
- <section>
- <info>
- <title xml:id="bootLive11-ti1">A partir d'un disque dur</title>
- </info>
-
- <para>Vous pouvez démarrer directement depuis le média habituellement utilisé pour
+<?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="fr"><info><title xml:id="bootLive-ti1">Démarrer Mageia comme système Live</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Démarrer le médium</title></info><section><info><title xml:id="bootLive11-ti1">A partir d'un disque dur</title></info><para>Vous pouvez démarrer directement depuis le média habituellement utilisé pour
graver vos images (CD-ROM, DVD-ROM...). Vous avez juste besoin de l'insérer
dans votre lecteur CD/DVD pour que le chargeur d'amorçage démarre
l'installation automatiquement après le redémarrage de l'ordinateur. Si cela
n'arrive pas, vous devrez peut-être reconfigurer votre BIOS ou appuyer sur
une touche (ex : F8) afin de choisir le périphérique sur lequel l'ordinateur
-devra démarrer.</para>
-
- <para>En fonction du matériel dont vous disposez, et de la manière dont il est
-configuré, vous obtenez l'un ou l'autre des deux écrans ci-dessous.</para>
- </section>
-
- <section>
- <info>
- <title xml:id="bootLive12-ti1">A partir d'un périphérique USB</title>
- </info>
-
- <para>Vous pouvez démarrer depuis le périphérique USB sur lequel se trouve votre
+devra démarrer.</para><para>En fonction du matériel dont vous disposez, et de la manière dont il est
+configuré, vous obtenez l'un ou l'autre des deux écrans ci-dessous.</para></section><section><info><title xml:id="bootLive12-ti1">A partir d'un périphérique USB</title></info><para>Vous pouvez démarrer depuis le périphérique USB sur lequel se trouve votre
image ISO. Selon les paramètres de votre BIOS, l'ordinateur démarrera
peut-être directement sur le périphérique USB déjà inséré dans le port. Si
cela n'arrive pas, vous devrez peut-être reconfigurer votre BIOS ou appuyer
sur une touche (ex : F8) afin de choisir le périphérique sur lequel
-l'ordinateur devra démarrer.</para>
- </section>
- </section>
-
- <section xml:id="biosmode">
- <info>
- <title xml:id="biosmode-ti1">Dans le mode Bios, csm ou legacy</title>
- </info>
-
- <mediaobject>
- <imageobject> <imagedata fileref="live-bootCSM.png"/> </imageobject>
-
- <caption>
- <para>Premier écran lors du démarrage en mode BIOS</para>
- </caption>
- </mediaobject>
-
- <para>Dans le menu du milieu, vous avez le choix entre trois actions : </para>
-
- <itemizedlist>
- <listitem>
- <para>Démarrer Mageia : cela signifie que Mageia 5 se lancera à partir du media
+l'ordinateur devra démarrer.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">Dans le mode Bios, csm ou legacy</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Premier écran lors du démarrage en mode BIOS</para></caption></mediaobject><para>Dans le menu du milieu, vous avez le choix entre trois actions : </para><itemizedlist><listitem><para>Démarrer Mageia : cela signifie que Mageia 5 se lancera à partir du media
connecté (CD/DVD ou clé USB), sans copier quoi que ce soit sur le disque
dur, ce qui se traduira par un système très lent. Une fois le démarrage
-réalisé, vous pourrez procéder à l'installation sur le disque dur.</para>
- </listitem>
-
- <listitem>
- <para>Installer Mageia : ce choix installera Mageia directement sur votre disque
-dur.</para>
- </listitem>
-
- <listitem>
- <para>Démarrer à partir du disque dur : ce choix vous permet de démarrer sur le
+réalisé, vous pourrez procéder à l'installation sur le disque dur.</para></listitem><listitem><para>Installer Mageia : ce choix installera Mageia directement sur votre disque
+dur.</para></listitem><listitem><para>Démarrer à partir du disque dur : ce choix vous permet de démarrer sur le
disque dur, comme habituellement, lorsque aucun media (CD/DVD ou clé USB)
-n'est connecté. (Ne fonctionne pas avec Mageia 5).</para>
- </listitem>
- </itemizedlist>
-
- <para>Dans le menu inférieur, vous disposez des options de démarrage :</para>
-
- <itemizedlist>
- <listitem>
- <para>F1 - Aide. Explique les options "splash", "apm", "acpi" et "Ide"</para>
- </listitem>
-
- <listitem>
- <para>F2 - Langue. Sélectionner la langue à afficher sur les écrans.</para>
- </listitem>
-
- <listitem>
- <para>F3 - Résolution de l'écran. Sélectionner entre texte, 640x400, 800x600,
-1024x728</para>
- </listitem>
-
- <listitem>
- <para>F4 - CD-Rom. CD-Rom ou autre. Normalement, l'installation se déroule à
+n'est connecté. (Ne fonctionne pas avec Mageia 5).</para></listitem></itemizedlist><para>Dans le menu inférieur, vous disposez des options de démarrage :</para><itemizedlist><listitem><para>F1 - Aide. Explique les options "splash", "apm", "acpi" et "Ide"</para></listitem><listitem><para>F2 - Langue. Sélectionner la langue à afficher sur les écrans.</para></listitem><listitem><para>F3 - Résolution de l'écran. Sélectionner entre texte, 640x400, 800x600,
+1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom ou autre. Normalement, l'installation se déroule à
partir du medium inséré. Vous pouvez sélectionner d'autres sources
d'installation, telles que les serveurs FTP ou NFS. Si l'installation est
réalisée sur le réseau avec un serveur SLP, sélectionner l'une des sources
-disponible sur le serveur avec cette option.</para>
- </listitem>
-
- <listitem>
- <para>F5 - Pilote. Oui ou Non. Le système sait si un disque supplémentaire
+disponible sur le serveur avec cette option.</para></listitem><listitem><para>F5 - Pilote. Oui ou Non. Le système sait si un disque supplémentaire
contient une mise à jour de pilote et demandera son insertion lors du
-processus d'installation.</para>
- </listitem>
-
- <listitem>
- <para>F6 - Options du Noyau. C'est un moyen pour préciser les options liées à
-votre matériel et aux pilotes à utiliser.</para>
- </listitem>
- </itemizedlist>
- </section>
-
- <section xml:id="uefimode">
- <info>
- <title xml:id="uefimode-ti1">En mode UEFI</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center"
-fileref="live-bootUEFI.png" format="PNG" xml:id="bootUEFI-im1"/>
-</imageobject>
-
- <caption>
- <para>Premier écran lors du démarrage à partir du disque dur sur les systèmes UEFI</para>
- </caption>
- </mediaobject>
-
- <para>Vous avez le choix entre lancer Mageia en mode Live (premier choix) ou
-effectuer son installation (second choix).</para>
- <para>Si vous avez démarré à partrir d'une clé USB, vous disposez de deux lignes
+processus d'installation.</para></listitem><listitem><para>F6 - Options du Noyau. C'est un moyen pour préciser les options liées à
+votre matériel et aux pilotes à utiliser.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">En mode 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>Premier écran lors du démarrage à partir du disque dur sur les systèmes UEFI</para></caption></mediaobject><para>Vous avez le choix entre lancer Mageia en mode Live (premier choix) ou
+effectuer son installation (second choix).</para><para>Si vous avez démarré à partrir d'une clé USB, vous disposez de deux lignes
supplémentaires qui sont des copies des lignes précédentes, suffixées par
-"USB". Vous devez les sélectionner.</para>
-
- <para>Dans chaque cas, les premières étapes seront les mêmes pour sélectionner la
+"USB". Vous devez les sélectionner.</para><para>Dans chaque cas, les premières étapes seront les mêmes pour sélectionner la
langue, le fuseau horaire et le clavier, puis le processus diffère ensuite,
-avec <link linkend="testing">des étapes complémentaires en mode Live</link>.</para>
- </section>
-</section> \ No newline at end of file
+avec <link linkend="testing">des étapes complémentaires en mode Live</link>.</para></section></section> \ No newline at end of file
diff --git a/docs/installer/fr/login.xml b/docs/installer/fr/login.xml
index f4fe078a..a3d8f89b 100644
--- a/docs/installer/fr/login.xml
+++ b/docs/installer/fr/login.xml
@@ -1,24 +1,6 @@
-<?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="login" version="5.0" xml:lang="fr">
- <info>
- <title xml:id="label-to-adapt-ti1">Ecran de connexion</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center" xml:id="login-im1"
-format="PNG" fileref="live-login.png"/> </imageobject>
-
- <caption>
- <para>Ecran de connexion KDM</para>
- </caption>
- </mediaobject>
-
- <para>Au final, vous arrivez sur l'écran de connexion.</para>
-
- <para>Entrer votre nom d'utilisateur ainsi que votre mot de passe utilisateur, et
+<?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="fr"><info><title xml:id="label-to-adapt-ti1">Ecran de connexion</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>Ecran de connexion KDM</para></caption></mediaobject><para>Au final, vous arrivez sur l'écran de connexion.</para><para>Entrer votre nom d'utilisateur ainsi que votre mot de passe utilisateur, et
dans quelques secondes, vous vous trouverez face à un environnement de
bureau GNOME ou KDE (suivant le média live que vous utilisez). Vous pouvez
-dès maintenant commencer à utiliser votre installation de Mageia.</para>
-
- <para>Vous pouvez trouver une autre partie de notre documentation dans <link
-linkend="https://wiki.mageia.org/en/Documentation-fr">le wiki Mageia</link>.</para>
-</section> \ No newline at end of file
+dès maintenant commencer à utiliser votre installation de Mageia.</para><para>Vous pouvez trouver une autre partie de notre documentation dans <link
+linkend="https://wiki.mageia.org/en/Documentation-fr">le wiki Mageia</link>.</para></section> \ No newline at end of file
diff --git a/docs/installer/fr/setupBootloader.xml b/docs/installer/fr/setupBootloader.xml
index ecf34c0e..9cdf4dd2 100644
--- a/docs/installer/fr/setupBootloader.xml
+++ b/docs/installer/fr/setupBootloader.xml
@@ -10,9 +10,11 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
-format="PNG"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="setupBootloader-im1"
+format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata
+xml:id="setupBootloader-im1" format="PNG" align="center" revision="1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<section>
<title>Avec un système BIOS</title>
@@ -33,7 +35,7 @@ ou autoriser Mageia à en créer un autre. </para>
<title xml:id="usingMageiaBootloader-ti2">Utiliser un chargeur de démarrage Mageia</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa4">Par défaut, Mageia écrit un nouveau chargeur d'amorçage GRUB (Legacy) dans
+ <para xml:id="setupBootloader-pa4" revision="3">Par défaut, Mageia écrit un nouveau chargeur d'amorçage GRUB (Legacy) dans
le MBR (Master Boot Record) de votre premier disque dur. Si d'autres
systèmes d'exploitation sont déjà installés, Mageia tentera de les ajouter
dans votre nouveau menu de démarrage Mageia.</para>
@@ -42,7 +44,7 @@ dans votre nouveau menu de démarrage Mageia.</para>
plus de GRUB legacy et Lilo.</para>
<warning>
- <para revision="3" xml:id="setupBootloader-pa6">Les systèmes Linux qui utilisent le chargeur GRUB2 ne sont pas actuellement
+ <para xml:id="setupBootloader-pa6" revision="3">Les systèmes Linux qui utilisent le chargeur GRUB2 ne sont pas actuellement
supportés par GRUB (legacy) et ne seront pas reconnus si le chargeur de
démarrage GRUB est utilisé.</para>
@@ -53,15 +55,15 @@ est disponible pendant l'installation à la page du résumé.</para>
<section xml:id="usingExistingBootloader">
<info>
- <title revision="2" xml:id="usingExistingBootloader-ti4">Utiliser un chargeur de démarrage existant. </title>
+ <title xml:id="usingExistingBootloader-ti4" revision="2">Utiliser un chargeur de démarrage existant. </title>
</info>
- <para revision="3" xml:id="setupBootloader-pa46">Si vous décidez d'utiliser un chargeur de démarrage existant, vous devez
+ <para xml:id="setupBootloader-pa46" revision="3">Si vous décidez d'utiliser un chargeur de démarrage existant, vous devez
alors vous souvenir de vous ARRETER pendant l'installation à la page du
résumé et de cliquer sur le bouton <guibutton>Configurer</guibutton>, lequel
permet de modifier le lieu d'installation du chargeur de démarrage.</para>
- <para revision="1" xml:id="setupBootloader-pa47">Ne sélectionnez pas un périphérique tel que "sda" car sinon vous allez
+ <para xml:id="setupBootloader-pa47" revision="1">Ne sélectionnez pas un périphérique tel que "sda" car sinon vous allez
écrasez votre MBR actuel. Vous devez sélectionner la partition que vous avez
choisi lors de la phase de partitionnement précédente, par exemple sda7.</para>
@@ -74,7 +76,7 @@ est la partition <literal>/</literal> (root). Ctrl+Alt+F7 ramène dans
l'écran de l'installateur.</para>
</tip>
- <para revision="2" xml:id="setupBootloader-pa49">La procédure exacte pour ajouter le système Mageia dans un chargeur de
+ <para xml:id="setupBootloader-pa49" revision="2">La procédure exacte pour ajouter le système Mageia dans un chargeur de
démarrage existant sort du périmètre de cette aide, cependant, la plupart du
temps, elle exige d'exécuter le programme d'installation du chargeur de
démarrage impliqué qui devrait le détecter et l'installer
@@ -84,10 +86,10 @@ question.</para>
<section xml:id="advancedOptionBootloader">
<info>
- <title revision="2" xml:id="advancedOptionBootloader-ti5">Option avancée du chargeur de démarrage </title>
+ <title xml:id="advancedOptionBootloader-ti5" revision="2">Option avancée du chargeur de démarrage </title>
</info>
- <para revision="3" xml:id="setupBootloader-pa52">Si la place sur le disque est très limitée pour la partition
+ <para xml:id="setupBootloader-pa52" revision="3">Si la place sur le disque est très limitée pour la partition
<literal>/</literal> qui contient <literal>/tmp</literal>, cliquer sur
<guibutton>Advancé</guibutton> et cocher la case <guilabel>Vider le dossier
/tmp à chaque démarrage</guilabel>. Cela aide à maintenir un peu de place
@@ -103,7 +105,10 @@ vous ne pouvez pas choisir le chargeur de démarrage car seul Grub2-efi est
disponible. </para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader2.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader2.png"/>
+</imageobject></mediaobject>
<para>Si Mageia est le premier système installé sur votre ordinateur,
l'installateur créé une partition ESP (Partition système EFI) pour reçevoir
diff --git a/docs/installer/fr/setupBootloaderAddEntry.xml b/docs/installer/fr/setupBootloaderAddEntry.xml
index 332e0af8..16798cd7 100644
--- a/docs/installer/fr/setupBootloaderAddEntry.xml
+++ b/docs/installer/fr/setupBootloaderAddEntry.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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="fr">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="fr" xml:id="setupBootloaderAddEntry">
<info>
@@ -7,9 +7,13 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
-xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="dx2-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="live-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject></mediaobject>
<section>
<title>Avec un système BIOS</title>
@@ -28,8 +32,8 @@ appuyez sur 'Suivant'. Vous devez modifier manuellement le fichier
</note>
<mediaobject>
-<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
-align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1"
+align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
</imageobject></mediaobject>
<para>Le changement du nom d'une entrée et l'activation de la case à cocher pour
diff --git a/docs/installer/fr/unused.xml b/docs/installer/fr/unused.xml
index 95e9e6b8..e34df99e 100644
--- a/docs/installer/fr/unused.xml
+++ b/docs/installer/fr/unused.xml
@@ -19,7 +19,7 @@ judicieux d'accepter, excepté si vous préparez une installation s'exécutant
sur des configurations matériel différentes.</para>
<mediaobject>
-<imageobject> <imagedata fileref="live-unused-InstallationProgress.png"/>
+<imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
</imageobject></mediaobject>
<para>La prochaine étape consistera à copier les fichiers sur le disque dur. Ceci
diff --git a/docs/installer/hr/DrakLive-cover.xml b/docs/installer/hr/DrakLive-cover.xml
new file mode 100644
index 00000000..5d158586
--- /dev/null
+++ b/docs/installer/hr/DrakLive-cover.xml
@@ -0,0 +1,76 @@
+<?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="hr" xml:id="Quick-Startup">
+ <info>
+ <title>Installation from LIVE medium</title>
+ <publisher> <publishername>Mageia.org</publishername> </publisher>
+ <revhistory>
+ <revision>
+ <date>Veljača 2015</date>
+ <revremark>Mageia 5</revremark>
+ </revision>
+ </revhistory>
+ <cover>
+ <para role="tagline">Službena dokumentacija za Mageiu</para>
+ <mediaobject>
+<imageobject> <imagedata fileref="mageia-2013.png"/> </imageobject></mediaobject>
+ <para>The texts and screenshots in this manual are available under the CC BY-SA
+3.0 license <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
+ </para>
+ <para>This manual was produced with the help of the <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.
+ </para>
+ <para>It was written by volunteers in their free time. Please contact <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
+Team</link>, if you would like to help improve this manual.</para>
+ </cover>
+ </info>
+ <article>
+ <title>Installation from LIVE medium</title>
+ <para><note>
+ <para>No one will see all the installer screens that you see in this manual. Which
+screens you will see, depends on your hardware and the choices you make
+while installing.</para>
+ </note></para>
+ <xi:include href="SelectAndUseISOs2.xml"/>
+
+ <xi:include href="bootLive.xml"/>
+
+ <xi:include href="selectLanguage.xml"/>
+
+ <xi:include href="acceptLicense.xml"/>
+
+ <xi:include href="configureTimezoneUTC.xml"/>
+
+ <xi:include href="bestTime.xml"/>
+
+ <xi:include href="selectKeyboardLive.xml"/>
+
+ <xi:include href="testing.xml"/>
+
+ <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"/>
+
+ <xi:include href="unused.xml"/>
+
+ <xi:include href="setupBootloader.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>
+</book> \ No newline at end of file
diff --git a/docs/installer/hr/DrakLive.xml b/docs/installer/hr/DrakLive.xml
new file mode 100644
index 00000000..0ad57446
--- /dev/null
+++ b/docs/installer/hr/DrakLive.xml
@@ -0,0 +1,65 @@
+<?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="hr" xml:id="Quick-Startup">
+ <info>
+ <title>Installation from LIVE medium</title>
+
+ <cover>
+ <para><note>
+ <para>No one will see all the installer screens that you see in this manual. Which
+screens you will see, depends on your hardware and the choices you make
+while installing.</para>
+ </note></para>
+
+ <para xml:id="CC_BY-SA">The texts and screenshots in this manual are available under the CC BY-SA
+3.0 license <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+ <para>This manual was produced with the help of the <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+ <para>It was written by volunteers in their free time. Please contact <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
+Team</link>, if you would like to help improve this manual.</para>
+ </cover>
+ </info>
+
+ <xi:include href="SelectAndUseISOs2.xml"/>
+
+ <xi:include href="bootLive.xml"/>
+
+ <xi:include href="selectLanguage.xml"/>
+
+ <xi:include href="acceptLicense.xml"/>
+
+ <xi:include href="configureTimezoneUTC.xml"/>
+
+ <xi:include href="bestTime.xml"/>
+
+ <xi:include href="selectKeyboardLive.xml"/>
+
+ <xi:include href="testing.xml"/>
+
+ <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"/>
+
+ <xi:include href="unused.xml"/>
+
+ <xi:include href="setupBootloader.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
diff --git a/docs/installer/hr/SelectAndUseISOs2.xml b/docs/installer/hr/SelectAndUseISOs2.xml
index 52d93ebe..7b2bea02 100644
--- a/docs/installer/hr/SelectAndUseISOs2.xml
+++ b/docs/installer/hr/SelectAndUseISOs2.xml
@@ -7,6 +7,32 @@
</info>
<section>
+ <title>Introduction</title>
+
+ <para>Mageia is distributed via ISO images. This page will help you to choose
+which image match your needs.</para>
+
+ <para>There is two families of media:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Classical installer: After booting the media, it will follow a process
+allowing to choose what to install and how to configure your target
+system. This give you the maximal flexibility for a customized installation,
+in particular to choose which Desktop Environment you will install.</para>
+ </listitem>
+
+ <listitem>
+ <para>LIVE media: you can boot the media in a real Mageia system without
+installing it, to see what you will get after installation. The
+installation process is simpler, but you get lesser choices.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>Details are given in the next sections.</para>
+ </section>
+
+ <section>
<title>Media</title>
<section>
@@ -260,12 +286,8 @@ http is chosen, you may also see something like</para>
<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
<para>md5sum and sha1sum are tools to check the ISO integrity. Use only one of
-them. Both hexadecimal numbers have been calculated by an algorithm from the
-file to be downloaded. When you ask these algorithms to recalculate this
-number from your downloaded file, either you have the same number and your
-downloaded file is correct, or the number is different and you have a
-failure. A failure infers that you should retry the download.Then this
-window appears:</para>
+them. Keep one of them <link linkend="integrity">for further
+usage</link>. Then this window appears:</para>
<mediaobject>
<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
@@ -274,7 +296,13 @@ window appears:</para>
</section>
<section>
- <title>Checking the downloaded media integrity</title>
+ <title xml:id="integrity">Checking the downloaded media integrity</title>
+
+ <para>Both checksums are hexadecimal numbers calculated by an algorithm from the
+file to be downloaded. When you ask these algorithms to recalculate this
+number from your downloaded file, either you have the same number and your
+downloaded file is correct, or the number is different and you have a
+failure. A failure infers that you should retry the download.</para>
<para>Open a console, no need to be root, and:</para>
@@ -323,13 +351,35 @@ the device; any other data will be lost and the partition capacity will be
reduced to the image size.</para>
</warning>
- <para>To recover the original capacity, you must re-format the USB stick.</para>
+ <para>To recover the original capacity, you must redo partitioning and re-format
+the USB stick.</para>
<section>
- <title>Using Mageia</title>
+ <title>Using a graphical tool within Mageia</title>
<para>You can use a graphical tool like <link
ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks">IsoDumper</link></para>
+ </section>
+
+ <section>
+ <title>Using a graphical tool within Windows</title>
+
+ <para>You could try:</para>
+
+ <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
+"ISO image" option;</para>
+
+ <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
+Disk Imager</link></para>
+ </section>
+
+ <section>
+ <title>Using Command line within a GNU/Linux system</title>
+
+ <warning>
+ <para>It is potentially *dangerous* to do this by hand. You risk to overwrite a
+disc partition if you get the device-ID wrong.</para>
+ </warning>
<para>You can also use the dd tool in a console:</para>
@@ -356,11 +406,34 @@ application or file manager that could access or read it)</para>
<mediaobject>
<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
+
+ <para>Alternatively, you can get the device name with the command
+<code>dmesg</code>: at end, you see the device name starting with
+<emphasis>sd</emphasis>, and <emphasis>sdd</emphasis> in this case:</para>
+
+ <screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
+[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
+[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
+[72594.770536] usb 1-1: Product: Mass Storage Device
+[72594.770537] usb 1-1: Manufacturer: JetFlash
+[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB
+[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes
+[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes
+[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected
+[72594.772447] scsi host8: usb-storage 1-1:1.0
+[72595.963238] scsi 8:0:0:0: Direct-Access JetFlash Transcend 2GB 1100 PQ: 0 ANSI: 4
+[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)
+[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off
+[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00
+[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found
+[72595.965031] sd 8:0:0:0: [sdd] Assuming drive cache: write through
+[72595.967251] <emphasis>sdd</emphasis>: sdd1
+[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen>
</listitem>
<listitem>
- <para>Find the device name for your USB stick (by its size), for example /dev/sdb
-in the screenshot above, it is a 8Go USB stick.</para>
+ <para>Find the device name for your USB stick (by its size), for example
+<code>/dev/sdb</code> in the screenshot above, it is a 8GB USB stick.</para>
</listitem>
<listitem>
@@ -382,30 +455,6 @@ of=/dev/sdb bs=1M</userinput></para>
</listitem>
</orderedlist>
</section>
-
- <section>
- <title>Using Windows</title>
-
- <para>You could try:</para>
-
- <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link></para>
-
- <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
-Disk Imager</link></para>
-
- <para/>
- </section>
</section>
</section>
-
- <section>
- <title>Mageia Installation</title>
-
- <para>This step is detailed in <link ns4:href="http://www.mageia.org/en/doc/">the
-Mageia documentation</link>.</para>
-
- <para>More information is available in <link
-ns4:href="https://wiki.mageia.org/en/Category:Documentation">the Mageia
-wiki</link>.</para>
- </section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/installer/hr/acceptLicense.xml b/docs/installer/hr/acceptLicense.xml
index cce1bc5a..415d8d38 100644
--- a/docs/installer/hr/acceptLicense.xml
+++ b/docs/installer/hr/acceptLicense.xml
@@ -1,11 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="hr" xml:id="acceptLicense"
- 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="acceptLicense" version="5.0" xml:lang="hr">
@@ -41,9 +34,12 @@
<title xml:id="acceptLicense-ti1">Licenca i bilješka o izdanju</title>
</info>
- <mediaobject condition="expert">
-<imageobject> <imagedata align="center" fileref="dx2-license.png"
-format="PNG" revision="1" xml:id="acceptLicense-im1"/> </imageobject></mediaobject>
+ <mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="acceptLicense-im1"
+revision="4" align="center" format="PNG" fileref="dx2-license.png"/>
+</imageobject> <imageobject> <imagedata xml:id="acceptLicense-im2"
+revision="5" align="center" condition="live" format="PNG"
+fileref="live-license.png"/> </imageobject></mediaobject>
<section xml:id="license">
<info>
@@ -82,4 +78,4 @@ Release Notes</para>
<para>Da biste vidjeli što je novo u <application>Mageii</application>, kliknite
na <guibutton>Bilješka o izdanju</guibutton> dugme.</para>
</section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/installer/hr/addUser.xml b/docs/installer/hr/addUser.xml
index 183e2d0f..07cd66bf 100644
--- a/docs/installer/hr/addUser.xml
+++ b/docs/installer/hr/addUser.xml
@@ -1,5 +1,4 @@
-<?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="addUser" version="5.0" xml:lang="hr">
-
+<?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="addUser" version="5.0" xml:lang="hr">
<info>
<title xml:id="addUser-ti1">Upravljanje korisnikom i superkorisnikom</title>
</info>
@@ -15,10 +14,12 @@
+
+
-
- <mediaobject>
+
+ <mediaobject>
<!-- Started by marja,using Led43's text, on 2012 03 27 -->
<!-- NEEDS TO BE REVIEWED! -->
<!-- SimonNZG 2012-04-03 has taken a look but needs to come back -->
@@ -31,10 +32,11 @@
"rbash" in the xguest warning - is that correct? -->
<!-- JohnR 2012-04-19 Language proofreading -->
<!-- marja 2012-04-24 Added screenshot -->
-<!-- marja 2013-04-26 added new note -->
-<imageobject> <imagedata revision="1" fileref="dx2-setRootPassword.png"
-format="PNG" align="center" xml:id="setRootPassword-im1"></imagedata>
-</imageobject></mediaobject>
+<!-- marja 2013-04-26 added new note-->
+<imageobject condition="classical"> <imagedata revision="1" align="center"
+xml:id="setRootPassword-im1" fileref="dx2-setRootPassword.png"
+format="PNG"/> </imageobject> <imageobject> <imagedata format="PNG"
+fileref="live-user1.png"/> </imageobject></mediaobject>
<section xml:id="root-password">
<info>
@@ -84,7 +86,7 @@ prijave je osjetljivo na mala i velika slova.</emphasis></para>
<listitem>
<para><guilabel>Lozinka</guilabel>: U tekstualno polje trebate uppisati korisničku
lozinku. Na kraju tekstualnog polja nalazi se štit koji pokazuje snagu
-lozinke.(Također vidi <xref linkend="givePassword"></xref>)</para>
+lozinke.(Također vidi <xref linkend="givePassword"/>)</para>
</listitem>
<listitem>
@@ -94,7 +96,7 @@ tekstualnom polju.</para>
</listitem>
</itemizedlist>
- <note>
+ <note>
<para>Svaki korisnik kojeg dodate tijekom instalacije Mageie, će imati čitljiv (
ali zaštićen za pisanje) osobni direktorij.</para>
@@ -103,34 +105,34 @@ System - Manage users on system</emphasis> will have a home directory that
is both read and write protected.</para>
<para>If you don't want a world readable home directory for anyone, it is advised
-to only add a temporary user now and to add the real one(s) after reboot.</para>
+to only add a temporary user now and to add the real one(s) after reboot.</para>
<para>If you prefer world readable home directories, you might want to add all
extra needed users in the <emphasis>Configuration - Summary</emphasis> step
during the install. Choose <emphasis>User management</emphasis>.</para>
<para>Dozvole pristupa također se mogu promjeniti nakon instlacije.</para>
- </note>
-
+ </note>
</section>
- <section xml:id="addUserAdvanced">
+ <section condition="classical" xml:id="addUserAdvanced">
<info>
<title xml:id="addUserAdvanced-ti3">Napredno korisničko upravljanje</title>
</info>
<para>Ako je kliknuto na <guibutton>napredno</guibutton> dugme nudi vam se zaslon
-gdje možete urediti postavke korisnika kojega dodajete. Dodatno, možete
-onemogućiti ili omogućiti račun gosta.</para>
+gdje možete urediti postavke korisnika kojega dodajete.</para>
- <warning>
+ <para condition="classical">Additionally, you can disable or enable a guest account.</para>
+
+ <warning condition="classical">
<para>Anything a guest with a default <emphasis>rbash</emphasis> guest account
saves to his /home directory will be erased when he logs out. The guest
should save his important files to a USB key.</para>
</warning>
<itemizedlist>
- <listitem>
+ <listitem condition="classical">
<para><guilabel>Omogući račun gosta</guilabel>: Ovdje možete omogućiti ili
onemogućiti račun gosta. Račun gosta dopušta gostu prijavu i korištenje
PC-ja, ali ima ograničeniji pristup od normalnih korisnika.</para>
diff --git a/docs/installer/hr/ask_mntpoint_s.xml b/docs/installer/hr/ask_mntpoint_s.xml
index 82d2d446..baef4ad8 100644
--- a/docs/installer/hr/ask_mntpoint_s.xml
+++ b/docs/installer/hr/ask_mntpoint_s.xml
@@ -33,9 +33,12 @@
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> <imagedata revision="1" fileref="dx2-chooseMountpoints.png"
-align="center" format="PNG" xml:id="chooseMountPoints-im1"></imagedata>
-</imageobject></mediaobject>
+<imageobject condition='classical'> <imagedata revision="1"
+fileref="dx2-chooseMountpoints.png" align="center" format="PNG"
+xml:id="chooseMountPoints-im1"></imagedata> </imageobject> <imageobject
+condition='live'> <imagedata revision="1"
+fileref="live-chooseMountpoints.png" align="center" format="PNG"
+xml:id="live-chooseMountPoints-im1"></imagedata> </imageobject></mediaobject>
<para>Ovdje možete vidjeti linux particije kje su nađene na vašem računalu. Ako se
ne slažete sa <application>DrakX</application> sugerstijama, možete
diff --git a/docs/installer/hr/bestTime.xml b/docs/installer/hr/bestTime.xml
new file mode 100644
index 00000000..2675b8eb
--- /dev/null
+++ b/docs/installer/hr/bestTime.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" 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">
+ <info>
+ <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>In this step, you have to select on which time your internal clock is set,
+either local time or UTC time.</para>
+
+ <para>In advanced tab, you will find more options about clock settings.</para>
+</section>
diff --git a/docs/installer/hr/bootLive.xml b/docs/installer/hr/bootLive.xml
new file mode 100644
index 00000000..e3fe0427
--- /dev/null
+++ b/docs/installer/hr/bootLive.xml
@@ -0,0 +1,29 @@
+<?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="hr"><info><title xml:id="bootLive-ti1">Boot Mageia as Live system</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Booting the medium</title></info><section><info><title xml:id="bootLive11-ti1">From a disc</title></info><para>You can boot directly from the media you used to burn your image (CD-ROM,
+DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the
+bootloader to launch the installation automatically after rebooting the
+computer. If that does not happen you may need to reconfigure your BIOS or
+press one key that will offer you to choose the peripheral from which the
+computer will boot.</para><para>According to which hardware you have, and how it is configured, you get
+either one or another of the two screens below.</para></section><section><info><title xml:id="bootLive12-ti1">From a USB device</title></info><para>You can boot from the USB device on which you dumped your image
+ISO. According to your BIOS settings, the computer boots perhaps directly on
+the USB device already plugged in a port. If that does not happen you may
+need to reconfigure your BIOS or press one key that will offer you to choose
+the peripheral from which the computer will boot.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>First screen while booting in BIOS mode</para></caption></mediaobject><para>In the middle menu, you have the choice between three actions:</para><itemizedlist><listitem><para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
+or USB stick) without writing anything on the disk, so expect a very slow
+system. Once the boot is done, you can proceed to the installation on a hard
+disk.</para></listitem><listitem><para>Install Mageia: This choice will directly install Mageia on a hard disk.</para></listitem><listitem><para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
+when no media (CD/DVD or USB stick) is connected. (not working with Mageia
+5).</para></listitem></itemizedlist><para>In the bottom menu, are the Boot Options:</para><itemizedlist><listitem><para>F1 - Help. Explain the options "splash", "apm", "acpi" and "Ide"</para></listitem><listitem><para>F2 - Language. Choose the display language of the screens.</para></listitem><listitem><para>F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
+the inserted installation medium. Here, select other sources, like FTP or
+NFS servers. If the installation is carried out in a network with an SLP
+server, select one of the installation sources available on the server with
+this option.</para></listitem><listitem><para>F5 - Driver. Yes or No. The system is aware about the presence of an
+optional disk with a driver update and will require its insertion during
+installation process.</para></listitem><listitem><para>F6 - Kernel options. This is a way to specify options according to your
+hardware and the drivers to use.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">In UEFI mode</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
+align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>First screen while booting on UEFI system from disk</para></caption></mediaobject><para>You have only the choice to run Mageia in Live mode (first choice) or to
+process the installation (second choice).</para><para>If you booted from a USB stick, you get two supplemental lines which are a
+duplicata of the previous lines suffixed with "USB". You have to choose
+them.</para><para>In each case, the first steps will be the same to choose language, timezone
+and keyboard, then the processes differ, with <link
+linkend="testing">additional steps in Live mode</link>.</para></section></section> \ No newline at end of file
diff --git a/docs/installer/hr/configureTimezoneUTC.xml b/docs/installer/hr/configureTimezoneUTC.xml
index 152add72..07cca07f 100644
--- a/docs/installer/hr/configureTimezoneUTC.xml
+++ b/docs/installer/hr/configureTimezoneUTC.xml
@@ -1,37 +1,29 @@
-<?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="hr">
+<?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="hr" xml:id="configureTimezoneUTC">
+ <info>
+ <title xml:id="configureTimezoneUTC-ti6">Konfigurirajte vremensku zonu</title>
+ </info>
+
- <info>
- <title xml:id="configureTimezoneUTC-ti6">Konfigurirajte vremensku zonu</title>
- </info>
+
-
-
-
-<mediaobject>
+ <mediaobject>
<!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
<!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-configureTimezoneUTC.png"
-align="center" format="PNG" xml:id="configureTimezoneUTC-im1"></imagedata>
-</imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+xml:id="configureTimezoneUTC-im1" revision="1"
+fileref="dx2-configureTimezoneUTC.png" align="center" format="PNG"/>
+</imageobject> <imageobject> <imagedata fileref="live-timeZone.png"
+condition="live" format="PNG"/> </imageobject></mediaobject>
- <para revision="1" xml:id="configureTimezoneUTC-pa1">Odaberite vašu vremensku zonu birajući vašu državu ili grad blizu vas u
+ <para revision="1" xml:id="configureTimezoneUTC-pa1">Odaberite vašu vremensku zonu birajući vašu državu ili grad blizu vas u
istoj vremenskoj zoni.</para>
- <para revision="1" xml:id="configureTimezoneUTC-pa2">Na slijedećem zaslonu moći ćete postaviti sat vašega sklopovlja na lokalno
+ <para revision="1" xml:id="configureTimezoneUTC-pa2">Na slijedećem zaslonu moći ćete postaviti sat vašega sklopovlja na lokalno
vrijeme ili na GMT, također poznat kao UTC.</para>
- <note>
- <para revision="1" xml:id="configureTimezoneUTC-pa3">Ako imate više operativinih sustava na vašem računalu, budite sigurni da su
+ <note>
+ <para revision="1" xml:id="configureTimezoneUTC-pa3">Ako imate više operativinih sustava na vašem računalu, budite sigurni da su
svi postavljeni na lokalno vrijeme ili na </para>
- </note>
- </section>
-
+ </note>
+</section> \ No newline at end of file
diff --git a/docs/installer/hr/diskdrake.xml b/docs/installer/hr/diskdrake.xml
index 838ea373..c47a77bc 100644
--- a/docs/installer/hr/diskdrake.xml
+++ b/docs/installer/hr/diskdrake.xml
@@ -29,8 +29,9 @@
</info>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-diskdrake.png" align="center"/>
-</imageobject></mediaobject>
+<imageobject condition='classical'> <imagedata fileref="dx2-diskdrake.png"
+align="center"/> </imageobject> <imageobject condition='live' > <imagedata
+fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
<warning>
<para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <literal>/</literal> partition you
@@ -63,5 +64,4 @@ System Partition) is present and correctly mounted on /boot/EFI (see above)</par
<para><mediaobject>
<imageobject> <imagedata fileref="dx2-diskdrake2.png"/> </imageobject></mediaobject></para>
</note>
-</section>
-
+</section> \ No newline at end of file
diff --git a/docs/installer/hr/doPartitionDisks.xml b/docs/installer/hr/doPartitionDisks.xml
index f3cc6aff..503284ea 100644
--- a/docs/installer/hr/doPartitionDisks.xml
+++ b/docs/installer/hr/doPartitionDisks.xml
@@ -3,35 +3,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
<info>
- <!-- Started by marja on 2012 03 29 -->
-<!-- NEEDS TO BE WRITTEN AND THEN REVIEWED! -->
-<!-- JohnR 2012-04-10 - tidy up module formatting -->
-<!-- barjac 2012-04-20 Yes I agree with Lebarhon - reference to home partition removed -->
-<!-- Simonnzg - doing anything to a Windows partition is DANGEROUS. I would prefer
- if this was not an option, but... -->
-<!-- marja 2012-04-24 put the para xml id's back. -->
-<!-- marja 2012-04-29 changed text as discussed on the ml and with papoteur's approval
- lebarhon: 2012-08-18 warning added-->
-<!-- marja 2013-04-05 changed warning to text suggested by Dave Hodgings in bug 9594 -->
-<!-- marja 2013-04-05 adjusted last line of warning as suggested by obgr_seneca -->
-<!-- lebarhon 2013-04-11 adjusted last line of warning as suggested by Dave Hodgins/Marja-->
+ <!---->
+<!-- lebarhon 2015-07-03 Suggested updates for Mageia 5 -->
<title xml:id="doPartitionDisks-ti1">Particioniranje</title>
</info>
@@ -81,7 +55,7 @@ back up your personal files.</para>
<para>With this option, the installer displays the remaining Windows partition in
light blue and the future Mageia partition in dark blue with their intended
sizes just under. You have the possibility to adapt these sizes by clicking
-and draging the gap between both partitions. See the screen-shot below.</para>
+and dragging the gap between both partitions. See the screen-shot below.</para>
<mediaobject>
<imageobject> <imagedata fileref="dx2-doPartitionDisks2.png"/>
@@ -99,7 +73,7 @@ and draging the gap between both partitions. See the screen-shot below.</para>
have data on the drive that you are not prepared to lose, then do not use
this option.</para>
</listitem>
- </itemizedlist> <itemizedlist>
+ </itemizedlist><itemizedlist>
<listitem>
<para revision="1" xml:id="doPartitionDisks-pa16">Prilagođeno</para>
@@ -108,6 +82,47 @@ hard drive(s).</para>
</listitem>
</itemizedlist></para>
+ <para><emphasis role="bold">Partitions sizing:</emphasis></para>
+
+ <para>The installer will share the available place out according to the following
+rules:</para>
+
+ <para><itemizedlist>
+ <listitem>
+ <para>If the total available place is lower than 50 GB, only one partition is
+created for /, there is no separate partition for /home.</para>
+ </listitem>
+
+ <listitem>
+ <para>If the total available place is over 50 GB, then three partitions are
+created</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>6/19 of the total available place is allocated to / with a maximum of 50 GB</para>
+ </listitem>
+
+ <listitem>
+ <para>1/19 is allocated to swap with a maximum of 4 GB</para>
+ </listitem>
+
+ <listitem>
+ <para>the rest (at least 12/19) is allocated to /home</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ </itemizedlist></para>
+
+ <para>That means that from 160 GB and over of available place, the installer will
+create three partitions: 50 GB for /, 4 GB for swap and the rest for /home.</para>
+
+ <note>
+ <para>If you are using an 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 "Custom" option is the only one that allows to check it has
+been correctly done</para>
+ </note>
+
<warning>
<para>Some newer drives are now using 4096 byte logical sectors, instead of the
previous standard of 512 byte logical sectors. Due to lack of available
@@ -115,13 +130,12 @@ hardware, the partitioning tool used in the installer has not been tested
with such a drive. Also some ssd drives now use an erase block size over 1
MB. We suggest to pre-partition the drive, using an alternative partitioning
tool like gparted, if you own such a device, and to use the following
-settings: </para>
+settings:</para>
- <para>"Align to" "MiB" </para>
+ <para>"Align to" "MiB"</para>
- <para>"Free space preceding (MiB)" "2" </para>
+ <para>"Free space preceding (MiB)" "2"</para>
<para>Also make sure all partitions are created with an even number of megabytes.</para>
</warning>
-</section>
-
+</section> \ No newline at end of file
diff --git a/docs/installer/hr/formatPartitions.xml b/docs/installer/hr/formatPartitions.xml
index 499c14e9..f1a295b7 100644
--- a/docs/installer/hr/formatPartitions.xml
+++ b/docs/installer/hr/formatPartitions.xml
@@ -19,9 +19,12 @@
<!-- NEEDS TO BE REVIEWED! -->
<!-- marja 2012-04-24 added screenshot -->
<!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject> <imagedata revision="1" fileref="dx2-formatPartitions.png"
-format="PNG" align="center" xml:id="formatPartitions-im1"> </imagedata>
-</imageobject></mediaobject>
+<imageobject condition='classical'> <imagedata revision="1"
+fileref="dx2-formatPartitions.png" format="PNG" align="center"
+xml:id="formatPartitions-im1"> </imagedata> </imageobject> <imageobject
+condition='live'> <imagedata revision="1"
+fileref="live-formatPartitions.png" format="PNG" align="center"
+xml:id="live-formatPartitions-im1"> </imagedata> </imageobject></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 saved.</para>
diff --git a/docs/installer/hr/login.xml b/docs/installer/hr/login.xml
new file mode 100644
index 00000000..1d0b3564
--- /dev/null
+++ b/docs/installer/hr/login.xml
@@ -0,0 +1,6 @@
+<?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="hr"><info><title xml:id="label-to-adapt-ti1">Login screen</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM login screen</para></caption></mediaobject><para>Finally, you will come to the login screen.</para><para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE or GNOME desktop, depending on which live medium
+you used. You can now start using your Mageia installation.</para><para>You can find another part of our documentation in <link
+linkend="https://wiki.mageia.org/en/Category:Documentation">the Mageia
+wiki</link>.</para></section> \ No newline at end of file
diff --git a/docs/installer/hr/reboot.xml b/docs/installer/hr/reboot.xml
new file mode 100644
index 00000000..90b5549d
--- /dev/null
+++ b/docs/installer/hr/reboot.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" xml:id="reboot" 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="reboot-ti1">Reboot</title>
+ </info>
+
+ <mediaobject condition="live">
+<imageobject> <imagedata align="center" fileref="live-reboot.png"
+format="PNG" revision="1" xml:id="reboot-im1"/> </imageobject></mediaobject>
+
+ <para>Once the bootloader has been installed, you will be prompted to halt your
+computer, remove the live CD and restart the computer. When you restart, you
+will see a succession of download progress bars. These indicate that the
+software media are being downloaded (see Software management).</para>
+</section>
diff --git a/docs/installer/hr/selectKeyboardLive.xml b/docs/installer/hr/selectKeyboardLive.xml
new file mode 100644
index 00000000..eee27122
--- /dev/null
+++ b/docs/installer/hr/selectKeyboardLive.xml
@@ -0,0 +1,14 @@
+<?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="hr" xml:id="selectKeyboardLive">
+ <info>
+ <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
diff --git a/docs/installer/hr/selectLanguage.xml b/docs/installer/hr/selectLanguage.xml
index 8a2a880c..706ca912 100644
--- a/docs/installer/hr/selectLanguage.xml
+++ b/docs/installer/hr/selectLanguage.xml
@@ -1,12 +1,4 @@
-<?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="hr" xml:id="selectLanguage">
-
+<?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="selectLanguage" version="5.0" xml:lang="hr">
@@ -32,36 +24,40 @@
continent. <application>Mageia</application> will use this selection during
the installation and for your installed system.</para>
- <para>If it is likely that you will require several languages installed on your
+ <para condition="classical">If it is likely that you will require several languages installed on your
system, for yourself or other users, then you should use the
<guibutton>Multiple languages</guibutton> button to add them now. It will be
difficult to add extra language support after installation.</para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-selectLanguage.png" align="center"
-format="PNG" > </imagedata> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-language.png" format=""/>
+</imageobject></mediaobject>
- <warning>
+ <warning condition="classical">
<para>Even if you choose more than one language, you must first choose one of them
as your preferred language in the first language screen. It will also be
marked as chosen in the multiple languages screen .</para>
</warning>
<itemizedlist>
- <listitem>
+ <listitem condition="classical">
<para>If your keyboard language is not the same as your preferred language, then
it is advisable to install the language of your keyboard as well.</para>
</listitem>
<listitem>
- <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
-"multiple languages" screen if you know that it is inappropriate for your
-language. Disabling UTF-8 applies to all installed languages.</para>
+ <para>Mageia uses UTF-8 (Unicode) support by default.</para>
+
+ <para condition="classical">This may be disabled in the "multiple languages" screen if you know that it
+is inappropriate for your language. Disabling UTF-8 applies to all installed
+languages.</para>
</listitem>
<listitem>
<para>You can change the language of your system after installation in the Mageia
-Control Center -&gt; System -&gt; Manage localization for your system.</para>
+Control Center -> System -> Manage localization for your system.</para>
</listitem>
</itemizedlist>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/installer/hr/setupBootloader.xml b/docs/installer/hr/setupBootloader.xml
index 7f137a8b..e56f1db5 100644
--- a/docs/installer/hr/setupBootloader.xml
+++ b/docs/installer/hr/setupBootloader.xml
@@ -1,94 +1,119 @@
<?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="hr" xml:id="setupBootloader">
- <info>
- <title xml:id="setupBootloader-ti1">Glavne postavke bootloadera</title>
- </info>
+
- <mediaobject>
-<!-- 2012-08-12 Copied this page, setupBootloader.xml, from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.
+ <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-->
+<title xml:id="setupBootloader-ti1">Glavne postavke bootloadera</title>
+ </info>
- 2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist-->
-<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
-format="PNG"/> </imageobject></mediaobject>
+ <mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="setupBootloader-im1"
+format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata
+xml:id="setupBootloader-im1" format="PNG" align="center" revision="1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
- <para><note>
- <para>With an UEFI system, the user interface is slightly different as you cannot
-choose the boot loader (first drop down list) since only one is available</para>
- </note></para>
+ <section>
+ <title>With a Bios system</title>
- <para xml:id="setupBootloader-pa1" revision="4">If you prefer different bootloader settings to those chosen automatically by
+ <para xml:id="setupBootloader-pa1" revision="4">If you prefer different bootloader settings to those chosen automatically by
the installer, you can change them here.</para>
- <para xml:id="setupBootloader-pa2" revision="4">You may already have another operating system on your machine, in which case
+ <para xml:id="setupBootloader-pa2" revision="4">You may already have another operating system on your machine, in which case
you need to decide whether to add Mageia to your existing bootloader, or
allow Mageia to create a new one.</para>
- <tip>
- <para revision="2" xml:id="setupBootloader-pa3">The Mageia graphical menus are nice :)</para>
- </tip>
+ <tip>
+ <para>The Mageia graphical menus are nice :</para>
+ </tip>
- <section xml:id="usingMageiaBootloader">
- <info>
- <title xml:id="usingMageiaBootloader-ti2">Using a Mageia bootloader</title>
- </info>
+ <section xml:id="usingMageiaBootloader">
+ <info>
+ <title xml:id="usingMageiaBootloader-ti2">Using a Mageia bootloader</title>
+ </info>
- <para revision="3" xml:id="setupBootloader-pa4">By default, Mageia writes a new GRUB (legacy) bootloader into the MBR
-(Master Boot Record) of your first hard drive. If you already have other
+ <para xml:id="setupBootloader-pa4" revision="3">By default, Mageia writes a new GRUB (legacy) bootloader into the MBR
+(Master Boot Record) of your first hard drive. If you already have other
operating systems installed, Mageia attempts to add them to your new Mageia
boot menu.</para>
- <para revision="3">Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB
+ <para revision="3">Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB
legacy and Lilo.</para>
- <warning>
- <para revision="3" xml:id="setupBootloader-pa6">Linux systems which use the GRUB2 bootloader are not currently supported by
-GRUB (legacy) and will not be recognised if the default GRUB bootloader is
+ <warning>
+ <para xml:id="setupBootloader-pa6" revision="3">Linux systems which use the GRUB2 bootloader are not currently supported by
+GRUB (legacy) and will not be recognized if the default GRUB bootloader is
used.</para>
- <para revision="3">The best solution here is to use the GRUB2 bootloader which is available at
+ <para revision="3">The best solution here is to use the GRUB2 bootloader which is available at
the Summary page during installation.</para>
- </warning>
- </section>
+ </warning>
+ </section>
- <section xml:id="usingExistingBootloader">
- <info>
- <title revision="2" xml:id="usingExistingBootloader-ti4">Using an existing bootloader</title>
- </info>
+ <section xml:id="usingExistingBootloader">
+ <info>
+ <title xml:id="usingExistingBootloader-ti4" revision="2">Using an existing bootloader</title>
+ </info>
- <para revision="3" xml:id="setupBootloader-pa46">If you decide to use an existing bootloader then you will need to remember
+ <para xml:id="setupBootloader-pa46" revision="3">If you decide to use an existing bootloader then you will need to remember
to STOP at the summary page during the installation and click the Bootloader
<guibutton>Configure</guibutton> button, which will allow you to change the
bootloader install location.</para>
- <para revision="1" xml:id="setupBootloader-pa47">Do not select a device e.g."sda", or you will overwrite your existing
+ <para xml:id="setupBootloader-pa47" revision="1">Do not select a device e.g."sda", or you will overwrite your existing
MBR. You must select the root partition that you chose during the
-partitioning phase earlier, e.g. sda7.</para>
+partitioning phase earlier, e.g. sda7.</para>
- <para xml:id="setupBootloader-pa48" revision="1">To be clear, sda is a device, sda7 is a partition on that device.</para>
+ <para xml:id="setupBootloader-pa48" revision="1">To be clear, sda is a device, sda7 is a partition on that device.</para>
- <tip>
- <para revision="1" xml:id="setupBootloader-pa48a">Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where
+ <tip>
+ <para revision="1" xml:id="setupBootloader-pa48a">Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where
your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to
the installer screen.</para>
- </tip>
+ </tip>
- <para revision="2" xml:id="setupBootloader-pa49">The exact procedure for adding your Mageia system to an existing bootloader
+ <para xml:id="setupBootloader-pa49" revision="2">The exact procedure for adding your Mageia system to an existing bootloader
is beyond the scope of this help, 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>
- <section xml:id="advancedOptionBootloader">
- <info>
- <title revision="2" xml:id="advancedOptionBootloader-ti5">Bootloader advanced option</title>
- </info>
+ <section xml:id="advancedOptionBootloader">
+ <info>
+ <title xml:id="advancedOptionBootloader-ti5" revision="2">Bootloader advanced option</title>
+ </info>
- <para revision="3" xml:id="setupBootloader-pa52">If you have very limited disk space for the <literal>/</literal> partition
+ <para xml:id="setupBootloader-pa52" revision="3">If you have very limited disk space for the <literal>/</literal> partition
that contains <literal>/tmp</literal>, click on
<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /tmp
at each boot</guilabel>. This helps to maintain some free space.</para>
+ </section>
+ </section>
+
+ <section>
+ <title>With an UEFI system</title>
+
+ <para>With an UEFI system, the user interface is slightly different as you cannot
+choose the boot loader since only Grub2-efi is available. </para>
+
+ <mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader2.png"/>
+</imageobject></mediaobject>
+
+ <para>If Mageia is the first system installed on your computer, the installer
+created an ESP (EFI System Partition) to receive the bootloader
+(Grub2-efi). If there was already UEFI operating systems previously
+installed on your computer (Windows 8 for example), the Mageia installer
+detected the existing ESP created by Windows and added grub2-efi. Although
+it is possible to have several ESPs, only one is advised and enough whatever
+the number of operating systems you have.</para>
+
+ <para>Don't modify the "Boot Device" unless really knowing what you do.</para>
</section>
</section> \ No newline at end of file
diff --git a/docs/installer/hr/setupBootloaderAddEntry.xml b/docs/installer/hr/setupBootloaderAddEntry.xml
index fa8c9876..9506999c 100644
--- a/docs/installer/hr/setupBootloaderAddEntry.xml
+++ b/docs/installer/hr/setupBootloaderAddEntry.xml
@@ -1,39 +1,68 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="hr">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hr" xml:id="setupBootloaderAddEntry">
+
+
<info>
- <title xml:id="setupBootloaderAddEntry-ti1">Add or Modify a Boot Menu Entry</title>
+ <!--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-->
+<title xml:id="setupBootloaderAddEntry-ti1">Add or Modify a Boot Menu Entry</title>
</info>
<mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
-xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="dx2-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="live-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject></mediaobject>
+
+ <section>
+ <title>With a Bios system</title>
- <para>You can add an entry or modify the one you select first, by pressing the
+ <para>You can add an entry or modify the one you select first, by pressing the
relevant button in the <emphasis>Bootloader Configuration</emphasis> screen
and editing the screen that pops up on top of it.</para>
- <note>
- <para>If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for
-UEFI systems, you cannot use this tool to edit entries at this step, press
-'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use
-<code>grub-customizer</code> instead.</para>
- </note>
+ <note>
+ <para>If you have chosen <code>Grub 2</code> as your bootloader, you cannot use
+this tool to edit entries at this step, press 'Next'. You need to manually
+edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code>
+instead.</para>
+ </note>
- <mediaobject>
-<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
-align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+ <mediaobject>
+<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1"
+align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
</imageobject></mediaobject>
- <para>Some things that can be done without any risk, are changing the label of an
+ <para>Some things that can be done without any risk, are changing the label of an
entry and ticking the box to make an entry the default one.</para>
- <para>You can add the proper version number of an entry, or rename it completely.</para>
+ <para>You can add the proper version number of an entry, or rename it completely.</para>
- <para>The default entry is the one the systems boots into if you don't make a
+ <para>The default entry is the one the systems boots into if you don't make a
choice while booting up.</para>
- <warning>
- <para>Editing other things can leave you with an unbootable system. Please don't
+ <warning>
+ <para>Editing other things can leave you with an unbootable system. Please don't
just try something without knowing what you are doing.</para>
- </warning>
+ </warning>
+ </section>
+
+ <section>
+ <title>With an UEFI system</title>
+
+ <para>In this case you are using Grub2-efi and you cannot use this tool to edit
+entries at this step. To do that you need to manually edit
+<code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code>
+instead. All you can do here, is to choose the default entry in the drop
+down list.</para>
+
+ <para>After a click on the <guibutton>Next</guibutton> button, another drop down
+list allows to choose the video resolution for Grub2 which is a graphical
+boot loader.</para>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="dx2-bootloaderConfiguration2.png"/>
+</imageobject></mediaobject>
+ </section>
</section> \ No newline at end of file
diff --git a/docs/installer/hr/takeOverHdConfirm.xml b/docs/installer/hr/takeOverHdConfirm.xml
index 46a3a435..44997be9 100644
--- a/docs/installer/hr/takeOverHdConfirm.xml
+++ b/docs/installer/hr/takeOverHdConfirm.xml
@@ -12,15 +12,18 @@
-<mediaobject>
+ <mediaobject>
<!-- Made by marja on 2012 04 03 -->
<!-- test comment - johnr -->
<!-- 2012-04-24 marja - replaced "if you are not sure you selected the correct
hard disk." with "if you are not sure about your choice", because I'm sure I
saw this help screen when I had only one HD -->
<!-- 2013-05-05 marja added screenshot -->
-<imageobject> <imagedata fileref="dx2-takeOverHdConfirm.png" format="PNG"
-align="center" ></imagedata> </imageobject></mediaobject>
+<imageobject condition='live'> <imagedata
+fileref="live-takeOverHdConfirm.png" format="PNG" align="center"
+></imagedata> </imageobject> <imageobject condition='classical'> <imagedata
+fileref="dx2-takeOverHdConfirm.png" format="PNG" align="center"
+></imagedata> </imageobject></mediaobject>
<para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <guibutton>Previous</guibutton> if you are not sure about your
choice.</para>
diff --git a/docs/installer/hr/testing.xml b/docs/installer/hr/testing.xml
new file mode 100644
index 00000000..bdf017c3
--- /dev/null
+++ b/docs/installer/hr/testing.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" xml:id="testing" xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns="http://docbook.org/ns/docbook">
+ <info>
+ <title xml:id="testing-ti1">Testing Mageia as Live system</title>
+ </info>
+
+ <section xml:id="testing-1">
+ <info>
+ <title xml:id="testing1-ti1">Live mode</title>
+ </info>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
+
+ <para>You get this screen if you selected "Boot Mageia". If not, you get the
+"<link linkend="doPartitionDisks">Partitioning</link> step"</para>
+
+ <section>
+ <info>
+ <title xml:id="testing2-ti1">Testing hardware</title>
+ </info>
+
+ <para>One of the Live mode goals is to test if the hardware is correctly managed
+by Mageia. You can check if all devices have a driver in the Hardware
+section of the Mageia Control Center. You can test the most current devices:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>network interface: configure it with net_applet</para>
+ </listitem>
+
+ <listitem>
+ <para>graphical card: if you see the previous screen, it's already OK.</para>
+ </listitem>
+
+ <listitem>
+ <para>webcam:</para>
+ </listitem>
+
+ <listitem>
+ <para>sound: a jingle has already been played</para>
+ </listitem>
+
+ <listitem>
+ <para>printer: configure it and print a test page</para>
+ </listitem>
+
+ <listitem>
+ <para>scanner: scan a document from ...</para>
+ </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>
+
+ <remark>The configuration settings you made here are kept for the installation.</remark>
+ </section>
+
+ <section>
+ <info>
+ <title xml:id="testing3-ti1">Launch installation</title>
+ </info>
+
+ <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/installer/hr/uninstall-Mageia.xml b/docs/installer/hr/uninstall-Mageia.xml
index 7d1826a8..a3dc8715 100644
--- a/docs/installer/hr/uninstall-Mageia.xml
+++ b/docs/installer/hr/uninstall-Mageia.xml
@@ -1,5 +1,5 @@
<?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="hr" xml:id="uninstall-Mageia">
- <!-- -->
+ <!--Lebarhon 2015-07-06 Not true with UEFI -->
<info>
<title xml:id="uninstall-Mageia-ti1">Uninstalling Mageia</title>
</info>
diff --git a/docs/installer/hr/unused.xml b/docs/installer/hr/unused.xml
new file mode 100644
index 00000000..d2d6b2e1
--- /dev/null
+++ b/docs/installer/hr/unused.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" 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">
+ <info>
+ <title xml:id="unused-ti1">Keep or delete unused material</title>
+ </info>
+
+ <mediaobject condition="live">
+<imageobject> <imagedata align="center" fileref="live-unused.png"
+format="PNG" revision="1" xml:id="unused-im1"/> </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>
+
+ <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>
+</section>
diff --git a/docs/installer/id/DrakLive-cover.xml b/docs/installer/id/DrakLive-cover.xml
new file mode 100644
index 00000000..45f2ef9a
--- /dev/null
+++ b/docs/installer/id/DrakLive-cover.xml
@@ -0,0 +1,75 @@
+<?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="id" xml:id="Quick-Startup">
+ <info>
+ <title>Installation from LIVE medium</title>
+ <publisher> <publishername>Mageia.org</publishername> </publisher>
+ <revhistory>
+ <revision>
+ <date>January 2015</date>
+ <revremark>Mageia 5</revremark>
+ </revision>
+ </revhistory>
+ <cover>
+ <para role="tagline">Dokumentasi Resmi Mageia</para>
+ <mediaobject>
+<imageobject> <imagedata fileref="mageia-2013.png"/> </imageobject></mediaobject>
+ <para>Teks dan gambar pada manual ini berada di bawah lisensi 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>Manual ini dibuat dengan bantuan <link ns6:href="http://www.calenco.com">CMS
+Calenco</link> yang dibangun oleh <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.
+ </para>
+ <para>Ini ditulis oleh sukarelawan di waktu senggang mereka. Silakan hubungi <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">Tim
+Dokumentasi</link>, jika Anda ingin membantu memperbaiki manual ini.</para>
+ </cover>
+ </info>
+ <article>
+ <title>Installation from LIVE medium</title>
+ <para><note>
+ <para>Tidak seorang pun akan melihat semua layar installer yang Anda lihat dalam
+manual ini. Layar mana yang akan Anda lihat, tergantung pada hardware dan
+pilihan yang Anda buat saat menginstall.</para>
+ </note></para>
+ <xi:include href="SelectAndUseISOs2.xml"/>
+
+ <xi:include href="bootLive.xml"/>
+
+ <xi:include href="selectLanguage.xml"/>
+
+ <xi:include href="acceptLicense.xml"/>
+
+ <xi:include href="configureTimezoneUTC.xml"/>
+
+ <xi:include href="bestTime.xml"/>
+
+ <xi:include href="selectKeyboardLive.xml"/>
+
+ <xi:include href="testing.xml"/>
+
+ <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"/>
+
+ <xi:include href="unused.xml"/>
+
+ <xi:include href="setupBootloader.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>
+</book> \ No newline at end of file
diff --git a/docs/installer/id/DrakLive.xml b/docs/installer/id/DrakLive.xml
new file mode 100644
index 00000000..1e79ead5
--- /dev/null
+++ b/docs/installer/id/DrakLive.xml
@@ -0,0 +1,64 @@
+<?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="id" xml:id="Quick-Startup">
+ <info>
+ <title>Installation from LIVE medium</title>
+
+ <cover>
+ <para><note>
+ <para>Tidak seorang pun akan melihat semua layar installer yang Anda lihat dalam
+manual ini. Layar mana yang akan Anda lihat, tergantung pada hardware dan
+pilihan yang Anda buat saat menginstall.</para>
+ </note></para>
+
+ <para xml:id="CC_BY-SA">Teks dan gambar pada manual ini berada di bawah lisensi 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>Manual ini dibuat dengan bantuan <link ns6:href="http://www.calenco.com">CMS
+Calenco</link> yang dibangun oleh <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+ <para>Ini ditulis oleh sukarelawan di waktu senggang mereka. Silakan hubungi <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">Tim
+Dokumentasi</link>, jika Anda ingin membantu memperbaiki manual ini.</para>
+ </cover>
+ </info>
+
+ <xi:include href="SelectAndUseISOs2.xml"/>
+
+ <xi:include href="bootLive.xml"/>
+
+ <xi:include href="selectLanguage.xml"/>
+
+ <xi:include href="acceptLicense.xml"/>
+
+ <xi:include href="configureTimezoneUTC.xml"/>
+
+ <xi:include href="bestTime.xml"/>
+
+ <xi:include href="selectKeyboardLive.xml"/>
+
+ <xi:include href="testing.xml"/>
+
+ <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"/>
+
+ <xi:include href="unused.xml"/>
+
+ <xi:include href="setupBootloader.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
diff --git a/docs/installer/id/SelectAndUseISOs2.xml b/docs/installer/id/SelectAndUseISOs2.xml
index 9e8ab6af..a5909273 100644
--- a/docs/installer/id/SelectAndUseISOs2.xml
+++ b/docs/installer/id/SelectAndUseISOs2.xml
@@ -7,6 +7,32 @@
</info>
<section>
+ <title>Introduction</title>
+
+ <para>Mageia is distributed via ISO images. This page will help you to choose
+which image match your needs.</para>
+
+ <para>There is two families of media:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Classical installer: After booting the media, it will follow a process
+allowing to choose what to install and how to configure your target
+system. This give you the maximal flexibility for a customized installation,
+in particular to choose which Desktop Environment you will install.</para>
+ </listitem>
+
+ <listitem>
+ <para>LIVE media: you can boot the media in a real Mageia system without
+installing it, to see what you will get after installation. The
+installation process is simpler, but you get lesser choices.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>Details are given in the next sections.</para>
+ </section>
+
+ <section>
<title>Media</title>
<section>
@@ -259,13 +285,9 @@ terlalu lambat. Jika http dipilih, Anda juga mungkin melihat</para>
<mediaobject>
<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
- <para>md5sum dan sha1sum adalah alat untuk memeriksa keabsahan ISO. Gunakan salah
-satunya. Kedua nomor heksadesimal telah dihitung dengan algoritma dari
-berkas yang diunduh. Ketika Anda meminta algoritma untuk menghitung ulang
-nomor dari berkas yang diunduh ini, apakah Anda mendapatkan nomor yang sama
-dan berkas yang diunduh adalah benar, atau nomor yang berbeda dan Anda
-mendapatkan yang salah. Jika salah berarti Anda harus mencoba kembali
-mengunduh. Lalu jendela ini akan muncul:</para>
+ <para>md5sum and sha1sum are tools to check the ISO integrity. Use only one of
+them. Keep one of them <link linkend="integrity">for further
+usage</link>. Then this window appears:</para>
<mediaobject>
<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
@@ -274,7 +296,13 @@ mengunduh. Lalu jendela ini akan muncul:</para>
</section>
<section>
- <title>Memeriksa keabsahan media yang diunduh</title>
+ <title xml:id="integrity">Memeriksa keabsahan media yang diunduh</title>
+
+ <para>Both checksums are hexadecimal numbers calculated by an algorithm from the
+file to be downloaded. When you ask these algorithms to recalculate this
+number from your downloaded file, either you have the same number and your
+downloaded file is correct, or the number is different and you have a
+failure. A failure infers that you should retry the download.</para>
<para>Buka konsol, tidak perlu menjadi root, dan:</para>
@@ -323,13 +351,35 @@ data apapun akan hilang dan kapasitas partisi akan berkurang menjadi sebesar
ukuran image.</para>
</warning>
- <para>Untuk mengembalikan ke ukuran asli, Anda harus memformat ulang flashdisk.</para>
+ <para>To recover the original capacity, you must redo partitioning and re-format
+the USB stick.</para>
<section>
- <title>Menggunakan Mageia</title>
+ <title>Using a graphical tool within Mageia</title>
<para>Anda bisa menggunakan peralatan seperti <link
ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks">IsoDumper</link></para>
+ </section>
+
+ <section>
+ <title>Using a graphical tool within Windows</title>
+
+ <para>Anda bisa mencoba:</para>
+
+ <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
+"ISO image" option;</para>
+
+ <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
+Disk Imager</link></para>
+ </section>
+
+ <section>
+ <title>Using Command line within a GNU/Linux system</title>
+
+ <warning>
+ <para>It is potentially *dangerous* to do this by hand. You risk to overwrite a
+disc partition if you get the device-ID wrong.</para>
+ </warning>
<para>Anda juga bisa menggunakan dd dari konsol:</para>
@@ -356,11 +406,34 @@ manajer berkas apapun yang bisa membuka atau membacanya)</para>
<mediaobject>
<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
+
+ <para>Alternatively, you can get the device name with the command
+<code>dmesg</code>: at end, you see the device name starting with
+<emphasis>sd</emphasis>, and <emphasis>sdd</emphasis> in this case:</para>
+
+ <screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
+[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
+[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
+[72594.770536] usb 1-1: Product: Mass Storage Device
+[72594.770537] usb 1-1: Manufacturer: JetFlash
+[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB
+[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes
+[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes
+[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected
+[72594.772447] scsi host8: usb-storage 1-1:1.0
+[72595.963238] scsi 8:0:0:0: Direct-Access JetFlash Transcend 2GB 1100 PQ: 0 ANSI: 4
+[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)
+[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off
+[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00
+[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found
+[72595.965031] sd 8:0:0:0: [sdd] Assuming drive cache: write through
+[72595.967251] <emphasis>sdd</emphasis>: sdd1
+[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen>
</listitem>
<listitem>
- <para>Temukan nama perangkat flashdisk Anda (berdasarkan ukuran), contohnya
-/dev/sdb pada gambar di atas, ini adalah flashdisk 8GB.</para>
+ <para>Find the device name for your USB stick (by its size), for example
+<code>/dev/sdb</code> in the screenshot above, it is a 8GB USB stick.</para>
</listitem>
<listitem>
@@ -382,30 +455,6 @@ of=/dev/sdb bs=1M</userinput></para>
</listitem>
</orderedlist>
</section>
-
- <section>
- <title>Menggunakan Windows</title>
-
- <para>Anda bisa mencoba:</para>
-
- <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link></para>
-
- <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
-Disk Imager</link></para>
-
- <para/>
- </section>
</section>
</section>
-
- <section>
- <title>Instalasi Mageia</title>
-
- <para>Langkah ini dirinci di <link
-ns4:href="http://www.mageia.org/id/doc/">dokumentasi Mageia</link>.</para>
-
- <para>Informasi lebih lengkap ada di <link
-ns4:href="https://wiki.mageia.org/en/Category:Documentation">wiki
-Mageia</link>.</para>
- </section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/installer/id/acceptLicense.xml b/docs/installer/id/acceptLicense.xml
index 94a8b75e..41e329dc 100644
--- a/docs/installer/id/acceptLicense.xml
+++ b/docs/installer/id/acceptLicense.xml
@@ -1,11 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="id" xml:id="acceptLicense"
- 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="acceptLicense" version="5.0" xml:lang="id">
@@ -41,9 +34,12 @@
<title xml:id="acceptLicense-ti1">Lisensi dan Catatan Rilis</title>
</info>
- <mediaobject condition="expert">
-<imageobject> <imagedata align="center" fileref="dx2-license.png"
-format="PNG" revision="1" xml:id="acceptLicense-im1"/> </imageobject></mediaobject>
+ <mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="acceptLicense-im1"
+revision="4" align="center" format="PNG" fileref="dx2-license.png"/>
+</imageobject> <imageobject> <imagedata xml:id="acceptLicense-im2"
+revision="5" align="center" condition="live" format="PNG"
+fileref="live-license.png"/> </imageobject></mediaobject>
<section xml:id="license">
<info>
@@ -83,4 +79,4 @@ Release Notes</para>
<para>Untuk melihat apa yang baru di rilis <application>Mageia</application> ini,
klik pada tombol <guibutton>Catatan Rilis</guibutton>.</para>
</section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/installer/id/addUser.xml b/docs/installer/id/addUser.xml
index c056dffc..e64005a7 100644
--- a/docs/installer/id/addUser.xml
+++ b/docs/installer/id/addUser.xml
@@ -1,5 +1,4 @@
-<?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="addUser" version="5.0" xml:lang="id">
-
+<?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="addUser" version="5.0" xml:lang="id">
<info>
<title xml:id="addUser-ti1">Pengelolaan Pengguna dan Pengguna Super</title>
</info>
@@ -15,10 +14,12 @@
+
+
-
- <mediaobject>
+
+ <mediaobject>
<!-- Started by marja,using Led43's text, on 2012 03 27 -->
<!-- NEEDS TO BE REVIEWED! -->
<!-- SimonNZG 2012-04-03 has taken a look but needs to come back -->
@@ -31,10 +32,11 @@
"rbash" in the xguest warning - is that correct? -->
<!-- JohnR 2012-04-19 Language proofreading -->
<!-- marja 2012-04-24 Added screenshot -->
-<!-- marja 2013-04-26 added new note -->
-<imageobject> <imagedata revision="1" fileref="dx2-setRootPassword.png"
-format="PNG" align="center" xml:id="setRootPassword-im1"></imagedata>
-</imageobject></mediaobject>
+<!-- marja 2013-04-26 added new note-->
+<imageobject condition="classical"> <imagedata revision="1" align="center"
+xml:id="setRootPassword-im1" fileref="dx2-setRootPassword.png"
+format="PNG"/> </imageobject> <imageobject> <imagedata format="PNG"
+fileref="live-user1.png"/> </imageobject></mediaobject>
<section xml:id="root-password">
<info>
@@ -86,7 +88,7 @@ login berlaku sensitif.</emphasis></para>
<listitem>
<para><guilabel>Sandi</guilabel>: Pada kotak teks ini Anda perlu mengetikkan sandi
pengguna. Terdapat pelindung pada ujung dari kotak teks yang menandakan
-kekuatan sandi. (Lihat juga <xref linkend="givePassword"></xref>)</para>
+kekuatan sandi. (Lihat juga <xref linkend="givePassword"/>)</para>
</listitem>
<listitem>
@@ -96,7 +98,7 @@ tiap-tiap kotak teks.</para>
</listitem>
</itemizedlist>
- <note>
+ <note>
<para>Setiap pengguna yang Anda tambahkan saat menginstall Mageia akan memiliki
direktori home yang terbaca oleh semua (tapi terlindungi dari penulisan).</para>
@@ -114,28 +116,28 @@ Ringkasan</emphasis> saat instalasi. Pilih <emphasis>Pengelolaan
pengguna</emphasis>.</para>
<para>Perizinan hak akses juga bisa diubah setelah instalasi.</para>
- </note>
-
+ </note>
</section>
- <section xml:id="addUserAdvanced">
+ <section condition="classical" xml:id="addUserAdvanced">
<info>
<title xml:id="addUserAdvanced-ti3">Pengelolaan Pengguna Lanjutan</title>
</info>
<para>Jika tombol <guibutton>lanjutan</guibutton> diklik, akan ditampilkan sebuah
layar yang memungkinkan Anda mengedit pengaturan pengguna yang Anda
-tambahkan. Sebagai tambahan, Anda bisa mematikan atau menghidupkan akun
-tamu.</para>
+tambahkan.</para>
- <warning>
+ <para condition="classical">Additionally, you can disable or enable a guest account.</para>
+
+ <warning condition="classical">
<para>Apapun yang disimpan oleh akun tamu dengan <emphasis>rbash</emphasis> bawaan
yang disimpan di direktori /home akan dihapus saat dia keluar. Tamu harus
menyimpan file pentingnya ke dalam flashdisk.</para>
</warning>
<itemizedlist>
- <listitem>
+ <listitem condition="classical">
<para><guilabel>Hidupkan akun tamu</guilabel>: Di sini Anda bisa menghidupkan atau
mematikan akun tamu. Akun tamu memungkinkan tamu masuk dan menggunakan
komputer, tapi dia memiliki akses yang lebih terbatas daripada pengguna
diff --git a/docs/installer/id/ask_mntpoint_s.xml b/docs/installer/id/ask_mntpoint_s.xml
index 8753d54d..fab478ee 100644
--- a/docs/installer/id/ask_mntpoint_s.xml
+++ b/docs/installer/id/ask_mntpoint_s.xml
@@ -33,9 +33,12 @@
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> <imagedata revision="1" fileref="dx2-chooseMountpoints.png"
-align="center" format="PNG" xml:id="chooseMountPoints-im1"></imagedata>
-</imageobject></mediaobject>
+<imageobject condition='classical'> <imagedata revision="1"
+fileref="dx2-chooseMountpoints.png" align="center" format="PNG"
+xml:id="chooseMountPoints-im1"></imagedata> </imageobject> <imageobject
+condition='live'> <imagedata revision="1"
+fileref="live-chooseMountpoints.png" align="center" format="PNG"
+xml:id="live-chooseMountPoints-im1"></imagedata> </imageobject></mediaobject>
<para>Di sini Anda melihat partisi Linux yang ditemukan di komputer. Jika Anda
tidak setuju dengan saran <application>DrakX</application>, Anda bisa
diff --git a/docs/installer/id/bestTime.xml b/docs/installer/id/bestTime.xml
new file mode 100644
index 00000000..8a23da28
--- /dev/null
+++ b/docs/installer/id/bestTime.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="id" 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">
+ <info>
+ <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>In this step, you have to select on which time your internal clock is set,
+either local time or UTC time.</para>
+
+ <para>In advanced tab, you will find more options about clock settings.</para>
+</section>
diff --git a/docs/installer/id/bootLive.xml b/docs/installer/id/bootLive.xml
new file mode 100644
index 00000000..1e7f0647
--- /dev/null
+++ b/docs/installer/id/bootLive.xml
@@ -0,0 +1,29 @@
+<?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="id"><info><title xml:id="bootLive-ti1">Boot Mageia as Live system</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Booting the medium</title></info><section><info><title xml:id="bootLive11-ti1">From a disc</title></info><para>You can boot directly from the media you used to burn your image (CD-ROM,
+DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the
+bootloader to launch the installation automatically after rebooting the
+computer. If that does not happen you may need to reconfigure your BIOS or
+press one key that will offer you to choose the peripheral from which the
+computer will boot.</para><para>According to which hardware you have, and how it is configured, you get
+either one or another of the two screens below.</para></section><section><info><title xml:id="bootLive12-ti1">From a USB device</title></info><para>You can boot from the USB device on which you dumped your image
+ISO. According to your BIOS settings, the computer boots perhaps directly on
+the USB device already plugged in a port. If that does not happen you may
+need to reconfigure your BIOS or press one key that will offer you to choose
+the peripheral from which the computer will boot.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>First screen while booting in BIOS mode</para></caption></mediaobject><para>In the middle menu, you have the choice between three actions:</para><itemizedlist><listitem><para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
+or USB stick) without writing anything on the disk, so expect a very slow
+system. Once the boot is done, you can proceed to the installation on a hard
+disk.</para></listitem><listitem><para>Install Mageia: This choice will directly install Mageia on a hard disk.</para></listitem><listitem><para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
+when no media (CD/DVD or USB stick) is connected. (not working with Mageia
+5).</para></listitem></itemizedlist><para>In the bottom menu, are the Boot Options:</para><itemizedlist><listitem><para>F1 - Help. Explain the options "splash", "apm", "acpi" and "Ide"</para></listitem><listitem><para>F2 - Language. Choose the display language of the screens.</para></listitem><listitem><para>F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
+the inserted installation medium. Here, select other sources, like FTP or
+NFS servers. If the installation is carried out in a network with an SLP
+server, select one of the installation sources available on the server with
+this option.</para></listitem><listitem><para>F5 - Driver. Yes or No. The system is aware about the presence of an
+optional disk with a driver update and will require its insertion during
+installation process.</para></listitem><listitem><para>F6 - Kernel options. This is a way to specify options according to your
+hardware and the drivers to use.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">In UEFI mode</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
+align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>First screen while booting on UEFI system from disk</para></caption></mediaobject><para>You have only the choice to run Mageia in Live mode (first choice) or to
+process the installation (second choice).</para><para>If you booted from a USB stick, you get two supplemental lines which are a
+duplicata of the previous lines suffixed with "USB". You have to choose
+them.</para><para>In each case, the first steps will be the same to choose language, timezone
+and keyboard, then the processes differ, with <link
+linkend="testing">additional steps in Live mode</link>.</para></section></section> \ No newline at end of file
diff --git a/docs/installer/id/configureTimezoneUTC.xml b/docs/installer/id/configureTimezoneUTC.xml
index 27ead1ec..ac5801fd 100644
--- a/docs/installer/id/configureTimezoneUTC.xml
+++ b/docs/installer/id/configureTimezoneUTC.xml
@@ -1,37 +1,29 @@
-<?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="id">
+<?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="id" xml:id="configureTimezoneUTC">
+ <info>
+ <title xml:id="configureTimezoneUTC-ti6">Konfigurasi Zona Waktu Anda</title>
+ </info>
+
- <info>
- <title xml:id="configureTimezoneUTC-ti6">Konfigurasi Zona Waktu Anda</title>
- </info>
+
-
-
-
-<mediaobject>
+ <mediaobject>
<!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
<!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-configureTimezoneUTC.png"
-align="center" format="PNG" xml:id="configureTimezoneUTC-im1"></imagedata>
-</imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+xml:id="configureTimezoneUTC-im1" revision="1"
+fileref="dx2-configureTimezoneUTC.png" align="center" format="PNG"/>
+</imageobject> <imageobject> <imagedata fileref="live-timeZone.png"
+condition="live" format="PNG"/> </imageobject></mediaobject>
- <para revision="1" xml:id="configureTimezoneUTC-pa1">Pilih zona waktu Anda dengan memilih negara Anda atau sebuah kota yang dekat
+ <para revision="1" xml:id="configureTimezoneUTC-pa1">Pilih zona waktu Anda dengan memilih negara Anda atau sebuah kota yang dekat
dengan Anda dengan zona waktu yang sama.</para>
- <para revision="1" xml:id="configureTimezoneUTC-pa2">Pada layar berikutnya Anda bisa memilih untuk mengatur jam hardware Anda ke
+ <para revision="1" xml:id="configureTimezoneUTC-pa2">Pada layar berikutnya Anda bisa memilih untuk mengatur jam hardware Anda ke
waktu lokal atau GMT, atau disebut juga UTC.</para>
- <note>
- <para revision="1" xml:id="configureTimezoneUTC-pa3">Jika Anda memiliki lebih dari satu sistem operasi pada komputer, pastikan
+ <note>
+ <para revision="1" xml:id="configureTimezoneUTC-pa3">Jika Anda memiliki lebih dari satu sistem operasi pada komputer, pastikan
semua diatur ke waktu lokal, atau semua ke UTC/GMT.</para>
- </note>
- </section>
-
+ </note>
+</section> \ No newline at end of file
diff --git a/docs/installer/id/diskdrake.xml b/docs/installer/id/diskdrake.xml
index 81ca3b84..47f91542 100644
--- a/docs/installer/id/diskdrake.xml
+++ b/docs/installer/id/diskdrake.xml
@@ -29,8 +29,9 @@
</info>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-diskdrake.png" align="center"/>
-</imageobject></mediaobject>
+<imageobject condition='classical'> <imagedata fileref="dx2-diskdrake.png"
+align="center"/> </imageobject> <imageobject condition='live' > <imagedata
+fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
<warning>
<para revision="3" xml:id="diskdrake-pa1">Jika ingin menggunakan enkripsi untuk partisi <literal>/</literal> Anda,
@@ -63,5 +64,4 @@ Partition) tersedia dan dimount dengan benar pada /boot/EFI (lihat di atas)</par
<para><mediaobject>
<imageobject> <imagedata fileref="dx2-diskdrake2.png"/> </imageobject></mediaobject></para>
</note>
-</section>
-
+</section> \ No newline at end of file
diff --git a/docs/installer/id/doPartitionDisks.xml b/docs/installer/id/doPartitionDisks.xml
index e8c56fdb..717d458a 100644
--- a/docs/installer/id/doPartitionDisks.xml
+++ b/docs/installer/id/doPartitionDisks.xml
@@ -3,35 +3,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
<info>
- <!-- Started by marja on 2012 03 29 -->
-<!-- NEEDS TO BE WRITTEN AND THEN REVIEWED! -->
-<!-- JohnR 2012-04-10 - tidy up module formatting -->
-<!-- barjac 2012-04-20 Yes I agree with Lebarhon - reference to home partition removed -->
-<!-- Simonnzg - doing anything to a Windows partition is DANGEROUS. I would prefer
- if this was not an option, but... -->
-<!-- marja 2012-04-24 put the para xml id's back. -->
-<!-- marja 2012-04-29 changed text as discussed on the ml and with papoteur's approval
- lebarhon: 2012-08-18 warning added-->
-<!-- marja 2013-04-05 changed warning to text suggested by Dave Hodgings in bug 9594 -->
-<!-- marja 2013-04-05 adjusted last line of warning as suggested by obgr_seneca -->
-<!-- lebarhon 2013-04-11 adjusted last line of warning as suggested by Dave Hodgins/Marja-->
+ <!---->
+<!-- lebarhon 2015-07-03 Suggested updates for Mageia 5 -->
<title xml:id="doPartitionDisks-ti1">Pemartisian</title>
</info>
@@ -99,7 +73,7 @@ dipilih. Hati-hati!</para>
atau Anda memiliki data pada perangkat yang tidak boleh hilang, jangan
gunakan pilihan ini.</para>
</listitem>
- </itemizedlist> <itemizedlist>
+ </itemizedlist><itemizedlist>
<listitem>
<para revision="1" xml:id="doPartitionDisks-pa16">Sesuaian</para>
@@ -107,6 +81,47 @@ gunakan pilihan ini.</para>
</listitem>
</itemizedlist></para>
+ <para><emphasis role="bold">Partitions sizing:</emphasis></para>
+
+ <para>The installer will share the available place out according to the following
+rules:</para>
+
+ <para><itemizedlist>
+ <listitem>
+ <para>If the total available place is lower than 50 GB, only one partition is
+created for /, there is no separate partition for /home.</para>
+ </listitem>
+
+ <listitem>
+ <para>If the total available place is over 50 GB, then three partitions are
+created</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>6/19 of the total available place is allocated to / with a maximum of 50 GB</para>
+ </listitem>
+
+ <listitem>
+ <para>1/19 is allocated to swap with a maximum of 4 GB</para>
+ </listitem>
+
+ <listitem>
+ <para>the rest (at least 12/19) is allocated to /home</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ </itemizedlist></para>
+
+ <para>That means that from 160 GB and over of available place, the installer will
+create three partitions: 50 GB for /, 4 GB for swap and the rest for /home.</para>
+
+ <note>
+ <para>If you are using an 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 "Custom" option is the only one that allows to check it has
+been correctly done</para>
+ </note>
+
<warning>
<para>Beberapa perangkat baru sekarang menggunakan sektor logis 4096 bit, daripada
standar sebelumnya 512 bit. Karena keterbatasan hardware, alat pemartisian
@@ -114,13 +129,12 @@ yang digunakan pada installer belum teruji pada perangkat tersebut. Beberapa
perangkat ssd juga menggunakan ukuran blok penghapusan melebihi 1
MB. Disarankan untuk melakukan pemartisian awal menggunakan alat pemartisian
alternatif seperti gparted jika Anda memilikinya, dan menggunakan pengaturan
-berikut: </para>
+berikut:</para>
- <para>"Selaraskan ke" "MiB" </para>
+ <para>"Selaraskan ke" "MiB"</para>
- <para>"Ruang kosong di awal (MiB)" "2" </para>
+ <para>"Ruang kosong di awal (MiB)" "2"</para>
<para>Juga pastikan semua partisi dibuat dengan penomoran megabite.</para>
</warning>
-</section>
-
+</section> \ No newline at end of file
diff --git a/docs/installer/id/formatPartitions.xml b/docs/installer/id/formatPartitions.xml
index d756f3d4..e73477ed 100644
--- a/docs/installer/id/formatPartitions.xml
+++ b/docs/installer/id/formatPartitions.xml
@@ -19,9 +19,12 @@
<!-- NEEDS TO BE REVIEWED! -->
<!-- marja 2012-04-24 added screenshot -->
<!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject> <imagedata revision="1" fileref="dx2-formatPartitions.png"
-format="PNG" align="center" xml:id="formatPartitions-im1"> </imagedata>
-</imageobject></mediaobject>
+<imageobject condition='classical'> <imagedata revision="1"
+fileref="dx2-formatPartitions.png" format="PNG" align="center"
+xml:id="formatPartitions-im1"> </imagedata> </imageobject> <imageobject
+condition='live'> <imagedata revision="1"
+fileref="live-formatPartitions.png" format="PNG" align="center"
+xml:id="live-formatPartitions-im1"> </imagedata> </imageobject></mediaobject>
<para revision="2" xml:id="formatPartitions-pa1">Di sini Anda bisa memilih partisi mana yang ingin Anda format. Semua data
pada partisi yang <emphasis>tidak</emphasis> ditandai untuk diformat akan
diff --git a/docs/installer/id/login.xml b/docs/installer/id/login.xml
new file mode 100644
index 00000000..a7e60cea
--- /dev/null
+++ b/docs/installer/id/login.xml
@@ -0,0 +1,6 @@
+<?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="id"><info><title xml:id="label-to-adapt-ti1">Login screen</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM login screen</para></caption></mediaobject><para>Finally, you will come to the login screen.</para><para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE or GNOME desktop, depending on which live medium
+you used. You can now start using your Mageia installation.</para><para>Informasi lebih lengkap ada di <link
+ns4:href="https://wiki.mageia.org/en/Category:Documentation">wiki
+Mageia</link>.</para></section> \ No newline at end of file
diff --git a/docs/installer/id/reboot.xml b/docs/installer/id/reboot.xml
new file mode 100644
index 00000000..90af742f
--- /dev/null
+++ b/docs/installer/id/reboot.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="id" xml:id="reboot" 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="reboot-ti1">Reboot</title>
+ </info>
+
+ <mediaobject condition="live">
+<imageobject> <imagedata align="center" fileref="live-reboot.png"
+format="PNG" revision="1" xml:id="reboot-im1"/> </imageobject></mediaobject>
+
+ <para>Once the bootloader has been installed, you will be prompted to halt your
+computer, remove the live CD and restart the computer. When you restart, you
+will see a succession of download progress bars. These indicate that the
+software media are being downloaded (see Software management).</para>
+</section>
diff --git a/docs/installer/id/selectKeyboardLive.xml b/docs/installer/id/selectKeyboardLive.xml
new file mode 100644
index 00000000..87161835
--- /dev/null
+++ b/docs/installer/id/selectKeyboardLive.xml
@@ -0,0 +1,14 @@
+<?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="id" xml:id="selectKeyboardLive">
+ <info>
+ <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
diff --git a/docs/installer/id/selectLanguage.xml b/docs/installer/id/selectLanguage.xml
index a1d3697b..b06b8ed9 100644
--- a/docs/installer/id/selectLanguage.xml
+++ b/docs/installer/id/selectLanguage.xml
@@ -1,12 +1,4 @@
-<?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="id" xml:id="selectLanguage">
-
+<?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="selectLanguage" version="5.0" xml:lang="id">
@@ -32,36 +24,39 @@
Anda. <application>Mageia</application> akan menggunakan pilihan ini selama
instalasi dan pada sistem yang sudah terinstall.</para>
- <para>Jika sepertinya Anda akan memerlukan beberapa bahasa untuk komputer Anda,
+ <para condition="classical">Jika sepertinya Anda akan memerlukan beberapa bahasa untuk komputer Anda,
untuk Anda sendiri atau orang lain, maka gunakanlah tombol <guibutton>Banyak
bahasa</guibutton> untuk menambahkannya sekarang. Akan sulit untuk
menambahkan dukungan bahasa tambahan setelah instalasi selesai.</para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-selectLanguage.png" align="center"
-format="PNG" > </imagedata> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-language.png" format=""/>
+</imageobject></mediaobject>
- <warning>
+ <warning condition="classical">
<para>Bahkan jika Anda akan memilih lebih dari satu bahasa, Anda harus memilih
salah satu sebagai bahasa yang lebih disukai di layar bahasa pertama. Bahasa
tersebut juga akan ditandai sudah dipilih di layar banyak bahasa.</para>
</warning>
<itemizedlist>
- <listitem>
+ <listitem condition="classical">
<para>Jika bahasa keyboard tidak sama dengan bahasa yang akan dipilih, maka
disarankan untuk menginstall bahasa dari keyboard yang digunakan juga.</para>
</listitem>
<listitem>
- <para>Mageia menggunakan dukungan UTF-8 (Unicode) sebagai bawaan. Ini bisa
-dimatikan di layar "banyak bahasa" jika tidak sesuai dengan bahasa
+ <para>Mageia uses UTF-8 (Unicode) support by default.</para>
+
+ <para condition="classical">Ini bisa dimatikan di layar "banyak bahasa" jika tidak sesuai dengan bahasa
Anda. Mematikan UTF-8 akan berpengaruh pada bahasa-bahasa yang diinstall.</para>
</listitem>
<listitem>
<para>Anda bisa mengubah bahasa komputer Anda setelah instalasi selesai di Pusat
-Kendali Mageia -&gt; Sistem -&gt; Kelola lokalisasi untuk sistem Anda.</para>
+Kendali Mageia -> Sistem -> Kelola lokalisasi untuk sistem Anda.</para>
</listitem>
</itemizedlist>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/installer/id/setupBootloader.xml b/docs/installer/id/setupBootloader.xml
index 09b7ebe1..9c03ec33 100644
--- a/docs/installer/id/setupBootloader.xml
+++ b/docs/installer/id/setupBootloader.xml
@@ -1,95 +1,119 @@
<?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="id" xml:id="setupBootloader">
- <info>
- <title xml:id="setupBootloader-ti1">Pilihan utama Bootloader</title>
- </info>
+
- <mediaobject>
-<!-- 2012-08-12 Copied this page, setupBootloader.xml, from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.
+ <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-->
+<title xml:id="setupBootloader-ti1">Pilihan utama Bootloader</title>
+ </info>
- 2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist-->
-<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
-format="PNG"/> </imageobject></mediaobject>
+ <mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="setupBootloader-im1"
+format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata
+xml:id="setupBootloader-im1" format="PNG" align="center" revision="1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
- <para><note>
- <para>Dengan sistem UEFI, antarmuka pengguna sangat berbeda karena Anda tidak bisa
-memilih boot loader (daftar tarik ulur pertama) karena hanya satu yang
-tersedia</para>
- </note></para>
+ <section>
+ <title>With a Bios system</title>
- <para xml:id="setupBootloader-pa1" revision="4">Jika Anda lebih suka pengaturan bootloader yang berbeda yang akan dipilih
+ <para xml:id="setupBootloader-pa1" revision="4">Jika Anda lebih suka pengaturan bootloader yang berbeda yang akan dipilih
secara otomatis oleh installer, Anda bisa mengubahnya di sini.</para>
- <para xml:id="setupBootloader-pa2" revision="4">Anda mungkin sudah memiliki sistem operasi lain pada komputer, yang mana
+ <para xml:id="setupBootloader-pa2" revision="4">Anda mungkin sudah memiliki sistem operasi lain pada komputer, yang mana
Anda harus memilih untuk menambahkan Mageia ke bootloader yang sudah ada,
atau membiarkan Mageia membuatnya.</para>
- <tip>
- <para revision="2" xml:id="setupBootloader-pa3">Menu grafis Mageia sangat cantik :)</para>
- </tip>
+ <tip>
+ <para>Menu grafis Mageia sangat cantik :</para>
+ </tip>
- <section xml:id="usingMageiaBootloader">
- <info>
- <title xml:id="usingMageiaBootloader-ti2">Gunakan bootloader Mageia</title>
- </info>
+ <section xml:id="usingMageiaBootloader">
+ <info>
+ <title xml:id="usingMageiaBootloader-ti2">Gunakan bootloader Mageia</title>
+ </info>
- <para revision="3" xml:id="setupBootloader-pa4">Bawaannya, Mageia membuat bootloader GRUB (legacy) baru ke MBR (Master Boot
+ <para xml:id="setupBootloader-pa4" revision="3">Bawaannya, Mageia membuat bootloader GRUB (legacy) baru ke MBR (Master Boot
Record) dari harddisk pertama. Jika Anda sudah memiliki sistem operasi lain
yang terinstall, Mageia akan berusaha menambahkannya ke menu boot Mageia
baru.</para>
- <para revision="3">Mageia sekarang juga menawarkan GRUB2 sebagai bootloader pilihan sebagai
+ <para revision="3">Mageia sekarang juga menawarkan GRUB2 sebagai bootloader pilihan sebagai
tambahan GRUB legacy dan Lilo.</para>
- <warning>
- <para revision="3" xml:id="setupBootloader-pa6">Sistem Linux yang menggunakan bootloader GRUB2 tidak didukung oleh GRUB
+ <warning>
+ <para xml:id="setupBootloader-pa6" revision="3">Sistem Linux yang menggunakan bootloader GRUB2 tidak didukung oleh GRUB
(legacy) dan tidak akan dikenali jika bootloader GRUB bawaan digunakan.</para>
- <para revision="3">Solusi terbaik adalah menggunakan bootloader GRUB2 yang tersedia di halaman
+ <para revision="3">Solusi terbaik adalah menggunakan bootloader GRUB2 yang tersedia di halaman
Ringkasan selama instalasi.</para>
- </warning>
- </section>
+ </warning>
+ </section>
- <section xml:id="usingExistingBootloader">
- <info>
- <title revision="2" xml:id="usingExistingBootloader-ti4">Gunakan bootloader yang ada</title>
- </info>
+ <section xml:id="usingExistingBootloader">
+ <info>
+ <title xml:id="usingExistingBootloader-ti4" revision="2">Gunakan bootloader yang ada</title>
+ </info>
- <para revision="3" xml:id="setupBootloader-pa46">Jika Anda memutuskan untuk menggunakan bootloader yang sudah ada maka Anda
+ <para xml:id="setupBootloader-pa46" revision="3">Jika Anda memutuskan untuk menggunakan bootloader yang sudah ada maka Anda
harus BERHENTI di halaman ringkasan, lalu klik tombol
<guibutton>Konfigurasi</guibutton> Bootloader, yang memungkinkan Anda
mengubah lokasi instalasi bootloader.</para>
- <para revision="1" xml:id="setupBootloader-pa47">Jangan memilih perangkat seperti "sda", atau Anda akan menghapus MBR yang
+ <para xml:id="setupBootloader-pa47" revision="1">Jangan memilih perangkat seperti "sda", atau Anda akan menghapus MBR yang
sudah ada. Anda harus memilih partisi root yang Anda pilih di bagian
pemartisian sebelumnya, misalnya sda7.</para>
- <para xml:id="setupBootloader-pa48" revision="1">Supaya jelas, sda adalah perangkat, sda7 adalah partisi pada perangkat
+ <para xml:id="setupBootloader-pa48" revision="1">Supaya jelas, sda adalah perangkat, sda7 adalah partisi pada perangkat
tersebut.</para>
- <tip>
- <para revision="1" xml:id="setupBootloader-pa48a">Jalankan tty2 dengan Ctrl+Alt+F2 lalu ketik <literal>df</literal> untuk
+ <tip>
+ <para revision="1" xml:id="setupBootloader-pa48a">Jalankan tty2 dengan Ctrl+Alt+F2 lalu ketik <literal>df</literal> untuk
memeriksa di mana partisi <literal>/</literal> (root) berada. Ctrl+Alt+F7
akan membawa Anda kembali ke layar installer.</para>
- </tip>
+ </tip>
- <para revision="2" xml:id="setupBootloader-pa49">Prosedur yang sebenarnya untuk menambahkan Mageia ke bootloader yang sudah
+ <para xml:id="setupBootloader-pa49" revision="2">Prosedur yang sebenarnya untuk menambahkan Mageia ke bootloader yang sudah
ada diluar ruang lingkup bantuan ini, tapi dalam kebanyakan kasus akan harus
menjalankan program intalasi bootloader yang sesuai yang akan mendeteksi dan
menambahkan secara otomatis. Lihat pada dokumentasi sistem operasi.</para>
- </section>
+ </section>
- <section xml:id="advancedOptionBootloader">
- <info>
- <title revision="2" xml:id="advancedOptionBootloader-ti5">Pilihan lanjutan bootloader</title>
- </info>
+ <section xml:id="advancedOptionBootloader">
+ <info>
+ <title xml:id="advancedOptionBootloader-ti5" revision="2">Pilihan lanjutan bootloader</title>
+ </info>
- <para revision="3" xml:id="setupBootloader-pa52">Jika Anda memiliki ruang disk terbatas untuk partisi <literal>/</literal>
+ <para xml:id="setupBootloader-pa52" revision="3">Jika Anda memiliki ruang disk terbatas untuk partisi <literal>/</literal>
yang berisi <literal>/tmp</literal>, klik pada
<guibutton>Lanjutan</guibutton> lalu centang kotak <guilabel>Bersihkan /tmp
setiap komputer dijalankan ulang</guilabel>. Ini akan membantu menjaga ruang
kosong.</para>
+ </section>
+ </section>
+
+ <section>
+ <title>With an UEFI system</title>
+
+ <para>With an UEFI system, the user interface is slightly different as you cannot
+choose the boot loader since only Grub2-efi is available. </para>
+
+ <mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader2.png"/>
+</imageobject></mediaobject>
+
+ <para>If Mageia is the first system installed on your computer, the installer
+created an ESP (EFI System Partition) to receive the bootloader
+(Grub2-efi). If there was already UEFI operating systems previously
+installed on your computer (Windows 8 for example), the Mageia installer
+detected the existing ESP created by Windows and added grub2-efi. Although
+it is possible to have several ESPs, only one is advised and enough whatever
+the number of operating systems you have.</para>
+
+ <para>Don't modify the "Boot Device" unless really knowing what you do.</para>
</section>
</section> \ No newline at end of file
diff --git a/docs/installer/id/setupBootloaderAddEntry.xml b/docs/installer/id/setupBootloaderAddEntry.xml
index 3f7628ab..d4291ebd 100644
--- a/docs/installer/id/setupBootloaderAddEntry.xml
+++ b/docs/installer/id/setupBootloaderAddEntry.xml
@@ -1,40 +1,69 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="id">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="id" xml:id="setupBootloaderAddEntry">
+
+
<info>
- <title xml:id="setupBootloaderAddEntry-ti1">Tambah atau Modifikasi Entri Menu Boot</title>
+ <!--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-->
+<title xml:id="setupBootloaderAddEntry-ti1">Tambah atau Modifikasi Entri Menu Boot</title>
</info>
<mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
-xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="dx2-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="live-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject></mediaobject>
+
+ <section>
+ <title>With a Bios system</title>
- <para>Anda bisa menambah atau memodifikasi entri yang Anda pilih, dengan menekan
+ <para>Anda bisa menambah atau memodifikasi entri yang Anda pilih, dengan menekan
tombol yang sesuai di layar <emphasis>Konfigurasi Bootloader</emphasis> dan
mengedit layar yang muncul di atasnya.</para>
- <note>
- <para>Jika Anda telah memilih <code>Grub 2</code> sebagai bootloader, atau
-Grub2-efi untuk sistem UEFI, Anda tidak bisa menggunakan alat ini untuk
-mengedit daftar pada langkah ini, tekan 'Berikutnya'. Anda perlu mengedit
-secara manual <code>/boot/grub2/custom.cfg</code> atau menggunakan
+ <note>
+ <para>Jika Anda telah memilih <code>Grub 2</code> sebagai bootloader Anda tidak
+bisa menggunakan alat ini untuk mengedit daftar pada langkah ini, tekan
+'Berikutnya'. Anda perlu mengedit secara manual
+<code>/boot/grub2/custom.cfg</code> atau menggunakan
<code>grub-customizer</code> saja.</para>
- </note>
+ </note>
- <mediaobject>
-<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
-align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+ <mediaobject>
+<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1"
+align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
</imageobject></mediaobject>
- <para>Beberapa hal yang bisa dilakukan tanpa resiko adalah mengubah label entri
+ <para>Beberapa hal yang bisa dilakukan tanpa resiko adalah mengubah label entri
dan memilih kotak untuk membuat entri menjadi bawaan.</para>
- <para>Anda bisa menambah nomor versi entri yang tepat, atau mengganti namanya.</para>
+ <para>Anda bisa menambah nomor versi entri yang tepat, atau mengganti namanya.</para>
- <para>Entri bawaan adalah entri yang dipilih sistem untuk dijalankan jika Anda
+ <para>Entri bawaan adalah entri yang dipilih sistem untuk dijalankan jika Anda
tidak memilih saat mulai berjalan.</para>
- <warning>
- <para>Mengedit lainnya bisa membuat komputer Anda tidak berjalan. Jangan lakukan
-apapun yang Anda tidak mengerti.</para>
- </warning>
+ <warning>
+ <para>Editing other things can leave you with an unbootable system. Please don't
+just try something without knowing what you are doing.</para>
+ </warning>
+ </section>
+
+ <section>
+ <title>With an UEFI system</title>
+
+ <para>In this case you are using Grub2-efi and you cannot use this tool to edit
+entries at this step. To do that you need to manually edit
+<code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code>
+instead. All you can do here, is to choose the default entry in the drop
+down list.</para>
+
+ <para>After a click on the <guibutton>Next</guibutton> button, another drop down
+list allows to choose the video resolution for Grub2 which is a graphical
+boot loader.</para>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="dx2-bootloaderConfiguration2.png"/>
+</imageobject></mediaobject>
+ </section>
</section> \ No newline at end of file
diff --git a/docs/installer/id/takeOverHdConfirm.xml b/docs/installer/id/takeOverHdConfirm.xml
index 9e1e3b2f..477e5f31 100644
--- a/docs/installer/id/takeOverHdConfirm.xml
+++ b/docs/installer/id/takeOverHdConfirm.xml
@@ -12,15 +12,18 @@
-<mediaobject>
+ <mediaobject>
<!-- Made by marja on 2012 04 03 -->
<!-- test comment - johnr -->
<!-- 2012-04-24 marja - replaced "if you are not sure you selected the correct
hard disk." with "if you are not sure about your choice", because I'm sure I
saw this help screen when I had only one HD -->
<!-- 2013-05-05 marja added screenshot -->
-<imageobject> <imagedata fileref="dx2-takeOverHdConfirm.png" format="PNG"
-align="center" ></imagedata> </imageobject></mediaobject>
+<imageobject condition='live'> <imagedata
+fileref="live-takeOverHdConfirm.png" format="PNG" align="center"
+></imagedata> </imageobject> <imageobject condition='classical'> <imagedata
+fileref="dx2-takeOverHdConfirm.png" format="PNG" align="center"
+></imagedata> </imageobject></mediaobject>
<para revision="1" xml:id="takeOverHdConfirm-pa1">Klik <guibutton>Sebelumnya</guibutton> jika Anda tidak yakin dengan pilihan
Anda.</para>
diff --git a/docs/installer/id/testing.xml b/docs/installer/id/testing.xml
new file mode 100644
index 00000000..017a0b8c
--- /dev/null
+++ b/docs/installer/id/testing.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="id" xml:id="testing" xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns="http://docbook.org/ns/docbook">
+ <info>
+ <title xml:id="testing-ti1">Testing Mageia as Live system</title>
+ </info>
+
+ <section xml:id="testing-1">
+ <info>
+ <title xml:id="testing1-ti1">Live mode</title>
+ </info>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
+
+ <para>You get this screen if you selected "Boot Mageia". If not, you get the
+"<link linkend="doPartitionDisks">Partitioning</link> step"</para>
+
+ <section>
+ <info>
+ <title xml:id="testing2-ti1">Testing hardware</title>
+ </info>
+
+ <para>One of the Live mode goals is to test if the hardware is correctly managed
+by Mageia. You can check if all devices have a driver in the Hardware
+section of the Mageia Control Center. You can test the most current devices:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>network interface: configure it with net_applet</para>
+ </listitem>
+
+ <listitem>
+ <para>graphical card: if you see the previous screen, it's already OK.</para>
+ </listitem>
+
+ <listitem>
+ <para>webcam:</para>
+ </listitem>
+
+ <listitem>
+ <para>sound: a jingle has already been played</para>
+ </listitem>
+
+ <listitem>
+ <para>printer: configure it and print a test page</para>
+ </listitem>
+
+ <listitem>
+ <para>scanner: scan a document from ...</para>
+ </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>
+
+ <remark>The configuration settings you made here are kept for the installation.</remark>
+ </section>
+
+ <section>
+ <info>
+ <title xml:id="testing3-ti1">Launch installation</title>
+ </info>
+
+ <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/installer/id/uninstall-Mageia.xml b/docs/installer/id/uninstall-Mageia.xml
index cc32e498..15dec862 100644
--- a/docs/installer/id/uninstall-Mageia.xml
+++ b/docs/installer/id/uninstall-Mageia.xml
@@ -1,5 +1,5 @@
<?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="id" xml:id="uninstall-Mageia">
- <!-- -->
+ <!--Lebarhon 2015-07-06 Not true with UEFI -->
<info>
<title xml:id="uninstall-Mageia-ti1">Uninstall Mageia</title>
</info>
diff --git a/docs/installer/id/unused.xml b/docs/installer/id/unused.xml
new file mode 100644
index 00000000..b3428486
--- /dev/null
+++ b/docs/installer/id/unused.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="id" 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">
+ <info>
+ <title xml:id="unused-ti1">Keep or delete unused material</title>
+ </info>
+
+ <mediaobject condition="live">
+<imageobject> <imagedata align="center" fileref="live-unused.png"
+format="PNG" revision="1" xml:id="unused-im1"/> </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>
+
+ <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>
+</section>
diff --git a/docs/installer/it/acceptLicense.xml b/docs/installer/it/acceptLicense.xml
index 0277076c..6602c1d2 100644
--- a/docs/installer/it/acceptLicense.xml
+++ b/docs/installer/it/acceptLicense.xml
@@ -76,7 +76,7 @@ Release Notes</para>
<para>Vengono date informazioni importanti riguardo al rilascio di
- <application>Mageia</application> e sono accessibili cliccando sul bottone
+<application>Mageia</application> e sono accessibili cliccando sul bottone
<guibutton>Rilascia Note</guibutton>.</para>
</section>
</section> \ No newline at end of file
diff --git a/docs/installer/it/bootLive.xml b/docs/installer/it/bootLive.xml
index d2bd13e9..1789e53e 100644
--- a/docs/installer/it/bootLive.xml
+++ b/docs/installer/it/bootLive.xml
@@ -1,135 +1,29 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="bootLive" version="5.0" xml:lang="it">
- <info>
- <title xml:id="bootLive-ti1">Boot Mageia as Live system</title>
- </info>
-
- <section xml:id="bootLive-1">
- <info>
- <title xml:id="bootLive1-ti1">Booting the medium</title>
- </info>
-
- <section>
- <info>
- <title xml:id="bootLive11-ti1">From a disc</title>
- </info>
-
- <para>You can boot directly from the media you used to burn your image (CD-ROM,
+<?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="it"><info><title xml:id="bootLive-ti1">Boot Mageia as Live system</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Booting the medium</title></info><section><info><title xml:id="bootLive11-ti1">From a disc</title></info><para>You can boot directly from the media you used to burn your image (CD-ROM,
DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the
bootloader to launch the installation automatically after rebooting the
computer. If that does not happen you may need to reconfigure your BIOS or
press one key that will offer you to choose the peripheral from which the
-computer will boot.</para>
-
- <para>According to which hardware you have, and how it is configured, you get
-either one or another of the two screens below.</para>
- </section>
-
- <section>
- <info>
- <title xml:id="bootLive12-ti1">From a USB device</title>
- </info>
-
- <para>You can boot from the USB device on which you dumped your image
+computer will boot.</para><para>According to which hardware you have, and how it is configured, you get
+either one or another of the two screens below.</para></section><section><info><title xml:id="bootLive12-ti1">From a USB device</title></info><para>You can boot from the USB device on which you dumped your image
ISO. According to your BIOS settings, the computer boots perhaps directly on
the USB device already plugged in a port. If that does not happen you may
need to reconfigure your BIOS or press one key that will offer you to choose
-the peripheral from which the computer will boot.</para>
- </section>
- </section>
-
- <section xml:id="biosmode">
- <info>
- <title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title>
- </info>
-
- <mediaobject>
- <imageobject> <imagedata fileref="live-bootCSM.png"/> </imageobject>
-
- <caption>
- <para>First screen while booting in BIOS mode</para>
- </caption>
- </mediaobject>
-
- <para>In the middle menu, you have the choice between three actions:</para>
-
- <itemizedlist>
- <listitem>
- <para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
+the peripheral from which the computer will boot.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>First screen while booting in BIOS mode</para></caption></mediaobject><para>In the middle menu, you have the choice between three actions:</para><itemizedlist><listitem><para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
or USB stick) without writing anything on the disk, so expect a very slow
system. Once the boot is done, you can proceed to the installation on a hard
-disk.</para>
- </listitem>
-
- <listitem>
- <para>Install Mageia: This choice will directly install Mageia on a hard disk.</para>
- </listitem>
-
- <listitem>
- <para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
+disk.</para></listitem><listitem><para>Install Mageia: This choice will directly install Mageia on a hard disk.</para></listitem><listitem><para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
when no media (CD/DVD or USB stick) is connected. (not working with Mageia
-5).</para>
- </listitem>
- </itemizedlist>
-
- <para>In the bottom menu, are the Boot Options:</para>
-
- <itemizedlist>
- <listitem>
- <para>F1 - Help. Explain the options "splash", "apm", "acpi" and "Ide"</para>
- </listitem>
-
- <listitem>
- <para>F2 - Language. Choose the display language of the screens.</para>
- </listitem>
-
- <listitem>
- <para>F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728</para>
- </listitem>
-
- <listitem>
- <para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
+5).</para></listitem></itemizedlist><para>In the bottom menu, are the Boot Options:</para><itemizedlist><listitem><para>F1 - Help. Explain the options "splash", "apm", "acpi" and "Ide"</para></listitem><listitem><para>F2 - Language. Choose the display language of the screens.</para></listitem><listitem><para>F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
the inserted installation medium. Here, select other sources, like FTP or
NFS servers. If the installation is carried out in a network with an SLP
server, select one of the installation sources available on the server with
-this option.</para>
- </listitem>
-
- <listitem>
- <para>F5 - Driver. Yes or No. The system is aware about the presence of an
+this option.</para></listitem><listitem><para>F5 - Driver. Yes or No. The system is aware about the presence of an
optional disk with a driver update and will require its insertion during
-installation process.</para>
- </listitem>
-
- <listitem>
- <para>F6 - Kernel options. This is a way to specify options according to your
-hardware and the drivers to use.</para>
- </listitem>
- </itemizedlist>
- </section>
-
- <section xml:id="uefimode">
- <info>
- <title xml:id="uefimode-ti1">In UEFI mode</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center"
-fileref="live-bootUEFI.png" format="PNG" xml:id="bootUEFI-im1"/>
-</imageobject>
-
- <caption>
- <para>First screen while booting on UEFI system from disk</para>
- </caption>
- </mediaobject>
-
- <para>You have only the choice to run Mageia in Live mode (first choice) or to
-process the installation (second choice).</para>
- <para>If you booted from a USB stick, you get two supplemental lines which are a
+installation process.</para></listitem><listitem><para>F6 - Kernel options. This is a way to specify options according to your
+hardware and the drivers to use.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">In UEFI mode</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
+align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>First screen while booting on UEFI system from disk</para></caption></mediaobject><para>You have only the choice to run Mageia in Live mode (first choice) or to
+process the installation (second choice).</para><para>If you booted from a USB stick, you get two supplemental lines which are a
duplicata of the previous lines suffixed with "USB". You have to choose
-them.</para>
-
- <para>In each case, the first steps will be the same to choose language, timezone
+them.</para><para>In each case, the first steps will be the same to choose language, timezone
and keyboard, then the processes differ, with <link
-linkend="testing">additional steps in Live mode</link>.</para>
- </section>
-</section> \ No newline at end of file
+linkend="testing">additional steps in Live mode</link>.</para></section></section> \ No newline at end of file
diff --git a/docs/installer/it/login.xml b/docs/installer/it/login.xml
index e8edbf16..aaeb54f8 100644
--- a/docs/installer/it/login.xml
+++ b/docs/installer/it/login.xml
@@ -1,24 +1,5 @@
-<?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="login" version="5.0" xml:lang="it">
- <info>
- <title xml:id="label-to-adapt-ti1">Login screen</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center" xml:id="login-im1"
-format="PNG" fileref="live-login.png"/> </imageobject>
-
- <caption>
- <para>KDM login screen</para>
- </caption>
- </mediaobject>
-
- <para>Finally, you will come to the login screen.</para>
-
- <para>Enter your user name and user password, and in a few seconds you will find
+<?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="it"><info><title xml:id="label-to-adapt-ti1">Login screen</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM login screen</para></caption></mediaobject><para>Finally, you will come to the login screen.</para><para>Enter your user name and user password, and in a few seconds you will find
yourself with a loaded KDE or GNOME desktop, depending on which live medium
-you used. You can now start using your Mageia installation.</para>
-
- <para>You can find another part of our documentation in <link
-linkend="https://wiki.mageia.org/en/Category:Documentation">the Mageia
-wiki</link>.</para>
-</section> \ No newline at end of file
+you used. You can now start using your Mageia installation.</para><para>Puoi trovarli <link
+linkend="https://wiki.mageia.org/en/Category:Documentation">qui</link>.</para></section> \ No newline at end of file
diff --git a/docs/installer/it/setupBootloader.xml b/docs/installer/it/setupBootloader.xml
index 5b7730d6..95160960 100644
--- a/docs/installer/it/setupBootloader.xml
+++ b/docs/installer/it/setupBootloader.xml
@@ -10,9 +10,11 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
-format="PNG"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="setupBootloader-im1"
+format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata
+xml:id="setupBootloader-im1" format="PNG" align="center" revision="1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<section>
<title>With a Bios system</title>
@@ -33,7 +35,7 @@ Mageia di crearne uno nuovo.</para>
<title xml:id="usingMageiaBootloader-ti2">Using a Mageia bootloader</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa4">By default, Mageia writes a new GRUB (legacy) bootloader into the MBR
+ <para xml:id="setupBootloader-pa4" revision="3">By default, Mageia writes a new GRUB (legacy) bootloader into the MBR
(Master Boot Record) of your first hard drive. If you already have other
operating systems installed, Mageia attempts to add them to your new Mageia
boot menu.</para>
@@ -42,7 +44,7 @@ boot menu.</para>
Lilo.</para>
<warning>
- <para revision="3" xml:id="setupBootloader-pa6">Linux systems which use the GRUB2 bootloader are not currently supported by
+ <para xml:id="setupBootloader-pa6" revision="3">Linux systems which use the GRUB2 bootloader are not currently supported by
GRUB (legacy) and will not be recognized if the default GRUB bootloader is
used.</para>
@@ -53,15 +55,15 @@ l'installazione.</para>
<section xml:id="usingExistingBootloader">
<info>
- <title revision="2" xml:id="usingExistingBootloader-ti4">Usare un bootloader esistente</title>
+ <title xml:id="usingExistingBootloader-ti4" revision="2">Usare un bootloader esistente</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa46">If you decide to use an existing bootloader then you will need to remember
+ <para xml:id="setupBootloader-pa46" revision="3">If you decide to use an existing bootloader then you will need to remember
to STOP at the summary page during the installation and click the Bootloader
<guibutton>Configure</guibutton> button, which will allow you to change the
bootloader install location.</para>
- <para revision="1" xml:id="setupBootloader-pa47">Do not select a device e.g."sda", or you will overwrite your existing
+ <para xml:id="setupBootloader-pa47" revision="1">Do not select a device e.g."sda", or you will overwrite your existing
MBR. You must select the root partition that you chose during the
partitioning phase earlier, e.g. sda7.</para>
@@ -74,7 +76,7 @@ your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to
the installer screen.</para>
</tip>
- <para revision="2" xml:id="setupBootloader-pa49">The exact procedure for adding your Mageia system to an existing bootloader
+ <para xml:id="setupBootloader-pa49" revision="2">The exact procedure for adding your Mageia system to an existing bootloader
is beyond the scope of this help, 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
@@ -83,10 +85,10 @@ question.</para>
<section xml:id="advancedOptionBootloader">
<info>
- <title revision="2" xml:id="advancedOptionBootloader-ti5">Opzioni avanzate del Bootloader</title>
+ <title xml:id="advancedOptionBootloader-ti5" revision="2">Opzioni avanzate del Bootloader</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa52">If you have very limited disk space for the <literal>/</literal> partition
+ <para xml:id="setupBootloader-pa52" revision="3">If you have very limited disk space for the <literal>/</literal> partition
that contains <literal>/tmp</literal>, click on
<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /tmp
at each boot</guilabel>. This helps to maintain some free space.</para>
@@ -100,7 +102,10 @@ at each boot</guilabel>. This helps to maintain some free space.</para>
choose the boot loader since only Grub2-efi is available. </para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader2.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader2.png"/>
+</imageobject></mediaobject>
<para>If Mageia is the first system installed on your computer, the installer
created an ESP (EFI System Partition) to receive the bootloader
diff --git a/docs/installer/it/setupBootloaderAddEntry.xml b/docs/installer/it/setupBootloaderAddEntry.xml
index 9c05f093..e4b6b982 100644
--- a/docs/installer/it/setupBootloaderAddEntry.xml
+++ b/docs/installer/it/setupBootloaderAddEntry.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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="it">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="it" xml:id="setupBootloaderAddEntry">
<info>
@@ -7,9 +7,13 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
-xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="dx2-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="live-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject></mediaobject>
<section>
<title>With a Bios system</title>
@@ -26,8 +30,8 @@ instead.</para>
</note>
<mediaobject>
-<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
-align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1"
+align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
</imageobject></mediaobject>
<para>Some things that can be done without any risk, are changing the label of an
diff --git a/docs/installer/it/unused.xml b/docs/installer/it/unused.xml
index b04e2506..a5f196ed 100644
--- a/docs/installer/it/unused.xml
+++ b/docs/installer/it/unused.xml
@@ -19,7 +19,7 @@ accept, except if you prepare an installation which has to run on different
hardware.</para>
<mediaobject>
-<imageobject> <imagedata fileref="live-unused-InstallationProgress.png"/>
+<imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
</imageobject></mediaobject>
<para>The next step is the copying of files on hard disk. This takes some
diff --git a/docs/installer/ja/bootLive.xml b/docs/installer/ja/bootLive.xml
index 2abcb44e..885b1ca7 100644
--- a/docs/installer/ja/bootLive.xml
+++ b/docs/installer/ja/bootLive.xml
@@ -1,135 +1,29 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="bootLive" version="5.0" xml:lang="ja">
- <info>
- <title xml:id="bootLive-ti1">Boot Mageia as Live system</title>
- </info>
-
- <section xml:id="bootLive-1">
- <info>
- <title xml:id="bootLive1-ti1">Booting the medium</title>
- </info>
-
- <section>
- <info>
- <title xml:id="bootLive11-ti1">From a disc</title>
- </info>
-
- <para>You can boot directly from the media you used to burn your image (CD-ROM,
+<?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="ja"><info><title xml:id="bootLive-ti1">Boot Mageia as Live system</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Booting the medium</title></info><section><info><title xml:id="bootLive11-ti1">From a disc</title></info><para>You can boot directly from the media you used to burn your image (CD-ROM,
DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the
bootloader to launch the installation automatically after rebooting the
computer. If that does not happen you may need to reconfigure your BIOS or
press one key that will offer you to choose the peripheral from which the
-computer will boot.</para>
-
- <para>According to which hardware you have, and how it is configured, you get
-either one or another of the two screens below.</para>
- </section>
-
- <section>
- <info>
- <title xml:id="bootLive12-ti1">From a USB device</title>
- </info>
-
- <para>You can boot from the USB device on which you dumped your image
+computer will boot.</para><para>According to which hardware you have, and how it is configured, you get
+either one or another of the two screens below.</para></section><section><info><title xml:id="bootLive12-ti1">From a USB device</title></info><para>You can boot from the USB device on which you dumped your image
ISO. According to your BIOS settings, the computer boots perhaps directly on
the USB device already plugged in a port. If that does not happen you may
need to reconfigure your BIOS or press one key that will offer you to choose
-the peripheral from which the computer will boot.</para>
- </section>
- </section>
-
- <section xml:id="biosmode">
- <info>
- <title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title>
- </info>
-
- <mediaobject>
- <imageobject> <imagedata fileref="live-bootCSM.png"/> </imageobject>
-
- <caption>
- <para>First screen while booting in BIOS mode</para>
- </caption>
- </mediaobject>
-
- <para>In the middle menu, you have the choice between three actions:</para>
-
- <itemizedlist>
- <listitem>
- <para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
+the peripheral from which the computer will boot.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>First screen while booting in BIOS mode</para></caption></mediaobject><para>In the middle menu, you have the choice between three actions:</para><itemizedlist><listitem><para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
or USB stick) without writing anything on the disk, so expect a very slow
system. Once the boot is done, you can proceed to the installation on a hard
-disk.</para>
- </listitem>
-
- <listitem>
- <para>Install Mageia: This choice will directly install Mageia on a hard disk.</para>
- </listitem>
-
- <listitem>
- <para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
+disk.</para></listitem><listitem><para>Install Mageia: This choice will directly install Mageia on a hard disk.</para></listitem><listitem><para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
when no media (CD/DVD or USB stick) is connected. (not working with Mageia
-5).</para>
- </listitem>
- </itemizedlist>
-
- <para>In the bottom menu, are the Boot Options:</para>
-
- <itemizedlist>
- <listitem>
- <para>F1 - Help. Explain the options "splash", "apm", "acpi" and "Ide"</para>
- </listitem>
-
- <listitem>
- <para>F2 - Language. Choose the display language of the screens.</para>
- </listitem>
-
- <listitem>
- <para>F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728</para>
- </listitem>
-
- <listitem>
- <para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
+5).</para></listitem></itemizedlist><para>In the bottom menu, are the Boot Options:</para><itemizedlist><listitem><para>F1 - Help. Explain the options "splash", "apm", "acpi" and "Ide"</para></listitem><listitem><para>F2 - Language. Choose the display language of the screens.</para></listitem><listitem><para>F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
the inserted installation medium. Here, select other sources, like FTP or
NFS servers. If the installation is carried out in a network with an SLP
server, select one of the installation sources available on the server with
-this option.</para>
- </listitem>
-
- <listitem>
- <para>F5 - Driver. Yes or No. The system is aware about the presence of an
+this option.</para></listitem><listitem><para>F5 - Driver. Yes or No. The system is aware about the presence of an
optional disk with a driver update and will require its insertion during
-installation process.</para>
- </listitem>
-
- <listitem>
- <para>F6 - Kernel options. This is a way to specify options according to your
-hardware and the drivers to use.</para>
- </listitem>
- </itemizedlist>
- </section>
-
- <section xml:id="uefimode">
- <info>
- <title xml:id="uefimode-ti1">In UEFI mode</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center"
-fileref="live-bootUEFI.png" format="PNG" xml:id="bootUEFI-im1"/>
-</imageobject>
-
- <caption>
- <para>First screen while booting on UEFI system from disk</para>
- </caption>
- </mediaobject>
-
- <para>You have only the choice to run Mageia in Live mode (first choice) or to
-process the installation (second choice).</para>
- <para>If you booted from a USB stick, you get two supplemental lines which are a
+installation process.</para></listitem><listitem><para>F6 - Kernel options. This is a way to specify options according to your
+hardware and the drivers to use.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">In UEFI mode</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
+align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>First screen while booting on UEFI system from disk</para></caption></mediaobject><para>You have only the choice to run Mageia in Live mode (first choice) or to
+process the installation (second choice).</para><para>If you booted from a USB stick, you get two supplemental lines which are a
duplicata of the previous lines suffixed with "USB". You have to choose
-them.</para>
-
- <para>In each case, the first steps will be the same to choose language, timezone
+them.</para><para>In each case, the first steps will be the same to choose language, timezone
and keyboard, then the processes differ, with <link
-linkend="testing">additional steps in Live mode</link>.</para>
- </section>
-</section> \ No newline at end of file
+linkend="testing">additional steps in Live mode</link>.</para></section></section> \ No newline at end of file
diff --git a/docs/installer/ja/login.xml b/docs/installer/ja/login.xml
index 37db6376..bf6962f1 100644
--- a/docs/installer/ja/login.xml
+++ b/docs/installer/ja/login.xml
@@ -1,24 +1,6 @@
-<?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="login" version="5.0" xml:lang="ja">
- <info>
- <title xml:id="label-to-adapt-ti1">Login screen</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center" xml:id="login-im1"
-format="PNG" fileref="live-login.png"/> </imageobject>
-
- <caption>
- <para>KDM login screen</para>
- </caption>
- </mediaobject>
-
- <para>Finally, you will come to the login screen.</para>
-
- <para>Enter your user name and user password, and in a few seconds you will find
+<?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="ja"><info><title xml:id="label-to-adapt-ti1">Login screen</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM login screen</para></caption></mediaobject><para>Finally, you will come to the login screen.</para><para>Enter your user name and user password, and in a few seconds you will find
yourself with a loaded KDE or GNOME desktop, depending on which live medium
-you used. You can now start using your Mageia installation.</para>
-
- <para>You can find another part of our documentation in <link
+you used. You can now start using your Mageia installation.</para><para>You can find another part of our documentation in <link
linkend="https://wiki.mageia.org/en/Category:Documentation">the Mageia
-wiki</link>.</para>
-</section> \ No newline at end of file
+wiki</link>.</para></section> \ No newline at end of file
diff --git a/docs/installer/ja/setupBootloader.xml b/docs/installer/ja/setupBootloader.xml
index ce2852e8..db69f5f3 100644
--- a/docs/installer/ja/setupBootloader.xml
+++ b/docs/installer/ja/setupBootloader.xml
@@ -10,9 +10,11 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
-format="PNG"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="setupBootloader-im1"
+format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata
+xml:id="setupBootloader-im1" format="PNG" align="center" revision="1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<section>
<title>With a Bios system</title>
@@ -33,7 +35,7 @@ allow Mageia to create a new one.</para>
<title xml:id="usingMageiaBootloader-ti2">Using a Mageia bootloader</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa4">By default, Mageia writes a new GRUB (legacy) bootloader into the MBR
+ <para xml:id="setupBootloader-pa4" revision="3">By default, Mageia writes a new GRUB (legacy) bootloader into the MBR
(Master Boot Record) of your first hard drive. If you already have other
operating systems installed, Mageia attempts to add them to your new Mageia
boot menu.</para>
@@ -42,7 +44,7 @@ boot menu.</para>
legacy and Lilo.</para>
<warning>
- <para revision="3" xml:id="setupBootloader-pa6">Linux systems which use the GRUB2 bootloader are not currently supported by
+ <para xml:id="setupBootloader-pa6" revision="3">Linux systems which use the GRUB2 bootloader are not currently supported by
GRUB (legacy) and will not be recognized if the default GRUB bootloader is
used.</para>
@@ -53,15 +55,15 @@ the Summary page during installation.</para>
<section xml:id="usingExistingBootloader">
<info>
- <title revision="2" xml:id="usingExistingBootloader-ti4">Using an existing bootloader</title>
+ <title xml:id="usingExistingBootloader-ti4" revision="2">Using an existing bootloader</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa46">If you decide to use an existing bootloader then you will need to remember
+ <para xml:id="setupBootloader-pa46" revision="3">If you decide to use an existing bootloader then you will need to remember
to STOP at the summary page during the installation and click the Bootloader
<guibutton>Configure</guibutton> button, which will allow you to change the
bootloader install location.</para>
- <para revision="1" xml:id="setupBootloader-pa47">Do not select a device e.g."sda", or you will overwrite your existing
+ <para xml:id="setupBootloader-pa47" revision="1">Do not select a device e.g."sda", or you will overwrite your existing
MBR. You must select the root partition that you chose during the
partitioning phase earlier, e.g. sda7.</para>
@@ -73,7 +75,7 @@ your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to
the installer screen.</para>
</tip>
- <para revision="2" xml:id="setupBootloader-pa49">The exact procedure for adding your Mageia system to an existing bootloader
+ <para xml:id="setupBootloader-pa49" revision="2">The exact procedure for adding your Mageia system to an existing bootloader
is beyond the scope of this help, 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
@@ -82,10 +84,10 @@ question.</para>
<section xml:id="advancedOptionBootloader">
<info>
- <title revision="2" xml:id="advancedOptionBootloader-ti5">Bootloader advanced option</title>
+ <title xml:id="advancedOptionBootloader-ti5" revision="2">Bootloader advanced option</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa52">If you have very limited disk space for the <literal>/</literal> partition
+ <para xml:id="setupBootloader-pa52" revision="3">If you have very limited disk space for the <literal>/</literal> partition
that contains <literal>/tmp</literal>, click on
<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /tmp
at each boot</guilabel>. This helps to maintain some free space.</para>
@@ -99,7 +101,10 @@ at each boot</guilabel>. This helps to maintain some free space.</para>
choose the boot loader since only Grub2-efi is available. </para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader2.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader2.png"/>
+</imageobject></mediaobject>
<para>If Mageia is the first system installed on your computer, the installer
created an ESP (EFI System Partition) to receive the bootloader
diff --git a/docs/installer/ja/setupBootloaderAddEntry.xml b/docs/installer/ja/setupBootloaderAddEntry.xml
index 88f1d1d8..58a6889c 100644
--- a/docs/installer/ja/setupBootloaderAddEntry.xml
+++ b/docs/installer/ja/setupBootloaderAddEntry.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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="ja">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ja" xml:id="setupBootloaderAddEntry">
<info>
@@ -7,9 +7,13 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
-xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="dx2-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="live-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject></mediaobject>
<section>
<title>With a Bios system</title>
@@ -26,8 +30,8 @@ instead.</para>
</note>
<mediaobject>
-<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
-align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1"
+align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
</imageobject></mediaobject>
<para>Some things that can be done without any risk, are changing the label of an
diff --git a/docs/installer/ja/unused.xml b/docs/installer/ja/unused.xml
index e4783fe5..6140314d 100644
--- a/docs/installer/ja/unused.xml
+++ b/docs/installer/ja/unused.xml
@@ -19,7 +19,7 @@ accept, except if you prepare an installation which has to run on different
hardware.</para>
<mediaobject>
-<imageobject> <imagedata fileref="live-unused-InstallationProgress.png"/>
+<imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
</imageobject></mediaobject>
<para>The next step is the copying of files on hard disk. This takes some
diff --git a/docs/installer/nl/bootLive.xml b/docs/installer/nl/bootLive.xml
index 5ee5d18b..1808478e 100644
--- a/docs/installer/nl/bootLive.xml
+++ b/docs/installer/nl/bootLive.xml
@@ -1,134 +1,28 @@
-<?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="bootLive" version="5.0" xml:lang="nl">
- <info>
- <title xml:id="bootLive-ti1">Start Mageia als Live-systeem</title>
- </info>
-
- <section xml:id="bootLive-1">
- <info>
- <title xml:id="bootLive1-ti1">Het medium opstarten</title>
- </info>
-
- <section>
- <info>
- <title xml:id="bootLive11-ti1">Van een DVD</title>
- </info>
-
- <para>U kunt opstarten vanaf de DVD waarop u uw beeldbestand brandde. Vaak gebeurt
+<?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="nl"><info><title xml:id="bootLive-ti1">Start Mageia als Live-systeem</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Het medium opstarten</title></info><section><info><title xml:id="bootLive11-ti1">Van een DVD</title></info><para>U kunt opstarten vanaf de DVD waarop u uw beeldbestand brandde. Vaak gebeurt
dat vanzelf als de DVD in het DVD-station zit. Anders kunt u in uw BIOS
instellen vanaf welk apparaat opgestart moet worden. Soms is het mogelijk
-éénmalig van opstartapparaat te wisselen, raadpleeg uw pc-handleiding.</para>
-
- <para>Afhankelijk van de hardware die u heeft en van hoe die geconfigureerd is,
-krijgt u één van de twee onderstaande schermen.</para>
- </section>
-
- <section>
- <info>
- <title xml:id="bootLive12-ti1">Van een USB-apparaat</title>
- </info>
-
- <para>U kunt booten vanaf het USB-apparaat waar u uw ISO-image op
+éénmalig van opstartapparaat te wisselen, raadpleeg uw pc-handleiding.</para><para>Afhankelijk van de hardware die u heeft en van hoe die geconfigureerd is,
+krijgt u één van de twee onderstaande schermen.</para></section><section><info><title xml:id="bootLive12-ti1">Van een USB-apparaat</title></info><para>U kunt booten vanaf het USB-apparaat waar u uw ISO-image op
zette. Afhankelijk van uw BIOS-instellingen, start de computer mogelijk al
meteen op van de ingeplugde USB-key. Als dat niet gebeurt, dient u uw
BIOS-instellingen te wijzigen, of een toets in te drukken die u een
-keuzescherm geeft vanaf welk apparaat u de computer wilt booten.</para>
- </section>
- </section>
-
- <section xml:id="biosmode">
- <info>
- <title xml:id="biosmode-ti1">In BIOS/CSM/Legacy-modus</title>
- </info>
-
- <mediaobject>
- <imageobject> <imagedata fileref="live-bootCSM.png"/> </imageobject>
-
- <caption>
- <para>Eerste scherm na starten in BIOS-modus</para>
- </caption>
- </mediaobject>
-
- <para>In het middelste menu, heeft u de keuze tussen drie acties:</para>
-
- <itemizedlist>
- <listitem>
- <para>Mageia opstarten: dat betekent dat Mageia 5 van het verbonden medium (cd /
+keuzescherm geeft vanaf welk apparaat u de computer wilt booten.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">In BIOS/CSM/Legacy-modus</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Eerste scherm na starten in BIOS-modus</para></caption></mediaobject><para>In het middelste menu, heeft u de keuze tussen drie acties:</para><itemizedlist><listitem><para>Mageia opstarten: dat betekent dat Mageia 5 van het verbonden medium (cd /
dvd of usb-stick) zal opstarten zonder iets op de schijf te schrijven, dus
verwacht een erg langzaam systeem. Als het opstarten eenmaal klaar is, kunt
-u verdergaan naar de installatie op een harde schijf</para>
- </listitem>
-
- <listitem>
- <para>Mageia installeren: Deze keuze zal Mageia direct op een harde schijf
-installeren</para>
- </listitem>
-
- <listitem>
- <para>Opstarten vanaf harde schijf: Met deze optie kunt u opstarten vanaf de harde
+u verdergaan naar de installatie op een harde schijf</para></listitem><listitem><para>Mageia installeren: Deze keuze zal Mageia direct op een harde schijf
+installeren</para></listitem><listitem><para>Opstarten vanaf harde schijf: Met deze optie kunt u opstarten vanaf de harde
schijf, zoals gebruikelijk als er geen medium (cd / dvd of usb-stick) is
-aangesloten. (werkt niet met Mageia 5)</para>
- </listitem>
- </itemizedlist>
-
- <para>In het onderste menu, zijn de opstartopties:</para>
-
- <itemizedlist>
- <listitem>
- <para>F1 - Hulp. Leg de opties "splash", "apm", "acpi" en "lde" uit</para>
- </listitem>
-
- <listitem>
- <para>F2 - Taal. Kies de weergegeven taal van de schermen</para>
- </listitem>
-
- <listitem>
- <para>F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728</para>
- </listitem>
-
- <listitem>
- <para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
+aangesloten. (werkt niet met Mageia 5)</para></listitem></itemizedlist><para>In het onderste menu, zijn de opstartopties:</para><itemizedlist><listitem><para>F1 - Hulp. Leg de opties "splash", "apm", "acpi" en "lde" uit</para></listitem><listitem><para>F2 - Taal. Kies de weergegeven taal van de schermen</para></listitem><listitem><para>F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
the inserted installation medium. Here, select other sources, like FTP or
NFS servers. If the installation is carried out in a network with an SLP
server, select one of the installation sources available on the server with
-this option.</para>
- </listitem>
-
- <listitem>
- <para>F5 - Driver. Yes or No. The system is aware about the presence of an
+this option.</para></listitem><listitem><para>F5 - Driver. Yes or No. The system is aware about the presence of an
optional disk with a driver update and will require its insertion during
-installation process.</para>
- </listitem>
-
- <listitem>
- <para>F6 - Kernel options. This is a way to specify options according to your
-hardware and the drivers to use.</para>
- </listitem>
- </itemizedlist>
- </section>
-
- <section xml:id="uefimode">
- <info>
- <title xml:id="uefimode-ti1">In UEFI-modus</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center"
-fileref="live-bootUEFI.png" format="PNG" xml:id="bootUEFI-im1"/>
-</imageobject>
-
- <caption>
- <para>First screen while booting on UEFI system from disk</para>
- </caption>
- </mediaobject>
-
- <para>You have only the choice to run Mageia in Live mode (first choice) or to
-process the installation (second choice).</para>
- <para>If you booted from a USB stick, you get two supplemental lines which are a
+installation process.</para></listitem><listitem><para>F6 - Kernel options. This is a way to specify options according to your
+hardware and the drivers to use.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">In UEFI-modus</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
+align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>First screen while booting on UEFI system from disk</para></caption></mediaobject><para>You have only the choice to run Mageia in Live mode (first choice) or to
+process the installation (second choice).</para><para>If you booted from a USB stick, you get two supplemental lines which are a
duplicata of the previous lines suffixed with "USB". You have to choose
-them.</para>
-
- <para>In each case, the first steps will be the same to choose language, timezone
+them.</para><para>In each case, the first steps will be the same to choose language, timezone
and keyboard, then the processes differ, with <link
-linkend="testing">additional steps in Live mode</link>.</para>
- </section>
-</section> \ No newline at end of file
+linkend="testing">additional steps in Live mode</link>.</para></section></section> \ No newline at end of file
diff --git a/docs/installer/nl/login.xml b/docs/installer/nl/login.xml
index a8b63292..91837d07 100644
--- a/docs/installer/nl/login.xml
+++ b/docs/installer/nl/login.xml
@@ -1,23 +1,5 @@
-<?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="login" version="5.0" xml:lang="nl">
- <info>
- <title xml:id="label-to-adapt-ti1">Aanmeldscherm</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center" xml:id="login-im1"
-format="PNG" fileref="live-login.png"/> </imageobject>
-
- <caption>
- <para>KDM-aanmeldscherm</para>
- </caption>
- </mediaobject>
-
- <para>Tenslotte komt u bij het aanmeldscherm</para>
-
- <para>Enter your user name and user password, and in a few seconds you will find
+<?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="nl"><info><title xml:id="label-to-adapt-ti1">Aanmeldscherm</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM-aanmeldscherm</para></caption></mediaobject><para>Tenslotte komt u bij het aanmeldscherm</para><para>Enter your user name and user password, and in a few seconds you will find
yourself with a loaded KDE or GNOME desktop, depending on which live medium
-you used. You can now start using your Mageia installation.</para>
-
- <para>Meer documentatie vindt u in <link
-ns4:href="https://wiki.mageia.org/en/Documentation">de Mageia wiki</link>.</para>
-</section> \ No newline at end of file
+you used. You can now start using your Mageia installation.</para><para>Meer documentatie vindt u in <link
+ns4:href="https://wiki.mageia.org/en/Documentation">de Mageia wiki</link>.</para></section> \ No newline at end of file
diff --git a/docs/installer/nl/setupBootloader.xml b/docs/installer/nl/setupBootloader.xml
index 8cbac4e3..f8f6fe5a 100644
--- a/docs/installer/nl/setupBootloader.xml
+++ b/docs/installer/nl/setupBootloader.xml
@@ -10,9 +10,11 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
-format="PNG"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="setupBootloader-im1"
+format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata
+xml:id="setupBootloader-im1" format="PNG" align="center" revision="1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<section>
<title>With a Bios system</title>
@@ -33,7 +35,7 @@ of dat u Mageia toestaat een nieuwe te creëren.</para>
<title xml:id="usingMageiaBootloader-ti2">De Mageia-opstartlader gebruiken</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa4">Standaard schrijft Mageia een nieuwe GRUB-(legacy-)opstartlader in de MBR
+ <para xml:id="setupBootloader-pa4" revision="3">Standaard schrijft Mageia een nieuwe GRUB-(legacy-)opstartlader in de MBR
(Master Boot Record) van uw eerste harde schijf. Als u al andere
besturingssystemen heeft, probeert Mageia ze aan uw nieuwe Mageia
opstartmenu toe te voegen.</para>
@@ -42,7 +44,7 @@ opstartmenu toe te voegen.</para>
opstartlader te nemen, ook GRUB2 als keuze aan.</para>
<warning>
- <para revision="3" xml:id="setupBootloader-pa6">Linux systemen die de GRUB2 opstartlader gebruiken worden nog niet door
+ <para xml:id="setupBootloader-pa6" revision="3">Linux systemen die de GRUB2 opstartlader gebruiken worden nog niet door
GRUB(-legacy) ondersteund en zullen niet herkend worden als de standaard
GRUB opstartlader gebruikt wordt.</para>
@@ -53,15 +55,15 @@ tijdens het installeren in de Overzichtspagina beschikbaar is.</para>
<section xml:id="usingExistingBootloader">
<info>
- <title revision="2" xml:id="usingExistingBootloader-ti4">Een bestaande opstartlader gebruiken</title>
+ <title xml:id="usingExistingBootloader-ti4" revision="2">Een bestaande opstartlader gebruiken</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa46">Als u besluit een bestaande opstartlader te gebruiken, moet u er tijdens de
+ <para xml:id="setupBootloader-pa46" revision="3">Als u besluit een bestaande opstartlader te gebruiken, moet u er tijdens de
installatie aan denken te STOPPEN in de overzichtspagina en op de
Opstartlader <guibutton>Configureren</guibutton> knop te klikken, waarna u
de locatie kunt veranderen waar de opstartlader geplaatst wordt.</para>
- <para revision="1" xml:id="setupBootloader-pa47">Kies geen apparaat zoals "sda", anders overschrijft u uw bestaande MBR. U
+ <para xml:id="setupBootloader-pa47" revision="1">Kies geen apparaat zoals "sda", anders overschrijft u uw bestaande MBR. U
moet de root partitie selecteren die u eerder tijdens de installatie koos,
bijvoorbeeld "sda7".</para>
@@ -73,7 +75,7 @@ waar uw <literal>/</literal> (root) partitie is. Ctrl+Alt+F7 brengt u terug
naar het installatiescherm.</para>
</tip>
- <para revision="2" xml:id="setupBootloader-pa49">De precieze procedure om Mageia aan een bestaande opstartlader toe te
+ <para xml:id="setupBootloader-pa49" revision="2">De precieze procedure om Mageia aan een bestaande opstartlader toe te
voegen, valt buiten het bereik van dit document. In de meeste gevallen is
het nodig het installatieprogramma van de betreffende opstartlader te
gebruiken, dat Mageia automatisch zou moeten zien en toevoegen. Raadpleeg de
@@ -82,10 +84,10 @@ documentatie van het betreffende besturingssysteem.</para>
<section xml:id="advancedOptionBootloader">
<info>
- <title revision="2" xml:id="advancedOptionBootloader-ti5">Geavanceerde optie voor de opstartlader</title>
+ <title xml:id="advancedOptionBootloader-ti5" revision="2">Geavanceerde optie voor de opstartlader</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa52">Als u zeer weinig schijfruimte heeft voor de <literal>/</literal> partitie
+ <para xml:id="setupBootloader-pa52" revision="3">Als u zeer weinig schijfruimte heeft voor de <literal>/</literal> partitie
met <literal>/tmp</literal>, klik dan op <guibutton>Geavanceerd</guibutton>
en zet een vinkje voor <guilabel>Elke keer bij opstarten /tmp
legen</guilabel>. Dit helpt om wat vrije ruimte te behouden.</para>
@@ -99,7 +101,10 @@ legen</guilabel>. Dit helpt om wat vrije ruimte te behouden.</para>
opstartlader kiezen, omdat enkel Grub2-efi beschikbaar is. </para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader2.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader2.png"/>
+</imageobject></mediaobject>
<para>Als uw computer nog geen besturingssysteem had, dan maakte het
Mageia-installatieprogramma een ESP (EFI-SysteemPartitie) voor de
diff --git a/docs/installer/nl/setupBootloaderAddEntry.xml b/docs/installer/nl/setupBootloaderAddEntry.xml
index 05ee8a70..5d1d2b98 100644
--- a/docs/installer/nl/setupBootloaderAddEntry.xml
+++ b/docs/installer/nl/setupBootloaderAddEntry.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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="nl">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="nl" xml:id="setupBootloaderAddEntry">
<info>
@@ -7,9 +7,13 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
-xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="dx2-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="live-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject></mediaobject>
<section>
<title>With a Bios system</title>
@@ -27,8 +31,8 @@ handmatig <code>/boot/grub2/custom.cfg</code> bewerken, of de tool
</note>
<mediaobject>
-<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
-align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1"
+align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
</imageobject></mediaobject>
<para>Een paar dingen die zonder enig risico gedaan kunnen worden, zijn de naam
diff --git a/docs/installer/nl/unused.xml b/docs/installer/nl/unused.xml
index b1bf848b..f4aac985 100644
--- a/docs/installer/nl/unused.xml
+++ b/docs/installer/nl/unused.xml
@@ -19,7 +19,7 @@ accept, except if you prepare an installation which has to run on different
hardware.</para>
<mediaobject>
-<imageobject> <imagedata fileref="live-unused-InstallationProgress.png"/>
+<imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
</imageobject></mediaobject>
<para>De volgende stap is het kopiëren van bestanden naar de harde schijf. Dit
diff --git a/docs/installer/pl/DrakLive-cover.xml b/docs/installer/pl/DrakLive-cover.xml
new file mode 100644
index 00000000..e1b8cb0d
--- /dev/null
+++ b/docs/installer/pl/DrakLive-cover.xml
@@ -0,0 +1,76 @@
+<?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">
+ <info>
+ <title>Installation from LIVE medium</title>
+ <publisher> <publishername>Mageia.org</publishername> </publisher>
+ <revhistory>
+ <revision>
+ <date>January 2015</date>
+ <revremark>Mageia 5</revremark>
+ </revision>
+ </revhistory>
+ <cover>
+ <para role="tagline">The Official Documentation for 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
+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>
+ <article>
+ <title>Installation from LIVE medium</title>
+ <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"/>
+
+ <xi:include href="bootLive.xml"/>
+
+ <xi:include href="selectLanguage.xml"/>
+
+ <xi:include href="acceptLicense.xml"/>
+
+ <xi:include href="configureTimezoneUTC.xml"/>
+
+ <xi:include href="bestTime.xml"/>
+
+ <xi:include href="selectKeyboardLive.xml"/>
+
+ <xi:include href="testing.xml"/>
+
+ <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"/>
+
+ <xi:include href="unused.xml"/>
+
+ <xi:include href="setupBootloader.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>
+</book> \ No newline at end of file
diff --git a/docs/installer/pl/DrakLive.xml b/docs/installer/pl/DrakLive.xml
new file mode 100644
index 00000000..544ea646
--- /dev/null
+++ b/docs/installer/pl/DrakLive.xml
@@ -0,0 +1,65 @@
+<?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">
+ <info>
+ <title>Installation from LIVE medium</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="bootLive.xml"/>
+
+ <xi:include href="selectLanguage.xml"/>
+
+ <xi:include href="acceptLicense.xml"/>
+
+ <xi:include href="configureTimezoneUTC.xml"/>
+
+ <xi:include href="bestTime.xml"/>
+
+ <xi:include href="selectKeyboardLive.xml"/>
+
+ <xi:include href="testing.xml"/>
+
+ <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"/>
+
+ <xi:include href="unused.xml"/>
+
+ <xi:include href="setupBootloader.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
diff --git a/docs/installer/pl/SelectAndUseISOs2.xml b/docs/installer/pl/SelectAndUseISOs2.xml
index f7cd9ce3..688a541d 100644
--- a/docs/installer/pl/SelectAndUseISOs2.xml
+++ b/docs/installer/pl/SelectAndUseISOs2.xml
@@ -7,7 +7,33 @@
</info>
<section>
- <title>Media</title>
+ <title>Introduction</title>
+
+ <para>Mageia is distributed via ISO images. This page will help you to choose
+which image match your needs.</para>
+
+ <para>There is two families of media:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Classical installer: After booting the media, it will follow a process
+allowing to choose what to install and how to configure your target
+system. This give you the maximal flexibility for a customized installation,
+in particular to choose which Desktop Environment you will install.</para>
+ </listitem>
+
+ <listitem>
+ <para>LIVE media: you can boot the media in a real Mageia system without
+installing it, to see what you will get after installation. The
+installation process is simpler, but you get lesser choices.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>Details are given in the next sections.</para>
+ </section>
+
+ <section>
+ <title>Nośnik</title>
<section>
<title>Definition</title>
@@ -260,12 +286,8 @@ http is chosen, you may also see something like</para>
<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
<para>md5sum and sha1sum are tools to check the ISO integrity. Use only one of
-them. Both hexadecimal numbers have been calculated by an algorithm from the
-file to be downloaded. When you ask these algorithms to recalculate this
-number from your downloaded file, either you have the same number and your
-downloaded file is correct, or the number is different and you have a
-failure. A failure infers that you should retry the download.Then this
-window appears:</para>
+them. Keep one of them <link linkend="integrity">for further
+usage</link>. Then this window appears:</para>
<mediaobject>
<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
@@ -274,7 +296,13 @@ window appears:</para>
</section>
<section>
- <title>Checking the downloaded media integrity</title>
+ <title xml:id="integrity">Checking the downloaded media integrity</title>
+
+ <para>Both checksums are hexadecimal numbers calculated by an algorithm from the
+file to be downloaded. When you ask these algorithms to recalculate this
+number from your downloaded file, either you have the same number and your
+downloaded file is correct, or the number is different and you have a
+failure. A failure infers that you should retry the download.</para>
<para>Open a console, no need to be root, and:</para>
@@ -323,13 +351,35 @@ the device; any other data will be lost and the partition capacity will be
reduced to the image size.</para>
</warning>
- <para>To recover the original capacity, you must re-format the USB stick.</para>
+ <para>To recover the original capacity, you must redo partitioning and re-format
+the USB stick.</para>
<section>
- <title>Using Mageia</title>
+ <title>Using a graphical tool within Mageia</title>
<para>You can use a graphical tool like <link
ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks">IsoDumper</link></para>
+ </section>
+
+ <section>
+ <title>Using a graphical tool within Windows</title>
+
+ <para>You could try:</para>
+
+ <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
+"ISO image" option;</para>
+
+ <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
+Disk Imager</link></para>
+ </section>
+
+ <section>
+ <title>Using Command line within a GNU/Linux system</title>
+
+ <warning>
+ <para>It is potentially *dangerous* to do this by hand. You risk to overwrite a
+disc partition if you get the device-ID wrong.</para>
+ </warning>
<para>You can also use the dd tool in a console:</para>
@@ -356,11 +406,34 @@ application or file manager that could access or read it)</para>
<mediaobject>
<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
+
+ <para>Alternatively, you can get the device name with the command
+<code>dmesg</code>: at end, you see the device name starting with
+<emphasis>sd</emphasis>, and <emphasis>sdd</emphasis> in this case:</para>
+
+ <screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
+[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
+[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
+[72594.770536] usb 1-1: Product: Mass Storage Device
+[72594.770537] usb 1-1: Manufacturer: JetFlash
+[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB
+[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes
+[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes
+[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected
+[72594.772447] scsi host8: usb-storage 1-1:1.0
+[72595.963238] scsi 8:0:0:0: Direct-Access JetFlash Transcend 2GB 1100 PQ: 0 ANSI: 4
+[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)
+[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off
+[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00
+[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found
+[72595.965031] sd 8:0:0:0: [sdd] Assuming drive cache: write through
+[72595.967251] <emphasis>sdd</emphasis>: sdd1
+[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen>
</listitem>
<listitem>
- <para>Find the device name for your USB stick (by its size), for example /dev/sdb
-in the screenshot above, it is a 8Go USB stick.</para>
+ <para>Find the device name for your USB stick (by its size), for example
+<code>/dev/sdb</code> in the screenshot above, it is a 8GB USB stick.</para>
</listitem>
<listitem>
@@ -382,30 +455,6 @@ of=/dev/sdb bs=1M</userinput></para>
</listitem>
</orderedlist>
</section>
-
- <section>
- <title>Using Windows</title>
-
- <para>You could try:</para>
-
- <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link></para>
-
- <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
-Disk Imager</link></para>
-
- <para/>
- </section>
</section>
</section>
-
- <section>
- <title>Mageia Installation</title>
-
- <para>This step is detailed in <link ns4:href="http://www.mageia.org/en/doc/">the
-Mageia documentation</link>.</para>
-
- <para>More information is available in <link
-ns4:href="https://wiki.mageia.org/en/Category:Documentation">the Mageia
-wiki</link>.</para>
- </section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/installer/pl/acceptLicense.xml b/docs/installer/pl/acceptLicense.xml
index 5cdcbded..622bfd5a 100644
--- a/docs/installer/pl/acceptLicense.xml
+++ b/docs/installer/pl/acceptLicense.xml
@@ -1,11 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="pl" xml:id="acceptLicense"
- 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="acceptLicense" version="5.0" xml:lang="pl">
@@ -41,9 +34,12 @@
<title xml:id="acceptLicense-ti1">Licencja oraz informacje o wydaniu</title>
</info>
- <mediaobject condition="expert">
-<imageobject> <imagedata align="center" fileref="dx2-license.png"
-format="PNG" revision="1" xml:id="acceptLicense-im1"/> </imageobject></mediaobject>
+ <mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="acceptLicense-im1"
+revision="4" align="center" format="PNG" fileref="dx2-license.png"/>
+</imageobject> <imageobject> <imagedata xml:id="acceptLicense-im2"
+revision="5" align="center" condition="live" format="PNG"
+fileref="live-license.png"/> </imageobject></mediaobject>
<section xml:id="license">
<info>
@@ -83,4 +79,4 @@ Release Notes</para>
<para>Aby zobaczyć co nowego w tym wydaniu <application>Mageia</application>,
Kliknij <guibutton>Informacje na temat wydania</guibutton>.</para>
</section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/installer/pl/addUser.xml b/docs/installer/pl/addUser.xml
index 7a7013e3..bea31dd0 100644
--- a/docs/installer/pl/addUser.xml
+++ b/docs/installer/pl/addUser.xml
@@ -1,5 +1,4 @@
-<?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="addUser" 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="addUser" version="5.0" xml:lang="pl">
<info>
<title xml:id="addUser-ti1">Zarządzanie użytkownikami</title>
</info>
@@ -15,10 +14,12 @@
+
+
-
- <mediaobject>
+
+ <mediaobject>
<!-- Started by marja,using Led43's text, on 2012 03 27 -->
<!-- NEEDS TO BE REVIEWED! -->
<!-- SimonNZG 2012-04-03 has taken a look but needs to come back -->
@@ -31,10 +32,11 @@
"rbash" in the xguest warning - is that correct? -->
<!-- JohnR 2012-04-19 Language proofreading -->
<!-- marja 2012-04-24 Added screenshot -->
-<!-- marja 2013-04-26 added new note -->
-<imageobject> <imagedata revision="1" fileref="dx2-setRootPassword.png"
-format="PNG" align="center" xml:id="setRootPassword-im1"></imagedata>
-</imageobject></mediaobject>
+<!-- marja 2013-04-26 added new note-->
+<imageobject condition="classical"> <imagedata revision="1" align="center"
+xml:id="setRootPassword-im1" fileref="dx2-setRootPassword.png"
+format="PNG"/> </imageobject> <imageobject> <imagedata format="PNG"
+fileref="live-user1.png"/> </imageobject></mediaobject>
<section xml:id="root-password">
<info>
@@ -85,7 +87,7 @@ ma znaczenie.</emphasis></para>
<listitem>
<para><guilabel>Hasło</guilabel>: W tym polu wpisz hasło użytkownika. Pojawi się w
nim ikonka tarczy, która oznacza siłę hasła (Zobacz również <xref
-linkend="givePassword"></xref>)</para>
+linkend="givePassword"/>)</para>
</listitem>
<listitem>
@@ -94,7 +96,7 @@ tym polu, instalator sprawdzi czy hasła się zgadzają.</para>
</listitem>
</itemizedlist>
- <note>
+ <note>
<para>Wszyscy użytkownicy, których dodasz podczas instalacji Magei, będą mieli
katalogi domowe (dostępne do odczytu dla każdego, ale do zapisu tylko dla
danego użytkownika)</para>
@@ -112,26 +114,26 @@ extra needed users in the <emphasis>Configuration - Summary</emphasis> step
during the install. Choose <emphasis>User management</emphasis>.</para>
<para>Ustawienia dostępu mogą być również zmienione po instalacji.</para>
- </note>
-
+ </note>
</section>
- <section xml:id="addUserAdvanced">
+ <section condition="classical" xml:id="addUserAdvanced">
<info>
<title xml:id="addUserAdvanced-ti3">Zaawansowane Zarządzanie Użytkownikami</title>
</info>
<para>Po kliknięciu na przycisk <guibutton>Zaawansowane</guibutton> będziesz miał
-możliwość edycji ustawień dla użytkownika którego dodajesz. Dodatkowo,
-możesz aktywować lub deaktywować konto gościa.</para>
+możliwość edycji ustawień dla użytkownika którego dodajesz.</para>
- <warning>
+ <para condition="classical">Additionally, you can disable or enable a guest account.</para>
+
+ <warning condition="classical">
<para>Wszystkie dane, które zapisze w swoim katalogu domowym gość zostaną
wykasowane po jego wylogowaniu. Gość musi zapisywać ważne pliki na USB.</para>
</warning>
<itemizedlist>
- <listitem>
+ <listitem condition="classical">
<para><guilabel>Aktywuj konto gościa</guilabel>: Tutaj aktywujesz lub deaktywujesz
konto gościa. Konto gościa pozwala na zalogowanie się i używanie komputera
przez gości, ale posiada mniejsze uprawnienia niż zwykły użytkownik.</para>
diff --git a/docs/installer/pl/ask_mntpoint_s.xml b/docs/installer/pl/ask_mntpoint_s.xml
index f09d580d..96481152 100644
--- a/docs/installer/pl/ask_mntpoint_s.xml
+++ b/docs/installer/pl/ask_mntpoint_s.xml
@@ -33,9 +33,12 @@
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> <imagedata revision="1" fileref="dx2-chooseMountpoints.png"
-align="center" format="PNG" xml:id="chooseMountPoints-im1"></imagedata>
-</imageobject></mediaobject>
+<imageobject condition='classical'> <imagedata revision="1"
+fileref="dx2-chooseMountpoints.png" align="center" format="PNG"
+xml:id="chooseMountPoints-im1"></imagedata> </imageobject> <imageobject
+condition='live'> <imagedata revision="1"
+fileref="live-chooseMountpoints.png" align="center" format="PNG"
+xml:id="live-chooseMountPoints-im1"></imagedata> </imageobject></mediaobject>
<para>Tutaj zobaczysz partycje Linux, które zostały znalezione na Twoim
komputerze. Jeśli nie zgadzasz się z sugestiami <application>instalatora
diff --git a/docs/installer/pl/bestTime.xml b/docs/installer/pl/bestTime.xml
new file mode 100644
index 00000000..b003640e
--- /dev/null
+++ b/docs/installer/pl/bestTime.xml
@@ -0,0 +1,21 @@
+<?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">
+ <info>
+ <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>In this step, you have to select on which time your internal clock is set,
+either local time or UTC time.</para>
+
+ <para>In advanced tab, you will find more options about clock settings.</para>
+</section>
diff --git a/docs/installer/pl/bootLive.xml b/docs/installer/pl/bootLive.xml
new file mode 100644
index 00000000..5bcda68c
--- /dev/null
+++ b/docs/installer/pl/bootLive.xml
@@ -0,0 +1,29 @@
+<?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">Boot Mageia as Live system</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Booting the medium</title></info><section><info><title xml:id="bootLive11-ti1">From a disc</title></info><para>You can boot directly from the media you used to burn your image (CD-ROM,
+DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the
+bootloader to launch the installation automatically after rebooting the
+computer. If that does not happen you may need to reconfigure your BIOS or
+press one key that will offer you to choose the peripheral from which the
+computer will boot.</para><para>According to which hardware you have, and how it is configured, you get
+either one or another of the two screens below.</para></section><section><info><title xml:id="bootLive12-ti1">From a USB device</title></info><para>You can boot from the USB device on which you dumped your image
+ISO. According to your BIOS settings, the computer boots perhaps directly on
+the USB device already plugged in a port. If that does not happen you may
+need to reconfigure your BIOS or press one key that will offer you to choose
+the peripheral from which the computer will boot.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>First screen while booting in BIOS mode</para></caption></mediaobject><para>In the middle menu, you have the choice between three actions:</para><itemizedlist><listitem><para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
+or USB stick) without writing anything on the disk, so expect a very slow
+system. Once the boot is done, you can proceed to the installation on a hard
+disk.</para></listitem><listitem><para>Install Mageia: This choice will directly install Mageia on a hard disk.</para></listitem><listitem><para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
+when no media (CD/DVD or USB stick) is connected. (not working with Mageia
+5).</para></listitem></itemizedlist><para>In the bottom menu, are the Boot Options:</para><itemizedlist><listitem><para>F1 - Help. Explain the options "splash", "apm", "acpi" and "Ide"</para></listitem><listitem><para>F2 - Language. Choose the display language of the screens.</para></listitem><listitem><para>F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
+the inserted installation medium. Here, select other sources, like FTP or
+NFS servers. If the installation is carried out in a network with an SLP
+server, select one of the installation sources available on the server with
+this option.</para></listitem><listitem><para>F5 - Driver. Yes or No. The system is aware about the presence of an
+optional disk with a driver update and will require its insertion during
+installation process.</para></listitem><listitem><para>F6 - Kernel options. This is a way to specify options according to your
+hardware and the drivers to use.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">In UEFI mode</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
+align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>First screen while booting on UEFI system from disk</para></caption></mediaobject><para>You have only the choice to run Mageia in Live mode (first choice) or to
+process the installation (second choice).</para><para>If you booted from a USB stick, you get two supplemental lines which are a
+duplicata of the previous lines suffixed with "USB". You have to choose
+them.</para><para>In each case, the first steps will be the same to choose language, timezone
+and keyboard, then the processes differ, with <link
+linkend="testing">additional steps in Live mode</link>.</para></section></section> \ No newline at end of file
diff --git a/docs/installer/pl/configureTimezoneUTC.xml b/docs/installer/pl/configureTimezoneUTC.xml
index d9aaffc6..df86f142 100644
--- a/docs/installer/pl/configureTimezoneUTC.xml
+++ b/docs/installer/pl/configureTimezoneUTC.xml
@@ -1,37 +1,29 @@
-<?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" version="5.0" xml:lang="pl" xml:id="configureTimezoneUTC">
+ <info>
+ <title xml:id="configureTimezoneUTC-ti6">Konfiguruj strefę czasową</title>
+ </info>
+
- <info>
- <title xml:id="configureTimezoneUTC-ti6">Konfiguruj strefę czasową</title>
- </info>
+
-
-
-
-<mediaobject>
+ <mediaobject>
<!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
<!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-configureTimezoneUTC.png"
-align="center" format="PNG" xml:id="configureTimezoneUTC-im1"></imagedata>
-</imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+xml:id="configureTimezoneUTC-im1" revision="1"
+fileref="dx2-configureTimezoneUTC.png" align="center" format="PNG"/>
+</imageobject> <imageobject> <imagedata fileref="live-timeZone.png"
+condition="live" format="PNG"/> </imageobject></mediaobject>
- <para revision="1" xml:id="configureTimezoneUTC-pa1">Wybierz swoją strefę czasową poprzez wybranie swojego kraju lub miasta w
+ <para revision="1" xml:id="configureTimezoneUTC-pa1">Wybierz swoją strefę czasową poprzez wybranie swojego kraju lub miasta w
pobliżu w tej samej strefie czasowej.</para>
- <para revision="1" xml:id="configureTimezoneUTC-pa2">In next screen you can choose to set your hardware clock to local time or to
+ <para revision="1" xml:id="configureTimezoneUTC-pa2">In next screen you can choose to set your hardware clock to local time or to
GMT, also known as UTC.</para>
- <note>
- <para revision="1" xml:id="configureTimezoneUTC-pa3">If you have more than one operating system on your computer, make sure they
+ <note>
+ <para revision="1" xml:id="configureTimezoneUTC-pa3">If you have more than one operating system on your computer, make sure they
are all set to local time, or all to UTC/GMT.</para>
- </note>
- </section>
-
+ </note>
+</section> \ No newline at end of file
diff --git a/docs/installer/pl/diskdrake.xml b/docs/installer/pl/diskdrake.xml
index 4c181da5..f9e6f109 100644
--- a/docs/installer/pl/diskdrake.xml
+++ b/docs/installer/pl/diskdrake.xml
@@ -29,8 +29,9 @@
</info>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-diskdrake.png" align="center"/>
-</imageobject></mediaobject>
+<imageobject condition='classical'> <imagedata fileref="dx2-diskdrake.png"
+align="center"/> </imageobject> <imageobject condition='live' > <imagedata
+fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
<warning>
<para revision="3" xml:id="diskdrake-pa1">Jeśli chcesz zaszyfrować swoją partycję <literal>/</literal> musisz się
@@ -66,5 +67,4 @@ System Partition) is present and correctly mounted on /boot/EFI (see above)</par
<para><mediaobject>
<imageobject> <imagedata fileref="dx2-diskdrake2.png"/> </imageobject></mediaobject></para>
</note>
-</section>
-
+</section> \ No newline at end of file
diff --git a/docs/installer/pl/doPartitionDisks.xml b/docs/installer/pl/doPartitionDisks.xml
index 7baa4641..cfec15f1 100644
--- a/docs/installer/pl/doPartitionDisks.xml
+++ b/docs/installer/pl/doPartitionDisks.xml
@@ -3,35 +3,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
<info>
- <!-- Started by marja on 2012 03 29 -->
-<!-- NEEDS TO BE WRITTEN AND THEN REVIEWED! -->
-<!-- JohnR 2012-04-10 - tidy up module formatting -->
-<!-- barjac 2012-04-20 Yes I agree with Lebarhon - reference to home partition removed -->
-<!-- Simonnzg - doing anything to a Windows partition is DANGEROUS. I would prefer
- if this was not an option, but... -->
-<!-- marja 2012-04-24 put the para xml id's back. -->
-<!-- marja 2012-04-29 changed text as discussed on the ml and with papoteur's approval
- lebarhon: 2012-08-18 warning added-->
-<!-- marja 2013-04-05 changed warning to text suggested by Dave Hodgings in bug 9594 -->
-<!-- marja 2013-04-05 adjusted last line of warning as suggested by obgr_seneca -->
-<!-- lebarhon 2013-04-11 adjusted last line of warning as suggested by Dave Hodgins/Marja-->
+ <!---->
+<!-- lebarhon 2015-07-03 Suggested updates for Mageia 5 -->
<title xml:id="doPartitionDisks-ti1">Partycjonowanie</title>
</info>
@@ -81,7 +55,7 @@ wskazane jest zrobienie kopii zapasowej ważnych plików.</para>
<para>With this option, the installer displays the remaining Windows partition in
light blue and the future Mageia partition in dark blue with their intended
sizes just under. You have the possibility to adapt these sizes by clicking
-and draging the gap between both partitions. See the screen-shot below.</para>
+and dragging the gap between both partitions. See the screen-shot below.</para>
<mediaobject>
<imageobject> <imagedata fileref="dx2-doPartitionDisks2.png"/>
@@ -98,7 +72,7 @@ and draging the gap between both partitions. See the screen-shot below.</para>
<para revision="1" xml:id="doPartitionDisks-pa15">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>
+ </itemizedlist><itemizedlist>
<listitem>
<para revision="1" xml:id="doPartitionDisks-pa16">Własne</para>
@@ -106,19 +80,59 @@ dysku dane, których nie chcesz stracić, nie używaj tej opcji.</para>
</listitem>
</itemizedlist></para>
+ <para><emphasis role="bold">Partitions sizing:</emphasis></para>
+
+ <para>The installer will share the available place out according to the following
+rules:</para>
+
+ <para><itemizedlist>
+ <listitem>
+ <para>If the total available place is lower than 50 GB, only one partition is
+created for /, there is no separate partition for /home.</para>
+ </listitem>
+
+ <listitem>
+ <para>If the total available place is over 50 GB, then three partitions are
+created</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>6/19 of the total available place is allocated to / with a maximum of 50 GB</para>
+ </listitem>
+
+ <listitem>
+ <para>1/19 is allocated to swap with a maximum of 4 GB</para>
+ </listitem>
+
+ <listitem>
+ <para>the rest (at least 12/19) is allocated to /home</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ </itemizedlist></para>
+
+ <para>That means that from 160 GB and over of available place, the installer will
+create three partitions: 50 GB for /, 4 GB for swap and the rest for /home.</para>
+
+ <note>
+ <para>If you are using an 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 "Custom" option is the only one that allows to check it has
+been correctly done</para>
+ </note>
+
<warning>
<para>Niektóre nowe dysku używają 4096 bitowych sektorów logicznych, zamiast
wcześniej standardowych 512 bitowych. Z powodu braku takiego sprzętu,
narzędzie do partycjonowania użyte w instalatorze nie zostało przetestowane
z takim dyskiem. Sugerujemy wcześniejsze przygotowanie takiego dysku, za
-pomocą innego narzędzia jak np. gparted. przy użyciu następujących ustawień: </para>
+pomocą innego narzędzia jak np. gparted. przy użyciu następujących ustawień:</para>
- <para>"Align to" "MiB" </para>
+ <para>"Align to" "MiB"</para>
- <para>"Free space preceding (MiB)" "2" </para>
+ <para>"Free space preceding (MiB)" "2"</para>
<para>Należy się także upewnić, aby wszystkie utworzone partycje miały parzystą
liczbę megabajtów.</para>
</warning>
-</section>
-
+</section> \ No newline at end of file
diff --git a/docs/installer/pl/formatPartitions.xml b/docs/installer/pl/formatPartitions.xml
index b5fe99f4..9317850d 100644
--- a/docs/installer/pl/formatPartitions.xml
+++ b/docs/installer/pl/formatPartitions.xml
@@ -19,9 +19,12 @@
<!-- NEEDS TO BE REVIEWED! -->
<!-- marja 2012-04-24 added screenshot -->
<!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject> <imagedata revision="1" fileref="dx2-formatPartitions.png"
-format="PNG" align="center" xml:id="formatPartitions-im1"> </imagedata>
-</imageobject></mediaobject>
+<imageobject condition='classical'> <imagedata revision="1"
+fileref="dx2-formatPartitions.png" format="PNG" align="center"
+xml:id="formatPartitions-im1"> </imagedata> </imageobject> <imageobject
+condition='live'> <imagedata revision="1"
+fileref="live-formatPartitions.png" format="PNG" align="center"
+xml:id="live-formatPartitions-im1"> </imagedata> </imageobject></mediaobject>
<para revision="2" xml:id="formatPartitions-pa1">Tutaj możesz wybrać, które partycje chcesz sformatować. Wszystkie dane na
partycjach <emphasis>nie</emphasis> zaznaczonych do formatowania zostaną
diff --git a/docs/installer/pl/login.xml b/docs/installer/pl/login.xml
new file mode 100644
index 00000000..e68bc6f3
--- /dev/null
+++ b/docs/installer/pl/login.xml
@@ -0,0 +1,6 @@
+<?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">Login screen</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM login screen</para></caption></mediaobject><para>Finally, you will come to the login screen.</para><para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE or GNOME desktop, depending on which live medium
+you used. You can now start using your Mageia installation.</para><para>You can find another part of our documentation in <link
+linkend="https://wiki.mageia.org/en/Category:Documentation">the Mageia
+wiki</link>.</para></section> \ No newline at end of file
diff --git a/docs/installer/pl/reboot.xml b/docs/installer/pl/reboot.xml
new file mode 100644
index 00000000..5b701755
--- /dev/null
+++ b/docs/installer/pl/reboot.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="reboot" 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="reboot-ti1">Reboot</title>
+ </info>
+
+ <mediaobject condition="live">
+<imageobject> <imagedata align="center" fileref="live-reboot.png"
+format="PNG" revision="1" xml:id="reboot-im1"/> </imageobject></mediaobject>
+
+ <para>Once the bootloader has been installed, you will be prompted to halt your
+computer, remove the live CD and restart the computer. When you restart, you
+will see a succession of download progress bars. These indicate that the
+software media are being downloaded (see Software management).</para>
+</section>
diff --git a/docs/installer/pl/selectKeyboardLive.xml b/docs/installer/pl/selectKeyboardLive.xml
new file mode 100644
index 00000000..cd9afd1c
--- /dev/null
+++ b/docs/installer/pl/selectKeyboardLive.xml
@@ -0,0 +1,14 @@
+<?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">
+ <info>
+ <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
diff --git a/docs/installer/pl/selectLanguage.xml b/docs/installer/pl/selectLanguage.xml
index a95519c7..6c521b2d 100644
--- a/docs/installer/pl/selectLanguage.xml
+++ b/docs/installer/pl/selectLanguage.xml
@@ -1,12 +1,4 @@
-<?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 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="selectLanguage" version="5.0" xml:lang="pl">
@@ -32,32 +24,35 @@
kontynentu. <application>Mageia</application> będzie używać wybranego języka
zarówno podczas instalacji jak i w zainstalowanym systemie.</para>
- <para>Jeśli potrzebujesz mieć kilka języków zainstalowanych w systemie, dla siebie
+ <para condition="classical">Jeśli potrzebujesz mieć kilka języków zainstalowanych w systemie, dla siebie
lub innych użytkowników, możesz użyć przycisku <guibutton>Więcej
języków</guibutton> aby je teraz dodać. </para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-selectLanguage.png" align="center"
-format="PNG" > </imagedata> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-language.png" format=""/>
+</imageobject></mediaobject>
- <warning>
+ <warning condition="classical">
<para>Nawet jeśli chcesz zainstalować więcej niż jeden język, musisz najpierw
wybrać jeden z nich jako domyślny w głównym oknie wyboru języka. Będzie on
również zaznaczony jako domyślny w oknie wyboru wielu języków.</para>
</warning>
<itemizedlist>
- <listitem>
+ <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>
</listitem>
<listitem>
- <para>Mageia używa domyślnie kodowania UTF-8 (Unikod). Jeśli wiesz, że to
-kodowanie nie jest odpowiednie dla twojego języka, możesz wyłączyć wsparcie
-dla UTF-8 w oknie "więcej języków". Będzie to dotyczyć wszystkich
-zainstalowanych języków.</para>
+ <para>Mageia uses UTF-8 (Unicode) support by default.</para>
+
+ <para condition="classical">Jeśli wiesz, że to kodowanie nie jest odpowiednie dla twojego języka, możesz
+wyłączyć wsparcie dla UTF-8 w oknie "więcej języków". Będzie to dotyczyć
+wszystkich zainstalowanych języków.</para>
</listitem>
<listitem>
@@ -65,4 +60,4 @@ zainstalowanych języków.</para>
Centrum Sterowania Mageia -> System -> Zarządzanie lokalizacją systemu</para>
</listitem>
</itemizedlist>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/installer/pl/setupBootloader.xml b/docs/installer/pl/setupBootloader.xml
index 993b1fa0..c34fce7d 100644
--- a/docs/installer/pl/setupBootloader.xml
+++ b/docs/installer/pl/setupBootloader.xml
@@ -1,94 +1,119 @@
<?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="setupBootloader">
- <info>
- <title xml:id="setupBootloader-ti1">Podstawowe opcje programu rozruchowego</title>
- </info>
+
- <mediaobject>
-<!-- 2012-08-12 Copied this page, setupBootloader.xml, from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.
+ <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-->
+<title xml:id="setupBootloader-ti1">Podstawowe opcje programu rozruchowego</title>
+ </info>
- 2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist-->
-<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
-format="PNG"/> </imageobject></mediaobject>
+ <mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="setupBootloader-im1"
+format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata
+xml:id="setupBootloader-im1" format="PNG" align="center" revision="1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
- <para><note>
- <para>With an UEFI system, the user interface is slightly different as you cannot
-choose the boot loader (first drop down list) since only one is available</para>
- </note></para>
+ <section>
+ <title>With a Bios system</title>
- <para xml:id="setupBootloader-pa1" revision="4">If you prefer different bootloader settings to those chosen automatically by
+ <para xml:id="setupBootloader-pa1" revision="4">If you prefer different bootloader settings to those chosen automatically by
the installer, you can change them here.</para>
- <para xml:id="setupBootloader-pa2" revision="4">You may already have another operating system on your machine, in which case
+ <para xml:id="setupBootloader-pa2" revision="4">You may already have another operating system on your machine, in which case
you need to decide whether to add Mageia to your existing bootloader, or
allow Mageia to create a new one.</para>
- <tip>
- <para revision="2" xml:id="setupBootloader-pa3">The Mageia graphical menus are nice :)</para>
- </tip>
+ <tip>
+ <para>The Mageia graphical menus are nice :</para>
+ </tip>
- <section xml:id="usingMageiaBootloader">
- <info>
- <title xml:id="usingMageiaBootloader-ti2">Using a Mageia bootloader</title>
- </info>
+ <section xml:id="usingMageiaBootloader">
+ <info>
+ <title xml:id="usingMageiaBootloader-ti2">Using a Mageia bootloader</title>
+ </info>
- <para revision="3" xml:id="setupBootloader-pa4">By default, Mageia writes a new GRUB (legacy) bootloader into the MBR
-(Master Boot Record) of your first hard drive. If you already have other
+ <para xml:id="setupBootloader-pa4" revision="3">By default, Mageia writes a new GRUB (legacy) bootloader into the MBR
+(Master Boot Record) of your first hard drive. If you already have other
operating systems installed, Mageia attempts to add them to your new Mageia
boot menu.</para>
- <para revision="3">Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB
+ <para revision="3">Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB
legacy and Lilo.</para>
- <warning>
- <para revision="3" xml:id="setupBootloader-pa6">Linux systems which use the GRUB2 bootloader are not currently supported by
-GRUB (legacy) and will not be recognised if the default GRUB bootloader is
+ <warning>
+ <para xml:id="setupBootloader-pa6" revision="3">Linux systems which use the GRUB2 bootloader are not currently supported by
+GRUB (legacy) and will not be recognized if the default GRUB bootloader is
used.</para>
- <para revision="3">The best solution here is to use the GRUB2 bootloader which is available at
+ <para revision="3">The best solution here is to use the GRUB2 bootloader which is available at
the Summary page during installation.</para>
- </warning>
- </section>
+ </warning>
+ </section>
- <section xml:id="usingExistingBootloader">
- <info>
- <title revision="2" xml:id="usingExistingBootloader-ti4">Using an existing bootloader</title>
- </info>
+ <section xml:id="usingExistingBootloader">
+ <info>
+ <title xml:id="usingExistingBootloader-ti4" revision="2">Using an existing bootloader</title>
+ </info>
- <para revision="3" xml:id="setupBootloader-pa46">If you decide to use an existing bootloader then you will need to remember
+ <para xml:id="setupBootloader-pa46" revision="3">If you decide to use an existing bootloader then you will need to remember
to STOP at the summary page during the installation and click the Bootloader
<guibutton>Configure</guibutton> button, which will allow you to change the
bootloader install location.</para>
- <para revision="1" xml:id="setupBootloader-pa47">Do not select a device e.g."sda", or you will overwrite your existing
+ <para xml:id="setupBootloader-pa47" revision="1">Do not select a device e.g."sda", or you will overwrite your existing
MBR. You must select the root partition that you chose during the
-partitioning phase earlier, e.g. sda7.</para>
+partitioning phase earlier, e.g. sda7.</para>
- <para xml:id="setupBootloader-pa48" revision="1">To be clear, sda is a device, sda7 is a partition on that device.</para>
+ <para xml:id="setupBootloader-pa48" revision="1">To be clear, sda is a device, sda7 is a partition on that device.</para>
- <tip>
- <para revision="1" xml:id="setupBootloader-pa48a">Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where
+ <tip>
+ <para revision="1" xml:id="setupBootloader-pa48a">Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where
your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to
the installer screen.</para>
- </tip>
+ </tip>
- <para revision="2" xml:id="setupBootloader-pa49">The exact procedure for adding your Mageia system to an existing bootloader
+ <para xml:id="setupBootloader-pa49" revision="2">The exact procedure for adding your Mageia system to an existing bootloader
is beyond the scope of this help, 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>
- <section xml:id="advancedOptionBootloader">
- <info>
- <title revision="2" xml:id="advancedOptionBootloader-ti5">Bootloader advanced option</title>
- </info>
+ <section xml:id="advancedOptionBootloader">
+ <info>
+ <title xml:id="advancedOptionBootloader-ti5" revision="2">Bootloader advanced option</title>
+ </info>
- <para revision="3" xml:id="setupBootloader-pa52">If you have very limited disk space for the <literal>/</literal> partition
+ <para xml:id="setupBootloader-pa52" revision="3">If you have very limited disk space for the <literal>/</literal> partition
that contains <literal>/tmp</literal>, click on
<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /tmp
at each boot</guilabel>. This helps to maintain some free space.</para>
+ </section>
+ </section>
+
+ <section>
+ <title>With an UEFI system</title>
+
+ <para>With an UEFI system, the user interface is slightly different as you cannot
+choose the boot loader since only Grub2-efi is available. </para>
+
+ <mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader2.png"/>
+</imageobject></mediaobject>
+
+ <para>If Mageia is the first system installed on your computer, the installer
+created an ESP (EFI System Partition) to receive the bootloader
+(Grub2-efi). If there was already UEFI operating systems previously
+installed on your computer (Windows 8 for example), the Mageia installer
+detected the existing ESP created by Windows and added grub2-efi. Although
+it is possible to have several ESPs, only one is advised and enough whatever
+the number of operating systems you have.</para>
+
+ <para>Don't modify the "Boot Device" unless really knowing what you do.</para>
</section>
</section> \ No newline at end of file
diff --git a/docs/installer/pl/setupBootloaderAddEntry.xml b/docs/installer/pl/setupBootloaderAddEntry.xml
index 09c709f0..09cd3d1a 100644
--- a/docs/installer/pl/setupBootloaderAddEntry.xml
+++ b/docs/installer/pl/setupBootloaderAddEntry.xml
@@ -1,39 +1,68 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" 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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pl" xml:id="setupBootloaderAddEntry">
+
+
<info>
- <title xml:id="setupBootloaderAddEntry-ti1">Add or Modify a Boot Menu Entry</title>
+ <!--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-->
+<title xml:id="setupBootloaderAddEntry-ti1">Add or Modify a Boot Menu Entry</title>
</info>
<mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
-xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="dx2-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="live-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject></mediaobject>
+
+ <section>
+ <title>With a Bios system</title>
- <para>You can add an entry or modify the one you select first, by pressing the
+ <para>You can add an entry or modify the one you select first, by pressing the
relevant button in the <emphasis>Bootloader Configuration</emphasis> screen
and editing the screen that pops up on top of it.</para>
- <note>
- <para>If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for
-UEFI systems, you cannot use this tool to edit entries at this step, press
-'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use
-<code>grub-customizer</code> instead.</para>
- </note>
+ <note>
+ <para>If you have chosen <code>Grub 2</code> as your bootloader, you cannot use
+this tool to edit entries at this step, press 'Next'. You need to manually
+edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code>
+instead.</para>
+ </note>
- <mediaobject>
-<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
-align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+ <mediaobject>
+<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1"
+align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
</imageobject></mediaobject>
- <para>Some things that can be done without any risk, are changing the label of an
+ <para>Some things that can be done without any risk, are changing the label of an
entry and ticking the box to make an entry the default one.</para>
- <para>You can add the proper version number of an entry, or rename it completely.</para>
+ <para>You can add the proper version number of an entry, or rename it completely.</para>
- <para>The default entry is the one the systems boots into if you don't make a
+ <para>The default entry is the one the systems boots into if you don't make a
choice while booting up.</para>
- <warning>
- <para>Editing other things can leave you with an unbootable system. Please don't
+ <warning>
+ <para>Editing other things can leave you with an unbootable system. Please don't
just try something without knowing what you are doing.</para>
- </warning>
+ </warning>
+ </section>
+
+ <section>
+ <title>With an UEFI system</title>
+
+ <para>In this case you are using Grub2-efi and you cannot use this tool to edit
+entries at this step. To do that you need to manually edit
+<code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code>
+instead. All you can do here, is to choose the default entry in the drop
+down list.</para>
+
+ <para>After a click on the <guibutton>Next</guibutton> button, another drop down
+list allows to choose the video resolution for Grub2 which is a graphical
+boot loader.</para>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="dx2-bootloaderConfiguration2.png"/>
+</imageobject></mediaobject>
+ </section>
</section> \ No newline at end of file
diff --git a/docs/installer/pl/takeOverHdConfirm.xml b/docs/installer/pl/takeOverHdConfirm.xml
index 3cb5d5e3..d73d9ea0 100644
--- a/docs/installer/pl/takeOverHdConfirm.xml
+++ b/docs/installer/pl/takeOverHdConfirm.xml
@@ -12,15 +12,18 @@
-<mediaobject>
+ <mediaobject>
<!-- Made by marja on 2012 04 03 -->
<!-- test comment - johnr -->
<!-- 2012-04-24 marja - replaced "if you are not sure you selected the correct
hard disk." with "if you are not sure about your choice", because I'm sure I
saw this help screen when I had only one HD -->
<!-- 2013-05-05 marja added screenshot -->
-<imageobject> <imagedata fileref="dx2-takeOverHdConfirm.png" format="PNG"
-align="center" ></imagedata> </imageobject></mediaobject>
+<imageobject condition='live'> <imagedata
+fileref="live-takeOverHdConfirm.png" format="PNG" align="center"
+></imagedata> </imageobject> <imageobject condition='classical'> <imagedata
+fileref="dx2-takeOverHdConfirm.png" format="PNG" align="center"
+></imagedata> </imageobject></mediaobject>
<para revision="1" xml:id="takeOverHdConfirm-pa1">Kliknij <guibutton>Wstecz</guibutton> jeśli nie jesteś pewien swojego
wyboru.</para>
diff --git a/docs/installer/pl/testing.xml b/docs/installer/pl/testing.xml
new file mode 100644
index 00000000..e94343aa
--- /dev/null
+++ b/docs/installer/pl/testing.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="testing" xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns="http://docbook.org/ns/docbook">
+ <info>
+ <title xml:id="testing-ti1">Testing Mageia as Live system</title>
+ </info>
+
+ <section xml:id="testing-1">
+ <info>
+ <title xml:id="testing1-ti1">Live mode</title>
+ </info>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
+
+ <para>You get this screen if you selected "Boot Mageia". If not, you get the
+"<link linkend="doPartitionDisks">Partitioning</link> step"</para>
+
+ <section>
+ <info>
+ <title xml:id="testing2-ti1">Testing hardware</title>
+ </info>
+
+ <para>One of the Live mode goals is to test if the hardware is correctly managed
+by Mageia. You can check if all devices have a driver in the Hardware
+section of the Mageia Control Center. You can test the most current devices:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>network interface: configure it with net_applet</para>
+ </listitem>
+
+ <listitem>
+ <para>graphical card: if you see the previous screen, it's already OK.</para>
+ </listitem>
+
+ <listitem>
+ <para>webcam:</para>
+ </listitem>
+
+ <listitem>
+ <para>sound: a jingle has already been played</para>
+ </listitem>
+
+ <listitem>
+ <para>printer: configure it and print a test page</para>
+ </listitem>
+
+ <listitem>
+ <para>scanner: scan a document from ...</para>
+ </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>
+
+ <remark>The configuration settings you made here are kept for the installation.</remark>
+ </section>
+
+ <section>
+ <info>
+ <title xml:id="testing3-ti1">Launch installation</title>
+ </info>
+
+ <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/installer/pl/uninstall-Mageia.xml b/docs/installer/pl/uninstall-Mageia.xml
index 4d8b27e6..19b9680e 100644
--- a/docs/installer/pl/uninstall-Mageia.xml
+++ b/docs/installer/pl/uninstall-Mageia.xml
@@ -1,5 +1,5 @@
<?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="uninstall-Mageia">
- <!-- -->
+ <!--Lebarhon 2015-07-06 Not true with UEFI -->
<info>
<title xml:id="uninstall-Mageia-ti1">Uninstalling Mageia</title>
</info>
diff --git a/docs/installer/pl/unused.xml b/docs/installer/pl/unused.xml
new file mode 100644
index 00000000..48a62ede
--- /dev/null
+++ b/docs/installer/pl/unused.xml
@@ -0,0 +1,27 @@
+<?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">
+ <info>
+ <title xml:id="unused-ti1">Keep or delete unused material</title>
+ </info>
+
+ <mediaobject condition="live">
+<imageobject> <imagedata align="center" fileref="live-unused.png"
+format="PNG" revision="1" xml:id="unused-im1"/> </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>
+
+ <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>
+</section>
diff --git a/docs/installer/pt_BR/bootLive.xml b/docs/installer/pt_BR/bootLive.xml
index 00f53df1..3735e150 100644
--- a/docs/installer/pt_BR/bootLive.xml
+++ b/docs/installer/pt_BR/bootLive.xml
@@ -1,138 +1,32 @@
-<?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="bootLive" version="5.0" xml:lang="pt_BR">
- <info>
- <title xml:id="bootLive-ti1">Boot no sistema Live Mageia</title>
- </info>
-
- <section xml:id="bootLive-1">
- <info>
- <title xml:id="bootLive1-ti1">Iniciando os meios</title>
- </info>
-
- <section>
- <info>
- <title xml:id="bootLive11-ti1">A partir de um disco</title>
- </info>
-
- <para>Você pode iniciar diretamente a partir da mídia que usou para queimar sua
+<?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="pt_BR"><info><title xml:id="bootLive-ti1">Boot no sistema Live Mageia</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Iniciando os meios</title></info><section><info><title xml:id="bootLive11-ti1">A partir de um disco</title></info><para>Você pode iniciar diretamente a partir da mídia que usou para queimar sua
imagem (CD-ROM, DVD-ROM ...). Você normalmente só precisa inseri-lo na
unidade de CD/DVD para o bootloader para iniciar a instalação
automaticamente após a reinicialização do computador. Se isso não acontecer
pode ser necessário reconfigurar o sua BIOS ou pressionar uma chave que irá
oferecer-lhe para escolher o periférico a partir do qual o computador irá
-arrancar.</para>
-
- <para>De acordo com o hardware que você tem, e como ele está configurado, você
-verá uma das duas telas abaixo.</para>
- </section>
-
- <section>
- <info>
- <title xml:id="bootLive12-ti1">A partir de um dispositivo USB</title>
- </info>
-
- <para>Você pode iniciar a partir do dispositivo USB no qual você colocou sua
+arrancar.</para><para>De acordo com o hardware que você tem, e como ele está configurado, você
+verá uma das duas telas abaixo.</para></section><section><info><title xml:id="bootLive12-ti1">A partir de um dispositivo USB</title></info><para>Você pode iniciar a partir do dispositivo USB no qual você colocou sua
imagem ISO. De acordo com as definições da BIOS, o computador provavelmente
inicializará diretamente pelo dispositivo USB já conectado em uma porta. Se
isso não acontecer pode ser necessário reconfigurar a sua BIOS ou pressionar
uma tecla que irá oferecer-lhe opções para escolher o dispositivo a partir
-do qual o computador irá iniciar.</para>
- </section>
- </section>
-
- <section xml:id="biosmode">
- <info>
- <title xml:id="biosmode-ti1">No modo BIOS/CSM/Legacy</title>
- </info>
-
- <mediaobject>
- <imageobject> <imagedata fileref="live-bootCSM.png"/> </imageobject>
-
- <caption>
- <para>Primeira tela durante a inicialização no modo BIOS</para>
- </caption>
- </mediaobject>
-
- <para>No menu central, você tem a escolha entre três ações:</para>
-
- <itemizedlist>
- <listitem>
- <para>Inicialização Mageia: Isso significa que Mageia 5 vai começar a partir da
+do qual o computador irá iniciar.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">No modo BIOS/CSM/Legacy</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Primeira tela durante a inicialização no modo BIOS</para></caption></mediaobject><para>No menu central, você tem a escolha entre três ações:</para><itemizedlist><listitem><para>Inicialização Mageia: Isso significa que Mageia 5 vai começar a partir da
mídia conectada (CD/ DVD ou dispositivo USB) sem gravar nada no disco, por
isso esperamos um sistema muito lento. Uma vez que a inicialização for
-feita, você pode ir para a instalação em um disco rígido.</para>
- </listitem>
-
- <listitem>
- <para>Instalar Mageia: Esta opção irá instalar Mageia diretamente em um disco
-rígido.</para>
- </listitem>
-
- <listitem>
- <para>Inicialização do disco rígido: Esta opção permite inicializar a partir de
+feita, você pode ir para a instalação em um disco rígido.</para></listitem><listitem><para>Instalar Mageia: Esta opção irá instalar Mageia diretamente em um disco
+rígido.</para></listitem><listitem><para>Inicialização do disco rígido: Esta opção permite inicializar a partir de
disco rígido, como de costume, quando não há mídia (CD/DVD ou dispositivo
-USB) ligado. (Não funciona com Mageia 5).</para>
- </listitem>
- </itemizedlist>
-
- <para>No menu inferior estão as opções de inicialização:</para>
-
- <itemizedlist>
- <listitem>
- <para>F1 - Ajuda. Explicar as opções "splash", "APM", "ACPI" e "Ide"</para>
- </listitem>
-
- <listitem>
- <para>F2 - Linguagem. Escolha o idioma das telas de exibição.</para>
- </listitem>
-
- <listitem>
- <para>F3 - Resolução da tela. Escolha entre texto, 640x400, 800x600, 1024x728</para>
- </listitem>
-
- <listitem>
- <para>F4 - CD-Rom. CD-ROM ou outro. Normalmente, a instalação é executada a partir
+USB) ligado. (Não funciona com Mageia 5).</para></listitem></itemizedlist><para>No menu inferior estão as opções de inicialização:</para><itemizedlist><listitem><para>F1 - Ajuda. Explicar as opções "splash", "APM", "ACPI" e "Ide"</para></listitem><listitem><para>F2 - Linguagem. Escolha o idioma das telas de exibição.</para></listitem><listitem><para>F3 - Resolução da tela. Escolha entre texto, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-ROM ou outro. Normalmente, a instalação é executada a partir
da mídia de instalação inserida. Aqui, selecione outras fontes, como
servidores FTP ou NFS. Se a instalação for realizada em uma rede com um
servidor SLP, selecione uma das fontes de instalação disponíveis no servidor
-com esta opção.</para>
- </listitem>
-
- <listitem>
- <para>F5 - Driver. Sim ou Não. O sistema tem conhecimento sobre a presença de um
+com esta opção.</para></listitem><listitem><para>F5 - Driver. Sim ou Não. O sistema tem conhecimento sobre a presença de um
disco óptico com uma atualização do driver e irá requerer a sua inserção
-durante o processo de instalação.</para>
- </listitem>
-
- <listitem>
- <para>F6 - opções de kernel. Esta é uma maneira para especificar as opções de
-acordo com o seu hardware e os drivers para usar.</para>
- </listitem>
- </itemizedlist>
- </section>
-
- <section xml:id="uefimode">
- <info>
- <title xml:id="uefimode-ti1">No modo UEFI</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center"
-fileref="live-bootUEFI.png" format="PNG" xml:id="bootUEFI-im1"/>
-</imageobject>
-
- <caption>
- <para>Primeira tela durante a inicialização do sistema UEFI a partir do disco</para>
- </caption>
- </mediaobject>
-
- <para>Você só tem a opção de executar Mageia no modo Live (primeira escolha) ou
-para processar a instalação (segunda opção).</para>
- <para>Se você inicializou a partir de um pen drive USB, você tem duas linhas
+durante o processo de instalação.</para></listitem><listitem><para>F6 - opções de kernel. Esta é uma maneira para especificar as opções de
+acordo com o seu hardware e os drivers para usar.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">No modo 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>Primeira tela durante a inicialização do sistema UEFI a partir do disco</para></caption></mediaobject><para>Você só tem a opção de executar Mageia no modo Live (primeira escolha) ou
+para processar a instalação (segunda opção).</para><para>Se você inicializou a partir de um pen drive USB, você tem duas linhas
complementares que são uma cópia das linhas anteriores seguido de
-"USB". Você tem que escolhê-los.</para>
-
- <para>Em cada caso, os primeiros passos serão os mesmos para escolher o idioma,
+"USB". Você tem que escolhê-los.</para><para>Em cada caso, os primeiros passos serão os mesmos para escolher o idioma,
fuso horário e teclado, em seguida, os processos diferem, com <link
-linkend="testing"> passos adicionais no modo Live </link>.</para>
- </section>
-</section> \ No newline at end of file
+linkend="testing"> passos adicionais no modo Live </link>.</para></section></section> \ No newline at end of file
diff --git a/docs/installer/pt_BR/login.xml b/docs/installer/pt_BR/login.xml
index 1f23e2c6..f2815f21 100644
--- a/docs/installer/pt_BR/login.xml
+++ b/docs/installer/pt_BR/login.xml
@@ -1,24 +1,6 @@
-<?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="login" version="5.0" xml:lang="pt_BR">
- <info>
- <title xml:id="label-to-adapt-ti1">Tela de Login</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center" xml:id="login-im1"
-format="PNG" fileref="live-login.png"/> </imageobject>
-
- <caption>
- <para>KDM login screen</para>
- </caption>
- </mediaobject>
-
- <para>Finalmente, você chegará à tela de login.</para>
-
- <para>Digite seu nome de usuário e senha, e em poucos segundos você estará com o
+<?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="pt_BR"><info><title xml:id="label-to-adapt-ti1">Tela de Login</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM login screen</para></caption></mediaobject><para>Finalmente, você chegará à tela de login.</para><para>Digite seu nome de usuário e senha, e em poucos segundos você estará com o
ambiente de trabalho KDE ou GNOME carregado, dependendo de qual Mídia você
-usou. Agora você pode começar a usar a sua instalação Mageia.</para>
-
- <para>Você pode encontrar outra parte de nossa documentação em <link
+usou. Agora você pode começar a usar a sua instalação Mageia.</para><para>Você pode encontrar outra parte de nossa documentação em <link
linkend="https://wiki.mageia.org/en/Category:Documentation">o wiki
-Mageia</link>.</para>
-</section> \ No newline at end of file
+Mageia</link>.</para></section> \ No newline at end of file
diff --git a/docs/installer/pt_BR/setupBootloader.xml b/docs/installer/pt_BR/setupBootloader.xml
index b54b6e7e..eed6af00 100644
--- a/docs/installer/pt_BR/setupBootloader.xml
+++ b/docs/installer/pt_BR/setupBootloader.xml
@@ -10,9 +10,11 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
-format="PNG"/> </imageobject> </mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="setupBootloader-im1"
+format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata
+xml:id="setupBootloader-im1" format="PNG" align="center" revision="1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<section>
<title>Com um sistema Bios</title>
@@ -34,7 +36,7 @@ inicialização existente, ou permitir que a Mageia crie um novo.</para>
<title xml:id="usingMageiaBootloader-ti2">Usando o Gerenciador de Inicialização da Mageia</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa4">Por padrão, Mageia grava um novo bootloader (legado) de GRUB no MBR (Master
+ <para xml:id="setupBootloader-pa4" revision="3">Por padrão, Mageia grava um novo bootloader (legado) de GRUB no MBR (Master
Boot Record) do seu disco rígido primeiro. Se você já tem outros sistemas
operacionais instalados, a Mageia tenta adicioná-los ao seu novo menu de
inicialização do Mageia.</para>
@@ -43,7 +45,7 @@ inicialização do Mageia.</para>
opcional, em adição ao GRUB original e Lilo.</para>
<warning>
- <para revision="3" xml:id="setupBootloader-pa6">Sistemas Linux que utilizam o bootloader do GRUB2 não são atualmente
+ <para xml:id="setupBootloader-pa6" revision="3">Sistemas Linux que utilizam o bootloader do GRUB2 não são atualmente
suportados pelo GRUB (legado) e não serão reconhecidos se o bootloader GRUB
padrão é usado.</para>
@@ -54,16 +56,16 @@ que está disponível na página de resumo durante a instalação.</para>
<section xml:id="usingExistingBootloader">
<info>
- <title revision="2" xml:id="usingExistingBootloader-ti4">Usando um Gerenciador de Inicialização existente</title>
+ <title xml:id="usingExistingBootloader-ti4" revision="2">Usando um Gerenciador de Inicialização existente</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa46">Se você decidir usar um Gerenciador de Inicialização existente, então você
+ <para xml:id="setupBootloader-pa46" revision="3">Se você decidir usar um Gerenciador de Inicialização existente, então você
precisa se lembrar de PARAR na página de resumo durante a instalação e
clicar no botão <guibutton>Configurar</guibutton> "Gerenciador de
Inicialização", o que permitirá que você mude o local de instalação do
Gerenciador de Inicialização.</para>
- <para revision="1" xml:id="setupBootloader-pa47">Não selecione um dispositivo e.g."sda", ou você irá sobrescrever sua MBR
+ <para xml:id="setupBootloader-pa47" revision="1">Não selecione um dispositivo e.g."sda", ou você irá sobrescrever sua MBR
existente. Você deve selecionar a partição raiz que você escolheu durante a
fase de particionamento mais cedo, por exemplo, sda7.</para>
@@ -75,7 +77,7 @@ onde a partição <literal>/</literal> (raiz) está. Ctrl+Alt+F7 leva você de
volta para a tela do instalador.</para>
</tip>
- <para revision="2" xml:id="setupBootloader-pa49">O procedimento exato para adicionar o seu sistema Mageia ao Gerenciador de
+ <para xml:id="setupBootloader-pa49" revision="2">O procedimento exato para adicionar o seu sistema Mageia ao Gerenciador de
Inicialização existente, está além do escopo desta ajuda, no entanto, na
maioria dos casos irá envolver a execução adequado de um programa de
instalação do Gerenciador de Inicialização, que deve detectá-lo e
@@ -85,10 +87,10 @@ operacional em questão.</para>
<section xml:id="advancedOptionBootloader">
<info>
- <title revision="2" xml:id="advancedOptionBootloader-ti5">Opções Avançadas do Gerenciador de Inicialização</title>
+ <title xml:id="advancedOptionBootloader-ti5" revision="2">Opções Avançadas do Gerenciador de Inicialização</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa52">Se você tiver espaço em disco muito limitado para a partição
+ <para xml:id="setupBootloader-pa52" revision="3">Se você tiver espaço em disco muito limitado para a partição
<literal>/</literal> (raiz) que contém <literal>/tmp</literal>, clique em
<guibutton>Avançado</guibutton> e marque a caixa <guilabel>Limpar /tmp a
cada inicialização</guilabel>. Isto ajuda a obter algum espaço livre
@@ -104,7 +106,10 @@ não pode escolher o gestor de arranque uma vez apenas Grub2-efi está
disponível. </para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader2.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader2.png"/>
+</imageobject></mediaobject>
<para>Se a Mageia é o primeiro sistema instalado no seu computador, o instalador
criou um ESP (partição de sistema EFI) para receber o bootloader
diff --git a/docs/installer/pt_BR/setupBootloaderAddEntry.xml b/docs/installer/pt_BR/setupBootloaderAddEntry.xml
index 08c3c42d..f60f6379 100644
--- a/docs/installer/pt_BR/setupBootloaderAddEntry.xml
+++ b/docs/installer/pt_BR/setupBootloaderAddEntry.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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="pt_BR">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pt_BR" xml:id="setupBootloaderAddEntry">
<info>
@@ -7,9 +7,13 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
-xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="dx2-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="live-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject></mediaobject>
<section>
<title>Com um sistema Bios</title>
@@ -27,8 +31,8 @@ seu lugar.</para>
</note>
<mediaobject>
-<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
-align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1"
+align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
</imageobject></mediaobject>
<para>Algumas coisas que podem ser feitas sem qualquer risco são, mudar o rótulo
diff --git a/docs/installer/pt_BR/unused.xml b/docs/installer/pt_BR/unused.xml
index bbda7e46..c5a9d21d 100644
--- a/docs/installer/pt_BR/unused.xml
+++ b/docs/installer/pt_BR/unused.xml
@@ -19,7 +19,7 @@ recomendado aceitar, exceto se você preparar uma instalação que tem de ser
executado em hardware diferente.</para>
<mediaobject>
-<imageobject> <imagedata fileref="live-unused-InstallationProgress.png"/>
+<imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
</imageobject></mediaobject>
<para>O próximo passo é a cópia de arquivos no disco rígido. Isso leva alguns
diff --git a/docs/installer/ro/DrakLive-cover.xml b/docs/installer/ro/DrakLive-cover.xml
new file mode 100644
index 00000000..f66c2478
--- /dev/null
+++ b/docs/installer/ro/DrakLive-cover.xml
@@ -0,0 +1,77 @@
+<?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="ro" xml:id="Quick-Startup">
+ <info>
+ <title>Installation from LIVE medium</title>
+ <publisher> <publishername>Mageia.org</publishername> </publisher>
+ <revhistory>
+ <revision>
+ <date>January 2015</date>
+ <revremark>Mageia 5</revremark>
+ </revision>
+ </revhistory>
+ <cover>
+ <para role="tagline">Documentația oficială pentru Mageia</para>
+ <mediaobject>
+<imageobject> <imagedata fileref="mageia-2013.png"/> </imageobject></mediaobject>
+ <para>Textele și capturile de ecran din acest manual sînt disponibile sub licența
+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>Acest manual a fost produs cu ajutorul <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> dezvoltat de <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.
+ </para>
+ <para>A fost scris de voluntari în timpul lor liber. Dacă doriți să ajutați la
+îmbunătățirea acestui manual, vă rugăm să contactați <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">echipa de
+documentație</link>.</para>
+ </cover>
+ </info>
+ <article>
+ <title>Installation from LIVE medium</title>
+ <para><note>
+ <para>Ecranele care urmează să le vedeți pe parcursul instalării sînt în funcție
+de componentele voastre materiale și de alegerile făcute în timpul
+instalării.</para>
+ </note></para>
+ <xi:include href="SelectAndUseISOs2.xml"/>
+
+ <xi:include href="bootLive.xml"/>
+
+ <xi:include href="selectLanguage.xml"/>
+
+ <xi:include href="acceptLicense.xml"/>
+
+ <xi:include href="configureTimezoneUTC.xml"/>
+
+ <xi:include href="bestTime.xml"/>
+
+ <xi:include href="selectKeyboardLive.xml"/>
+
+ <xi:include href="testing.xml"/>
+
+ <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"/>
+
+ <xi:include href="unused.xml"/>
+
+ <xi:include href="setupBootloader.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>
+</book> \ No newline at end of file
diff --git a/docs/installer/ro/DrakLive.xml b/docs/installer/ro/DrakLive.xml
new file mode 100644
index 00000000..fc50cc08
--- /dev/null
+++ b/docs/installer/ro/DrakLive.xml
@@ -0,0 +1,66 @@
+<?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="ro" xml:id="Quick-Startup">
+ <info>
+ <title>Installation from LIVE medium</title>
+
+ <cover>
+ <para><note>
+ <para>Ecranele care urmează să le vedeți pe parcursul instalării sînt în funcție
+de componentele voastre materiale și de alegerile făcute în timpul
+instalării.</para>
+ </note></para>
+
+ <para xml:id="CC_BY-SA">Textele și capturile de ecran din acest manual sînt disponibile sub licența
+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>Acest manual a fost produs cu ajutorul <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> dezvoltat de <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+ <para>A fost scris de voluntari în timpul lor liber. Dacă doriți să ajutați la
+îmbunătățirea acestui manual, vă rugăm să contactați <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">echipa de
+documentație</link>.</para>
+ </cover>
+ </info>
+
+ <xi:include href="SelectAndUseISOs2.xml"/>
+
+ <xi:include href="bootLive.xml"/>
+
+ <xi:include href="selectLanguage.xml"/>
+
+ <xi:include href="acceptLicense.xml"/>
+
+ <xi:include href="configureTimezoneUTC.xml"/>
+
+ <xi:include href="bestTime.xml"/>
+
+ <xi:include href="selectKeyboardLive.xml"/>
+
+ <xi:include href="testing.xml"/>
+
+ <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"/>
+
+ <xi:include href="unused.xml"/>
+
+ <xi:include href="setupBootloader.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
diff --git a/docs/installer/ro/SelectAndUseISOs2.xml b/docs/installer/ro/SelectAndUseISOs2.xml
index 35b3e256..7ea14144 100644
--- a/docs/installer/ro/SelectAndUseISOs2.xml
+++ b/docs/installer/ro/SelectAndUseISOs2.xml
@@ -7,6 +7,32 @@
</info>
<section>
+ <title>Introduction</title>
+
+ <para>Mageia is distributed via ISO images. This page will help you to choose
+which image match your needs.</para>
+
+ <para>There is two families of media:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Classical installer: After booting the media, it will follow a process
+allowing to choose what to install and how to configure your target
+system. This give you the maximal flexibility for a customized installation,
+in particular to choose which Desktop Environment you will install.</para>
+ </listitem>
+
+ <listitem>
+ <para>LIVE media: you can boot the media in a real Mageia system without
+installing it, to see what you will get after installation. The
+installation process is simpler, but you get lesser choices.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>Details are given in the next sections.</para>
+ </section>
+
+ <section>
<title>Medii</title>
<section>
@@ -262,13 +288,9 @@ este prea lentă. Dacă alegeți HTTP, puteți vedea și ceva de genul</para>
<mediaobject>
<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
- <para>md5sum și sha1sum sînt utilitare pentru a verifica integritatea fișierului
-ISO. Utilizați doar unul din ele. Ambele numere hexazecimale au fost
-calculate de un algoritm cu fișierul ce va fi descărcat. Dacă îi cereți din
-nou algoritmului să calculeze acest număr din fișierul pe care l-ați
-descărcat, ori obțineți același număr și descărcarea s-a efectuat corect,
-ori numărul este diferit și ați întîlnit un eșec. În caz de eșec trebuie să
-încercați să-l mai descărcați odată. Apoi va apărea această fereastră:</para>
+ <para>md5sum and sha1sum are tools to check the ISO integrity. Use only one of
+them. Keep one of them <link linkend="integrity">for further
+usage</link>. Then this window appears:</para>
<mediaobject>
<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
@@ -277,7 +299,13 @@ ori numărul este diferit și ați întîlnit un eșec. În caz de eșec trebuie
</section>
<section>
- <title>Se verifică integritatea mediului descărcat</title>
+ <title xml:id="integrity">Se verifică integritatea mediului descărcat</title>
+
+ <para>Both checksums are hexadecimal numbers calculated by an algorithm from the
+file to be downloaded. When you ask these algorithms to recalculate this
+number from your downloaded file, either you have the same number and your
+downloaded file is correct, or the number is different and you have a
+failure. A failure infers that you should retry the download.</para>
<para>Deschideți o consolă, trebuie să fiți root, și:</para>
@@ -327,13 +355,35 @@ sistem de fișiere aflat înainte pe acel dispozitiv; toate datele vor fi
pierdute și capacitatea partiției va fi redusă la mărimea fișierului ISO.</para>
</warning>
- <para>Pentru a recupera capacitatea inițială va trebui să reformatați cheia USB.</para>
+ <para>To recover the original capacity, you must redo partitioning and re-format
+the USB stick.</para>
<section>
- <title>Utilizînd Mageia</title>
+ <title>Using a graphical tool within Mageia</title>
<para>Puteți utiliza un utilitar grafic precum <link
ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks">IsoDumper</link></para>
+ </section>
+
+ <section>
+ <title>Using a graphical tool within Windows</title>
+
+ <para>Puteți încerca:</para>
+
+ <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
+"ISO image" option;</para>
+
+ <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
+Disk Imager</link></para>
+ </section>
+
+ <section>
+ <title>Using Command line within a GNU/Linux system</title>
+
+ <warning>
+ <para>It is potentially *dangerous* to do this by hand. You risk to overwrite a
+disc partition if you get the device-ID wrong.</para>
+ </warning>
<para>Puteți utiliza utilitarul dd într-o consolă:</para>
@@ -360,11 +410,34 @@ gestionar de fișiere pentru a o citi)</para>
<mediaobject>
<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
+
+ <para>Alternatively, you can get the device name with the command
+<code>dmesg</code>: at end, you see the device name starting with
+<emphasis>sd</emphasis>, and <emphasis>sdd</emphasis> in this case:</para>
+
+ <screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
+[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
+[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
+[72594.770536] usb 1-1: Product: Mass Storage Device
+[72594.770537] usb 1-1: Manufacturer: JetFlash
+[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB
+[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes
+[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes
+[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected
+[72594.772447] scsi host8: usb-storage 1-1:1.0
+[72595.963238] scsi 8:0:0:0: Direct-Access JetFlash Transcend 2GB 1100 PQ: 0 ANSI: 4
+[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)
+[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off
+[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00
+[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found
+[72595.965031] sd 8:0:0:0: [sdd] Assuming drive cache: write through
+[72595.967251] <emphasis>sdd</emphasis>: sdd1
+[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen>
</listitem>
<listitem>
- <para>Găsiți numele cheii USB (după mărime), de exemplu /dev/sdb în imaginea de
-mai sus este o cheie USB de 8 Go.</para>
+ <para>Find the device name for your USB stick (by its size), for example
+<code>/dev/sdb</code> in the screenshot above, it is a 8GB USB stick.</para>
</listitem>
<listitem>
@@ -386,30 +459,6 @@ of=/dev/sdb bs=1M</userinput></para>
</listitem>
</orderedlist>
</section>
-
- <section>
- <title>Utilizînd Windows</title>
-
- <para>Puteți încerca:</para>
-
- <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link></para>
-
- <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
-Disk Imager</link></para>
-
- <para/>
- </section>
</section>
</section>
-
- <section>
- <title>Instalarea Mageia</title>
-
- <para>Această etapă este detaliată în <link
-ns4:href="http://www.mageia.org/en/doc/">documentația Mageia</link>.</para>
-
- <para>Informații suplimentare sînt disponibile pe <link
-ns4:href="https://wiki.mageia.org/en/Category:Documentation">Mageia
-wiki</link>.</para>
- </section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/installer/ro/acceptLicense.xml b/docs/installer/ro/acceptLicense.xml
index 966a22c1..fd4aefab 100644
--- a/docs/installer/ro/acceptLicense.xml
+++ b/docs/installer/ro/acceptLicense.xml
@@ -1,11 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="ro" xml:id="acceptLicense"
- 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="acceptLicense" version="5.0" xml:lang="ro">
@@ -41,9 +34,12 @@
<title xml:id="acceptLicense-ti1">Licența și Notele ediției</title>
</info>
- <mediaobject condition="expert">
-<imageobject> <imagedata align="center" fileref="dx2-license.png"
-format="PNG" revision="1" xml:id="acceptLicense-im1"/> </imageobject></mediaobject>
+ <mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="acceptLicense-im1"
+revision="4" align="center" format="PNG" fileref="dx2-license.png"/>
+</imageobject> <imageobject> <imagedata xml:id="acceptLicense-im2"
+revision="5" align="center" condition="live" format="PNG"
+fileref="live-license.png"/> </imageobject></mediaobject>
<section xml:id="license">
<info>
@@ -83,4 +79,4 @@ Release Notes</para>
<application>Mageia</application>, apăsați pe butonul <guibutton>Nota
ediției</guibutton>.</para>
</section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/installer/ro/addUser.xml b/docs/installer/ro/addUser.xml
index 86de20c6..b20186e7 100644
--- a/docs/installer/ro/addUser.xml
+++ b/docs/installer/ro/addUser.xml
@@ -1,5 +1,4 @@
-<?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="addUser" version="5.0" xml:lang="ro">
-
+<?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="addUser" version="5.0" xml:lang="ro">
<info>
<title xml:id="addUser-ti1">Gestionare utilizatori și administratori</title>
</info>
@@ -15,10 +14,12 @@
+
+
-
- <mediaobject>
+
+ <mediaobject>
<!-- Started by marja,using Led43's text, on 2012 03 27 -->
<!-- NEEDS TO BE REVIEWED! -->
<!-- SimonNZG 2012-04-03 has taken a look but needs to come back -->
@@ -31,10 +32,11 @@
"rbash" in the xguest warning - is that correct? -->
<!-- JohnR 2012-04-19 Language proofreading -->
<!-- marja 2012-04-24 Added screenshot -->
-<!-- marja 2013-04-26 added new note -->
-<imageobject> <imagedata revision="1" fileref="dx2-setRootPassword.png"
-format="PNG" align="center" xml:id="setRootPassword-im1"></imagedata>
-</imageobject></mediaobject>
+<!-- marja 2013-04-26 added new note-->
+<imageobject condition="classical"> <imagedata revision="1" align="center"
+xml:id="setRootPassword-im1" fileref="dx2-setRootPassword.png"
+format="PNG"/> </imageobject> <imageobject> <imagedata format="PNG"
+fileref="live-user1.png"/> </imageobject></mediaobject>
<section xml:id="root-password">
<info>
@@ -87,7 +89,7 @@ majuscule.</emphasis></para>
<listitem>
<para><guilabel>Parolă</guilabel>: tastați aici parola utilizatorului. La capătul
căsuței de dialog există un scut care indică puterea parolei. (Vedeți și
-<xref linkend="givePassword"></xref>)</para>
+<xref linkend="givePassword"/>)</para>
</listitem>
<listitem>
@@ -96,7 +98,7 @@ căsuței de dialog există un scut care indică puterea parolei. (Vedeți și
</listitem>
</itemizedlist>
- <note>
+ <note>
<para>Toți utilizatorii adăugați în cursul instalării distribuției Magaiea vor
avea un director personal ce poate fi consultat de toată lumea (însă
protejat la scriere).</para>
@@ -115,20 +117,21 @@ va trebui să adăugați toți utilizatorii doriți în etapa
utilizatori</emphasis>.</para>
<para>Drepturile de acces pot fi modificate și după instalare.</para>
- </note>
-
+ </note>
</section>
- <section xml:id="addUserAdvanced">
+ <section condition="classical" xml:id="addUserAdvanced">
<info>
<title xml:id="addUserAdvanced-ti3">Gestionare avansată utilizatori</title>
</info>
<para>Dacă apăsați butonul <guibutton>Avansat</guibutton> vi se va prezenta un
ecran în care veți putea edita parametrii conturilor utilizatorilor pe care
-îi adăugați. Adițional, puteți dezactiva sau activa contul invitat.</para>
+îi adăugați.</para>
- <warning>
+ <para condition="classical">Additionally, you can disable or enable a guest account.</para>
+
+ <warning condition="classical">
<para>Tot ceea ce un invitat, conectat cu un cont invitat implicit
<emphasis>rbash</emphasis>, înregistrează în directorul său /home va fi
șters la deconectare. Utilizatorul invitat trebuie să-și salveze fișierele
@@ -136,7 +139,7 @@ importante pe o cheie USB.</para>
</warning>
<itemizedlist>
- <listitem>
+ <listitem condition="classical">
<para><guilabel>Activează contul invitat</guilabel>: aici puteți activa sau
dezactiva contul invitat. Contul invitat permite unui invitat să se
conecteze și să utilizeze un calculator, însă are drepturi mult mai
diff --git a/docs/installer/ro/ask_mntpoint_s.xml b/docs/installer/ro/ask_mntpoint_s.xml
index 6976633d..e5985b32 100644
--- a/docs/installer/ro/ask_mntpoint_s.xml
+++ b/docs/installer/ro/ask_mntpoint_s.xml
@@ -33,9 +33,12 @@
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> <imagedata revision="1" fileref="dx2-chooseMountpoints.png"
-align="center" format="PNG" xml:id="chooseMountPoints-im1"></imagedata>
-</imageobject></mediaobject>
+<imageobject condition='classical'> <imagedata revision="1"
+fileref="dx2-chooseMountpoints.png" align="center" format="PNG"
+xml:id="chooseMountPoints-im1"></imagedata> </imageobject> <imageobject
+condition='live'> <imagedata revision="1"
+fileref="live-chooseMountpoints.png" align="center" format="PNG"
+xml:id="live-chooseMountPoints-im1"></imagedata> </imageobject></mediaobject>
<para>Aici puteți vedea partițiile Linux care au fost găsite pe acest
calculator. Dacă nu sînteți de acord cu sugestiile făcute de
diff --git a/docs/installer/ro/bestTime.xml b/docs/installer/ro/bestTime.xml
new file mode 100644
index 00000000..338881ae
--- /dev/null
+++ b/docs/installer/ro/bestTime.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" 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">
+ <info>
+ <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>In this step, you have to select on which time your internal clock is set,
+either local time or UTC time.</para>
+
+ <para>In advanced tab, you will find more options about clock settings.</para>
+</section>
diff --git a/docs/installer/ro/bootLive.xml b/docs/installer/ro/bootLive.xml
new file mode 100644
index 00000000..5142ac17
--- /dev/null
+++ b/docs/installer/ro/bootLive.xml
@@ -0,0 +1,29 @@
+<?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="ro"><info><title xml:id="bootLive-ti1">Boot Mageia as Live system</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Booting the medium</title></info><section><info><title xml:id="bootLive11-ti1">From a disc</title></info><para>You can boot directly from the media you used to burn your image (CD-ROM,
+DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the
+bootloader to launch the installation automatically after rebooting the
+computer. If that does not happen you may need to reconfigure your BIOS or
+press one key that will offer you to choose the peripheral from which the
+computer will boot.</para><para>According to which hardware you have, and how it is configured, you get
+either one or another of the two screens below.</para></section><section><info><title xml:id="bootLive12-ti1">From a USB device</title></info><para>You can boot from the USB device on which you dumped your image
+ISO. According to your BIOS settings, the computer boots perhaps directly on
+the USB device already plugged in a port. If that does not happen you may
+need to reconfigure your BIOS or press one key that will offer you to choose
+the peripheral from which the computer will boot.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>First screen while booting in BIOS mode</para></caption></mediaobject><para>In the middle menu, you have the choice between three actions:</para><itemizedlist><listitem><para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
+or USB stick) without writing anything on the disk, so expect a very slow
+system. Once the boot is done, you can proceed to the installation on a hard
+disk.</para></listitem><listitem><para>Install Mageia: This choice will directly install Mageia on a hard disk.</para></listitem><listitem><para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
+when no media (CD/DVD or USB stick) is connected. (not working with Mageia
+5).</para></listitem></itemizedlist><para>In the bottom menu, are the Boot Options:</para><itemizedlist><listitem><para>F1 - Help. Explain the options "splash", "apm", "acpi" and "Ide"</para></listitem><listitem><para>F2 - Language. Choose the display language of the screens.</para></listitem><listitem><para>F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
+the inserted installation medium. Here, select other sources, like FTP or
+NFS servers. If the installation is carried out in a network with an SLP
+server, select one of the installation sources available on the server with
+this option.</para></listitem><listitem><para>F5 - Driver. Yes or No. The system is aware about the presence of an
+optional disk with a driver update and will require its insertion during
+installation process.</para></listitem><listitem><para>F6 - Kernel options. This is a way to specify options according to your
+hardware and the drivers to use.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">In UEFI mode</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
+align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>First screen while booting on UEFI system from disk</para></caption></mediaobject><para>You have only the choice to run Mageia in Live mode (first choice) or to
+process the installation (second choice).</para><para>If you booted from a USB stick, you get two supplemental lines which are a
+duplicata of the previous lines suffixed with "USB". You have to choose
+them.</para><para>In each case, the first steps will be the same to choose language, timezone
+and keyboard, then the processes differ, with <link
+linkend="testing">additional steps in Live mode</link>.</para></section></section> \ No newline at end of file
diff --git a/docs/installer/ro/configureTimezoneUTC.xml b/docs/installer/ro/configureTimezoneUTC.xml
index e8934e6e..9d05b8a7 100644
--- a/docs/installer/ro/configureTimezoneUTC.xml
+++ b/docs/installer/ro/configureTimezoneUTC.xml
@@ -1,37 +1,29 @@
-<?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="ro">
+<?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="ro" xml:id="configureTimezoneUTC">
+ <info>
+ <title xml:id="configureTimezoneUTC-ti6">Configurați fusul orar</title>
+ </info>
+
- <info>
- <title xml:id="configureTimezoneUTC-ti6">Configurați fusul orar</title>
- </info>
+
-
-
-
-<mediaobject>
+ <mediaobject>
<!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
<!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-configureTimezoneUTC.png"
-align="center" format="PNG" xml:id="configureTimezoneUTC-im1"></imagedata>
-</imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+xml:id="configureTimezoneUTC-im1" revision="1"
+fileref="dx2-configureTimezoneUTC.png" align="center" format="PNG"/>
+</imageobject> <imageobject> <imagedata fileref="live-timeZone.png"
+condition="live" format="PNG"/> </imageobject></mediaobject>
- <para revision="1" xml:id="configureTimezoneUTC-pa1">Alegeți fusul orar alegînd țara sau un oraș prin apropiere din același fus
+ <para revision="1" xml:id="configureTimezoneUTC-pa1">Alegeți fusul orar alegînd țara sau un oraș prin apropiere din același fus
orar.</para>
- <para revision="1" xml:id="configureTimezoneUTC-pa2">În ecranul următor veți putea configura ceasul intern pe ora locală sau pe
+ <para revision="1" xml:id="configureTimezoneUTC-pa2">În ecranul următor veți putea configura ceasul intern pe ora locală sau pe
GMT, cunoscut și ca UTC.</para>
- <note>
- <para revision="1" xml:id="configureTimezoneUTC-pa3">Dacă aveți instalate mai multe sisteme de operare pe acest calculator,
+ <note>
+ <para revision="1" xml:id="configureTimezoneUTC-pa3">Dacă aveți instalate mai multe sisteme de operare pe acest calculator,
asigurați-vă că toate sînt configurate pe ora locală, sau toate pe UTC/GMT.</para>
- </note>
- </section>
-
+ </note>
+</section> \ No newline at end of file
diff --git a/docs/installer/ro/diskdrake.xml b/docs/installer/ro/diskdrake.xml
index d94c5cba..fb30662c 100644
--- a/docs/installer/ro/diskdrake.xml
+++ b/docs/installer/ro/diskdrake.xml
@@ -29,8 +29,9 @@
</info>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-diskdrake.png" align="center"/>
-</imageobject></mediaobject>
+<imageobject condition='classical'> <imagedata fileref="dx2-diskdrake.png"
+align="center"/> </imageobject> <imageobject condition='live' > <imagedata
+fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
<warning>
<para revision="3" xml:id="diskdrake-pa1">Dacă doriți să criptați partiția <literal>/</literal> trebuie să vă
@@ -64,5 +65,4 @@ EFI (ESP) este prezentă și montată corect în /boot/EFI (a se vedea mai sus)<
<para><mediaobject>
<imageobject> <imagedata fileref="dx2-diskdrake2.png"/> </imageobject></mediaobject></para>
</note>
-</section>
-
+</section> \ No newline at end of file
diff --git a/docs/installer/ro/doPartitionDisks.xml b/docs/installer/ro/doPartitionDisks.xml
index 247d866e..79d90e5c 100644
--- a/docs/installer/ro/doPartitionDisks.xml
+++ b/docs/installer/ro/doPartitionDisks.xml
@@ -3,35 +3,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
<info>
- <!-- Started by marja on 2012 03 29 -->
-<!-- NEEDS TO BE WRITTEN AND THEN REVIEWED! -->
-<!-- JohnR 2012-04-10 - tidy up module formatting -->
-<!-- barjac 2012-04-20 Yes I agree with Lebarhon - reference to home partition removed -->
-<!-- Simonnzg - doing anything to a Windows partition is DANGEROUS. I would prefer
- if this was not an option, but... -->
-<!-- marja 2012-04-24 put the para xml id's back. -->
-<!-- marja 2012-04-29 changed text as discussed on the ml and with papoteur's approval
- lebarhon: 2012-08-18 warning added-->
-<!-- marja 2013-04-05 changed warning to text suggested by Dave Hodgings in bug 9594 -->
-<!-- marja 2013-04-05 adjusted last line of warning as suggested by obgr_seneca -->
-<!-- lebarhon 2013-04-11 adjusted last line of warning as suggested by Dave Hodgins/Marja-->
+ <!---->
+<!-- lebarhon 2015-07-03 Suggested updates for Mageia 5 -->
<title xml:id="doPartitionDisks-ti1">Partiționare</title>
</info>
@@ -101,7 +75,7 @@ grijă!</para>
deja date pe disc și nu sînteți pregătit să le pierdeți, atunci nu utilizați
această opțiune.</para>
</listitem>
- </itemizedlist> <itemizedlist>
+ </itemizedlist><itemizedlist>
<listitem>
<para revision="1" xml:id="doPartitionDisks-pa16">Personalizat</para>
@@ -110,6 +84,47 @@ dure.</para>
</listitem>
</itemizedlist></para>
+ <para><emphasis role="bold">Partitions sizing:</emphasis></para>
+
+ <para>The installer will share the available place out according to the following
+rules:</para>
+
+ <para><itemizedlist>
+ <listitem>
+ <para>If the total available place is lower than 50 GB, only one partition is
+created for /, there is no separate partition for /home.</para>
+ </listitem>
+
+ <listitem>
+ <para>If the total available place is over 50 GB, then three partitions are
+created</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>6/19 of the total available place is allocated to / with a maximum of 50 GB</para>
+ </listitem>
+
+ <listitem>
+ <para>1/19 is allocated to swap with a maximum of 4 GB</para>
+ </listitem>
+
+ <listitem>
+ <para>the rest (at least 12/19) is allocated to /home</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ </itemizedlist></para>
+
+ <para>That means that from 160 GB and over of available place, the installer will
+create three partitions: 50 GB for /, 4 GB for swap and the rest for /home.</para>
+
+ <note>
+ <para>If you are using an 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 "Custom" option is the only one that allows to check it has
+been correctly done</para>
+ </note>
+
<warning>
<para>Unele discuri mai noi utilizează sectoare logice de 4096 octeți în locul
standardului precedent de 512 octeți. Din cauză că nu am dispus de un astfel
@@ -117,14 +132,13 @@ de disc, unealta de partiționare utilizată de instalator nu a fost testată
în consecință. De asemenea, unele discuri SSD utilizează acum blocuri de
ștergere de peste 1Mo. Dacă aveți un astfel de disc, vă sugerăm să-l
partiționați în prealabil cu o unealtă de partiționare alternativă precum
-gparted, sau să folosiți parametrii următori: </para>
+gparted, sau să folosiți parametrii următori:</para>
- <para>"Aliniază la" "MiB" </para>
+ <para>"Aliniază la" "MiB"</para>
- <para>"Spațiu liber precedent (MiB)" "2" </para>
+ <para>"Spațiu liber precedent (MiB)" "2"</para>
<para>De asemenea, verificați că toate partițiile sînt create cu un număr par de
megaocteți.</para>
</warning>
-</section>
-
+</section> \ No newline at end of file
diff --git a/docs/installer/ro/formatPartitions.xml b/docs/installer/ro/formatPartitions.xml
index d1055747..ecd56c36 100644
--- a/docs/installer/ro/formatPartitions.xml
+++ b/docs/installer/ro/formatPartitions.xml
@@ -19,9 +19,12 @@
<!-- NEEDS TO BE REVIEWED! -->
<!-- marja 2012-04-24 added screenshot -->
<!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject> <imagedata revision="1" fileref="dx2-formatPartitions.png"
-format="PNG" align="center" xml:id="formatPartitions-im1"> </imagedata>
-</imageobject></mediaobject>
+<imageobject condition='classical'> <imagedata revision="1"
+fileref="dx2-formatPartitions.png" format="PNG" align="center"
+xml:id="formatPartitions-im1"> </imagedata> </imageobject> <imageobject
+condition='live'> <imagedata revision="1"
+fileref="live-formatPartitions.png" format="PNG" align="center"
+xml:id="live-formatPartitions-im1"> </imagedata> </imageobject></mediaobject>
<para revision="2" xml:id="formatPartitions-pa1">Aici puteți alege care din partiții doriți să le formatați. Datele de pe
partițiile <emphasis>nebifate</emphasis> pentru formatare vor fi păstrate.</para>
diff --git a/docs/installer/ro/login.xml b/docs/installer/ro/login.xml
new file mode 100644
index 00000000..44f59a75
--- /dev/null
+++ b/docs/installer/ro/login.xml
@@ -0,0 +1,6 @@
+<?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="ro"><info><title xml:id="label-to-adapt-ti1">Login screen</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM login screen</para></caption></mediaobject><para>Finally, you will come to the login screen.</para><para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE or GNOME desktop, depending on which live medium
+you used. You can now start using your Mageia installation.</para><para>Informații suplimentare sînt disponibile pe <link
+ns4:href="https://wiki.mageia.org/en/Category:Documentation">Mageia
+wiki</link>.</para></section> \ No newline at end of file
diff --git a/docs/installer/ro/reboot.xml b/docs/installer/ro/reboot.xml
new file mode 100644
index 00000000..d902f542
--- /dev/null
+++ b/docs/installer/ro/reboot.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" xml:id="reboot" 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="reboot-ti1">Reboot</title>
+ </info>
+
+ <mediaobject condition="live">
+<imageobject> <imagedata align="center" fileref="live-reboot.png"
+format="PNG" revision="1" xml:id="reboot-im1"/> </imageobject></mediaobject>
+
+ <para>Once the bootloader has been installed, you will be prompted to halt your
+computer, remove the live CD and restart the computer. When you restart, you
+will see a succession of download progress bars. These indicate that the
+software media are being downloaded (see Software management).</para>
+</section>
diff --git a/docs/installer/ro/selectKeyboardLive.xml b/docs/installer/ro/selectKeyboardLive.xml
new file mode 100644
index 00000000..a75be6f2
--- /dev/null
+++ b/docs/installer/ro/selectKeyboardLive.xml
@@ -0,0 +1,14 @@
+<?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="ro" xml:id="selectKeyboardLive">
+ <info>
+ <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
diff --git a/docs/installer/ro/selectLanguage.xml b/docs/installer/ro/selectLanguage.xml
index d5cac765..be9ba8d3 100644
--- a/docs/installer/ro/selectLanguage.xml
+++ b/docs/installer/ro/selectLanguage.xml
@@ -1,12 +1,4 @@
-<?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="ro" xml:id="selectLanguage">
-
+<?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="selectLanguage" version="5.0" xml:lang="ro">
@@ -32,38 +24,41 @@
continentului. <application>Mageia</application> va utiliza această alegere
pe parcursul instalării și după pentru pentru sistemul instalat.</para>
- <para>În cazul în care veți avea nevoie de mai multe limbi instalate în sistem,
+ <para condition="classical">În cazul în care veți avea nevoie de mai multe limbi instalate în sistem,
pentru uzul personal sau al celorlalți utilizatori, atunci trebuie să
utilizați butonul <guibutton>Multilingv</guibutton> de mai jos și să le
adăugați acum. Va fi mai dificil să adăugați suport multilingv după
instalare.</para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-selectLanguage.png" align="center"
-format="PNG" > </imagedata> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-language.png" format=""/>
+</imageobject></mediaobject>
- <warning>
+ <warning condition="classical">
<para>Chiar dacă ați optat pentru mai multe limbi, va trebui să alegeți una din
ele ca limbă preferată din primul ecran cu lista limbilor. Va fi de asemenea
indicată drept limba preferată în ecranul multilingv.</para>
</warning>
<itemizedlist>
- <listitem>
+ <listitem condition="classical">
<para>Dacă dispunerea tastaturii nu este aceeași cu limba preferată, atunci este
recomandat să instalați și limba pentru dispunerea tastaturii.</para>
</listitem>
<listitem>
- <para>Mageia utilizează UTF-8 (Unicode) în mod implicit. Acest lucru poate fi
-dezactivat în ecranul „multilingv” dacă știți că nu corespunde limbii
-dumneavoastră. Dezactivarea suportului UTF-8 se aplică tuturor limbilor
-instalate.</para>
+ <para>Mageia uses UTF-8 (Unicode) support by default.</para>
+
+ <para condition="classical">Acest lucru poate fi dezactivat în ecranul „multilingv” dacă știți că nu
+corespunde limbii dumneavoastră. Dezactivarea suportului UTF-8 se aplică
+tuturor limbilor instalate.</para>
</listitem>
<listitem>
<para>Puteți schimba limba sistemului și după instalare din Centrul de Control
-Mageia -&gt; Sistem -&gt; Gestionați localizarea sistemului.</para>
+Mageia -> Sistem -> Gestionați localizarea sistemului.</para>
</listitem>
</itemizedlist>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/installer/ro/setupBootloader.xml b/docs/installer/ro/setupBootloader.xml
index d8d515ef..5f9873a3 100644
--- a/docs/installer/ro/setupBootloader.xml
+++ b/docs/installer/ro/setupBootloader.xml
@@ -1,99 +1,123 @@
<?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="ro" xml:id="setupBootloader">
- <info>
- <title xml:id="setupBootloader-ti1">Opțiunile principale ale încărcătorului de sistem</title>
- </info>
+
- <mediaobject>
-<!-- 2012-08-12 Copied this page, setupBootloader.xml, from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.
+ <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-->
+<title xml:id="setupBootloader-ti1">Opțiunile principale ale încărcătorului de sistem</title>
+ </info>
- 2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist-->
-<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
-format="PNG"/> </imageobject></mediaobject>
+ <mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="setupBootloader-im1"
+format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata
+xml:id="setupBootloader-im1" format="PNG" align="center" revision="1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
- <para><note>
- <para>Pe un sistem UEFI interfața utilizator este un pic diferită deoarece nu
-puteți alege încărcătorul de sistem (prima listă derulantă) din moment ce
-numai unul singur este disponibil.</para>
- </note></para>
+ <section>
+ <title>With a Bios system</title>
- <para xml:id="setupBootloader-pa1" revision="4">Dacă preferați alți parametri pentru încărcătorul de sistem în locul celor
+ <para xml:id="setupBootloader-pa1" revision="4">Dacă preferați alți parametri pentru încărcătorul de sistem în locul celor
aleși automatic de instalator, în acest caz îi puteți schimba aici.</para>
- <para xml:id="setupBootloader-pa2" revision="4">Dacă aveți deja instalat un alt sistem de operare pe calculator, în acest
+ <para xml:id="setupBootloader-pa2" revision="4">Dacă aveți deja instalat un alt sistem de operare pe calculator, în acest
caz trebuie să vă decideți ori să adăugați Mageia la încărcătorul de sistem
existent, ori să lăsați Mageia să creeze unul nou.</para>
- <tip>
- <para revision="2" xml:id="setupBootloader-pa3">Meniurile grafice Mageia sînt frumoase :)</para>
- </tip>
+ <tip>
+ <para>The Mageia graphical menus are nice :</para>
+ </tip>
- <section xml:id="usingMageiaBootloader">
- <info>
- <title xml:id="usingMageiaBootloader-ti2">Se utilizează un încărcător de sistem Mageia</title>
- </info>
+ <section xml:id="usingMageiaBootloader">
+ <info>
+ <title xml:id="usingMageiaBootloader-ti2">Se utilizează un încărcător de sistem Mageia</title>
+ </info>
- <para revision="3" xml:id="setupBootloader-pa4">Implicit Mageia scrie un nou încărcător de sistem GRUB (învechit) pe MBR
-(„Master Boot Record”, sectorul principal de demaraj) de pe primul disc
-dur. Dacă aveți deja alte sisteme de operare instalate, Mageia va încerca să
-le adauge în noul meniu de demaraj.</para>
+ <para xml:id="setupBootloader-pa4" revision="3">By default, Mageia writes a new GRUB (legacy) bootloader into the MBR
+(Master Boot Record) of your first hard drive. If you already have other
+operating systems installed, Mageia attempts to add them to your new Mageia
+boot menu.</para>
- <para revision="3">De asemenea, Mageia propune GRUB2 ca încărcător de sistem opțional în plus
+ <para revision="3">De asemenea, Mageia propune GRUB2 ca încărcător de sistem opțional în plus
de GRUB (învechit) și Lilo. </para>
- <warning>
- <para revision="3" xml:id="setupBootloader-pa6">Sistemele Linux care utilizează GRUB2 ca încărcător de sistem nu sînt
+ <warning>
+ <para xml:id="setupBootloader-pa6" revision="3">Sistemele Linux care utilizează GRUB2 ca încărcător de sistem nu sînt
suportate în momentul de față de GRUB (învechit) și nu vor fi recunoscute
dacă este utilizat încărcătorul de sistem GRUB implicit.</para>
- <para revision="3">Cea mai bună soluție aici este să utilizați încărcătorul de sistem GRUB2
+ <para revision="3">Cea mai bună soluție aici este să utilizați încărcătorul de sistem GRUB2
care este disponibil în pagina rezumat din cursul instalării.</para>
- </warning>
- </section>
+ </warning>
+ </section>
- <section xml:id="usingExistingBootloader">
- <info>
- <title revision="2" xml:id="usingExistingBootloader-ti4">Se utilizează încărcătorul de sistem existent</title>
- </info>
+ <section xml:id="usingExistingBootloader">
+ <info>
+ <title xml:id="usingExistingBootloader-ti4" revision="2">Se utilizează încărcătorul de sistem existent</title>
+ </info>
- <para revision="3" xml:id="setupBootloader-pa46">Dacă ați decis să utilizați un încărcător de sistem existent, atunci va
+ <para xml:id="setupBootloader-pa46" revision="3">Dacă ați decis să utilizați un încărcător de sistem existent, atunci va
trebui să nu uitați să VĂ OPRIȚI la pagina rezumat din cursul instalării și
să faceți clic pe butonul <guibutton>Configurează</guibutton> de lîngă
încărcătorul de sistem pentru a schimba locația de instalare a
încărcătorului de sistem. </para>
- <para revision="1" xml:id="setupBootloader-pa47">Nu selectați dispozitivul intitulat spre exemplu „sda”, că veți suprascrie
+ <para xml:id="setupBootloader-pa47" revision="1">Nu selectați dispozitivul intitulat spre exemplu „sda”, că veți suprascrie
sectorul principal de demaraj (MBR) existent. Trebuie să selectați partiția
rădăcină (/) pe care ați ales-o în etapa de partiționare precedentă (de
exemplu: sda7).</para>
- <para xml:id="setupBootloader-pa48" revision="1">Ca să fie clar: sda este un dispozitiv, iar sda7 este o partiție de pe acel
+ <para xml:id="setupBootloader-pa48" revision="1">Ca să fie clar: sda este un dispozitiv, iar sda7 este o partiție de pe acel
dispozitiv.</para>
- <tip>
- <para revision="1" xml:id="setupBootloader-pa48a">Treceți în terminalul tty2 cu Ctrl+Alt+F2 și tastați <literal>df</literal>
+ <tip>
+ <para revision="1" xml:id="setupBootloader-pa48a">Treceți în terminalul tty2 cu Ctrl+Alt+F2 și tastați <literal>df</literal>
ca să verificați unde se află partiția <literal>/</literal>
(rădăcină). Ctrl+Alt+F7 vă readuce în ecranul instalatorului.</para>
- </tip>
+ </tip>
- <para revision="2" xml:id="setupBootloader-pa49">Procedura exactă pentru adăugarea sistemului Mageia la un încărcător de
+ <para xml:id="setupBootloader-pa49" revision="2">Procedura exactă pentru adăugarea sistemului Mageia la un încărcător de
sistem existent depășește scopul acestui ajutor. Totuși, în majoritatea
cazurilor, acest lucru implică lansarea programului de instalare al acelui
încărcător de sistem, care ar trebui să detecteze și să adauge automat noul
sistem Mageia. Consultați documentația sistemului de operare în chestiune.</para>
- </section>
+ </section>
- <section xml:id="advancedOptionBootloader">
- <info>
- <title revision="2" xml:id="advancedOptionBootloader-ti5">Opțiunile avansate ale încărcătorului de sistem</title>
- </info>
+ <section xml:id="advancedOptionBootloader">
+ <info>
+ <title xml:id="advancedOptionBootloader-ti5" revision="2">Opțiunile avansate ale încărcătorului de sistem</title>
+ </info>
- <para revision="3" xml:id="setupBootloader-pa52">Dacă dispuneți de un spațiu limitat pe partiția <literal>/</literal>, iar
+ <para xml:id="setupBootloader-pa52" revision="3">Dacă dispuneți de un spațiu limitat pe partiția <literal>/</literal>, iar
aceasta conține <literal>/tmp</literal>, faceți clic pe
<guibutton>Avansat</guibutton> și bifați căsuța <guilabel>Curăță /tmp la
fiecare pornire</guilabel>. Acest lucru vă ajută să mențineți ceva spațiu
liber.</para>
+ </section>
+ </section>
+
+ <section>
+ <title>With an UEFI system</title>
+
+ <para>With an UEFI system, the user interface is slightly different as you cannot
+choose the boot loader since only Grub2-efi is available. </para>
+
+ <mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader2.png"/>
+</imageobject></mediaobject>
+
+ <para>If Mageia is the first system installed on your computer, the installer
+created an ESP (EFI System Partition) to receive the bootloader
+(Grub2-efi). If there was already UEFI operating systems previously
+installed on your computer (Windows 8 for example), the Mageia installer
+detected the existing ESP created by Windows and added grub2-efi. Although
+it is possible to have several ESPs, only one is advised and enough whatever
+the number of operating systems you have.</para>
+
+ <para>Don't modify the "Boot Device" unless really knowing what you do.</para>
</section>
</section> \ No newline at end of file
diff --git a/docs/installer/ro/setupBootloaderAddEntry.xml b/docs/installer/ro/setupBootloaderAddEntry.xml
index d308b3f5..3ad5539d 100644
--- a/docs/installer/ro/setupBootloaderAddEntry.xml
+++ b/docs/installer/ro/setupBootloaderAddEntry.xml
@@ -1,42 +1,70 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="ro">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ro" xml:id="setupBootloaderAddEntry">
+
+
<info>
- <title xml:id="setupBootloaderAddEntry-ti1">Adăugați sau modificați o intrare din meniul de demaraj</title>
+ <!--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-->
+<title xml:id="setupBootloaderAddEntry-ti1">Adăugați sau modificați o intrare din meniul de demaraj</title>
</info>
<mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
-xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="dx2-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="live-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject></mediaobject>
+
+ <section>
+ <title>With a Bios system</title>
- <para>Puteți adăuga o intrare sau modifica una după ce ați selectat-o, apăsînd pe
+ <para>Puteți adăuga o intrare sau modifica una după ce ați selectat-o, apăsînd pe
butonul corespunzător din ecranul <emphasis>Configurare încărcător de
sistem</emphasis> și editînd intrările din fereastra care se afișează în
acel moment.</para>
- <note>
- <para>Dacă ați ales <code>Grub 2</code> ca încărcător de sistem, sau Grub2-efi
-pentru sistemele UEFI, nu puteți utiliza această unealtă pentru a edita
-intrările în această etapă, apăsați „Înainte”. Va trebui să editați manual
-<code>/boot/grub2/custom.cfg</code> sau să utilizați
-<code>grub-customizer</code>.</para>
- </note>
+ <note>
+ <para>Dacă ați ales <code>Grub 2</code> ca încărcător de sistem nu puteți utiliza
+această unealtă pentru a edita intrările în această etapă, apăsați
+„Înainte”. Va trebui să editați manual <code>/boot/grub2/custom.cfg</code>
+sau să utilizați <code>grub-customizer</code>.</para>
+ </note>
- <mediaobject>
-<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
-align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+ <mediaobject>
+<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1"
+align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
</imageobject></mediaobject>
- <para>Schimbarea numelui unei intrări și bifarea căsuței pentru a o defini ca
+ <para>Schimbarea numelui unei intrări și bifarea căsuței pentru a o defini ca
intrare implicită sînt acțiuni care nu comportă nici un risc.</para>
- <para>Puteți adăuga propriul vostru număr de versiune pentru o intrare, sau o
+ <para>Puteți adăuga propriul vostru număr de versiune pentru o intrare, sau o
puteți redenumi în întregime.</para>
- <para>Intrarea implicită este cea pe care sistemul o va demara dacă nu faceți nici
+ <para>Intrarea implicită este cea pe care sistemul o va demara dacă nu faceți nici
o alegere la pornire.</para>
- <warning>
- <para>Editarea altor lucruri vă poate conduce la un sistem nedemarabil. Nu
+ <warning>
+ <para>Editarea altor lucruri vă poate conduce la un sistem nedemarabil. Nu
încercați să testați ceva dacă nu știți ce faceți.</para>
- </warning>
+ </warning>
+ </section>
+
+ <section>
+ <title>With an UEFI system</title>
+
+ <para>In this case you are using Grub2-efi and you cannot use this tool to edit
+entries at this step. To do that you need to manually edit
+<code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code>
+instead. All you can do here, is to choose the default entry in the drop
+down list.</para>
+
+ <para>After a click on the <guibutton>Next</guibutton> button, another drop down
+list allows to choose the video resolution for Grub2 which is a graphical
+boot loader.</para>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="dx2-bootloaderConfiguration2.png"/>
+</imageobject></mediaobject>
+ </section>
</section> \ No newline at end of file
diff --git a/docs/installer/ro/takeOverHdConfirm.xml b/docs/installer/ro/takeOverHdConfirm.xml
index fbed0c6d..6827f6d5 100644
--- a/docs/installer/ro/takeOverHdConfirm.xml
+++ b/docs/installer/ro/takeOverHdConfirm.xml
@@ -12,15 +12,18 @@
-<mediaobject>
+ <mediaobject>
<!-- Made by marja on 2012 04 03 -->
<!-- test comment - johnr -->
<!-- 2012-04-24 marja - replaced "if you are not sure you selected the correct
hard disk." with "if you are not sure about your choice", because I'm sure I
saw this help screen when I had only one HD -->
<!-- 2013-05-05 marja added screenshot -->
-<imageobject> <imagedata fileref="dx2-takeOverHdConfirm.png" format="PNG"
-align="center" ></imagedata> </imageobject></mediaobject>
+<imageobject condition='live'> <imagedata
+fileref="live-takeOverHdConfirm.png" format="PNG" align="center"
+></imagedata> </imageobject> <imageobject condition='classical'> <imagedata
+fileref="dx2-takeOverHdConfirm.png" format="PNG" align="center"
+></imagedata> </imageobject></mediaobject>
<para revision="1" xml:id="takeOverHdConfirm-pa1">Faceți clic pe <guibutton>Înapoi</guibutton> dacă nu sînteți sigur de
alegere.</para>
diff --git a/docs/installer/ro/testing.xml b/docs/installer/ro/testing.xml
new file mode 100644
index 00000000..fc2d5a01
--- /dev/null
+++ b/docs/installer/ro/testing.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" xml:id="testing" xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns="http://docbook.org/ns/docbook">
+ <info>
+ <title xml:id="testing-ti1">Testing Mageia as Live system</title>
+ </info>
+
+ <section xml:id="testing-1">
+ <info>
+ <title xml:id="testing1-ti1">Live mode</title>
+ </info>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
+
+ <para>You get this screen if you selected "Boot Mageia". If not, you get the
+"<link linkend="doPartitionDisks">Partitioning</link> step"</para>
+
+ <section>
+ <info>
+ <title xml:id="testing2-ti1">Testing hardware</title>
+ </info>
+
+ <para>One of the Live mode goals is to test if the hardware is correctly managed
+by Mageia. You can check if all devices have a driver in the Hardware
+section of the Mageia Control Center. You can test the most current devices:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>network interface: configure it with net_applet</para>
+ </listitem>
+
+ <listitem>
+ <para>graphical card: if you see the previous screen, it's already OK.</para>
+ </listitem>
+
+ <listitem>
+ <para>webcam:</para>
+ </listitem>
+
+ <listitem>
+ <para>sound: a jingle has already been played</para>
+ </listitem>
+
+ <listitem>
+ <para>printer: configure it and print a test page</para>
+ </listitem>
+
+ <listitem>
+ <para>scanner: scan a document from ...</para>
+ </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>
+
+ <remark>The configuration settings you made here are kept for the installation.</remark>
+ </section>
+
+ <section>
+ <info>
+ <title xml:id="testing3-ti1">Launch installation</title>
+ </info>
+
+ <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/installer/ro/uninstall-Mageia.xml b/docs/installer/ro/uninstall-Mageia.xml
index a18449b5..e584043b 100644
--- a/docs/installer/ro/uninstall-Mageia.xml
+++ b/docs/installer/ro/uninstall-Mageia.xml
@@ -1,5 +1,5 @@
<?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="ro" xml:id="uninstall-Mageia">
- <!-- -->
+ <!--Lebarhon 2015-07-06 Not true with UEFI -->
<info>
<title xml:id="uninstall-Mageia-ti1">Dezinstalare Mageia</title>
</info>
diff --git a/docs/installer/ro/unused.xml b/docs/installer/ro/unused.xml
new file mode 100644
index 00000000..2400f577
--- /dev/null
+++ b/docs/installer/ro/unused.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" 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">
+ <info>
+ <title xml:id="unused-ti1">Keep or delete unused material</title>
+ </info>
+
+ <mediaobject condition="live">
+<imageobject> <imagedata align="center" fileref="live-unused.png"
+format="PNG" revision="1" xml:id="unused-im1"/> </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>
+
+ <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>
+</section>
diff --git a/docs/installer/ru/DrakLive-cover.xml b/docs/installer/ru/DrakLive-cover.xml
new file mode 100644
index 00000000..9449f104
--- /dev/null
+++ b/docs/installer/ru/DrakLive-cover.xml
@@ -0,0 +1,77 @@
+<?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="ru" xml:id="Quick-Startup">
+ <info>
+ <title>Installation from LIVE medium</title>
+ <publisher> <publishername>Mageia.org</publishername> </publisher>
+ <revhistory>
+ <revision>
+ <date>Январь 2015</date>
+ <revremark>Mageia 5</revremark>
+ </revision>
+ </revhistory>
+ <cover>
+ <para role="tagline">Официальная документация для Mageia</para>
+ <mediaobject>
+<imageobject> <imagedata fileref="mageia-2013.png"/> </imageobject></mediaobject>
+ <para>Текст и фотографии окон в этом учебнике предоставляются вам в соответствии с
+условиями лицензирования 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>Этот учебник был создан с помощью <link
+ns6:href="http://www.calenco.com">Calenco CMS</link>, разработанной
+компанией <link ns6:href="http://www.neodoc.biz">NeoDoc</link>.
+ </para>
+ <para>Учебник был написан доброжелателями в свободное от основной работы
+время. Пожалуйста, обратитесь к <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">команды
+документирования</link>, Если вы хотите, помочь улучшить данное руководство.</para>
+ </cover>
+ </info>
+ <article>
+ <title>Installation from LIVE medium</title>
+ <para><note>
+ <para>Все страницы, описанные в этом учебнике увидеть сразу невозможно. Набор
+страниц, которые вы увидите, зависит от набора оборудования в системе и
+выбранного вами варианта установки.</para>
+ </note></para>
+ <xi:include href="SelectAndUseISOs2.xml"/>
+
+ <xi:include href="bootLive.xml"/>
+
+ <xi:include href="selectLanguage.xml"/>
+
+ <xi:include href="acceptLicense.xml"/>
+
+ <xi:include href="configureTimezoneUTC.xml"/>
+
+ <xi:include href="bestTime.xml"/>
+
+ <xi:include href="selectKeyboardLive.xml"/>
+
+ <xi:include href="testing.xml"/>
+
+ <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"/>
+
+ <xi:include href="unused.xml"/>
+
+ <xi:include href="setupBootloader.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>
+</book> \ No newline at end of file
diff --git a/docs/installer/ru/DrakLive.xml b/docs/installer/ru/DrakLive.xml
new file mode 100644
index 00000000..306c34b6
--- /dev/null
+++ b/docs/installer/ru/DrakLive.xml
@@ -0,0 +1,66 @@
+<?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="ru" xml:id="Quick-Startup">
+ <info>
+ <title>Installation from LIVE medium</title>
+
+ <cover>
+ <para><note>
+ <para>Все страницы, описанные в этом учебнике увидеть сразу невозможно. Набор
+страниц, которые вы увидите, зависит от набора оборудования в системе и
+выбранного вами варианта установки.</para>
+ </note></para>
+
+ <para xml:id="CC_BY-SA">Текст и фотографии окон в этом учебнике предоставляются вам в соответствии с
+условиями лицензирования 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>Этот учебник был создан с помощью <link
+ns6:href="http://www.calenco.com">Calenco CMS</link>, разработанной
+компанией <link ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+ <para>Учебник был написан доброжелателями в свободное от основной работы
+время. Пожалуйста, обратитесь к <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">команды
+документирования</link>, Если вы хотите, помочь улучшить данное руководство.</para>
+ </cover>
+ </info>
+
+ <xi:include href="SelectAndUseISOs2.xml"/>
+
+ <xi:include href="bootLive.xml"/>
+
+ <xi:include href="selectLanguage.xml"/>
+
+ <xi:include href="acceptLicense.xml"/>
+
+ <xi:include href="configureTimezoneUTC.xml"/>
+
+ <xi:include href="bestTime.xml"/>
+
+ <xi:include href="selectKeyboardLive.xml"/>
+
+ <xi:include href="testing.xml"/>
+
+ <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"/>
+
+ <xi:include href="unused.xml"/>
+
+ <xi:include href="setupBootloader.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
diff --git a/docs/installer/ru/SelectAndUseISOs2.xml b/docs/installer/ru/SelectAndUseISOs2.xml
index 6d3876ba..c6212e37 100644
--- a/docs/installer/ru/SelectAndUseISOs2.xml
+++ b/docs/installer/ru/SelectAndUseISOs2.xml
@@ -7,6 +7,32 @@
</info>
<section>
+ <title>Introduction</title>
+
+ <para>Mageia is distributed via ISO images. This page will help you to choose
+which image match your needs.</para>
+
+ <para>There is two families of media:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Classical installer: After booting the media, it will follow a process
+allowing to choose what to install and how to configure your target
+system. This give you the maximal flexibility for a customized installation,
+in particular to choose which Desktop Environment you will install.</para>
+ </listitem>
+
+ <listitem>
+ <para>LIVE media: you can boot the media in a real Mageia system without
+installing it, to see what you will get after installation. The
+installation process is simpler, but you get lesser choices.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>Details are given in the next sections.</para>
+ </section>
+
+ <section>
<title>Носитель</title>
<section>
@@ -263,15 +289,9 @@ uk) БЫЛИ ПРОВЕРЕНЫ!</para>
<mediaobject>
<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
- <para>Программы md5sum и sha1sum предназначены для проверки целостности данных
-вашего образа ISO. Для выполнения проверки достаточно воспользоваться одной
-из этих программ. Оба шестнадцатеричных числа вычислены с помощью
-определённого алгоритма на основе файла, который должен быть загружен. Если
-вы попросите соответствующую программу снова вычислить шестнадцатеричное
-число на основе загруженного файла, то будет получено то же число (это
-означает что данные были загружены должным образом) или другое число
-(следовательно, данные были загружены с ошибками). При несовпадении чисел
-вам следует заново скачать образ. Вы увидите нечто:</para>
+ <para>md5sum and sha1sum are tools to check the ISO integrity. Use only one of
+them. Keep one of them <link linkend="integrity">for further
+usage</link>. Then this window appears:</para>
<mediaobject>
<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
@@ -280,7 +300,13 @@ uk) БЫЛИ ПРОВЕРЕНЫ!</para>
</section>
<section>
- <title>Проверка целостности загруженных данных</title>
+ <title xml:id="integrity">Проверка целостности загруженных данных</title>
+
+ <para>Both checksums are hexadecimal numbers calculated by an algorithm from the
+file to be downloaded. When you ask these algorithms to recalculate this
+number from your downloaded file, either you have the same number and your
+downloaded file is correct, or the number is different and you have a
+failure. A failure infers that you should retry the download.</para>
<para>Откройте консоль (от имени обычного пользователя) и дайте следующую команду:</para>
@@ -329,15 +355,36 @@ USB флешку и пользоваться ею для загрузки и у
уничтожены, будут потеряны. Размер диска будет уменьшен на размер образа.</para>
</warning>
- <para>Для восстановления первоначальной ёмкости диска USB вам впоследствии
-придётся его форматировать.</para>
+ <para>To recover the original capacity, you must redo partitioning and re-format
+the USB stick.</para>
<section>
- <title>Использование Mageia</title>
+ <title>Using a graphical tool within Mageia</title>
<para>Вы можете воспользоваться инструментом с графическим интерфейсом, например
<link
ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks">IsoDumper</link></para>
+ </section>
+
+ <section>
+ <title>Using a graphical tool within Windows</title>
+
+ <para>Вы можете попробовать:</para>
+
+ <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
+"ISO image" option;</para>
+
+ <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
+Disk Imager</link></para>
+ </section>
+
+ <section>
+ <title>Using Command line within a GNU/Linux system</title>
+
+ <warning>
+ <para>It is potentially *dangerous* to do this by hand. You risk to overwrite a
+disc partition if you get the device-ID wrong.</para>
+ </warning>
<para>Вы также можете воспользоваться консольной программой dd:</para>
@@ -365,11 +412,34 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
<mediaobject>
<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
+
+ <para>Alternatively, you can get the device name with the command
+<code>dmesg</code>: at end, you see the device name starting with
+<emphasis>sd</emphasis>, and <emphasis>sdd</emphasis> in this case:</para>
+
+ <screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
+[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
+[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
+[72594.770536] usb 1-1: Product: Mass Storage Device
+[72594.770537] usb 1-1: Manufacturer: JetFlash
+[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB
+[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes
+[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes
+[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected
+[72594.772447] scsi host8: usb-storage 1-1:1.0
+[72595.963238] scsi 8:0:0:0: Direct-Access JetFlash Transcend 2GB 1100 PQ: 0 ANSI: 4
+[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)
+[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off
+[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00
+[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found
+[72595.965031] sd 8:0:0:0: [sdd] Assuming drive cache: write through
+[72595.967251] <emphasis>sdd</emphasis>: sdd1
+[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen>
</listitem>
<listitem>
- <para>Имя можно определить по размеру. Например, на приведенном выше снимке
-/dev/sdb - это устройство ёмкостью 8 ГБ, это флешка USB.</para>
+ <para>Find the device name for your USB stick (by its size), for example
+<code>/dev/sdb</code> in the screenshot above, it is a 8GB USB stick.</para>
</listitem>
<listitem>
@@ -391,30 +461,6 @@ of=/dev/sdb bs=1M</userinput></para>
</listitem>
</orderedlist>
</section>
-
- <section>
- <title>Использование Windows</title>
-
- <para>Вы можете попробовать:</para>
-
- <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link></para>
-
- <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
-Disk Imager</link></para>
-
- <para/>
- </section>
</section>
</section>
-
- <section>
- <title>Установка Mageia</title>
-
- <para>Этот шаг детализирован в <link
-ns4:href="http://www.mageia.org/en/doc/">документации Mageia</link>.</para>
-
- <para>Ещё больше информации доступно в <link
-ns4:href="https://wiki.mageia.org/en/Category:Documentation">вики
-Mageia</link>.</para>
- </section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/installer/ru/acceptLicense.xml b/docs/installer/ru/acceptLicense.xml
index 00a78176..283a8174 100644
--- a/docs/installer/ru/acceptLicense.xml
+++ b/docs/installer/ru/acceptLicense.xml
@@ -1,11 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="ru" xml:id="acceptLicense"
- 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="acceptLicense" version="5.0" xml:lang="ru">
@@ -41,9 +34,12 @@
<title xml:id="acceptLicense-ti1">Условия лицензирования и заметки о выпуске</title>
</info>
- <mediaobject condition="expert">
-<imageobject> <imagedata align="center" fileref="dx2-license.png"
-format="PNG" revision="1" xml:id="acceptLicense-im1"/> </imageobject></mediaobject>
+ <mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="acceptLicense-im1"
+revision="4" align="center" format="PNG" fileref="dx2-license.png"/>
+</imageobject> <imageobject> <imagedata xml:id="acceptLicense-im2"
+revision="5" align="center" condition="live" format="PNG"
+fileref="live-license.png"/> </imageobject></mediaobject>
<section xml:id="license">
<info>
@@ -84,4 +80,4 @@ Release Notes</para>
<application>Mageia</application>, нажмите кнопку <guibutton>Заметки о
выпуске</guibutton>.</para>
</section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/installer/ru/addUser.xml b/docs/installer/ru/addUser.xml
index d67d88e5..18c16204 100644
--- a/docs/installer/ru/addUser.xml
+++ b/docs/installer/ru/addUser.xml
@@ -1,5 +1,4 @@
-<?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="addUser" version="5.0" xml:lang="ru">
-
+<?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="addUser" version="5.0" xml:lang="ru">
<info>
<title xml:id="addUser-ti1">Управление учётными записями пользователя и администратора</title>
</info>
@@ -15,10 +14,12 @@
+
+
-
- <mediaobject>
+
+ <mediaobject>
<!-- Started by marja,using Led43's text, on 2012 03 27 -->
<!-- NEEDS TO BE REVIEWED! -->
<!-- SimonNZG 2012-04-03 has taken a look but needs to come back -->
@@ -31,10 +32,11 @@
"rbash" in the xguest warning - is that correct? -->
<!-- JohnR 2012-04-19 Language proofreading -->
<!-- marja 2012-04-24 Added screenshot -->
-<!-- marja 2013-04-26 added new note -->
-<imageobject> <imagedata revision="1" fileref="dx2-setRootPassword.png"
-format="PNG" align="center" xml:id="setRootPassword-im1"></imagedata>
-</imageobject></mediaobject>
+<!-- marja 2013-04-26 added new note-->
+<imageobject condition="classical"> <imagedata revision="1" align="center"
+xml:id="setRootPassword-im1" fileref="dx2-setRootPassword.png"
+format="PNG"/> </imageobject> <imageobject> <imagedata format="PNG"
+fileref="live-user1.png"/> </imageobject></mediaobject>
<section xml:id="root-password">
<info>
@@ -87,7 +89,7 @@ format="PNG" align="center" xml:id="setRootPassword-im1"></imagedata>
<listitem>
<para><guilabel>Пароль</guilabel>: в этом поле вам следует указать пароль. Цвет
отметки защищенности рядом с полем соответствует сложности пароля (см. также
-<xref linkend="givePassword"></xref>)</para>
+<xref linkend="givePassword"/>)</para>
</listitem>
<listitem>
@@ -97,7 +99,7 @@ format="PNG" align="center" xml:id="setRootPassword-im1"></imagedata>
</listitem>
</itemizedlist>
- <note>
+ <note>
<para>Содержание домашних каталогов всех пользователей, учетные записи которых
будут созданы при установке Mageia, сможет читать любой пользователь (но не
записывать в эти каталоги данные).</para>
@@ -120,21 +122,21 @@ format="PNG" align="center" xml:id="setRootPassword-im1"></imagedata>
<para>Права доступа к домашним каталогам, конечно же, можно изменить и после
завершения установки системы.</para>
- </note>
-
+ </note>
</section>
- <section xml:id="addUserAdvanced">
+ <section condition="classical" xml:id="addUserAdvanced">
<info>
<title xml:id="addUserAdvanced-ti3">Дополнительные возможности управления учетными записями пользователей</title>
</info>
<para>Если вы нажмете кнопку <guibutton>Дополнительно</guibutton>, то программа
откроет диалоговое окно, с помощью которого вы сможете изменить параметры
-учетной записи, которую вы добавляете. Кроме того, с помощью этого
-диалогового окна можно отключить или включить гостевой аккаунт.</para>
+учетной записи, которую вы добавляете.</para>
- <warning>
+ <para condition="classical">Additionally, you can disable or enable a guest account.</para>
+
+ <warning condition="classical">
<para>Любые данные, которые будут записаны с гостевого аккаунта
<emphasis>rbash</emphasis> в соответствующий каталог в /home, будут потеряны
при выходе из системы. Пользователю гостевого аккаунта следует позаботиться
@@ -142,7 +144,7 @@ format="PNG" align="center" xml:id="setRootPassword-im1"></imagedata>
</warning>
<itemizedlist>
- <listitem>
+ <listitem condition="classical">
<para><guilabel>Включить гостевой аккаунт</guilabel>: с помощью этого пункта можно
включить или отключить гостевой аккаунт. Пользователь гостевого аккаунта
сможет войти в систему, пользоваться компьютером, но будет иметь
diff --git a/docs/installer/ru/ask_mntpoint_s.xml b/docs/installer/ru/ask_mntpoint_s.xml
index cfa18e53..59a478a3 100644
--- a/docs/installer/ru/ask_mntpoint_s.xml
+++ b/docs/installer/ru/ask_mntpoint_s.xml
@@ -33,9 +33,12 @@
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> <imagedata revision="1" fileref="dx2-chooseMountpoints.png"
-align="center" format="PNG" xml:id="chooseMountPoints-im1"></imagedata>
-</imageobject></mediaobject>
+<imageobject condition='classical'> <imagedata revision="1"
+fileref="dx2-chooseMountpoints.png" align="center" format="PNG"
+xml:id="chooseMountPoints-im1"></imagedata> </imageobject> <imageobject
+condition='live'> <imagedata revision="1"
+fileref="live-chooseMountpoints.png" align="center" format="PNG"
+xml:id="live-chooseMountPoints-im1"></imagedata> </imageobject></mediaobject>
<para>С помощью этой страницы вы можете просмотреть список разделов Linux на вашем
компьютере. Если вы не согласны с предложениями
diff --git a/docs/installer/ru/bestTime.xml b/docs/installer/ru/bestTime.xml
new file mode 100644
index 00000000..5f183ec9
--- /dev/null
+++ b/docs/installer/ru/bestTime.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ru" 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">
+ <info>
+ <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>In this step, you have to select on which time your internal clock is set,
+either local time or UTC time.</para>
+
+ <para>In advanced tab, you will find more options about clock settings.</para>
+</section>
diff --git a/docs/installer/ru/bootLive.xml b/docs/installer/ru/bootLive.xml
new file mode 100644
index 00000000..fff310e1
--- /dev/null
+++ b/docs/installer/ru/bootLive.xml
@@ -0,0 +1,29 @@
+<?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="ru"><info><title xml:id="bootLive-ti1">Boot Mageia as Live system</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Booting the medium</title></info><section><info><title xml:id="bootLive11-ti1">From a disc</title></info><para>You can boot directly from the media you used to burn your image (CD-ROM,
+DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the
+bootloader to launch the installation automatically after rebooting the
+computer. If that does not happen you may need to reconfigure your BIOS or
+press one key that will offer you to choose the peripheral from which the
+computer will boot.</para><para>According to which hardware you have, and how it is configured, you get
+either one or another of the two screens below.</para></section><section><info><title xml:id="bootLive12-ti1">From a USB device</title></info><para>You can boot from the USB device on which you dumped your image
+ISO. According to your BIOS settings, the computer boots perhaps directly on
+the USB device already plugged in a port. If that does not happen you may
+need to reconfigure your BIOS or press one key that will offer you to choose
+the peripheral from which the computer will boot.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>First screen while booting in BIOS mode</para></caption></mediaobject><para>In the middle menu, you have the choice between three actions:</para><itemizedlist><listitem><para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
+or USB stick) without writing anything on the disk, so expect a very slow
+system. Once the boot is done, you can proceed to the installation on a hard
+disk.</para></listitem><listitem><para>Install Mageia: This choice will directly install Mageia on a hard disk.</para></listitem><listitem><para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
+when no media (CD/DVD or USB stick) is connected. (not working with Mageia
+5).</para></listitem></itemizedlist><para>In the bottom menu, are the Boot Options:</para><itemizedlist><listitem><para>F1 - Help. Explain the options "splash", "apm", "acpi" and "Ide"</para></listitem><listitem><para>F2 - Language. Choose the display language of the screens.</para></listitem><listitem><para>F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
+the inserted installation medium. Here, select other sources, like FTP or
+NFS servers. If the installation is carried out in a network with an SLP
+server, select one of the installation sources available on the server with
+this option.</para></listitem><listitem><para>F5 - Driver. Yes or No. The system is aware about the presence of an
+optional disk with a driver update and will require its insertion during
+installation process.</para></listitem><listitem><para>F6 - Kernel options. This is a way to specify options according to your
+hardware and the drivers to use.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">In UEFI mode</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
+align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>First screen while booting on UEFI system from disk</para></caption></mediaobject><para>You have only the choice to run Mageia in Live mode (first choice) or to
+process the installation (second choice).</para><para>If you booted from a USB stick, you get two supplemental lines which are a
+duplicata of the previous lines suffixed with "USB". You have to choose
+them.</para><para>In each case, the first steps will be the same to choose language, timezone
+and keyboard, then the processes differ, with <link
+linkend="testing">additional steps in Live mode</link>.</para></section></section> \ No newline at end of file
diff --git a/docs/installer/ru/configureTimezoneUTC.xml b/docs/installer/ru/configureTimezoneUTC.xml
index 1d89c04e..190dc4fd 100644
--- a/docs/installer/ru/configureTimezoneUTC.xml
+++ b/docs/installer/ru/configureTimezoneUTC.xml
@@ -1,40 +1,32 @@
-<?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="ru">
+<?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="ru" xml:id="configureTimezoneUTC">
+ <info>
+ <title xml:id="configureTimezoneUTC-ti6">Настройка часового пояса</title>
+ </info>
+
- <info>
- <title xml:id="configureTimezoneUTC-ti6">Настройка часового пояса</title>
- </info>
+
-
-
-
-<mediaobject>
+ <mediaobject>
<!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
<!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-configureTimezoneUTC.png"
-align="center" format="PNG" xml:id="configureTimezoneUTC-im1"></imagedata>
-</imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+xml:id="configureTimezoneUTC-im1" revision="1"
+fileref="dx2-configureTimezoneUTC.png" align="center" format="PNG"/>
+</imageobject> <imageobject> <imagedata fileref="live-timeZone.png"
+condition="live" format="PNG"/> </imageobject></mediaobject>
- <para revision="1" xml:id="configureTimezoneUTC-pa1">Выберите ваш часовой пояс. Для этого достаточно выбрать вашу страну или
+ <para revision="1" xml:id="configureTimezoneUTC-pa1">Выберите ваш часовой пояс. Для этого достаточно выбрать вашу страну или
какой-то город рядом с вашим местом пребывания так, чтобы этот город был
расположен в том же часовом поясе.</para>
- <para revision="1" xml:id="configureTimezoneUTC-pa2">С помощью следующего раздела вы можете указать режим работы системных часов
+ <para revision="1" xml:id="configureTimezoneUTC-pa2">С помощью следующего раздела вы можете указать режим работы системных часов
компьютера: использование местного времени или времени по Гринвичу (GMT),
также известного как Всемирное время (UTC).</para>
- <note>
- <para revision="1" xml:id="configureTimezoneUTC-pa3">Если на компьютере установлено несколько операционных систем, убедитесь, что
+ <note>
+ <para revision="1" xml:id="configureTimezoneUTC-pa3">Если на компьютере установлено несколько операционных систем, убедитесь, что
во всех этих системах используется местное время или Всемирное время
(UTC/GMT).</para>
- </note>
- </section>
-
+ </note>
+</section> \ No newline at end of file
diff --git a/docs/installer/ru/diskdrake.xml b/docs/installer/ru/diskdrake.xml
index c7cb9111..c7a77934 100644
--- a/docs/installer/ru/diskdrake.xml
+++ b/docs/installer/ru/diskdrake.xml
@@ -29,8 +29,9 @@
</info>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-diskdrake.png" align="center"/>
-</imageobject></mediaobject>
+<imageobject condition='classical'> <imagedata fileref="dx2-diskdrake.png"
+align="center"/> </imageobject> <imageobject condition='live' > <imagedata
+fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
<warning>
<para revision="3" xml:id="diskdrake-pa1">Если на вашем разделе <literal>/</literal> вы хотите воспользоваться
@@ -69,5 +70,4 @@ ESP (EFI System Partition) и она смонтирована в /boot/EFI (с
<para><mediaobject>
<imageobject> <imagedata fileref="dx2-diskdrake2.png"/> </imageobject></mediaobject></para>
</note>
-</section>
-
+</section> \ No newline at end of file
diff --git a/docs/installer/ru/doPartitionDisks.xml b/docs/installer/ru/doPartitionDisks.xml
index bd410f9b..73cb2383 100644
--- a/docs/installer/ru/doPartitionDisks.xml
+++ b/docs/installer/ru/doPartitionDisks.xml
@@ -3,35 +3,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
<info>
- <!-- Started by marja on 2012 03 29 -->
-<!-- NEEDS TO BE WRITTEN AND THEN REVIEWED! -->
-<!-- JohnR 2012-04-10 - tidy up module formatting -->
-<!-- barjac 2012-04-20 Yes I agree with Lebarhon - reference to home partition removed -->
-<!-- Simonnzg - doing anything to a Windows partition is DANGEROUS. I would prefer
- if this was not an option, but... -->
-<!-- marja 2012-04-24 put the para xml id's back. -->
-<!-- marja 2012-04-29 changed text as discussed on the ml and with papoteur's approval
- lebarhon: 2012-08-18 warning added-->
-<!-- marja 2013-04-05 changed warning to text suggested by Dave Hodgings in bug 9594 -->
-<!-- marja 2013-04-05 adjusted last line of warning as suggested by obgr_seneca -->
-<!-- lebarhon 2013-04-11 adjusted last line of warning as suggested by Dave Hodgins/Marja-->
+ <!---->
+<!-- lebarhon 2015-07-03 Suggested updates for Mageia 5 -->
<title xml:id="doPartitionDisks-ti1">Разбиение на разделы</title>
</info>
@@ -105,7 +79,7 @@ Windows голубым цветом, а будущий раздел с Mageia -
данных или на диске уже хранятся какие-то важные данные, не пользуйтесь этим
вариантом.</para>
</listitem>
- </itemizedlist> <itemizedlist>
+ </itemizedlist><itemizedlist>
<listitem>
<para revision="1" xml:id="doPartitionDisks-pa16">Вручную</para>
@@ -114,6 +88,47 @@ Windows голубым цветом, а будущий раздел с Mageia -
</listitem>
</itemizedlist></para>
+ <para><emphasis role="bold">Partitions sizing:</emphasis></para>
+
+ <para>The installer will share the available place out according to the following
+rules:</para>
+
+ <para><itemizedlist>
+ <listitem>
+ <para>If the total available place is lower than 50 GB, only one partition is
+created for /, there is no separate partition for /home.</para>
+ </listitem>
+
+ <listitem>
+ <para>If the total available place is over 50 GB, then three partitions are
+created</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>6/19 of the total available place is allocated to / with a maximum of 50 GB</para>
+ </listitem>
+
+ <listitem>
+ <para>1/19 is allocated to swap with a maximum of 4 GB</para>
+ </listitem>
+
+ <listitem>
+ <para>the rest (at least 12/19) is allocated to /home</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ </itemizedlist></para>
+
+ <para>That means that from 160 GB and over of available place, the installer will
+create three partitions: 50 GB for /, 4 GB for swap and the rest for /home.</para>
+
+ <note>
+ <para>If you are using an 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 "Custom" option is the only one that allows to check it has
+been correctly done</para>
+ </note>
+
<warning>
<para>В некоторых новых дисках используются логические сектора в 4096 байт вместо
предыдущего стандарта в 512 байт на логический сектор. Так как у
@@ -121,13 +136,12 @@ Windows голубым цветом, а будущий раздел с Mageia -
надлежащее тестирование программы для разделения диска на разделы на таких
дисках не выполнялось. Советуем вам выполнить разделение такого диска на
разделы с помощью альтернативной специализированной программы, например
-gparted с такими параметрами: </para>
+gparted с такими параметрами:</para>
- <para>«Выровнять по» «МиБ» </para>
+ <para>«Выровнять по» «МиБ»</para>
- <para>«Свободное место до (МиБ)» «2» </para>
+ <para>«Свободное место до (МиБ)» «2»</para>
<para>Также следует создавать разделы только с чётным размером в мегабайтах.</para>
</warning>
-</section>
-
+</section> \ No newline at end of file
diff --git a/docs/installer/ru/formatPartitions.xml b/docs/installer/ru/formatPartitions.xml
index 4e67737e..1749b5c1 100644
--- a/docs/installer/ru/formatPartitions.xml
+++ b/docs/installer/ru/formatPartitions.xml
@@ -19,9 +19,12 @@
<!-- NEEDS TO BE REVIEWED! -->
<!-- marja 2012-04-24 added screenshot -->
<!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject> <imagedata revision="1" fileref="dx2-formatPartitions.png"
-format="PNG" align="center" xml:id="formatPartitions-im1"> </imagedata>
-</imageobject></mediaobject>
+<imageobject condition='classical'> <imagedata revision="1"
+fileref="dx2-formatPartitions.png" format="PNG" align="center"
+xml:id="formatPartitions-im1"> </imagedata> </imageobject> <imageobject
+condition='live'> <imagedata revision="1"
+fileref="live-formatPartitions.png" format="PNG" align="center"
+xml:id="live-formatPartitions-im1"> </imagedata> </imageobject></mediaobject>
<para revision="2" xml:id="formatPartitions-pa1">С помощью этой страницы вы можете определиться с тем, какие разделы следует
форматировать. Все данные на разделах, которые <emphasis>не</emphasis>
diff --git a/docs/installer/ru/login.xml b/docs/installer/ru/login.xml
new file mode 100644
index 00000000..3f1d3cfb
--- /dev/null
+++ b/docs/installer/ru/login.xml
@@ -0,0 +1,6 @@
+<?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="ru"><info><title xml:id="label-to-adapt-ti1">Login screen</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM login screen</para></caption></mediaobject><para>Finally, you will come to the login screen.</para><para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE or GNOME desktop, depending on which live medium
+you used. You can now start using your Mageia installation.</para><para>Ещё больше информации доступно в <link
+ns4:href="https://wiki.mageia.org/en/Category:Documentation">вики
+Mageia</link>.</para></section> \ No newline at end of file
diff --git a/docs/installer/ru/reboot.xml b/docs/installer/ru/reboot.xml
new file mode 100644
index 00000000..642ec1c0
--- /dev/null
+++ b/docs/installer/ru/reboot.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ru" xml:id="reboot" 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="reboot-ti1">Reboot</title>
+ </info>
+
+ <mediaobject condition="live">
+<imageobject> <imagedata align="center" fileref="live-reboot.png"
+format="PNG" revision="1" xml:id="reboot-im1"/> </imageobject></mediaobject>
+
+ <para>Once the bootloader has been installed, you will be prompted to halt your
+computer, remove the live CD and restart the computer. When you restart, you
+will see a succession of download progress bars. These indicate that the
+software media are being downloaded (see Software management).</para>
+</section>
diff --git a/docs/installer/ru/selectKeyboardLive.xml b/docs/installer/ru/selectKeyboardLive.xml
new file mode 100644
index 00000000..550892be
--- /dev/null
+++ b/docs/installer/ru/selectKeyboardLive.xml
@@ -0,0 +1,14 @@
+<?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="ru" xml:id="selectKeyboardLive">
+ <info>
+ <title xml:id="selectKeyboardLive-ti1">Выбор клавиатуры</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
diff --git a/docs/installer/ru/selectLanguage.xml b/docs/installer/ru/selectLanguage.xml
index 094ab00c..5faed75f 100644
--- a/docs/installer/ru/selectLanguage.xml
+++ b/docs/installer/ru/selectLanguage.xml
@@ -1,12 +1,4 @@
-<?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="ru" xml:id="selectLanguage">
-
+<?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="selectLanguage" version="5.0" xml:lang="ru">
@@ -32,38 +24,41 @@
стран вашего континента. <application>Mageia</application> будет
использовать этот выбор во время установки и в установленной системе.</para>
- <para>Если в системе будет использоваться несколько языков (вами или другими
+ <para condition="classical">Если в системе будет использоваться несколько языков (вами или другими
пользователями), нажмите кнопку <guibutton>Несколько языков</guibutton>,
чтобы добавить их. После установки добавить поддержку языков будет довольно
сложно.</para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-selectLanguage.png" align="center"
-format="PNG" > </imagedata> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-language.png" format=""/>
+</imageobject></mediaobject>
- <warning>
+ <warning condition="classical">
<para>Даже если вами было выбрано несколько языков, вам сначала необходимо выбрать
один из них как основной язык страниц программы установки. Кроме того, этот
язык будет отмечен и в окне выбора нескольких языков.</para>
</warning>
<itemizedlist>
- <listitem>
+ <listitem condition="classical">
<para>Если раскладка вашей клавиатуры не совпадает с раскладкой, используемой для
желаемого языка, следует также установить языковые пакеты для языка,
связанные с выбранной раскладкой.</para>
</listitem>
<listitem>
- <para>По умолчанию в Mageia используется кодировка UTF-8 (Unicode). Эту кодировку
-можно отключить в окне выбора нескольких языков, если вам заранее известно,
-что Unicode несовместим с вашим языком. Выключение UTF-8 касается всех
-установленных языков.</para>
+ <para>Mageia uses UTF-8 (Unicode) support by default.</para>
+
+ <para condition="classical">Кодировку можно отключить в окне выбора нескольких языков, если вам заранее
+известно, что Unicode несовместим с вашим языком. Выключение UTF-8 касается
+всех установленных языков.</para>
</listitem>
<listitem>
<para>Изменить язык интерфейса системы после установки можно с помощью Центра
-управления Mageia -&gt; Система -&gt; Настройка локализации системы.</para>
+управления Mageia -> Система -> Настройка локализации системы.</para>
</listitem>
</itemizedlist>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/installer/ru/setupBootloader.xml b/docs/installer/ru/setupBootloader.xml
index 1f0f6095..62ff3116 100644
--- a/docs/installer/ru/setupBootloader.xml
+++ b/docs/installer/ru/setupBootloader.xml
@@ -1,100 +1,124 @@
<?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="ru" xml:id="setupBootloader">
- <info>
- <title xml:id="setupBootloader-ti1">Основные параметры загрузчика</title>
- </info>
+
- <mediaobject>
-<!-- 2012-08-12 Copied this page, setupBootloader.xml, from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.
+ <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-->
+<title xml:id="setupBootloader-ti1">Основные параметры загрузчика</title>
+ </info>
- 2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist-->
-<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
-format="PNG"/> </imageobject></mediaobject>
+ <mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="setupBootloader-im1"
+format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata
+xml:id="setupBootloader-im1" format="PNG" align="center" revision="1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
- <para><note>
- <para>Если вы пользуетесь системой с UEFI system, интерфейс немного будет
-отличаться, т.к. вы не сможете выбрать загрузчик (с первого раскрывающегося
-списка), - здесь выбор будет однозначным</para>
- </note></para>
+ <section>
+ <title>With a Bios system</title>
- <para xml:id="setupBootloader-pa1" revision="4">Если вам нужны другие параметры работы загрузчика, чем те, которые были
+ <para xml:id="setupBootloader-pa1" revision="4">Если вам нужны другие параметры работы загрузчика, чем те, которые были
выбраны автоматически программой для установки системы, вы можете изменить
их с помощью этой страницы.</para>
- <para xml:id="setupBootloader-pa2" revision="4">Вероятно, вы уже пользовались какой-то операционной системой на
+ <para xml:id="setupBootloader-pa2" revision="4">Вероятно, вы уже пользовались какой-то операционной системой на
компьютере. Если это так, вам следует определиться, должен ли быть добавлен
пункт Mageia к меню текущего загрузчика, или Mageia должна создать
собственный загрузчик.</para>
- <tip>
- <para revision="2" xml:id="setupBootloader-pa3">Графические меню Mageia выглядят великолепно. :)</para>
- </tip>
+ <tip>
+ <para>Графические меню Mageia выглядят великолепно. :</para>
+ </tip>
- <section xml:id="usingMageiaBootloader">
- <info>
- <title xml:id="usingMageiaBootloader-ti2">Использование загрузчика Mageia</title>
- </info>
+ <section xml:id="usingMageiaBootloader">
+ <info>
+ <title xml:id="usingMageiaBootloader-ti2">Использование загрузчика Mageia</title>
+ </info>
- <para revision="3" xml:id="setupBootloader-pa4">По умолчанию Mageia записывает новый загрузчик GRUB (устаревшую версию) в
+ <para xml:id="setupBootloader-pa4" revision="3">По умолчанию Mageia записывает новый загрузчик GRUB (устаревшую версию) в
MBR (основную загрузочную запись) первого диска компьютера. Если на диске
уже были установлены операционные системы, Mageia попытается добавить пункты
этих операционных систем в новое меню загрузки Mageia.</para>
- <para revision="3">В новой версии Mageia вы сможете воспользоваться загрузчиком GRUB2 в
+ <para revision="3">В новой версии Mageia вы сможете воспользоваться загрузчиком GRUB2 в
дополнение к устаревшей версии GRUB и Lilo.</para>
- <warning>
- <para revision="3" xml:id="setupBootloader-pa6">Операционные системы Linux, в которых используется загрузчик GRUB2, в
+ <warning>
+ <para xml:id="setupBootloader-pa6" revision="3">Операционные системы Linux, в которых используется загрузчик GRUB2, в
текущей версии не распознаются и не поддерживаются дефолтным загрузчиком
GRUB (устаревшей версии).</para>
- <para revision="3">Лучшим решением является использование загрузчика GRUB2. Приказать системе
+ <para revision="3">Лучшим решением является использование загрузчика GRUB2. Приказать системе
использовать именно этот загрузчик можно на странице «Резюме» при установке
операционной системы.</para>
- </warning>
- </section>
+ </warning>
+ </section>
- <section xml:id="usingExistingBootloader">
- <info>
- <title revision="2" xml:id="usingExistingBootloader-ti4">Использование уже установленного загрузчика</title>
- </info>
+ <section xml:id="usingExistingBootloader">
+ <info>
+ <title xml:id="usingExistingBootloader-ti4" revision="2">Использование уже установленного загрузчика</title>
+ </info>
- <para revision="3" xml:id="setupBootloader-pa46">Если вы решите воспользоваться уже установленным загрузчиком, не забудьте
+ <para xml:id="setupBootloader-pa46" revision="3">Если вы решите воспользоваться уже установленным загрузчиком, не забудьте
остановиться на странице «Резюме» при установке и нажать в разделе
«Загрузчик» кнопку <guibutton>Настроить</guibutton>, с помощью которой вы
сможете изменить место установки загрузчика.</para>
- <para revision="1" xml:id="setupBootloader-pa47">Не выбирайте устройство, например «sda», иначе уже созданная запись MBR
+ <para xml:id="setupBootloader-pa47" revision="1">Не выбирайте устройство, например «sda», иначе уже созданная запись MBR
будет перезаписана. Вам следует выбрать корневой раздел, который выбран на
шаге распределения диска на разделы, например «sda7».</para>
- <para xml:id="setupBootloader-pa48" revision="1">Если быть точным, sda - это устройство, а sda7 - раздел на устройстве.</para>
+ <para xml:id="setupBootloader-pa48" revision="1">Если быть точным, sda - это устройство, а sda7 - раздел на устройстве.</para>
- <tip>
- <para revision="1" xml:id="setupBootloader-pa48a">Перейдите на tty2 нажатием комбинации клавиш Ctrl+Alt+F2 и отдайте команду
+ <tip>
+ <para revision="1" xml:id="setupBootloader-pa48a">Перейдите на tty2 нажатием комбинации клавиш Ctrl+Alt+F2 и отдайте команду
<literal>df</literal> чтобы определить расположение вашего раздела
<literal>/</literal> (корневого каталога). Вернуться к окну инсталлятора
можно с помощью нажатия комбинации клавиш Ctrl+Alt+F7.</para>
- </tip>
+ </tip>
- <para revision="2" xml:id="setupBootloader-pa49">Полный перечень шагов добавления пункта ОС Mageia в меню уже установленного
+ <para xml:id="setupBootloader-pa49" revision="2">Полный перечень шагов добавления пункта ОС Mageia в меню уже установленного
загрузчика не является предметом этой справочной страницы. Впрочем, в
основном, эти шаги связаны с запуском соответствующей программы установки
загрузчика, которая должна выявить и добавить пункт системы в автоматическом
режиме. Соответствующие пояснения должны быть приведены в документации
другой операционной системы.</para>
- </section>
+ </section>
- <section xml:id="advancedOptionBootloader">
- <info>
- <title revision="2" xml:id="advancedOptionBootloader-ti5">Дополнительные параметры загрузчика</title>
- </info>
+ <section xml:id="advancedOptionBootloader">
+ <info>
+ <title xml:id="advancedOptionBootloader-ti5" revision="2">Дополнительные параметры загрузчика</title>
+ </info>
- <para revision="3" xml:id="setupBootloader-pa52">Если объем на диске с разделом <literal>/</literal>, содержащий каталог
+ <para xml:id="setupBootloader-pa52" revision="3">Если объем на диске с разделом <literal>/</literal>, содержащий каталог
<literal>/tmp</literal>, является очень ограниченным, нажмите кнопку
<guibutton>Дополнительно</guibutton> и отметьте пункт <guilabel>Очищать /tmp
при каждой перезагрузке</guilabel>. Это поможет сэкономить немного места.</para>
+ </section>
+ </section>
+
+ <section>
+ <title>With an UEFI system</title>
+
+ <para>With an UEFI system, the user interface is slightly different as you cannot
+choose the boot loader since only Grub2-efi is available. </para>
+
+ <mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader2.png"/>
+</imageobject></mediaobject>
+
+ <para>If Mageia is the first system installed on your computer, the installer
+created an ESP (EFI System Partition) to receive the bootloader
+(Grub2-efi). If there was already UEFI operating systems previously
+installed on your computer (Windows 8 for example), the Mageia installer
+detected the existing ESP created by Windows and added grub2-efi. Although
+it is possible to have several ESPs, only one is advised and enough whatever
+the number of operating systems you have.</para>
+
+ <para>Don't modify the "Boot Device" unless really knowing what you do.</para>
</section>
</section> \ No newline at end of file
diff --git a/docs/installer/ru/setupBootloaderAddEntry.xml b/docs/installer/ru/setupBootloaderAddEntry.xml
index c818d678..7a69cdab 100644
--- a/docs/installer/ru/setupBootloaderAddEntry.xml
+++ b/docs/installer/ru/setupBootloaderAddEntry.xml
@@ -1,43 +1,72 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="ru">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ru" xml:id="setupBootloaderAddEntry">
+
+
<info>
- <title xml:id="setupBootloaderAddEntry-ti1">Добавление пункта в меню загрузки или внесение изменений в такие пункты</title>
+ <!--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-->
+<title xml:id="setupBootloaderAddEntry-ti1">Добавление пункта в меню загрузки или внесение изменений в такие пункты</title>
</info>
<mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
-xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="dx2-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="live-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject></mediaobject>
+
+ <section>
+ <title>With a Bios system</title>
- <para>Чтобы добавить запись или внести изменения в выбранную запись, нажмите
+ <para>Чтобы добавить запись или внести изменения в выбранную запись, нажмите
соответствующую кнопку на странице <emphasis>Настройки
загрузчика</emphasis>. В ответ будет показано окно редактирования.</para>
- <note>
- <para>Если вами был выбран загрузчик <code>Grub 2</code> или Grub2-efi для систем
-с UEFI, тогда вы не сможете воспользоваться этим инструментом для
-редактирования записей на следующем шаге, после нажатия кнопки «Далее». Вам
-следует воспользоваться другим графическим инструментом для редактирования,
-в частности <code>kcm-grub2</code>, <code>grub-customizer</code>, или внести
-изменения в <code>/boot/grub2/custom.cfg</code > вручную.</para>
- </note>
+ <note>
+ <para>Если вами был выбран загрузчик <code>Grub 2</code>, тогда вы не сможете
+воспользоваться этим инструментом для редактирования записей на следующем
+шаге, после нажатия кнопки «Далее». Вам следует воспользоваться другим
+графическим инструментом для редактирования, в частности
+<code>kcm-grub2</code>, <code>grub-customizer</code>, или внести изменения в
+<code>/boot/grub2/custom.cfg</code > вручную.</para>
+ </note>
- <mediaobject>
-<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
-align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+ <mediaobject>
+<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1"
+align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
</imageobject></mediaobject>
- <para>Некоторые из действий можно выполнять ничем не рискуя. К таким действиям
+ <para>Некоторые из действий можно выполнять ничем не рискуя. К таким действиям
относится изменение метки записи или обозначение дефолтной записи в списке.</para>
- <para>Вы можете добавить к записи надлежащий номер версии или полностью изменить
+ <para>Вы можете добавить к записи надлежащий номер версии или полностью изменить
название записи.</para>
- <para>Дефолтный пункт - это пункт операционной системы, которая загружается, если
+ <para>Дефолтный пункт - это пункт операционной системы, которая загружается, если
пользователем не будет сделано другого выбора во время показа меню загрузки.</para>
- <warning>
- <para>Изменение других параметров может привести к невозможности загрузки
+ <warning>
+ <para>Изменение других параметров может привести к невозможности загрузки
системы. Пожалуйста, не экспериментируйте с этими параметрами, если вам
достоверно неизвестно их назначение.</para>
- </warning>
+ </warning>
+ </section>
+
+ <section>
+ <title>With an UEFI system</title>
+
+ <para>In this case you are using Grub2-efi and you cannot use this tool to edit
+entries at this step. To do that you need to manually edit
+<code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code>
+instead. All you can do here, is to choose the default entry in the drop
+down list.</para>
+
+ <para>After a click on the <guibutton>Next</guibutton> button, another drop down
+list allows to choose the video resolution for Grub2 which is a graphical
+boot loader.</para>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="dx2-bootloaderConfiguration2.png"/>
+</imageobject></mediaobject>
+ </section>
</section> \ No newline at end of file
diff --git a/docs/installer/ru/takeOverHdConfirm.xml b/docs/installer/ru/takeOverHdConfirm.xml
index c57b6452..1b47322c 100644
--- a/docs/installer/ru/takeOverHdConfirm.xml
+++ b/docs/installer/ru/takeOverHdConfirm.xml
@@ -12,15 +12,18 @@
-<mediaobject>
+ <mediaobject>
<!-- Made by marja on 2012 04 03 -->
<!-- test comment - johnr -->
<!-- 2012-04-24 marja - replaced "if you are not sure you selected the correct
hard disk." with "if you are not sure about your choice", because I'm sure I
saw this help screen when I had only one HD -->
<!-- 2013-05-05 marja added screenshot -->
-<imageobject> <imagedata fileref="dx2-takeOverHdConfirm.png" format="PNG"
-align="center" ></imagedata> </imageobject></mediaobject>
+<imageobject condition='live'> <imagedata
+fileref="live-takeOverHdConfirm.png" format="PNG" align="center"
+></imagedata> </imageobject> <imageobject condition='classical'> <imagedata
+fileref="dx2-takeOverHdConfirm.png" format="PNG" align="center"
+></imagedata> </imageobject></mediaobject>
<para revision="1" xml:id="takeOverHdConfirm-pa1">Нажмите кнопку <guibutton>Назад</guibutton>, если вы не уверены в сделанном
выборе.</para>
diff --git a/docs/installer/ru/testing.xml b/docs/installer/ru/testing.xml
new file mode 100644
index 00000000..338220c3
--- /dev/null
+++ b/docs/installer/ru/testing.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ru" xml:id="testing" xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns="http://docbook.org/ns/docbook">
+ <info>
+ <title xml:id="testing-ti1">Testing Mageia as Live system</title>
+ </info>
+
+ <section xml:id="testing-1">
+ <info>
+ <title xml:id="testing1-ti1">Режим Live</title>
+ </info>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
+
+ <para>You get this screen if you selected "Boot Mageia". If not, you get the
+"<link linkend="doPartitionDisks">Partitioning</link> step"</para>
+
+ <section>
+ <info>
+ <title xml:id="testing2-ti1">Testing hardware</title>
+ </info>
+
+ <para>One of the Live mode goals is to test if the hardware is correctly managed
+by Mageia. You can check if all devices have a driver in the Hardware
+section of the Mageia Control Center. You can test the most current devices:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>network interface: configure it with net_applet</para>
+ </listitem>
+
+ <listitem>
+ <para>graphical card: if you see the previous screen, it's already OK.</para>
+ </listitem>
+
+ <listitem>
+ <para>webcam:</para>
+ </listitem>
+
+ <listitem>
+ <para>sound: a jingle has already been played</para>
+ </listitem>
+
+ <listitem>
+ <para>printer: configure it and print a test page</para>
+ </listitem>
+
+ <listitem>
+ <para>scanner: scan a document from ...</para>
+ </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>
+
+ <remark>The configuration settings you made here are kept for the installation.</remark>
+ </section>
+
+ <section>
+ <info>
+ <title xml:id="testing3-ti1">Запуск установки</title>
+ </info>
+
+ <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/installer/ru/uninstall-Mageia.xml b/docs/installer/ru/uninstall-Mageia.xml
index e6d7e0a6..d1a47745 100644
--- a/docs/installer/ru/uninstall-Mageia.xml
+++ b/docs/installer/ru/uninstall-Mageia.xml
@@ -1,5 +1,5 @@
<?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="ru" xml:id="uninstall-Mageia">
- <!-- -->
+ <!--Lebarhon 2015-07-06 Not true with UEFI -->
<info>
<title xml:id="uninstall-Mageia-ti1">Удаление Mageia</title>
</info>
diff --git a/docs/installer/ru/unused.xml b/docs/installer/ru/unused.xml
new file mode 100644
index 00000000..6470a0b5
--- /dev/null
+++ b/docs/installer/ru/unused.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ru" 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">
+ <info>
+ <title xml:id="unused-ti1">Keep or delete unused material</title>
+ </info>
+
+ <mediaobject condition="live">
+<imageobject> <imagedata align="center" fileref="live-unused.png"
+format="PNG" revision="1" xml:id="unused-im1"/> </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>
+
+ <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>
+</section>
diff --git a/docs/installer/sk/bootLive.xml b/docs/installer/sk/bootLive.xml
index e39f7aa0..c0634d8f 100644
--- a/docs/installer/sk/bootLive.xml
+++ b/docs/installer/sk/bootLive.xml
@@ -1,134 +1,28 @@
-<?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="bootLive" version="5.0" xml:lang="sk">
- <info>
- <title xml:id="bootLive-ti1">Zaviesť Mageiu ako Živý systém</title>
- </info>
-
- <section xml:id="bootLive-1">
- <info>
- <title xml:id="bootLive1-ti1">Zavedenie z dátového nosiča</title>
- </info>
-
- <section>
- <info>
- <title xml:id="bootLive11-ti1">Z disku</title>
- </info>
-
- <para>Systém môžete zaviesť z nosiča, na ktorý ste napálili váš obrazový súbor
+<?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="sk"><info><title xml:id="bootLive-ti1">Zaviesť Mageiu ako Živý systém</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Zavedenie z dátového nosiča</title></info><section><info><title xml:id="bootLive11-ti1">Z disku</title></info><para>Systém môžete zaviesť z nosiča, na ktorý ste napálili váš obrazový súbor
(CDčko, DVDčko...). Zvyčajne ho stačí len vložiť do vašej CD/DVD mechaniky,
aby zavádzač spustil inštaláciu automaticky po reštarte počítača. Ak sa to
nestane, možno potrebujete prekonfigurovať váš BIOS alebo stlačiť jednu
klávesu, ktorá vám ponúkne vybrať si zariadenie, z ktorého sa počítač
-zavedie.</para>
-
- <para>Podľa toho ktorý máte hardvér a ako je nakonfigurovaný, objaví sa buď jedna
-alebo druhá z dvoch nižšie uvedených obrazoviek.</para>
- </section>
-
- <section>
- <info>
- <title xml:id="bootLive12-ti1">Z USB zariadenia</title>
- </info>
-
- <para>Počítač môžete naštartovať z USB zariadenia, na ktorom je zaznamenaný váš
+zavedie.</para><para>Podľa toho ktorý máte hardvér a ako je nakonfigurovaný, objaví sa buď jedna
+alebo druhá z dvoch nižšie uvedených obrazoviek.</para></section><section><info><title xml:id="bootLive12-ti1">Z USB zariadenia</title></info><para>Počítač môžete naštartovať z USB zariadenia, na ktorom je zaznamenaný váš
ISO obraz. Vzhľadom na nastavenia vášho BIOSu sa počítač možno už zavádza
priamo z USB zariadenia zastrčeného v porte počítača. Ak sa tak nedeje,
možno potrebujete prekonfigurovať váš BIOS alebo stlačiť jednu klávesu,
-ktorá vám ponúkne vybrať si periférium, z ktorého sa naštartuje počítač.</para>
- </section>
- </section>
-
- <section xml:id="biosmode">
- <info>
- <title xml:id="biosmode-ti1">V zastaralom BIOS/CSM režime</title>
- </info>
-
- <mediaobject>
- <imageobject> <imagedata fileref="live-bootCSM.png"/> </imageobject>
-
- <caption>
- <para>Prvá obrazovka počas spúšťania v BIOSovom režime</para>
- </caption>
- </mediaobject>
-
- <para>V prostrednej ponuke, máte voľbu medzi tromi akciami:</para>
-
- <itemizedlist>
- <listitem>
- <para>Zaviesť Mageiu: Toto znamená že Mageia 5 sa spustí z pripojeného nosiča
+ktorá vám ponúkne vybrať si periférium, z ktorého sa naštartuje počítač.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">V zastaralom BIOS/CSM režime</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Prvá obrazovka počas spúšťania v BIOSovom režime</para></caption></mediaobject><para>V prostrednej ponuke, máte voľbu medzi tromi akciami:</para><itemizedlist><listitem><para>Zaviesť Mageiu: Toto znamená že Mageia 5 sa spustí z pripojeného nosiča
(CD/DVD alebo USB kľúča) bez akéhokoľvek zapisovania na disk, takže
očakávajte veľmi pomalý systém. Keď sa zavádzanie dokončí, môžete prikročiť
-i ku inštalácií na pevný disk.</para>
- </listitem>
-
- <listitem>
- <para>Nainštalovať Mageiu: Táto voľba priamo nainštaluje Mageiu na pevný disk.</para>
- </listitem>
-
- <listitem>
- <para>Spustiť z pevného disku: Táto voľba dovoľuje zaviesť systém z pevného disku,
+i ku inštalácií na pevný disk.</para></listitem><listitem><para>Nainštalovať Mageiu: Táto voľba priamo nainštaluje Mageiu na pevný disk.</para></listitem><listitem><para>Spustiť z pevného disku: Táto voľba dovoľuje zaviesť systém z pevného disku,
tak ako zvyčajne, keď žiadne médium (CD/DVD alebo USB kľúč) nie je
-pripojené. (nepracuje sa s Mageiou 5).</para>
- </listitem>
- </itemizedlist>
-
- <para>V spodnej ponuke sú Možnosti Zavedenia systému:</para>
-
- <itemizedlist>
- <listitem>
- <para>F1 - Pomoc. Vysvetľuje možnosti "splash", "apm", "acpi" a "Ide"</para>
- </listitem>
-
- <listitem>
- <para>F2 - Jazyk. Vyberte si pre zobrazenie jazyka obrazoviek.</para>
- </listitem>
-
- <listitem>
- <para>F3 - Rozlíšenie obrazovky. Voľba medzi textom, 640x400, 800x600, 1024x728</para>
- </listitem>
-
- <listitem>
- <para>F4 - CD-Rom. CD-Rom alebo Ďalšie. Normálne sa inštalácia vykoná z vloženého
+pripojené. (nepracuje sa s Mageiou 5).</para></listitem></itemizedlist><para>V spodnej ponuke sú Možnosti Zavedenia systému:</para><itemizedlist><listitem><para>F1 - Pomoc. Vysvetľuje možnosti "splash", "apm", "acpi" a "Ide"</para></listitem><listitem><para>F2 - Jazyk. Vyberte si pre zobrazenie jazyka obrazoviek.</para></listitem><listitem><para>F3 - Rozlíšenie obrazovky. Voľba medzi textom, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom alebo Ďalšie. Normálne sa inštalácia vykoná z vloženého
inštalačného média. Tu si vyberáte iné zdroje, akými sú FTP alebo NFS
servery. Ak sa inštalácia vykonáva v sieti so SLP serverom, pri tejto
-možnosti si vyberte jeden z inštalačných zdrojov dostupných na serveri.</para>
- </listitem>
-
- <listitem>
- <para>F5 - Ovládač. Áno alebo Nie. Systém je upovedomený o prítomnosti voliteľného
+možnosti si vyberte jeden z inštalačných zdrojov dostupných na serveri.</para></listitem><listitem><para>F5 - Ovládač. Áno alebo Nie. Systém je upovedomený o prítomnosti voliteľného
disku s aktualizáciou ovládača a bude požadovať jeho vloženie počas procesu
-inštalácie.</para>
- </listitem>
-
- <listitem>
- <para>F6 - Voľby jadra. Toto je cesta pre zadanie volieb vzťahujúcich sa k vášmu
-hardvéru a ovládačom, ktoré sa použijú.</para>
- </listitem>
- </itemizedlist>
- </section>
-
- <section xml:id="uefimode">
- <info>
- <title xml:id="uefimode-ti1">V UEFI režime</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center"
-fileref="live-bootUEFI.png" format="PNG" xml:id="bootUEFI-im1"/>
-</imageobject>
-
- <caption>
- <para>Prvá obrazovka počas štartu na UEFI systémoch z disku</para>
- </caption>
- </mediaobject>
-
- <para>Tu máte len možnosť spustiť Mageiu v Živom režime (prvá voľba) alebo spustiť
-inštaláciu (druhá voľba).</para>
- <para>Ak ste naštartovali počítač z USB kľúča, dostanete dva doplňujúce riadky,
+inštalácie.</para></listitem><listitem><para>F6 - Voľby jadra. Toto je cesta pre zadanie volieb vzťahujúcich sa k vášmu
+hardvéru a ovládačom, ktoré sa použijú.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">V UEFI režime</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
+align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>Prvá obrazovka počas štartu na UEFI systémoch z disku</para></caption></mediaobject><para>Tu máte len možnosť spustiť Mageiu v Živom režime (prvá voľba) alebo spustiť
+inštaláciu (druhá voľba).</para><para>Ak ste naštartovali počítač z USB kľúča, dostanete dva doplňujúce riadky,
ktoré sú duplikáty predošlých riadkov zakončené so skratkou "USB". Máte ich
-na výber.</para>
-
- <para>V každom prípade budú prvé kroky rovnaké - vybrať si jazyk, časovú zónu a
+na výber.</para><para>V každom prípade budú prvé kroky rovnaké - vybrať si jazyk, časovú zónu a
klávesnicu; potom sa postupy odlišujú v <link linkend="testing">dodatočných
-krokoch v Živom režime</link>.</para>
- </section>
-</section> \ No newline at end of file
+krokoch v Živom režime</link>.</para></section></section> \ No newline at end of file
diff --git a/docs/installer/sk/login.xml b/docs/installer/sk/login.xml
index c386dc63..88f5f518 100644
--- a/docs/installer/sk/login.xml
+++ b/docs/installer/sk/login.xml
@@ -1,25 +1,7 @@
-<?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="login" version="5.0" xml:lang="sk">
- <info>
- <title xml:id="label-to-adapt-ti1">Prihlasovacia obrazovka</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center" xml:id="login-im1"
-format="PNG" fileref="live-login.png"/> </imageobject>
-
- <caption>
- <para>KDM prihlasovacia obrazovka</para>
- </caption>
- </mediaobject>
-
- <para>Nakoniec sa dostanete ku prihlasovacej obrazovke</para>
-
- <para>Vložte vaše používateľské meno a používateľské heslo a za pár sekúnd sa
+<?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="sk"><info><title xml:id="label-to-adapt-ti1">Prihlasovacia obrazovka</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM prihlasovacia obrazovka</para></caption></mediaobject><para>Nakoniec sa dostanete ku prihlasovacej obrazovke</para><para>Vložte vaše používateľské meno a používateľské heslo a za pár sekúnd sa
ocitnete na načítanej KDE alebo GNOME pracovnej ploche, podľa toho ktorý
živý dátový nosič ste použili. Teraz môžete začať používať vašu inštaláciu
-Mageie.</para>
-
- <para>Ďalšiu časť našej dokumentácie môžete nájsť na <link
+Mageie.</para><para>Ďalšiu časť našej dokumentácie môžete nájsť na <link
linkend="https://wiki.mageia.org/en/Category:Documentation">Mageia
-wiki</link>.</para>
-</section> \ No newline at end of file
+wiki</link>.</para></section> \ No newline at end of file
diff --git a/docs/installer/sk/selectLanguage.xml b/docs/installer/sk/selectLanguage.xml
index 826962e7..0cfaa56f 100644
--- a/docs/installer/sk/selectLanguage.xml
+++ b/docs/installer/sk/selectLanguage.xml
@@ -32,7 +32,7 @@ náročné pridať extra jazykovú podporu po inštalácií.</para>
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
-condition="live"> <imagedata format="PNG" fileref="live-language.png"/>
+condition="live"> <imagedata fileref="live-language.png" format=""/>
</imageobject></mediaobject>
<warning condition="classical">
@@ -48,7 +48,7 @@ odporúča nainštalovať takisto jazyk vašej klávesnice.</para>
</listitem>
<listitem>
- <para>Mageia používa predvolene UTF-8 (Unicode) podporu. </para>
+ <para>Mageia používa predvolene UTF-8 (Unicode) podporu.</para>
<para condition="classical">Táto môže byť vypnutá na obrazovke "viaceré jazyky", ak viete, že je
nevhodná pre váš jazyk. Zakázanie UTF-8 sa použije pre všetky nainštalované
diff --git a/docs/installer/sk/setupBootloader.xml b/docs/installer/sk/setupBootloader.xml
index 2e37a7da..c22b0de8 100644
--- a/docs/installer/sk/setupBootloader.xml
+++ b/docs/installer/sk/setupBootloader.xml
@@ -10,9 +10,11 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
-format="PNG"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="setupBootloader-im1"
+format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata
+xml:id="setupBootloader-im1" format="PNG" align="center" revision="1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<section>
<title>So systémom BIOS</title>
@@ -33,7 +35,7 @@ alebo dovolíte Mageii vytvoriť nový zavádzač.</para>
<title xml:id="usingMageiaBootloader-ti2">Použitie zavádzača Mageie</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa4">Predvolene Mageia zapisuje nový zavádzač (obstarožného) GRUBa do MBR
+ <para xml:id="setupBootloader-pa4" revision="3">Predvolene Mageia zapisuje nový zavádzač (obstarožného) GRUBa do MBR
(Hlavného Spúšťacieho Záznamu) vášho prvého pevného disku. Ak už máte
nainštalované iné operačné systémy, Mageia sa pokúsi pridať ich do vašej
novej štartovacej ponuky Mageie.</para>
@@ -42,7 +44,7 @@ novej štartovacej ponuky Mageie.</para>
obstarožnému GRUBu a Lilu.</para>
<warning>
- <para revision="3" xml:id="setupBootloader-pa6">Linuxové systémy, ktoré používajú zavádzač GRUB2, nie sú momentálne
+ <para xml:id="setupBootloader-pa6" revision="3">Linuxové systémy, ktoré používajú zavádzač GRUB2, nie sú momentálne
podporované (zastaralým) GRUBom a nebudú rozpoznané, ak je použitý
predvolený zavádzač GRUB.</para>
@@ -53,15 +55,15 @@ súhrnnej stránke počas inštalácie.</para>
<section xml:id="usingExistingBootloader">
<info>
- <title revision="2" xml:id="usingExistingBootloader-ti4">Použitie už existujúceho zavádzača</title>
+ <title xml:id="usingExistingBootloader-ti4" revision="2">Použitie už existujúceho zavádzača</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa46">Ak sa rozhodnete použiť už existujúci zavádzač, potom sa potrebujete
+ <para xml:id="setupBootloader-pa46" revision="3">Ak sa rozhodnete použiť už existujúci zavádzač, potom sa potrebujete
POZASTAVIŤ na sumárnej stránke počas inštalácie a kliknúť na tlačidlo
<guibutton>Konfigurovania</guibutton> zavádzača, ktoré vám dovolí zmeniť
inštalačné umiestnenie zavádzača.</para>
- <para revision="1" xml:id="setupBootloader-pa47">Nevyberajte si zariadenie ako je napr. "sda", inak prepíšete váš existujúci
+ <para xml:id="setupBootloader-pa47" revision="1">Nevyberajte si zariadenie ako je napr. "sda", inak prepíšete váš existujúci
MBR. Musíte si vybrať koreňovú partíciu, ktorú ste si vybrali skoršie počas
fázy delenia disku, ako je napr. sda7.</para>
@@ -74,7 +76,7 @@ skontrolovanie, kde je umiestnená vaša <literal>/</literal> (koreňová)
partícia. Ctrl+Alt+F7 vás dostane naspäť na obrazovku inštalátora.</para>
</tip>
- <para revision="2" xml:id="setupBootloader-pa49">Presná procedúra pre pridanie vášho systému Mageia ku existujúcemu zavádzaču
+ <para xml:id="setupBootloader-pa49" revision="2">Presná procedúra pre pridanie vášho systému Mageia ku existujúcemu zavádzaču
presahuje oblasť tejto nápovedy, avšak vo väčšine prípadov bude zahŕňať
spustenie príslušného programu na inštaláciu zavádzača, ktorý by ho mal
detekovať a pridať automaticky. Pozrite si dokumentáciu pre otázny operačný
@@ -83,10 +85,10 @@ systém.</para>
<section xml:id="advancedOptionBootloader">
<info>
- <title revision="2" xml:id="advancedOptionBootloader-ti5">Pokročilé parametre zavádzača</title>
+ <title xml:id="advancedOptionBootloader-ti5" revision="2">Pokročilé parametre zavádzača</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa52">Ak máte veľmi obmedzený diskový priestor pre <literal>/</literal> partíciu,
+ <para xml:id="setupBootloader-pa52" revision="3">Ak máte veľmi obmedzený diskový priestor pre <literal>/</literal> partíciu,
ktorá obsahuje <literal>/tmp</literal> adresár, kliknite na tlačidlo
<guibutton>Pokročilé</guibutton> a skontrolujte políčko <guilabel>Vyčistiť
/tmp pred každým zavedením systému</guilabel>. Toto pomôže podržať trochu
@@ -101,7 +103,10 @@ voľného miesta.</para>
nemôžete zvoliť zavádzač systému, keďže je dostupný len Grub2-efi. </para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader2.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader2.png"/>
+</imageobject></mediaobject>
<para>Ak je Mageia prvým systémom nainštalovaným na váš počítač, inštalátor
vytvoril ESP (EFI Systémovú Partíciu) pre zapísanie zavádzača
diff --git a/docs/installer/sk/setupBootloaderAddEntry.xml b/docs/installer/sk/setupBootloaderAddEntry.xml
index 1e45e8d4..a9d99dd6 100644
--- a/docs/installer/sk/setupBootloaderAddEntry.xml
+++ b/docs/installer/sk/setupBootloaderAddEntry.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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="sk">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sk" xml:id="setupBootloaderAddEntry">
<info>
@@ -7,9 +7,13 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
-xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="dx2-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="live-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject></mediaobject>
<section>
<title>So systémom BIOS</title>
@@ -26,8 +30,8 @@ upraviť súbor <code>/boot/grub2/custom.cfg</code> alebo miesto toho použiť
</note>
<mediaobject>
-<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
-align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1"
+align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
</imageobject></mediaobject>
<para>Niektoré veci, ktoré môžu byť vykonané bez akéhokoľvek rizika, sú zmena
diff --git a/docs/installer/sk/unused.xml b/docs/installer/sk/unused.xml
index 9ab9878b..15884fc2 100644
--- a/docs/installer/sk/unused.xml
+++ b/docs/installer/sk/unused.xml
@@ -19,7 +19,7 @@ prijať to, okrem prípadu, že pripravujete inštaláciu, ktorá má bežať na
odlišnom hardvéri.</para>
<mediaobject>
-<imageobject> <imagedata fileref="live-unused-InstallationProgress.png"/>
+<imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
</imageobject></mediaobject>
<para>Ďalším krokom je kopírovanie súborov na pevný disk. Toto zaberie niekoľko
diff --git a/docs/installer/sl/bootLive.xml b/docs/installer/sl/bootLive.xml
index 8b94e8a6..1f24dee2 100644
--- a/docs/installer/sl/bootLive.xml
+++ b/docs/installer/sl/bootLive.xml
@@ -1,136 +1,30 @@
-<?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="bootLive" version="5.0" xml:lang="sl">
- <info>
- <title xml:id="bootLive-ti1">Zaženi Magejo kot živ sistem</title>
- </info>
-
- <section xml:id="bootLive-1">
- <info>
- <title xml:id="bootLive1-ti1">Zagon medija</title>
- </info>
-
- <section>
- <info>
- <title xml:id="bootLive11-ti1">Z diska</title>
- </info>
-
- <para>You can boot directly from the media you used to burn your image (CD-ROM,
+<?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="sl"><info><title xml:id="bootLive-ti1">Zaženi Magejo kot živ sistem</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Zagon medija</title></info><section><info><title xml:id="bootLive11-ti1">Z diska</title></info><para>You can boot directly from the media you used to burn your image (CD-ROM,
DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the
bootloader to launch the installation automatically after rebooting the
computer. If that does not happen you may need to reconfigure your BIOS or
press one key that will offer you to choose the peripheral from which the
-computer will boot.</para>
-
- <para>According to which hardware you have, and how it is configured, you get
-either one or another of the two screens below.</para>
- </section>
-
- <section>
- <info>
- <title xml:id="bootLive12-ti1">Z naprave USB</title>
- </info>
-
- <para>You can boot from the USB device on which you dumped your image
+computer will boot.</para><para>According to which hardware you have, and how it is configured, you get
+either one or another of the two screens below.</para></section><section><info><title xml:id="bootLive12-ti1">Z naprave USB</title></info><para>You can boot from the USB device on which you dumped your image
ISO. According to your BIOS settings, the computer boots perhaps directly on
the USB device already plugged in a port. If that does not happen you may
need to reconfigure your BIOS or press one key that will offer you to choose
-the peripheral from which the computer will boot.</para>
- </section>
- </section>
-
- <section xml:id="biosmode">
- <info>
- <title xml:id="biosmode-ti1">V načinu BIOS/CSM/Legacy</title>
- </info>
-
- <mediaobject>
- <imageobject> <imagedata fileref="live-bootCSM.png"/> </imageobject>
-
- <caption>
- <para>Prvi zaslon med zagonom v načinu BIOS</para>
- </caption>
- </mediaobject>
-
- <para>In the middle menu, you have the choice between three actions:</para>
-
- <itemizedlist>
- <listitem>
- <para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
+the peripheral from which the computer will boot.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">V načinu BIOS/CSM/Legacy</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Prvi zaslon med zagonom v načinu BIOS</para></caption></mediaobject><para>In the middle menu, you have the choice between three actions:</para><itemizedlist><listitem><para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
or USB stick) without writing anything on the disk, so expect a very slow
system. Once the boot is done, you can proceed to the installation on a hard
-disk.</para>
- </listitem>
-
- <listitem>
- <para>Install Mageia: This choice will directly install Mageia on a hard disk.</para>
- </listitem>
-
- <listitem>
- <para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
+disk.</para></listitem><listitem><para>Install Mageia: This choice will directly install Mageia on a hard disk.</para></listitem><listitem><para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
when no media (CD/DVD or USB stick) is connected. (not working with Mageia
-5).</para>
- </listitem>
- </itemizedlist>
-
- <para>V spodnjem meniju so na voljo zagonske možnosti:</para>
-
- <itemizedlist>
- <listitem>
- <para>F1 - pomoč. Razlaga možnosti »splash«, »apm«, »acpi« in »Ide«</para>
- </listitem>
-
- <listitem>
- <para>F2 - jezik. Izbor jezika za prikaz na zaslonu.</para>
- </listitem>
-
- <listitem>
- <para>F3 - ločljivost zaslona. Na voljo je izbor: tekst, 640x400, 800x600,
-1024x728</para>
- </listitem>
-
- <listitem>
- <para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
+5).</para></listitem></itemizedlist><para>V spodnjem meniju so na voljo zagonske možnosti:</para><itemizedlist><listitem><para>F1 - pomoč. Razlaga možnosti »splash«, »apm«, »acpi« in »Ide«</para></listitem><listitem><para>F2 - jezik. Izbor jezika za prikaz na zaslonu.</para></listitem><listitem><para>F3 - ločljivost zaslona. Na voljo je izbor: tekst, 640x400, 800x600,
+1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
the inserted installation medium. Here, select other sources, like FTP or
NFS servers. If the installation is carried out in a network with an SLP
server, select one of the installation sources available on the server with
-this option.</para>
- </listitem>
-
- <listitem>
- <para>F5 - Driver. Yes or No. The system is aware about the presence of an
+this option.</para></listitem><listitem><para>F5 - Driver. Yes or No. The system is aware about the presence of an
optional disk with a driver update and will require its insertion during
-installation process.</para>
- </listitem>
-
- <listitem>
- <para>F6 - Kernel options. This is a way to specify options according to your
-hardware and the drivers to use.</para>
- </listitem>
- </itemizedlist>
- </section>
-
- <section xml:id="uefimode">
- <info>
- <title xml:id="uefimode-ti1">V načinu UEFI</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center"
-fileref="live-bootUEFI.png" format="PNG" xml:id="bootUEFI-im1"/>
-</imageobject>
-
- <caption>
- <para>Prvi zaslon med zagonom sistema z diska v načinu UEFI </para>
- </caption>
- </mediaobject>
-
- <para>You have only the choice to run Mageia in Live mode (first choice) or to
-process the installation (second choice).</para>
- <para>If you booted from a USB stick, you get two supplemental lines which are a
+installation process.</para></listitem><listitem><para>F6 - Kernel options. This is a way to specify options according to your
+hardware and the drivers to use.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">V načinu 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>Prvi zaslon med zagonom sistema z diska v načinu UEFI </para></caption></mediaobject><para>You have only the choice to run Mageia in Live mode (first choice) or to
+process the installation (second choice).</para><para>If you booted from a USB stick, you get two supplemental lines which are a
duplicata of the previous lines suffixed with "USB". You have to choose
-them.</para>
-
- <para>In each case, the first steps will be the same to choose language, timezone
+them.</para><para>In each case, the first steps will be the same to choose language, timezone
and keyboard, then the processes differ, with <link
-linkend="testing">additional steps in Live mode</link>.</para>
- </section>
-</section> \ No newline at end of file
+linkend="testing">additional steps in Live mode</link>.</para></section></section> \ No newline at end of file
diff --git a/docs/installer/sl/login.xml b/docs/installer/sl/login.xml
index 07397df3..01886b3d 100644
--- a/docs/installer/sl/login.xml
+++ b/docs/installer/sl/login.xml
@@ -1,24 +1,5 @@
-<?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="login" version="5.0" xml:lang="sl">
- <info>
- <title xml:id="label-to-adapt-ti1">Login screen</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center" xml:id="login-im1"
-format="PNG" fileref="live-login.png"/> </imageobject>
-
- <caption>
- <para>KDM login screen</para>
- </caption>
- </mediaobject>
-
- <para>Finally, you will come to the login screen.</para>
-
- <para>Enter your user name and user password, and in a few seconds you will find
+<?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="sl"><info><title xml:id="label-to-adapt-ti1">Login screen</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM login screen</para></caption></mediaobject><para>Finally, you will come to the login screen.</para><para>Enter your user name and user password, and in a few seconds you will find
yourself with a loaded KDE or GNOME desktop, depending on which live medium
-you used. You can now start using your Mageia installation.</para>
-
- <para>You can find another part of our documentation in <link
-linkend="https://wiki.mageia.org/en/Category:Documentation">the Mageia
-wiki</link>.</para>
-</section> \ No newline at end of file
+you used. You can now start using your Mageia installation.</para><para>Najdete jih <link
+ns4:href="http://www.mageia.org/sl/downloads/">tukaj</link>.</para></section> \ No newline at end of file
diff --git a/docs/installer/sl/setupBootloader.xml b/docs/installer/sl/setupBootloader.xml
index 1ef88a64..dc4973fa 100644
--- a/docs/installer/sl/setupBootloader.xml
+++ b/docs/installer/sl/setupBootloader.xml
@@ -10,9 +10,11 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
-format="PNG"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="setupBootloader-im1"
+format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata
+xml:id="setupBootloader-im1" format="PNG" align="center" revision="1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<section>
<title>With a Bios system</title>
@@ -33,7 +35,7 @@ allow Mageia to create a new one.</para>
<title xml:id="usingMageiaBootloader-ti2">Using a Mageia bootloader</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa4">By default, Mageia writes a new GRUB (legacy) bootloader into the MBR
+ <para xml:id="setupBootloader-pa4" revision="3">By default, Mageia writes a new GRUB (legacy) bootloader into the MBR
(Master Boot Record) of your first hard drive. If you already have other
operating systems installed, Mageia attempts to add them to your new Mageia
boot menu.</para>
@@ -42,7 +44,7 @@ boot menu.</para>
legacy and Lilo.</para>
<warning>
- <para revision="3" xml:id="setupBootloader-pa6">Linux systems which use the GRUB2 bootloader are not currently supported by
+ <para xml:id="setupBootloader-pa6" revision="3">Linux systems which use the GRUB2 bootloader are not currently supported by
GRUB (legacy) and will not be recognized if the default GRUB bootloader is
used.</para>
@@ -53,15 +55,15 @@ the Summary page during installation.</para>
<section xml:id="usingExistingBootloader">
<info>
- <title revision="2" xml:id="usingExistingBootloader-ti4">Using an existing bootloader</title>
+ <title xml:id="usingExistingBootloader-ti4" revision="2">Using an existing bootloader</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa46">If you decide to use an existing bootloader then you will need to remember
+ <para xml:id="setupBootloader-pa46" revision="3">If you decide to use an existing bootloader then you will need to remember
to STOP at the summary page during the installation and click the Bootloader
<guibutton>Configure</guibutton> button, which will allow you to change the
bootloader install location.</para>
- <para revision="1" xml:id="setupBootloader-pa47">Do not select a device e.g."sda", or you will overwrite your existing
+ <para xml:id="setupBootloader-pa47" revision="1">Do not select a device e.g."sda", or you will overwrite your existing
MBR. You must select the root partition that you chose during the
partitioning phase earlier, e.g. sda7.</para>
@@ -73,7 +75,7 @@ your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to
the installer screen.</para>
</tip>
- <para revision="2" xml:id="setupBootloader-pa49">The exact procedure for adding your Mageia system to an existing bootloader
+ <para xml:id="setupBootloader-pa49" revision="2">The exact procedure for adding your Mageia system to an existing bootloader
is beyond the scope of this help, 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
@@ -82,10 +84,10 @@ question.</para>
<section xml:id="advancedOptionBootloader">
<info>
- <title revision="2" xml:id="advancedOptionBootloader-ti5">Napredne možnosti zagonskega nalagalnika</title>
+ <title xml:id="advancedOptionBootloader-ti5" revision="2">Napredne možnosti zagonskega nalagalnika</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa52">If you have very limited disk space for the <literal>/</literal> partition
+ <para xml:id="setupBootloader-pa52" revision="3">If you have very limited disk space for the <literal>/</literal> partition
that contains <literal>/tmp</literal>, click on
<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /tmp
at each boot</guilabel>. This helps to maintain some free space.</para>
@@ -99,7 +101,10 @@ at each boot</guilabel>. This helps to maintain some free space.</para>
choose the boot loader since only Grub2-efi is available. </para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader2.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader2.png"/>
+</imageobject></mediaobject>
<para>If Mageia is the first system installed on your computer, the installer
created an ESP (EFI System Partition) to receive the bootloader
diff --git a/docs/installer/sl/setupBootloaderAddEntry.xml b/docs/installer/sl/setupBootloaderAddEntry.xml
index bebc3d84..52ae73ca 100644
--- a/docs/installer/sl/setupBootloaderAddEntry.xml
+++ b/docs/installer/sl/setupBootloaderAddEntry.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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="sl">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sl" xml:id="setupBootloaderAddEntry">
<info>
@@ -7,9 +7,13 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
-xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="dx2-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="live-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject></mediaobject>
<section>
<title>With a Bios system</title>
@@ -26,8 +30,8 @@ instead.</para>
</note>
<mediaobject>
-<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
-align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1"
+align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
</imageobject></mediaobject>
<para>Some things that can be done without any risk, are changing the label of an
diff --git a/docs/installer/sl/unused.xml b/docs/installer/sl/unused.xml
index a0d4d81f..0ae8036e 100644
--- a/docs/installer/sl/unused.xml
+++ b/docs/installer/sl/unused.xml
@@ -19,7 +19,7 @@ accept, except if you prepare an installation which has to run on different
hardware.</para>
<mediaobject>
-<imageobject> <imagedata fileref="live-unused-InstallationProgress.png"/>
+<imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
</imageobject></mediaobject>
<para>The next step is the copying of files on hard disk. This takes some
diff --git a/docs/installer/sq/bootLive.xml b/docs/installer/sq/bootLive.xml
index 6cf11ff2..0b423a5a 100644
--- a/docs/installer/sq/bootLive.xml
+++ b/docs/installer/sq/bootLive.xml
@@ -1,135 +1,29 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="bootLive" version="5.0" xml:lang="sq">
- <info>
- <title xml:id="bootLive-ti1">Ndez Mageia si Sistem Live</title>
- </info>
-
- <section xml:id="bootLive-1">
- <info>
- <title xml:id="bootLive1-ti1">Booting the medium</title>
- </info>
-
- <section>
- <info>
- <title xml:id="bootLive11-ti1">Nga disku</title>
- </info>
-
- <para>You can boot directly from the media you used to burn your image (CD-ROM,
+<?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="sq"><info><title xml:id="bootLive-ti1">Ndez Mageia si Sistem Live</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Booting the medium</title></info><section><info><title xml:id="bootLive11-ti1">Nga disku</title></info><para>You can boot directly from the media you used to burn your image (CD-ROM,
DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the
bootloader to launch the installation automatically after rebooting the
computer. If that does not happen you may need to reconfigure your BIOS or
press one key that will offer you to choose the peripheral from which the
-computer will boot.</para>
-
- <para>According to which hardware you have, and how it is configured, you get
-either one or another of the two screens below.</para>
- </section>
-
- <section>
- <info>
- <title xml:id="bootLive12-ti1">Nga një pajisje USB</title>
- </info>
-
- <para>You can boot from the USB device on which you dumped your image
+computer will boot.</para><para>According to which hardware you have, and how it is configured, you get
+either one or another of the two screens below.</para></section><section><info><title xml:id="bootLive12-ti1">Nga një pajisje USB</title></info><para>You can boot from the USB device on which you dumped your image
ISO. According to your BIOS settings, the computer boots perhaps directly on
the USB device already plugged in a port. If that does not happen you may
need to reconfigure your BIOS or press one key that will offer you to choose
-the peripheral from which the computer will boot.</para>
- </section>
- </section>
-
- <section xml:id="biosmode">
- <info>
- <title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title>
- </info>
-
- <mediaobject>
- <imageobject> <imagedata fileref="live-bootCSM.png"/> </imageobject>
-
- <caption>
- <para>Ekrani fillestarë gjatë ndezjes në mënyrë të BIOS</para>
- </caption>
- </mediaobject>
-
- <para>Nl menynë e mesëm, ju kenë zgjedhjen e tre veprimeve:</para>
-
- <itemizedlist>
- <listitem>
- <para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
+the peripheral from which the computer will boot.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Ekrani fillestarë gjatë ndezjes në mënyrë të BIOS</para></caption></mediaobject><para>Nl menynë e mesëm, ju kenë zgjedhjen e tre veprimeve:</para><itemizedlist><listitem><para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
or USB stick) without writing anything on the disk, so expect a very slow
system. Once the boot is done, you can proceed to the installation on a hard
-disk.</para>
- </listitem>
-
- <listitem>
- <para>Install Mageia: This choice will directly install Mageia on a hard disk.</para>
- </listitem>
-
- <listitem>
- <para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
+disk.</para></listitem><listitem><para>Install Mageia: This choice will directly install Mageia on a hard disk.</para></listitem><listitem><para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
when no media (CD/DVD or USB stick) is connected. (not working with Mageia
-5).</para>
- </listitem>
- </itemizedlist>
-
- <para>In the bottom menu, are the Boot Options:</para>
-
- <itemizedlist>
- <listitem>
- <para>F1 - Ndihmë. Shpjegon mundësitë "splash", "apm", "acpi" dhe "Ide"</para>
- </listitem>
-
- <listitem>
- <para>F2 - Gjuha. Përzgjedh gjuhën të shfaqur në ekran.</para>
- </listitem>
-
- <listitem>
- <para>F3 - Rezolucioni ekranit. Zgjidh ndërmjet text, 640x400, 800x600, 1024x728</para>
- </listitem>
-
- <listitem>
- <para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
+5).</para></listitem></itemizedlist><para>In the bottom menu, are the Boot Options:</para><itemizedlist><listitem><para>F1 - Ndihmë. Shpjegon mundësitë "splash", "apm", "acpi" dhe "Ide"</para></listitem><listitem><para>F2 - Gjuha. Përzgjedh gjuhën të shfaqur në ekran.</para></listitem><listitem><para>F3 - Rezolucioni ekranit. Zgjidh ndërmjet text, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
the inserted installation medium. Here, select other sources, like FTP or
NFS servers. If the installation is carried out in a network with an SLP
server, select one of the installation sources available on the server with
-this option.</para>
- </listitem>
-
- <listitem>
- <para>F5 - Driver. Yes or No. The system is aware about the presence of an
+this option.</para></listitem><listitem><para>F5 - Driver. Yes or No. The system is aware about the presence of an
optional disk with a driver update and will require its insertion during
-installation process.</para>
- </listitem>
-
- <listitem>
- <para>F6 - Kernel options. This is a way to specify options according to your
-hardware and the drivers to use.</para>
- </listitem>
- </itemizedlist>
- </section>
-
- <section xml:id="uefimode">
- <info>
- <title xml:id="uefimode-ti1">Në mënyrë UEFI</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center"
-fileref="live-bootUEFI.png" format="PNG" xml:id="bootUEFI-im1"/>
-</imageobject>
-
- <caption>
- <para>Ekrani fillestarë gjatë ndezjes në sistem UEFI nga disku</para>
- </caption>
- </mediaobject>
-
- <para>Ju keni vetëm zgjedhjen për të lëshuar Mageia në mënyrë të jo instaluese
-(zgjedhja e parë), ose për të vazhduar me instalimin (zgjedhje e dytë).</para>
- <para>If you booted from a USB stick, you get two supplemental lines which are a
+installation process.</para></listitem><listitem><para>F6 - Kernel options. This is a way to specify options according to your
+hardware and the drivers to use.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">Në mënyrë 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>Ekrani fillestarë gjatë ndezjes në sistem UEFI nga disku</para></caption></mediaobject><para>Ju keni vetëm zgjedhjen për të lëshuar Mageia në mënyrë të jo instaluese
+(zgjedhja e parë), ose për të vazhduar me instalimin (zgjedhje e dytë).</para><para>If you booted from a USB stick, you get two supplemental lines which are a
duplicata of the previous lines suffixed with "USB". You have to choose
-them.</para>
-
- <para>Në çdo rast, hapat e parë do të jenë të njëjtë për të zgjedhur gjuhën,
+them.</para><para>Në çdo rast, hapat e parë do të jenë të njëjtë për të zgjedhur gjuhën,
vendndodhjen dhe tastierën, pastaj proceset ndryshojnë, me <link
-linkend="testing"> hapa shtesë në mënyrë live</link>.</para>
- </section>
-</section> \ No newline at end of file
+linkend="testing"> hapa shtesë në mënyrë live</link>.</para></section></section> \ No newline at end of file
diff --git a/docs/installer/sq/login.xml b/docs/installer/sq/login.xml
index 98e4c6be..ed85398b 100644
--- a/docs/installer/sq/login.xml
+++ b/docs/installer/sq/login.xml
@@ -1,24 +1,5 @@
-<?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="login" version="5.0" xml:lang="sq">
- <info>
- <title xml:id="label-to-adapt-ti1">Login screen</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center" xml:id="login-im1"
-format="PNG" fileref="live-login.png"/> </imageobject>
-
- <caption>
- <para>KDM login screen</para>
- </caption>
- </mediaobject>
-
- <para>Finally, you will come to the login screen.</para>
-
- <para>Enter your user name and user password, and in a few seconds you will find
+<?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="sq"><info><title xml:id="label-to-adapt-ti1">Login screen</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM login screen</para></caption></mediaobject><para>Finally, you will come to the login screen.</para><para>Enter your user name and user password, and in a few seconds you will find
yourself with a loaded KDE or GNOME desktop, depending on which live medium
-you used. You can now start using your Mageia installation.</para>
-
- <para>You can find another part of our documentation in <link
-linkend="https://wiki.mageia.org/en/Category:Documentation">the Mageia
-wiki</link>.</para>
-</section> \ No newline at end of file
+you used. You can now start using your Mageia installation.</para><para>Ju mund ti gjeni <link
+linkend="https://wiki.mageia.org/en/Category:Documentation">këtu</link>.</para></section> \ No newline at end of file
diff --git a/docs/installer/sq/setupBootloader.xml b/docs/installer/sq/setupBootloader.xml
index 0fea24a5..6b311d42 100644
--- a/docs/installer/sq/setupBootloader.xml
+++ b/docs/installer/sq/setupBootloader.xml
@@ -10,9 +10,11 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
-format="PNG"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="setupBootloader-im1"
+format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata
+xml:id="setupBootloader-im1" format="PNG" align="center" revision="1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<section>
<title>With a Bios system</title>
@@ -33,7 +35,7 @@ allow Mageia to create a new one.</para>
<title xml:id="usingMageiaBootloader-ti2">Using a Mageia bootloader</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa4">By default, Mageia writes a new GRUB (legacy) bootloader into the MBR
+ <para xml:id="setupBootloader-pa4" revision="3">By default, Mageia writes a new GRUB (legacy) bootloader into the MBR
(Master Boot Record) of your first hard drive. If you already have other
operating systems installed, Mageia attempts to add them to your new Mageia
boot menu.</para>
@@ -42,7 +44,7 @@ boot menu.</para>
legacy and Lilo.</para>
<warning>
- <para revision="3" xml:id="setupBootloader-pa6">Linux systems which use the GRUB2 bootloader are not currently supported by
+ <para xml:id="setupBootloader-pa6" revision="3">Linux systems which use the GRUB2 bootloader are not currently supported by
GRUB (legacy) and will not be recognized if the default GRUB bootloader is
used.</para>
@@ -53,15 +55,15 @@ the Summary page during installation.</para>
<section xml:id="usingExistingBootloader">
<info>
- <title revision="2" xml:id="usingExistingBootloader-ti4">Using an existing bootloader</title>
+ <title xml:id="usingExistingBootloader-ti4" revision="2">Using an existing bootloader</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa46">If you decide to use an existing bootloader then you will need to remember
+ <para xml:id="setupBootloader-pa46" revision="3">If you decide to use an existing bootloader then you will need to remember
to STOP at the summary page during the installation and click the Bootloader
<guibutton>Configure</guibutton> button, which will allow you to change the
bootloader install location.</para>
- <para revision="1" xml:id="setupBootloader-pa47">Do not select a device e.g."sda", or you will overwrite your existing
+ <para xml:id="setupBootloader-pa47" revision="1">Do not select a device e.g."sda", or you will overwrite your existing
MBR. You must select the root partition that you chose during the
partitioning phase earlier, e.g. sda7.</para>
@@ -73,7 +75,7 @@ your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to
the installer screen.</para>
</tip>
- <para revision="2" xml:id="setupBootloader-pa49">The exact procedure for adding your Mageia system to an existing bootloader
+ <para xml:id="setupBootloader-pa49" revision="2">The exact procedure for adding your Mageia system to an existing bootloader
is beyond the scope of this help, 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
@@ -82,10 +84,10 @@ question.</para>
<section xml:id="advancedOptionBootloader">
<info>
- <title revision="2" xml:id="advancedOptionBootloader-ti5">Bootloader advanced option</title>
+ <title xml:id="advancedOptionBootloader-ti5" revision="2">Bootloader advanced option</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa52">If you have very limited disk space for the <literal>/</literal> partition
+ <para xml:id="setupBootloader-pa52" revision="3">If you have very limited disk space for the <literal>/</literal> partition
that contains <literal>/tmp</literal>, click on
<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /tmp
at each boot</guilabel>. This helps to maintain some free space.</para>
@@ -99,7 +101,10 @@ at each boot</guilabel>. This helps to maintain some free space.</para>
choose the boot loader since only Grub2-efi is available. </para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader2.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader2.png"/>
+</imageobject></mediaobject>
<para>If Mageia is the first system installed on your computer, the installer
created an ESP (EFI System Partition) to receive the bootloader
diff --git a/docs/installer/sq/setupBootloaderAddEntry.xml b/docs/installer/sq/setupBootloaderAddEntry.xml
index cfda648c..ce80a993 100644
--- a/docs/installer/sq/setupBootloaderAddEntry.xml
+++ b/docs/installer/sq/setupBootloaderAddEntry.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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="sq">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sq" xml:id="setupBootloaderAddEntry">
<info>
@@ -7,9 +7,13 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
-xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="dx2-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="live-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject></mediaobject>
<section>
<title>With a Bios system</title>
@@ -26,8 +30,8 @@ instead.</para>
</note>
<mediaobject>
-<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
-align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1"
+align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
</imageobject></mediaobject>
<para>Some things that can be done without any risk, are changing the label of an
diff --git a/docs/installer/sq/unused.xml b/docs/installer/sq/unused.xml
index 3537483d..afd540af 100644
--- a/docs/installer/sq/unused.xml
+++ b/docs/installer/sq/unused.xml
@@ -19,7 +19,7 @@ accept, except if you prepare an installation which has to run on different
hardware.</para>
<mediaobject>
-<imageobject> <imagedata fileref="live-unused-InstallationProgress.png"/>
+<imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
</imageobject></mediaobject>
<para>The next step is the copying of files on hard disk. This takes some
diff --git a/docs/installer/sv/bootLive.xml b/docs/installer/sv/bootLive.xml
index fee3b797..12cbea1a 100644
--- a/docs/installer/sv/bootLive.xml
+++ b/docs/installer/sv/bootLive.xml
@@ -1,134 +1,28 @@
-<?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="bootLive" version="5.0" xml:lang="sv">
- <info>
- <title xml:id="bootLive-ti1">Starta Mageia som ett Live-system</title>
- </info>
-
- <section xml:id="bootLive-1">
- <info>
- <title xml:id="bootLive1-ti1">Startar upp mediat</title>
- </info>
-
- <section>
- <info>
- <title xml:id="bootLive11-ti1">Från en skiva</title>
- </info>
-
- <para>Du kan starta direkt från de media du använde för att bränna din avbildning
+<?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="sv"><info><title xml:id="bootLive-ti1">Starta Mageia som ett Live-system</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Startar upp mediat</title></info><section><info><title xml:id="bootLive11-ti1">Från en skiva</title></info><para>Du kan starta direkt från de media du använde för att bränna din avbildning
(CD-ROM, DVD-ROM...). Vanligtvis räcker det med att du sätter i skivan i din
CD/DVD för att starthanteraren automatiskt ska starta
installationsprogrammet efter omstart. Om det inte fungerar måste du ändra
inställningarna i ditt BIOS eller trycka på den tangent som gör att du kan
-välja startmedia.</para>
-
- <para>Beroende på vilken hårdvara du har och hur den är konfigurerad kan du få en
-av följande två skärmar nedan.</para>
- </section>
-
- <section>
- <info>
- <title xml:id="bootLive12-ti1">Från en USB-enhet</title>
- </info>
-
- <para>Du kan starta från din USB-enhet där du dumpat din ISO-avbildning. Beroende
+välja startmedia.</para><para>Beroende på vilken hårdvara du har och hur den är konfigurerad kan du få en
+av följande två skärmar nedan.</para></section><section><info><title xml:id="bootLive12-ti1">Från en USB-enhet</title></info><para>Du kan starta från din USB-enhet där du dumpat din ISO-avbildning. Beroende
på hur ditt BIOS är inställt kan datorn starta direkt från USB-enheten om
den redan är inkopplad i en USB-port. Om den inte gör det måste du
eventuellt ändra i dina BIOS-inställningar, eller trycka på den tangent som
-gör att du kan välja startmedia.</para>
- </section>
- </section>
-
- <section xml:id="biosmode">
- <info>
- <title xml:id="biosmode-ti1">I BIOS/CSM/Legacy-läge</title>
- </info>
-
- <mediaobject>
- <imageobject> <imagedata fileref="live-bootCSM.png"/> </imageobject>
-
- <caption>
- <para>Den första skärmen när du startar i BIOS-läge</para>
- </caption>
- </mediaobject>
-
- <para>I den mittersta menyn så kan du välja mellan tre handlingar:</para>
-
- <itemizedlist>
- <listitem>
- <para>Starta Mageia: Detta gör att Mageia 5 kommer att starta från det media som
+gör att du kan välja startmedia.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">I BIOS/CSM/Legacy-läge</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Den första skärmen när du startar i BIOS-läge</para></caption></mediaobject><para>I den mittersta menyn så kan du välja mellan tre handlingar:</para><itemizedlist><listitem><para>Starta Mageia: Detta gör att Mageia 5 kommer att starta från det media som
är anslutet (CD/DVD eller USB) utan att skriva något till hårddisken, så var
beredd på ett väldigt långsamt system. När uppstarten är klar kan du
-fortsätta och installera på hårddisken.</para>
- </listitem>
-
- <listitem>
- <para>Installera Mageia: Det här valet kommer att installera Mageia direkt på en
-hårddisk.</para>
- </listitem>
-
- <listitem>
- <para>Uppstart från hårddisk: Det här valet tillåter dig att starta upp som
+fortsätta och installera på hårddisken.</para></listitem><listitem><para>Installera Mageia: Det här valet kommer att installera Mageia direkt på en
+hårddisk.</para></listitem><listitem><para>Uppstart från hårddisk: Det här valet tillåter dig att starta upp som
vanligt från en hårddisk när inget media (CD/DVD eller USB-minne) är
-anslutet. (fungerar inte med Mageia 5).</para>
- </listitem>
- </itemizedlist>
-
- <para>I menyn längst ner finns startalternativen:</para>
-
- <itemizedlist>
- <listitem>
- <para>F1 - Hjälp. Förklara valen "splash", "apm", "acpi" och "idle"</para>
- </listitem>
-
- <listitem>
- <para>F2 - Språk. Välj skärmens visningsspråk.</para>
- </listitem>
-
- <listitem>
- <para>F3 - Skärmupplösning. Välj mellan text, 640x400, 800x600, 1024x728</para>
- </listitem>
-
- <listitem>
- <para>F4 - CD-Rom. CD-Rom eller annat. Normalt sätt genomförs installationen från
+anslutet. (fungerar inte med Mageia 5).</para></listitem></itemizedlist><para>I menyn längst ner finns startalternativen:</para><itemizedlist><listitem><para>F1 - Hjälp. Förklara valen "splash", "apm", "acpi" och "idle"</para></listitem><listitem><para>F2 - Språk. Välj skärmens visningsspråk.</para></listitem><listitem><para>F3 - Skärmupplösning. Välj mellan text, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom eller annat. Normalt sätt genomförs installationen från
det media som är anslutet. Du kan även välja andra källor så som en FTP
eller NFS-server. Om installationen genomförs över nätverk med en SLP-server
-så kan du välja installationskällor på servern med det här alternativet.</para>
- </listitem>
-
- <listitem>
- <para>F5 - Drivrutin. Ja eller Nej. Systemet är medvetet om närvaron av en
+så kan du välja installationskällor på servern med det här alternativet.</para></listitem><listitem><para>F5 - Drivrutin. Ja eller Nej. Systemet är medvetet om närvaron av en
alternativ disk med en drivrutinsuppdatering och kommer att kräva att den
-sätts in under installationsprocessen.</para>
- </listitem>
-
- <listitem>
- <para>F6 - Kernel-alternativ: Här kan du specificera alternativ beroende på din
-hårdvara och vilka drivrutiner som ska användas.</para>
- </listitem>
- </itemizedlist>
- </section>
-
- <section xml:id="uefimode">
- <info>
- <title xml:id="uefimode-ti1">I UEFI-läge</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center"
-fileref="live-bootUEFI.png" format="PNG" xml:id="bootUEFI-im1"/>
-</imageobject>
-
- <caption>
- <para>Första skärmen när du startar ett UEFI-system från disk</para>
- </caption>
- </mediaobject>
-
- <para>Du kan enbart köra Mageia i liveläge. (första alternativet) eller att
-bearbeta installationen (andra alternativet).</para>
- <para>Om du har startat från en USB-enhet har du två extra rader som är identiska
-men har "USB" på slutet. Du måste välja dem.</para>
-
- <para>I alla fall så kommer de första stegen att vara samma för att välja språk,
+sätts in under installationsprocessen.</para></listitem><listitem><para>F6 - Kernel-alternativ: Här kan du specificera alternativ beroende på din
+hårdvara och vilka drivrutiner som ska användas.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">I UEFI-läge</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
+align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>Första skärmen när du startar ett UEFI-system från disk</para></caption></mediaobject><para>Du kan enbart köra Mageia i liveläge. (första alternativet) eller att
+bearbeta installationen (andra alternativet).</para><para>Om du har startat från en USB-enhet har du två extra rader som är identiska
+men har "USB" på slutet. Du måste välja dem.</para><para>I alla fall så kommer de första stegen att vara samma för att välja språk,
tidszon och tangentbord. Sedan skiljer sig stegen med <link
-linkend="testing">extra steg för liveläge</link>.</para>
- </section>
-</section> \ No newline at end of file
+linkend="testing">extra steg för liveläge</link>.</para></section></section> \ No newline at end of file
diff --git a/docs/installer/sv/login.xml b/docs/installer/sv/login.xml
index abd29146..c8425fa8 100644
--- a/docs/installer/sv/login.xml
+++ b/docs/installer/sv/login.xml
@@ -1,25 +1,7 @@
-<?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="login" version="5.0" xml:lang="sv">
- <info>
- <title xml:id="label-to-adapt-ti1">Inloggningsskärm</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center" xml:id="login-im1"
-format="PNG" fileref="live-login.png"/> </imageobject>
-
- <caption>
- <para>Inoggningsskärm för KDM</para>
- </caption>
- </mediaobject>
-
- <para>Slutligen så kommer du till inloggningsskärmen.</para>
-
- <para>Skriv in ditt användarnamn och lösenord och efter ett par sekunder befinner
+<?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="sv"><info><title xml:id="label-to-adapt-ti1">Inloggningsskärm</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>Inoggningsskärm för KDM</para></caption></mediaobject><para>Slutligen så kommer du till inloggningsskärmen.</para><para>Skriv in ditt användarnamn och lösenord och efter ett par sekunder befinner
du dig i KDEs eller GNOMEs skrivbordsmiljö beroende på vilket
installationsmedia du har använt. Du kan nu börja använda din installation
-av Mageia.</para>
-
- <para>Du hittar mer dokumentation i <link
+av Mageia.</para><para>Du hittar mer dokumentation i <link
linkend="https://wiki.mageia.org/en/Category:Documentation">Mageias
-Wiki</link>.</para>
-</section> \ No newline at end of file
+Wiki</link>.</para></section> \ No newline at end of file
diff --git a/docs/installer/sv/setupBootloader.xml b/docs/installer/sv/setupBootloader.xml
index 6a7fc62c..b383c4f2 100644
--- a/docs/installer/sv/setupBootloader.xml
+++ b/docs/installer/sv/setupBootloader.xml
@@ -10,9 +10,11 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
-format="PNG"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="setupBootloader-im1"
+format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata
+xml:id="setupBootloader-im1" format="PNG" align="center" revision="1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<section>
<title>Med ett BIOS-system</title>
@@ -33,7 +35,7 @@ tillåta Mageia att skapa en ny.</para>
<title xml:id="usingMageiaBootloader-ti2">Använder en startshanterare från Mageia</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa4">Som standard kommer Mageia att skriva en ny GRUB (legacy)-starthanterare på
+ <para xml:id="setupBootloader-pa4" revision="3">Som standard kommer Mageia att skriva en ny GRUB (legacy)-starthanterare på
MBR (Master Boot Record) på din första hårddisk. Om du redan har andra
operativsystem installerade kommer Mageia att försöka lägga till dem i din
nya startmeny.</para>
@@ -42,7 +44,7 @@ nya startmeny.</para>
GRUB legacy och Lilo.</para>
<warning>
- <para revision="3" xml:id="setupBootloader-pa6">Linuxsystem som använder GRUB2-starthanterare stöds för närvarande inte av
+ <para xml:id="setupBootloader-pa6" revision="3">Linuxsystem som använder GRUB2-starthanterare stöds för närvarande inte av
GRUB (legacy) och kommer inte att kännas igen om standard starthanterare som
används är GRUB.</para>
@@ -53,15 +55,15 @@ tillgänglig på översiktssidan under installation.</para>
<section xml:id="usingExistingBootloader">
<info>
- <title revision="2" xml:id="usingExistingBootloader-ti4">Använder en befintlig startshanterare</title>
+ <title xml:id="usingExistingBootloader-ti4" revision="2">Använder en befintlig startshanterare</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa46">Om du bestämmer dig för att använda en befintlig starthanterare måste du
+ <para xml:id="setupBootloader-pa46" revision="3">Om du bestämmer dig för att använda en befintlig starthanterare måste du
komma ihåg att STANNA på översiktssidan under installationen. Klicka på
knappen <guibutton>Konfigurera</guibutton> för starthanterare där du kan
ändra var du vill installera starthanteraren.</para>
- <para revision="1" xml:id="setupBootloader-pa47">Välj inte en enhet, t. ex. "sda" för då kommer du att skriva över din
+ <para xml:id="setupBootloader-pa47" revision="1">Välj inte en enhet, t. ex. "sda" för då kommer du att skriva över din
nuvarande MBR. Du måste välja root-partitionen som du valde under
installationen tidigare, t. ex. sda7.</para>
@@ -73,7 +75,7 @@ kontrollera vilken din <literal>/</literal> (root) partition är. Ctrl+Alt+F7
tar dig tillbaka till installationen.</para>
</tip>
- <para revision="2" xml:id="setupBootloader-pa49">Den exakta proceduren för att lägga till ditt Mageia-system i en befintlig
+ <para xml:id="setupBootloader-pa49" revision="2">Den exakta proceduren för att lägga till ditt Mageia-system i en befintlig
starthanterare är utanför ramen av denna hjälp. I de felsta fall innebär det
att köra installationsprogrammet för starthanteraren som bör hitta och lägga
till det automatiskt. Se dokumentationen för operativsystemet i fråga.</para>
@@ -81,10 +83,10 @@ till det automatiskt. Se dokumentationen för operativsystemet i fråga.</para>
<section xml:id="advancedOptionBootloader">
<info>
- <title revision="2" xml:id="advancedOptionBootloader-ti5">Avancerat alternativ för starthanteraren</title>
+ <title xml:id="advancedOptionBootloader-ti5" revision="2">Avancerat alternativ för starthanteraren</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa52">Om du har begränsat lagringsutrymme för <literal>/</literal>-partitionen som
+ <para xml:id="setupBootloader-pa52" revision="3">Om du har begränsat lagringsutrymme för <literal>/</literal>-partitionen som
innehåller <literal>/tmp</literal>, klicka på
<guibutton>Avancerat</guibutton> och kryssa i rutan <guilabel>Rensa /tmp vid
varje start</guilabel>. Det hjälper till att upprätthålla en viss mängd
@@ -99,7 +101,10 @@ ledigt utrymme.</para>
kan välja starthanterare, det är bara Grub2-efi som är tillgänglig. </para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader2.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader2.png"/>
+</imageobject></mediaobject>
<para>Om Mageia är det första installerade operativsystemet på din dator så har
installationsprogrammet redan skapat en ESP (EFI Systempartition) för att ta
diff --git a/docs/installer/sv/setupBootloaderAddEntry.xml b/docs/installer/sv/setupBootloaderAddEntry.xml
index dcf56164..b9bc9c6a 100644
--- a/docs/installer/sv/setupBootloaderAddEntry.xml
+++ b/docs/installer/sv/setupBootloaderAddEntry.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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="sv">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sv" xml:id="setupBootloaderAddEntry">
<info>
@@ -7,9 +7,13 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
-xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="dx2-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="live-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject></mediaobject>
<section>
<title>Med ett BIOS-system</title>
@@ -26,8 +30,8 @@ använda <code>grub-customizer</code>.</para>
</note>
<mediaobject>
-<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
-align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1"
+align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
</imageobject></mediaobject>
<para>Några saker som kan ändras utan risk är att ändra etiketten av en post och
diff --git a/docs/installer/sv/unused.xml b/docs/installer/sv/unused.xml
index 40281459..eda122a9 100644
--- a/docs/installer/sv/unused.xml
+++ b/docs/installer/sv/unused.xml
@@ -19,7 +19,7 @@ acceptera detta om du inte tänker förbereda en installation som ska köras på
annan hårdvara.</para>
<mediaobject>
-<imageobject> <imagedata fileref="live-unused-InstallationProgress.png"/>
+<imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
</imageobject></mediaobject>
<para>I nästa steg kopieras filerna till hårddisken. Det kan ta lite tid och du
diff --git a/docs/installer/tr/bootLive.xml b/docs/installer/tr/bootLive.xml
index 74124ea2..d98da9f4 100644
--- a/docs/installer/tr/bootLive.xml
+++ b/docs/installer/tr/bootLive.xml
@@ -1,136 +1,30 @@
-<?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="bootLive" version="5.0" xml:lang="tr">
- <info>
- <title xml:id="bootLive-ti1">Mageia' yı ÇalışanCD Sistemi olarak başlatmak</title>
- </info>
-
- <section xml:id="bootLive-1">
- <info>
- <title xml:id="bootLive1-ti1">Kurulum ortamını başlatmak</title>
- </info>
-
- <section>
- <info>
- <title xml:id="bootLive11-ti1">Bir diskten</title>
- </info>
-
- <para>Kalıp dosyasını yazdırdığınız kurulum ortamından (CD-ROM, DVD-ROM... )
+<?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="tr"><info><title xml:id="bootLive-ti1">Mageia' yı ÇalışanCD Sistemi olarak başlatmak</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Kurulum ortamını başlatmak</title></info><section><info><title xml:id="bootLive11-ti1">Bir diskten</title></info><para>Kalıp dosyasını yazdırdığınız kurulum ortamından (CD-ROM, DVD-ROM... )
doğrudan başlatabilirsiniz. Genellikle, bilgisayar yeniden başlatıldıktan
sonra önyükleyicinin kurulumu kendiliğinden başlatması için ortamı CD/DVD
sürücünüze takmanız yeterlidir. Bu şekilde kurulum başlamıyorsa BIOS
ayarlarınızı yeniden yapmanız veya bilgisayarın hangi bileşenden
-başlatılacağını seçmek için önerilen bir tuşa basmanız gerekebilir.</para>
-
- <para>Hangi donanıma sahip olduğunuz ve donanımın yapılandırmasına bağlı olarak ya
-aşağıdaki tek veya diğer iki ekranla karşılaşırsınız.</para>
- </section>
-
- <section>
- <info>
- <title xml:id="bootLive12-ti1">Bir USB aygıttan</title>
- </info>
-
- <para>ISO kalıbını yazdırdığınız USB aygıtından önyükleme yapabilirsiniz. BIOS
+başlatılacağını seçmek için önerilen bir tuşa basmanız gerekebilir.</para><para>Hangi donanıma sahip olduğunuz ve donanımın yapılandırmasına bağlı olarak ya
+aşağıdaki tek veya diğer iki ekranla karşılaşırsınız.</para></section><section><info><title xml:id="bootLive12-ti1">Bir USB aygıttan</title></info><para>ISO kalıbını yazdırdığınız USB aygıtından önyükleme yapabilirsiniz. BIOS
ayarlarınıza göre bilgisayar belki doğrudan USB aygıtından başlatılır. Bu
şekilde olmuyorsa BIOS ayarlarınızı yeniden yapmanız veya bilgisayarın hangi
bileşenden başlatılacağını seçmek için önerilen bir tuşa basmanız
-gerekebilir.</para>
- </section>
- </section>
-
- <section xml:id="biosmode">
- <info>
- <title xml:id="biosmode-ti1">BIOS/CSM/Legacy kipinde</title>
- </info>
-
- <mediaobject>
- <imageobject> <imagedata fileref="live-bootCSM.png"/> </imageobject>
-
- <caption>
- <para>BIOS kipinde önyükleme yapılırken ilk ekran</para>
- </caption>
- </mediaobject>
-
- <para>Orta menüde, üç eylem arasında seçim yapabilirsiniz:</para>
-
- <itemizedlist>
- <listitem>
- <para>Mageia'yı Başlat: Mageia 5, sabit diske herhangi bir şey yazmadan bağlanan
+gerekebilir.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">BIOS/CSM/Legacy kipinde</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>BIOS kipinde önyükleme yapılırken ilk ekran</para></caption></mediaobject><para>Orta menüde, üç eylem arasında seçim yapabilirsiniz:</para><itemizedlist><listitem><para>Mageia'yı Başlat: Mageia 5, sabit diske herhangi bir şey yazmadan bağlanan
kurulum ortamından (CD/DVD veya USB bellek) başlatılır. Ancak, çok yavaş
çalışan bir sistem ile karşılaşmayı bekleyin. Önyükleme tamamlandığında, bir
-sabit diske kurulum yapmaya başlayabilirsiniz.</para>
- </listitem>
-
- <listitem>
- <para>Mageia'yı Kur: Bu seçenek Mageia'yı doğrudan sabit diske kuracaktır.</para>
- </listitem>
-
- <listitem>
- <para>Sabit Diskten Başlat: Bu seçenek herhangi bir kurulum ortamı (CD/DVD veya
+sabit diske kurulum yapmaya başlayabilirsiniz.</para></listitem><listitem><para>Mageia'yı Kur: Bu seçenek Mageia'yı doğrudan sabit diske kuracaktır.</para></listitem><listitem><para>Sabit Diskten Başlat: Bu seçenek herhangi bir kurulum ortamı (CD/DVD veya
USB bellek) takılı olmadığında, her zamaki gibi, sabit diskten önyüklemeye
-izin verir. (Mageia 5 ile çalışmamaktadır).</para>
- </listitem>
- </itemizedlist>
-
- <para>Alt menüde Önyükleme Seçenekleri bulunmaktadır:</para>
-
- <itemizedlist>
- <listitem>
- <para>F1 -Yardım. "splash", "apm", "acpi" ve "Ide" seçenekleini açıklar</para>
- </listitem>
-
- <listitem>
- <para>F2 - Dil. Ekranlarda görüntülenecek dili seçin.</para>
- </listitem>
-
- <listitem>
- <para>F3 - Ekran çözünürlüğü. Metin, 640x400, 800x600,1024x728 seçeneklerinden
-birini seçin</para>
- </listitem>
-
- <listitem>
- <para>F4 - CD-Rom. CD-Rom veya Diğeri. Normalde, kurulum takılı olan kurulum
+izin verir. (Mageia 5 ile çalışmamaktadır).</para></listitem></itemizedlist><para>Alt menüde Önyükleme Seçenekleri bulunmaktadır:</para><itemizedlist><listitem><para>F1 -Yardım. "splash", "apm", "acpi" ve "Ide" seçenekleini açıklar</para></listitem><listitem><para>F2 - Dil. Ekranlarda görüntülenecek dili seçin.</para></listitem><listitem><para>F3 - Ekran çözünürlüğü. Metin, 640x400, 800x600,1024x728 seçeneklerinden
+birini seçin</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom veya Diğeri. Normalde, kurulum takılı olan kurulum
ortamından gerçekleştirilir. Burada, FTP vela NFS sunucuları gibi başka
kaynakları seçebilirsiniz. Kurulum bir SLP sunucusundan yapılacaksa, bu
seçeneği kullanarak sunucudaki erişilebilir kurulum kaynaklarından birini
-seçin.</para>
- </listitem>
-
- <listitem>
- <para>F5 - Sürücü. Evet veya Hayır. Sistem, bir sürücü güncellemesi içeren tercihe
+seçin.</para></listitem><listitem><para>F5 - Sürücü. Evet veya Hayır. Sistem, bir sürücü güncellemesi içeren tercihe
bağlı bir diskin varlığını algılayabilir ve bunun kurulum sırasında
-takılmasını gerektirebilir.</para>
- </listitem>
-
- <listitem>
- <para>F6 - Çekirdek seçenekleri. Bu şekilde donanımınıza ve kullandığınız
-sürücülere bağlı olarak çeşitli seçenekleri belirtebilirsiniz.</para>
- </listitem>
- </itemizedlist>
- </section>
-
- <section xml:id="uefimode">
- <info>
- <title xml:id="uefimode-ti1">UEFI kipinde</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center"
-fileref="live-bootUEFI.png" format="PNG" xml:id="bootUEFI-im1"/>
-</imageobject>
-
- <caption>
- <para>UEFI sistem diskten başlatılırken ilk ekran</para>
- </caption>
- </mediaobject>
-
- <para>Sadece; Mageia' yı ÇalışanCD kipinde (ilk seçenek) çalıştırma veya kuruluma
-başlama (ikinci seçenek) seçeneklerini kullanabilirsiniz.</para>
- <para>Bir USB bellekten başlattıysanız, önceki satırların tekrarı olan ancak "USB"
+takılmasını gerektirebilir.</para></listitem><listitem><para>F6 - Çekirdek seçenekleri. Bu şekilde donanımınıza ve kullandığınız
+sürücülere bağlı olarak çeşitli seçenekleri belirtebilirsiniz.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">UEFI kipinde</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
+align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>UEFI sistem diskten başlatılırken ilk ekran</para></caption></mediaobject><para>Sadece; Mageia' yı ÇalışanCD kipinde (ilk seçenek) çalıştırma veya kuruluma
+başlama (ikinci seçenek) seçeneklerini kullanabilirsiniz.</para><para>Bir USB bellekten başlattıysanız, önceki satırların tekrarı olan ancak "USB"
ön eki bulunan iki ek satır daha görürsünüz. Bu ek satırlar arasından seçim
-yapmalısınız.</para>
-
- <para>Her durumda, ilk adımları yani dil seçimi, saat dilimi ve klavye seçimi
+yapmalısınız.</para><para>Her durumda, ilk adımları yani dil seçimi, saat dilimi ve klavye seçimi
aynıdır. Sonrasında ise işlem <link linkend="testing">ÇalışanCD kipinde ek
-adımlar</link> ile farklılaşır.</para>
- </section>
-</section> \ No newline at end of file
+adımlar</link> ile farklılaşır.</para></section></section> \ No newline at end of file
diff --git a/docs/installer/tr/login.xml b/docs/installer/tr/login.xml
index 1c100d6f..4cbc1b35 100644
--- a/docs/installer/tr/login.xml
+++ b/docs/installer/tr/login.xml
@@ -1,24 +1,6 @@
-<?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="login" version="5.0" xml:lang="tr">
- <info>
- <title xml:id="label-to-adapt-ti1">Giriş Ekranı</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center" xml:id="login-im1"
-format="PNG" fileref="live-login.png"/> </imageobject>
-
- <caption>
- <para>KDM giriş ekranı</para>
- </caption>
- </mediaobject>
-
- <para>Son olarak, giriş ekranına geleceksiniz.</para>
-
- <para>Kullanıcı adınızı ve parolanızı girin. Birkaç saniye içinde kendinizi hangi
+<?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="tr"><info><title xml:id="label-to-adapt-ti1">Giriş Ekranı</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM giriş ekranı</para></caption></mediaobject><para>Son olarak, giriş ekranına geleceksiniz.</para><para>Kullanıcı adınızı ve parolanızı girin. Birkaç saniye içinde kendinizi hangi
kurulum ortamı kullandığınıza bağlı olarak KDE veya GNOME masaüstünde
-bulacaksınız. Artık, Mageia kurulumunuza başlayabilirsiniz.</para>
-
- <para>Belgelendirmemizin diğer kısımlarına <link
+bulacaksınız. Artık, Mageia kurulumunuza başlayabilirsiniz.</para><para>Belgelendirmemizin diğer kısımlarına <link
linkend="https://wiki.mageia.org/en/Category:Documentation">Mageia
-Wiki</link> sayfasında bulabilirsiniz.</para>
-</section> \ No newline at end of file
+Wiki</link> sayfasında bulabilirsiniz.</para></section> \ No newline at end of file
diff --git a/docs/installer/tr/setupBootloader.xml b/docs/installer/tr/setupBootloader.xml
index f1badbe9..844694b6 100644
--- a/docs/installer/tr/setupBootloader.xml
+++ b/docs/installer/tr/setupBootloader.xml
@@ -10,9 +10,11 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
-format="PNG"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="setupBootloader-im1"
+format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata
+xml:id="setupBootloader-im1" format="PNG" align="center" revision="1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<section>
<title>Bir Bios sistem ile</title>
@@ -33,7 +35,7 @@ mevcut önyükleyiciye Mageia' yı eklemek veya Mageia' nın yeni bir
<title xml:id="usingMageiaBootloader-ti2">Bir Mageia önyükleyicisi kullanmak</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa4">Öntanımlı olarak Mageia, ilk sabit diskteki MBR (Birincil Önyükleme Kaydı)
+ <para xml:id="setupBootloader-pa4" revision="3">Öntanımlı olarak Mageia, ilk sabit diskteki MBR (Birincil Önyükleme Kaydı)
içine yeni bir GRUB (eski) önyükleyiciyi yazar. Başka işletim sistemleri
önceden kuruluysa Mageia bunları kendi yeni önyükleme menüsüne eklemeyi
dener.</para>
@@ -42,7 +44,7 @@ dener.</para>
olarak sunmaktadır.</para>
<warning>
- <para revision="3" xml:id="setupBootloader-pa6">GRUB2 önyükleyiciyi kullanan Linux sistemleri şimdilik GRUB (eski)
+ <para xml:id="setupBootloader-pa6" revision="3">GRUB2 önyükleyiciyi kullanan Linux sistemleri şimdilik GRUB (eski)
tarafından desteklenmemektedir ve öntanımlı GRUB kullanıldığında
algılanmayacaklardır.</para>
@@ -53,14 +55,14 @@ GRUB2 önyükleyiciyi kullanmak olacaktır.</para>
<section xml:id="usingExistingBootloader">
<info>
- <title revision="2" xml:id="usingExistingBootloader-ti4">Mevcut bir önyükleyiciyi kullanmak</title>
+ <title xml:id="usingExistingBootloader-ti4" revision="2">Mevcut bir önyükleyiciyi kullanmak</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa46">Mevcut bir önyükleyiciyi kullanmaya karar verirseniz kurulum sırasında Özet
+ <para xml:id="setupBootloader-pa46" revision="3">Mevcut bir önyükleyiciyi kullanmaya karar verirseniz kurulum sırasında Özet
sayfasında DURMALI ve önyükleyici kurulum konumunu değiştirmenizi sağlayan
Önyükleyici <guibutton>Yapılandır</guibutton> düğmesine basmalısınız.</para>
- <para revision="1" xml:id="setupBootloader-pa47">Bir aygıt, mesela "sda" seçmeyin yoksa mevcut MBR üzerine yazarsınız. Önceki
+ <para xml:id="setupBootloader-pa47" revision="1">Bir aygıt, mesela "sda" seçmeyin yoksa mevcut MBR üzerine yazarsınız. Önceki
disk bölümlendirme aşamasında ayarladığınız, sda7 gibi, kök bölümünü
seçmelisiniz.</para>
@@ -73,7 +75,7 @@ nerede olduğunu denetlemek için <literal>df</literal> komutunu
çalıştırın. Ctrl+Alt+F7 sizi kurulum ekranına döndürür.</para>
</tip>
- <para revision="2" xml:id="setupBootloader-pa49">Mageia sisteminizi mevcut bir önyükleyiciye eklemek için gerekli tam süreç,
+ <para xml:id="setupBootloader-pa49" revision="2">Mageia sisteminizi mevcut bir önyükleyiciye eklemek için gerekli tam süreç,
bu yardımını hedeflerinin ötesindedir. Ancak yine de bir çok durumda ilgili
önyükleme kurulum uygulamasını çalıştırmak onu algılayabilir ve
kendiliğinden ekleyebilir. Sorularınız için işletim sisteminin belgelerine
@@ -82,10 +84,10 @@ bakın.</para>
<section xml:id="advancedOptionBootloader">
<info>
- <title revision="2" xml:id="advancedOptionBootloader-ti5">Önyükleyici gelişmiş seçenekleri</title>
+ <title xml:id="advancedOptionBootloader-ti5" revision="2">Önyükleyici gelişmiş seçenekleri</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa52"><literal>/tmp</literal> içeren <literal>/</literal> bölümü için kısıtlı
+ <para xml:id="setupBootloader-pa52" revision="3"><literal>/tmp</literal> içeren <literal>/</literal> bölümü için kısıtlı
alanınız varsa, <guibutton>Gelişmiş</guibutton> düğmesine tıklayarak
<guilabel>Her açılışta /tmp temizle</guilabel> kutusunu işaretleyin. Böylece
biraz boş alan kazanmanız mümkün olur.</para>
@@ -99,7 +101,10 @@ biraz boş alan kazanmanız mümkün olur.</para>
mevcut olduğundan önyükleyici seçemezsiniz. </para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader2.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader2.png"/>
+</imageobject></mediaobject>
<para>Mageia bilgisayarınıza kurduğunuz ilk sistemse, kurulum aracı önyükleyiciyi
(Grub2-efi) taşımak üzere bir ESP (EFI Sistem Disk Bölümü)
diff --git a/docs/installer/tr/setupBootloaderAddEntry.xml b/docs/installer/tr/setupBootloaderAddEntry.xml
index bcd71269..0e68f664 100644
--- a/docs/installer/tr/setupBootloaderAddEntry.xml
+++ b/docs/installer/tr/setupBootloaderAddEntry.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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="tr">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="tr" xml:id="setupBootloaderAddEntry">
<info>
@@ -7,9 +7,13 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
-xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="dx2-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="live-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject></mediaobject>
<section>
<title>Bir Bios sistem ile</title>
@@ -26,8 +30,8 @@ düzenlemeniz veya yerine <code>grub-customizer</code> kullanmanız gerekiyor.</
</note>
<mediaobject>
-<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
-align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1"
+align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
</imageobject></mediaobject>
<para>Risk almadan yapılabilecek bazı şeyler, bir girdinin etiketini değiştirmek
diff --git a/docs/installer/tr/unused.xml b/docs/installer/tr/unused.xml
index 4c2caaa3..073a5131 100644
--- a/docs/installer/tr/unused.xml
+++ b/docs/installer/tr/unused.xml
@@ -19,7 +19,7 @@ bir donanım senaryosu için kurulum yapmıyorsanız bu öneriyi kabul etmek iyi
bir fikir olabilir.</para>
<mediaobject>
-<imageobject> <imagedata fileref="live-unused-InstallationProgress.png"/>
+<imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
</imageobject></mediaobject>
<para>Bir sonraki adım, dosyaların sabit diske kopyalanmasıdır. Bu işlem biraz
diff --git a/docs/installer/uk/bootLive.xml b/docs/installer/uk/bootLive.xml
index 0cdfa49f..6b36f96c 100644
--- a/docs/installer/uk/bootLive.xml
+++ b/docs/installer/uk/bootLive.xml
@@ -1,144 +1,38 @@
-<?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="bootLive" version="5.0" xml:lang="uk">
- <info>
- <title xml:id="bootLive-ti1">Завантаження Mageia як портативної системи</title>
- </info>
-
- <section xml:id="bootLive-1">
- <info>
- <title xml:id="bootLive1-ti1">Завантаження системи з носія</title>
- </info>
-
- <section>
- <info>
- <title xml:id="bootLive11-ti1">З диска</title>
- </info>
-
- <para>Ви можете завантажити систему безпосередньо із носія, на який було записано
+<?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="uk"><info><title xml:id="bootLive-ti1">Завантаження Mageia як портативної системи</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Завантаження системи з носія</title></info><section><info><title xml:id="bootLive11-ti1">З диска</title></info><para>Ви можете завантажити систему безпосередньо із носія, на який було записано
ваш образ (компакт-диска, DVD тощо). Зазвичай, достатньо вставити його до
пристрою зчитування компакт-дисків або DVD, щоб завантажувач автоматично
запустив процедуру встановлення після перезавантаження комп’ютера. Якщо
цього не трапиться, ймовірно, вам доведеться внести зміни у налаштування
BIOS або натиснути якусь клавішу (підказку буде показано під час
завантаження), яка надасть змогу вибрати пристрій, з якого відбуватиметься
-завантаження системи на комп’ютері.</para>
-
- <para>Відповідно до обладнання, на якому ви працюєте, та способу його
+завантаження системи на комп’ютері.</para><para>Відповідно до обладнання, на якому ви працюєте, та способу його
налаштування, ви побачите один із наведених нижче двох варіантів зображення
-на екрані.</para>
- </section>
-
- <section>
- <info>
- <title xml:id="bootLive12-ti1">З пристрою USB</title>
- </info>
-
- <para>Ви можете завантажити систему із флешки USB, на яку було записано образ
+на екрані.</para></section><section><info><title xml:id="bootLive12-ti1">З пристрою USB</title></info><para>Ви можете завантажити систему із флешки USB, на яку було записано образ
ISO. Відповідно до параметрів роботи BIOS, комп’ютер може завантажуватися
безпосередньо із флешки, яку вставлено у порт USB. Якщо цього не трапилося
одразу, вам доведеться трохи змінити налаштування BIOS або натиснути клавішу
(підказку буде показано під час завантаження), яка надаться вам змогу
-вибрати периферійний пристрій, з якого завантажуватиметься комп’ютер.</para>
- </section>
- </section>
-
- <section xml:id="biosmode">
- <info>
- <title xml:id="biosmode-ti1">У застарілому режимі BIOS/CSM</title>
- </info>
-
- <mediaobject>
- <imageobject> <imagedata fileref="live-bootCSM.png"/> </imageobject>
-
- <caption>
- <para>Перший екран завантаження у режимі BIOS</para>
- </caption>
- </mediaobject>
-
- <para>За допомогою середнього меню ви можете вибрати одну з трьох дій:</para>
-
- <itemizedlist>
- <listitem>
- <para>Завантажити Mageia: вибір цього пункту означає, що буде завантажено Mageia 5
+вибрати периферійний пристрій, з якого завантажуватиметься комп’ютер.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">У застарілому режимі BIOS/CSM</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Перший екран завантаження у режимі BIOS</para></caption></mediaobject><para>За допомогою середнього меню ви можете вибрати одну з трьох дій:</para><itemizedlist><listitem><para>Завантажити Mageia: вибір цього пункту означає, що буде завантажено Mageia 5
зі з’єднаного носія (CD/DVD або флешки USB), на жорсткий диск комп’ютера
нічого не буде записано, система працюватиме доволі повільно. Після
завантаження системи ви зможете встановити її на жорсткий диск комп’ютера
-або просто ознайомитися із нею.</para>
- </listitem>
-
- <listitem>
- <para>Встановити Mageia: якщо буде вибрано цей пункт, розпочнеться процедура
-встановлення Mageia на жорсткий диск.</para>
- </listitem>
-
- <listitem>
- <para>Завантажити з твердого диска: за допомогою цього варіанта можна завантажити
+або просто ознайомитися із нею.</para></listitem><listitem><para>Встановити Mageia: якщо буде вибрано цей пункт, розпочнеться процедура
+встановлення Mageia на жорсткий диск.</para></listitem><listitem><para>Завантажити з твердого диска: за допомогою цього варіанта можна завантажити
систему з твердого диска, як звичайно відбувається, якщо з комп’ютером не
з’єднано додаткових носіїв систем (компакт-дисків, DVD або флешок USB) (не
-працює у Mageia 5).</para>
- </listitem>
- </itemizedlist>
-
- <para>За допомогою нижнього меню можна отримати доступ до параметрів завантаження:</para>
-
- <itemizedlist>
- <listitem>
- <para>F1 — Довідка. Опис параметрі «splash», «apm», «acpi» та «Ide»</para>
- </listitem>
-
- <listitem>
- <para>F2 — Мова. Вибір мови інтерфейсу.</para>
- </listitem>
-
- <listitem>
- <para>F3 — Роздільна здатність. Тут можна вибрати один із таких варіантів: text,
-640x400, 800x600, 1024x728</para>
- </listitem>
-
- <listitem>
- <para>F4 — CD-Rom. Варіанти: CD-Rom або Other (інше). Зазвичай, встановлення
+працює у Mageia 5).</para></listitem></itemizedlist><para>За допомогою нижнього меню можна отримати доступ до параметрів завантаження:</para><itemizedlist><listitem><para>F1 — Довідка. Опис параметрі «splash», «apm», «acpi» та «Ide»</para></listitem><listitem><para>F2 — Мова. Вибір мови інтерфейсу.</para></listitem><listitem><para>F3 — Роздільна здатність. Тут можна вибрати один із таких варіантів: text,
+640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 — CD-Rom. Варіанти: CD-Rom або Other (інше). Зазвичай, встановлення
виконується зі з’єднаного з комп’ютером носія системи.За допомогою цього
пункту ви можете вибрати інші джерела пакунків, наприклад сервери FTP або
NFS. Якщо встановлення відбувається у мережі із сервером SLP, за допомогою
-цього пункту можна вибрати одне із джерел пакунків на сервері.</para>
- </listitem>
-
- <listitem>
- <para>F5 — Драйвер. «Yes» («Так») або «No» («Ні»). За допомогою цього пункту можна
+цього пункту можна вибрати одне із джерел пакунків на сервері.</para></listitem><listitem><para>F5 — Драйвер. «Yes» («Так») або «No» («Ні»). За допомогою цього пункту можна
повідомити системі про наявність додаткового диска з оновленням драйвера і
-наказати їй попросити його вставити під час встановлення.</para>
- </listitem>
-
- <listitem>
- <para>F6 — Параметри ядра. За допомогою цього пункту можна вказати параметри,
-відповідні до апаратної частини, і драйвери, якими слід скористатися.</para>
- </listitem>
- </itemizedlist>
- </section>
-
- <section xml:id="uefimode">
- <info>
- <title xml:id="uefimode-ti1">У режимі UEFI</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center"
-fileref="live-bootUEFI.png" format="PNG" xml:id="bootUEFI-im1"/>
-</imageobject>
-
- <caption>
- <para>Перший екран під час завантаження системи UEFI з диска</para>
- </caption>
- </mediaobject>
-
- <para>Вам доведеться обирати один з двох варіантів: запустити Mageia у
+наказати їй попросити його вставити під час встановлення.</para></listitem><listitem><para>F6 — Параметри ядра. За допомогою цього пункту можна вказати параметри,
+відповідні до апаратної частини, і драйвери, якими слід скористатися.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">У режимі 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>Перший екран під час завантаження системи UEFI з диска</para></caption></mediaobject><para>Вам доведеться обирати один з двох варіантів: запустити Mageia у
портативному режимі (перший варіант) або продовжити встановлення (другий
-варіант).</para>
- <para>Якщо завантаження відбувалося із флешки USB, буде показано два додаткових
+варіант).</para><para>Якщо завантаження відбувалося із флешки USB, буде показано два додаткових
рядки, які дублікатами попередніх, із суфіксами «USB». Вам слід вибрати саме
-один із цих рядків.</para>
-
- <para>У всіх варіантах перші кроки будуть однаковими: вибрати мову, часовий пояс і
+один із цих рядків.</para><para>У всіх варіантах перші кроки будуть однаковими: вибрати мову, часовий пояс і
модель клавіатури. На наступних кроках процедура змінюється, з’являються
-<link linkend="testing">додаткові кроки портативного режиму</link>.</para>
- </section>
-</section> \ No newline at end of file
+<link linkend="testing">додаткові кроки портативного режиму</link>.</para></section></section> \ No newline at end of file
diff --git a/docs/installer/uk/login.xml b/docs/installer/uk/login.xml
index 5410b82b..340e0e06 100644
--- a/docs/installer/uk/login.xml
+++ b/docs/installer/uk/login.xml
@@ -1,25 +1,7 @@
-<?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="login" version="5.0" xml:lang="uk">
- <info>
- <title xml:id="label-to-adapt-ti1">Вікно вітання</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center" xml:id="login-im1"
-format="PNG" fileref="live-login.png"/> </imageobject>
-
- <caption>
- <para>Вікно вітання KDM</para>
- </caption>
- </mediaobject>
-
- <para>Нарешті, вам буде показано вікно вітання.</para>
-
- <para>Введіть ім’я та пароль вашого користувача і за декілька секунд ви опинитеся
+<?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="uk"><info><title xml:id="label-to-adapt-ti1">Вікно вітання</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>Вікно вітання KDM</para></caption></mediaobject><para>Нарешті, вам буде показано вікно вітання.</para><para>Введіть ім’я та пароль вашого користувача і за декілька секунд ви опинитеся
у завантаженому KDE, GNOME чи іншому стільничному середовищі, залежно від
типу використаного вами носія портативної системи. Далі, можете
-користуватися встановленою Mageia, як вам заманеться.</para>
-
- <para>Іншу частину документації можна знайти у <link
+користуватися встановленою Mageia, як вам заманеться.</para><para>Іншу частину документації можна знайти у <link
linkend="https://wiki.mageia.org/en/Category:Documentation">вікі
-Mageia</link>.</para>
-</section> \ No newline at end of file
+Mageia</link>.</para></section> \ No newline at end of file
diff --git a/docs/installer/uk/setupBootloader.xml b/docs/installer/uk/setupBootloader.xml
index 0e5cb60d..0ec194da 100644
--- a/docs/installer/uk/setupBootloader.xml
+++ b/docs/installer/uk/setupBootloader.xml
@@ -10,9 +10,11 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
-format="PNG"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="setupBootloader-im1"
+format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata
+xml:id="setupBootloader-im1" format="PNG" align="center" revision="1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<section>
<title>Із системою BIOS</title>
@@ -35,7 +37,7 @@ format="PNG"/> </imageobject></mediaobject>
<title xml:id="usingMageiaBootloader-ti2">Користування завантажувачем Mageia</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa4">Типово, Mageia записує новий завантажувач GRUB (застарілу версію) до MBR
+ <para xml:id="setupBootloader-pa4" revision="3">Типово, Mageia записує новий завантажувач GRUB (застарілу версію) до MBR
(основного запису завантаження) першого диска вашого комп’ютера. Якщо на
диску вже було встановлено операційні системи, Mageia спробує додати пункти
цих операційних систем до нового меню завантаження Mageia.</para>
@@ -44,7 +46,7 @@ format="PNG"/> </imageobject></mediaobject>
до застарілої версії GRUB та Lilo.</para>
<warning>
- <para revision="3" xml:id="setupBootloader-pa6">Операційні системи Linux, у яких використовується завантажувач GRUB2, у
+ <para xml:id="setupBootloader-pa6" revision="3">Операційні системи Linux, у яких використовується завантажувач GRUB2, у
поточній версії не розпізнаються і не підтримуються типовим завантажувачем
GRUB (застарілої версії).</para>
@@ -56,15 +58,15 @@ GRUB2. Наказати системі використовувати саме
<section xml:id="usingExistingBootloader">
<info>
- <title revision="2" xml:id="usingExistingBootloader-ti4">Користування вже встановленим завантажувачем</title>
+ <title xml:id="usingExistingBootloader-ti4" revision="2">Користування вже встановленим завантажувачем</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa46">Якщо ви вирішите скористатися вже встановленим завантажувачем, не забудьте
+ <para xml:id="setupBootloader-pa46" revision="3">Якщо ви вирішите скористатися вже встановленим завантажувачем, не забудьте
зупинитися на сторінці резюме під час встановлення і натиснути у розділі
«Завантажувач» кнопку <guibutton>Налаштувати</guibutton> , за допомогою якої
ви зможете змінити місце встановлення завантажувача.</para>
- <para revision="1" xml:id="setupBootloader-pa47">Не вибирайте пристрій, наприклад «sda», інакше вже створений запис MBR буде
+ <para xml:id="setupBootloader-pa47" revision="1">Не вибирайте пристрій, наприклад «sda», інакше вже створений запис MBR буде
перезаписано. Вам слід вибрати кореневий розділ, який було вибрано під час
кроку розподілу диска на розділи, наприклад «sda7».</para>
@@ -77,7 +79,7 @@ GRUB2. Наказати системі використовувати саме
встановлення можна за допомогою натискання комбінації клавіш Ctrl+Alt+F7.</para>
</tip>
- <para revision="2" xml:id="setupBootloader-pa49">Повний перелік кроків додавання пункту операційної системи Mageia до меню
+ <para xml:id="setupBootloader-pa49" revision="2">Повний перелік кроків додавання пункту операційної системи Mageia до меню
вже встановленого завантажувача не є предметом цієї довідкової
сторінки. Втім, здебільшого, ці кроки пов’язано з запуском відповідної
програми встановлення завантажувача, яка має виявити і додати пункт системи
@@ -87,10 +89,10 @@ GRUB2. Наказати системі використовувати саме
<section xml:id="advancedOptionBootloader">
<info>
- <title revision="2" xml:id="advancedOptionBootloader-ti5">Додаткові параметри завантажувача</title>
+ <title xml:id="advancedOptionBootloader-ti5" revision="2">Додаткові параметри завантажувача</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa52">Якщо об’єм на диску з розділом <literal>/</literal>, що містить каталог
+ <para xml:id="setupBootloader-pa52" revision="3">Якщо об’єм на диску з розділом <literal>/</literal>, що містить каталог
<literal>/tmp</literal>, є дуже обмеженим, натисніть кнопку
<guibutton>Додатково</guibutton> і позначте пункт <guilabel>Очищати /tmp при
кожному перезавантаженні</guilabel>. Це допоможе зекономити трохи місця.</para>
@@ -105,7 +107,10 @@ GRUB2. Наказати системі використовувати саме
буде лише grub2-efi. </para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader2.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader2.png"/>
+</imageobject></mediaobject>
<para>Якщо Mageia є першою операційною системою, яку встановлено на вашому
комп’ютері, засіб встановлення створить ESP (системний розділ EFI) для
diff --git a/docs/installer/uk/setupBootloaderAddEntry.xml b/docs/installer/uk/setupBootloaderAddEntry.xml
index ae847253..79e1946b 100644
--- a/docs/installer/uk/setupBootloaderAddEntry.xml
+++ b/docs/installer/uk/setupBootloaderAddEntry.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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="uk">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="uk" xml:id="setupBootloaderAddEntry">
<info>
@@ -7,9 +7,13 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
-xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="dx2-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="live-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject></mediaobject>
<section>
<title>Із системою BIOS</title>
@@ -28,8 +32,8 @@ xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
</note>
<mediaobject>
-<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
-align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1"
+align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
</imageobject></mediaobject>
<para>Деякі з дій можна виконувати нічим не ризикуючи. До таких дій належить зміна
diff --git a/docs/installer/uk/unused.xml b/docs/installer/uk/unused.xml
index cc3ecd73..63fe87b1 100644
--- a/docs/installer/uk/unused.xml
+++ b/docs/installer/uk/unused.xml
@@ -20,7 +20,7 @@ format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
від того, на якому її було встановлено.</para>
<mediaobject>
-<imageobject> <imagedata fileref="live-unused-InstallationProgress.png"/>
+<imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
</imageobject></mediaobject>
<para>На наступному кроці відбудеться копіювання файлів на жорсткий диск. Ця
diff --git a/docs/installer/zh_CN/bootLive.xml b/docs/installer/zh_CN/bootLive.xml
index 47b3bcb3..578cb584 100644
--- a/docs/installer/zh_CN/bootLive.xml
+++ b/docs/installer/zh_CN/bootLive.xml
@@ -1,113 +1,7 @@
-<?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="bootLive" version="5.0" xml:lang="zh_CN">
- <info>
- <title xml:id="bootLive-ti1">引导 Mageia Live 系统</title>
- </info>
-
- <section xml:id="bootLive-1">
- <info>
- <title xml:id="bootLive1-ti1">引导媒体</title>
- </info>
-
- <section>
- <info>
- <title xml:id="bootLive11-ti1">自磁盘</title>
- </info>
-
- <para>可以使用刻录的镜像(CD-ROM,DVD-ROM等)直接引导
+<?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="zh_CN"><info><title xml:id="bootLive-ti1">引导 Mageia Live 系统</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">引导媒体</title></info><section><info><title xml:id="bootLive11-ti1">自磁盘</title></info><para>可以使用刻录的镜像(CD-ROM,DVD-ROM等)直接引导
Mageia。只需将媒体插入到光盘驱动器中,然后重启电脑即可。若没有出现引导画面,则需要手动修改 BIOS
-配置,或者在电脑启动时按下特定按键来选择引导设备。</para>
-
- <para>根据你所使用的硬件以及配置的不同,接下来还有一些安装选项需要设置。</para>
- </section>
-
- <section>
- <info>
- <title xml:id="bootLive12-ti1">自 USB 设备</title>
- </info>
-
- <para>你可以通过写有镜像 ISO 的 USB 设备来引导 Mageia。根据 BIOS 设置不同,电脑可能直接从插入的 USB 设备上启动,也可能跳过 USB
-设备。在后一种情况下,你需要手动修改 BIOS 配置,或在电脑启动时按下特定按键来选择引导设备。</para>
- </section>
- </section>
-
- <section xml:id="biosmode">
- <info>
- <title xml:id="biosmode-ti1">在 BIOS/CSM/Legacy 模式下</title>
- </info>
-
- <mediaobject>
- <imageobject> <imagedata fileref="live-bootCSM.png"/> </imageobject>
-
- <caption>
- <para>在 BIOS 模式下引导时的第一个画面</para>
- </caption>
- </mediaobject>
-
- <para>中间的菜单提供了三个可选操作:</para>
-
- <itemizedlist>
- <listitem>
- <para>Boot Mageia:将从媒体(CD/DVD 或 U 盘)直接启动 Mageia
-5,并且不会向硬盘写入任何数据,所以系统可能运行较慢。引导完成后,即可将系统安装到硬盘。</para>
- </listitem>
-
- <listitem>
- <para>Install Mageia:将 Mageia 直接安装到硬盘。</para>
- </listitem>
-
- <listitem>
- <para>Boot from hard disk:从硬盘引导,和不使用引导媒体的情况相同(即不启动 Mageia 5)。</para>
- </listitem>
- </itemizedlist>
-
- <para>底部菜单中提供了引导选项:</para>
-
- <itemizedlist>
- <listitem>
- <para>F1 - 帮助。说明”splash“、”apm“、”acpi“、”ide“等选项。</para>
- </listitem>
-
- <listitem>
- <para>F2 - 语言。选择用于显示的语言。</para>
- </listitem>
-
- <listitem>
- <para>F3 -屏幕分辨率。选择 640x400、800x600、1024x728 或纯文本模式。</para>
- </listitem>
-
- <listitem>
- <para>F4 - CD-Rom。CD-Rom 相关选项。一般通过插入的安装媒体来安装,但也可以选择 FTP、NFS 等其他安装源。如果通过网络上的 SLP
-服务器来安装,请用此选项选择一个服务器上可用的安装源。</para>
- </listitem>
-
- <listitem>
- <para>F5 - 驱动。是否使用驱动。系统将在安装过程中提醒需要使用驱动更新的磁盘,并将其插入。</para>
- </listitem>
-
- <listitem>
- <para>F6 - 内核选项。用于指定与硬件和驱动相关的内核参数。</para>
- </listitem>
- </itemizedlist>
- </section>
-
- <section xml:id="uefimode">
- <info>
- <title xml:id="uefimode-ti1">在 UEFI 模式下</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center"
-fileref="live-bootUEFI.png" format="PNG" xml:id="bootUEFI-im1"/>
-</imageobject>
-
- <caption>
- <para>在 UEFI 模式下引导时的第一个画面</para>
- </caption>
- </mediaobject>
-
- <para>你可以选择以 Live 模式运行 Mageia(第一个选项)或者直接进行安装(第二个选项)。</para>
- <para>若从 U 盘引导,除了以”uSB“结尾的行以外,还会有额外的两行供选择。</para>
-
- <para>在不同选项中,都需要先选择语言、时区和键盘布局,然后 <link linkend="testing">Live 模式下会有额外的步骤</link>。</para>
- </section>
-</section> \ No newline at end of file
+配置,或者在电脑启动时按下特定按键来选择引导设备。</para><para>根据你所使用的硬件以及配置的不同,接下来还有一些安装选项需要设置。</para></section><section><info><title xml:id="bootLive12-ti1">自 USB 设备</title></info><para>你可以通过写有镜像 ISO 的 USB 设备来引导 Mageia。根据 BIOS 设置不同,电脑可能直接从插入的 USB 设备上启动,也可能跳过 USB
+设备。在后一种情况下,你需要手动修改 BIOS 配置,或在电脑启动时按下特定按键来选择引导设备。</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">在 BIOS/CSM/Legacy 模式下</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>在 BIOS 模式下引导时的第一个画面</para></caption></mediaobject><para>中间的菜单提供了三个可选操作:</para><itemizedlist><listitem><para>Boot Mageia:将从媒体(CD/DVD 或 U 盘)直接启动 Mageia
+5,并且不会向硬盘写入任何数据,所以系统可能运行较慢。引导完成后,即可将系统安装到硬盘。</para></listitem><listitem><para>Install Mageia:将 Mageia 直接安装到硬盘。</para></listitem><listitem><para>Boot from hard disk:从硬盘引导,和不使用引导媒体的情况相同(即不启动 Mageia 5)。</para></listitem></itemizedlist><para>底部菜单中提供了引导选项:</para><itemizedlist><listitem><para>F1 - 帮助。说明”splash“、”apm“、”acpi“、”ide“等选项。</para></listitem><listitem><para>F2 - 语言。选择用于显示的语言。</para></listitem><listitem><para>F3 -屏幕分辨率。选择 640x400、800x600、1024x728 或纯文本模式。</para></listitem><listitem><para>F4 - CD-Rom。CD-Rom 相关选项。一般通过插入的安装媒体来安装,但也可以选择 FTP、NFS 等其他安装源。如果通过网络上的 SLP
+服务器来安装,请用此选项选择一个服务器上可用的安装源。</para></listitem><listitem><para>F5 - 驱动。是否使用驱动。系统将在安装过程中提醒需要使用驱动更新的磁盘,并将其插入。</para></listitem><listitem><para>F6 - 内核选项。用于指定与硬件和驱动相关的内核参数。</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">在 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>在 UEFI 模式下引导时的第一个画面</para></caption></mediaobject><para>你可以选择以 Live 模式运行 Mageia(第一个选项)或者直接进行安装(第二个选项)。</para><para>若从 U 盘引导,除了以”uSB“结尾的行以外,还会有额外的两行供选择。</para><para>在不同选项中,都需要先选择语言、时区和键盘布局,然后 <link linkend="testing">Live 模式下会有额外的步骤</link>。</para></section></section> \ No newline at end of file
diff --git a/docs/installer/zh_CN/login.xml b/docs/installer/zh_CN/login.xml
index 1349d462..25b811f4 100644
--- a/docs/installer/zh_CN/login.xml
+++ b/docs/installer/zh_CN/login.xml
@@ -1,21 +1,3 @@
-<?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="login" version="5.0" xml:lang="zh_CN">
- <info>
- <title xml:id="label-to-adapt-ti1">登录界面</title>
- </info>
-
- <mediaobject condition="live">
- <imageobject> <imagedata revision="1" align="center" xml:id="login-im1"
-format="PNG" fileref="live-login.png"/> </imageobject>
-
- <caption>
- <para>KDM 登录界面</para>
- </caption>
- </mediaobject>
-
- <para>最后,您将会看到登录界面。</para>
-
- <para>请输入您的用户名和密码,随后您将看到 KDE 或 GNOME 桌面(根据您所选的安装介质而异)。您现在即可使用 Mageia 系统。</para>
-
- <para>可以在 <link linkend="https://wiki.mageia.org/en/Category:Documentation">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="zh_CN"><info><title xml:id="label-to-adapt-ti1">登录界面</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM 登录界面</para></caption></mediaobject><para>最后,您将会看到登录界面。</para><para>请输入您的用户名和密码,随后您将看到 KDE 或 GNOME 桌面(根据您所选的安装介质而异)。您现在即可使用 Mageia 系统。</para><para>可以在 <link linkend="https://wiki.mageia.org/en/Category:Documentation">Mageia
+wiki</link> 中找到有关系统使用的方法。</para></section> \ No newline at end of file
diff --git a/docs/installer/zh_CN/selectInstallClass.xml b/docs/installer/zh_CN/selectInstallClass.xml
index 7cbab7e2..30cd9f8f 100644
--- a/docs/installer/zh_CN/selectInstallClass.xml
+++ b/docs/installer/zh_CN/selectInstallClass.xml
@@ -57,6 +57,6 @@ Delete</guibutton> 来触发重启操作。</para>
<tip>
<para>若您忘记选择某一附加语言,您可以回到“安装或升级”界面,然后按下来 <guilabel>Alt Ctrl Home</guilabel>
- 并进行选择。请<emphasis>不要</emphasis>在安装后再进行添加。</para>
+并进行选择。请<emphasis>不要</emphasis>在安装后再进行添加。</para>
</tip>
</section>
diff --git a/docs/installer/zh_CN/setupBootloader.xml b/docs/installer/zh_CN/setupBootloader.xml
index f0b1a8ec..75dea51a 100644
--- a/docs/installer/zh_CN/setupBootloader.xml
+++ b/docs/installer/zh_CN/setupBootloader.xml
@@ -10,9 +10,11 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
-format="PNG"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="setupBootloader-im1"
+format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata
+xml:id="setupBootloader-im1" format="PNG" align="center" revision="1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<section>
<title>使用 BIOS 系统</title>
@@ -30,13 +32,13 @@ format="PNG"/> </imageobject></mediaobject>
<title xml:id="usingMageiaBootloader-ti2">使用 Mageia 提供的引导器</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa4">默认情况下将新的 GRUB(传统版)引导器写入到第一硬盘驱动器的 MBR(主引导记录)中。如果您已经安装了其他系统,Mageia
+ <para xml:id="setupBootloader-pa4" revision="3">默认情况下将新的 GRUB(传统版)引导器写入到第一硬盘驱动器的 MBR(主引导记录)中。如果您已经安装了其他系统,Mageia
会尝试将其添加到新的引导菜单中。</para>
<para revision="3">除了 GRUB 传统版和 Lilo,Mageia 目前也提供 GRUB2 作为可选的引导器,</para>
<warning>
- <para revision="3" xml:id="setupBootloader-pa6">当前,GRUB(传统版,默认选项)无法识别和支持使用 GRUB2 作为引导器的 Linux 系统。</para>
+ <para xml:id="setupBootloader-pa6" revision="3">当前,GRUB(传统版,默认选项)无法识别和支持使用 GRUB2 作为引导器的 Linux 系统。</para>
<para revision="3">最好的解决方法是使用 GRUB 2 引导器,可以在安装过程中的摘要页面中选择安装。</para>
</warning>
@@ -44,13 +46,13 @@ format="PNG"/> </imageobject></mediaobject>
<section xml:id="usingExistingBootloader">
<info>
- <title revision="2" xml:id="usingExistingBootloader-ti4">使用现存的引导器</title>
+ <title xml:id="usingExistingBootloader-ti4" revision="2">使用现存的引导器</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa46">若您要使用现存的引导器,请记得在安装过程中的摘要页面处停留,然后点击引导器 <guibutton>配置</guibutton>
+ <para xml:id="setupBootloader-pa46" revision="3">若您要使用现存的引导器,请记得在安装过程中的摘要页面处停留,然后点击引导器 <guibutton>配置</guibutton>
按钮,并改变引导器的安装位置。</para>
- <para revision="1" xml:id="setupBootloader-pa47">请不要选择类似“sda”的设备,否则会覆盖现存的 MBR。您必须选择根分区(在之前的分区操作中设置)作为安装对象</para>
+ <para xml:id="setupBootloader-pa47" revision="1">请不要选择类似“sda”的设备,否则会覆盖现存的 MBR。您必须选择根分区(在之前的分区操作中设置)作为安装对象</para>
<para xml:id="setupBootloader-pa48" revision="1">要清楚,sda 代表一个设备(磁盘),sda7 代表设备上的分区。</para>
@@ -59,16 +61,16 @@ format="PNG"/> </imageobject></mediaobject>
<literal>/</literal>(根分区)对应的分区编号。然后按下 Ctrl+Alt+F7 返回安装界面。</para>
</tip>
- <para revision="2" xml:id="setupBootloader-pa49">有关添加 Mageia
+ <para xml:id="setupBootloader-pa49" revision="2">有关添加 Mageia
系统至现存引导器的问题超出了此帮助的范围。多数情况下,这设计到运行相应的引导器安装程序,并自动检测和添加引导项。请参见有关操作系统的文档以便进一步操作。</para>
</section>
<section xml:id="advancedOptionBootloader">
<info>
- <title revision="2" xml:id="advancedOptionBootloader-ti5">引导器高级选项</title>
+ <title xml:id="advancedOptionBootloader-ti5" revision="2">引导器高级选项</title>
</info>
- <para revision="3" xml:id="setupBootloader-pa52">如果您的 <literal>/</literal> 分区对于 <literal>/tmp</literal> 来说太小,请点击
+ <para xml:id="setupBootloader-pa52" revision="3">如果您的 <literal>/</literal> 分区对于 <literal>/tmp</literal> 来说太小,请点击
<guibutton>Advanced</guibutton>,然后勾选 <guilabel>每次启动时清理
/tmp</guilabel>。这有助于维持一定的空闲空间。</para>
</section>
@@ -80,7 +82,10 @@ format="PNG"/> </imageobject></mediaobject>
<para>对于 UEFI,用户界面会稍有不同,您将无法选择引导器(因为只能使用 Grub2-efi)。 </para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader2.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader2.png"/>
+</imageobject></mediaobject>
<para>如果 Mageia 是您在电脑上安装的第一个系统,安装程序将自动创建一个 ESP(EFI 系统分区)来容纳引导器(Grub2-efi)。如果已安装了其他
UEFI 操作系统(例如 Windows 8),Mageia 安装器将会探测现存的(由 Windows 创建的) ESP,并添加
diff --git a/docs/installer/zh_CN/setupBootloaderAddEntry.xml b/docs/installer/zh_CN/setupBootloaderAddEntry.xml
index a7cded9a..d4e61dc7 100644
--- a/docs/installer/zh_CN/setupBootloaderAddEntry.xml
+++ b/docs/installer/zh_CN/setupBootloaderAddEntry.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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="zh_CN">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="setupBootloaderAddEntry">
<info>
@@ -7,9 +7,13 @@
</info>
<mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
-xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="dx2-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="live-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject></mediaobject>
<section>
<title>使用 BIOS 系统</title>
@@ -22,8 +26,8 @@ xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
</note>
<mediaobject>
-<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
-align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1"
+align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
</imageobject></mediaobject>
<para>部分操作,例如改变引导项标题,或设置默认选项,是没有风险的。</para>
diff --git a/docs/installer/zh_CN/unused.xml b/docs/installer/zh_CN/unused.xml
index ecd839f2..b105c0c8 100644
--- a/docs/installer/zh_CN/unused.xml
+++ b/docs/installer/zh_CN/unused.xml
@@ -16,7 +16,7 @@ format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
<para>在这一步中,安装程序将会查找未使用的语言包和硬件包,并将其删除。除非您需要在不同的硬件上运行系统,否则最好允许此操作。</para>
<mediaobject>
-<imageobject> <imagedata fileref="live-unused-InstallationProgress.png"/>
+<imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
</imageobject></mediaobject>
<para>下一步是复制文件到硬盘。这需要花费几分钟的时间。之后,您的屏幕会变黑一段时间,这是正常现象。</para>