diff options
Diffstat (limited to 'docs/installer/sl')
| -rw-r--r-- | docs/installer/sl/bootLive.xml | 134 | ||||
| -rw-r--r-- | docs/installer/sl/login.xml | 27 | ||||
| -rw-r--r-- | docs/installer/sl/setupBootloader.xml | 29 | ||||
| -rw-r--r-- | docs/installer/sl/setupBootloaderAddEntry.xml | 16 | ||||
| -rw-r--r-- | docs/installer/sl/unused.xml | 2 |
5 files changed, 46 insertions, 162 deletions
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 |