aboutsummaryrefslogtreecommitdiffstats
path: root/docs/installer/hr
diff options
context:
space:
mode:
Diffstat (limited to 'docs/installer/hr')
-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
22 files changed, 680 insertions, 230 deletions
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>