aboutsummaryrefslogtreecommitdiffstats
path: root/docs/installer
diff options
context:
space:
mode:
Diffstat (limited to 'docs/installer')
-rw-r--r--docs/installer/sl.po258
-rw-r--r--docs/installer/sl/DrakLive-cover.xml4
-rw-r--r--docs/installer/sl/DrakLive.xml2
-rw-r--r--docs/installer/sl/SelectAndUseISOs2.xml68
-rw-r--r--docs/installer/sl/addUser.xml57
-rw-r--r--docs/installer/sl/chooseDesktop.xml30
-rw-r--r--docs/installer/sl/choosePackageGroups.xml55
-rw-r--r--docs/installer/sl/diskdrake.xml55
-rw-r--r--docs/installer/sl/doPartitionDisks.xml62
-rw-r--r--docs/installer/sl/exitInstall.xml41
-rw-r--r--docs/installer/sl/misc-params.xml125
-rw-r--r--docs/installer/sl/reboot.xml35
-rw-r--r--docs/installer/sl/selectCountry.xml75
-rw-r--r--docs/installer/sl/setupBootloader.xml261
-rw-r--r--docs/installer/sl/setupBootloaderAddEntry.xml68
-rw-r--r--docs/installer/sl/soundConfig.xml36
-rw-r--r--docs/installer/sl/uninstall-Mageia.xml5
17 files changed, 536 insertions, 701 deletions
diff --git a/docs/installer/sl.po b/docs/installer/sl.po
index 30c6fc13..4617c12c 100644
--- a/docs/installer/sl.po
+++ b/docs/installer/sl.po
@@ -3,7 +3,8 @@
# This file is distributed under the same license as the Mageia Installer Help package.
#
# Translators:
-# Filip Komar <filip.komar@gmail.com>, 2013,2016
+# Filip Komar <filip.komar@gmail.com>, 2013
+# Filip Komar <filip.komar@gmail.com>, 2013,2016-2017
# Rok Kepa <rokkepa@gmail.com>, 2014
# Yuri Chornoivan <yurchor@ukr.net>, 2016
msgid ""
@@ -11,12 +12,11 @@ msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
"POT-Creation-Date: 2017-02-10 19:18+0200\n"
-"PO-Revision-Date: 2016-08-23 12:10+0000\n"
+"PO-Revision-Date: 2017-02-21 23:44+0000\n"
"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
-"Language-Team: Slovenian <lugos-slo@lugos.si>, Translation list <mageia-"
-"i18n@mageia.org>, Slovenian (http://www.transifex.com/MageiaLinux/mageia/"
+"Language-Team: Slovenian (http://www.transifex.com/MageiaLinux/mageia/"
+"language/sl/)\n"
"Language: sl\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -171,17 +171,16 @@ msgstr "Upravljanje z naprednimi in navadnimi uporabniki"
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
#: en/addUser.xml:9
-#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
msgstr ""
-"<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>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
+"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
#: en/addUser.xml:20
@@ -661,13 +660,12 @@ msgstr ""
#. type: Content of: <section><mediaobject>
#: en/chooseDesktop.xml:16
-#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
"align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
#. type: Content of: <section><para>
#: en/chooseDesktop.xml:21
@@ -689,13 +687,12 @@ msgstr "Izbira skupin paketov"
#. Lebarhon 20170209 Updated SC
#. type: Content of: <section><mediaobject>
#: en/choosePackageGroups.xml:9
-#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
"\" align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
#. type: Content of: <section><para>
#: en/choosePackageGroups.xml:14
@@ -1133,15 +1130,14 @@ msgstr "Razdeljevanje diska po meri s programom DiskDrake"
#. type: Content of: <section><mediaobject>
#: en/diskdrake.xml:12
-#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
#. type: Content of: <section><warning><para>
#: en/diskdrake.xml:22
@@ -1207,19 +1203,17 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:61
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
#. type: Content of: <section><note><para>
#: en/diskdrake.xml:56
-#, fuzzy
msgid ""
"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
"\" id=\"1\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr ""
#. type: Content of: <section><note><para>
#: en/diskdrake.xml:68
@@ -1230,15 +1224,14 @@ msgstr ""
#. type: Content of: <section><note><mediaobject>
#: en/diskdrake.xml:72
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
"> </imageobject>"
msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
#. type: Content of: <section><info><title>
#: en/doPartitionDisks.xml:9
@@ -1262,22 +1255,20 @@ msgstr ""
#. type: Content of: <section><mediaobject>
#: en/doPartitionDisks.xml:22
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
"\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
+"\"/> </imageobject>"
#. type: Content of: <section><mediaobject>
#: en/doPartitionDisks.xml:28
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
"imageobject>"
#. type: Content of: <section><para><itemizedlist><listitem><para>
@@ -1355,12 +1346,11 @@ msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
#: en/doPartitionDisks.xml:85
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
"imageobject>"
#. type: Content of: <section><para><itemizedlist><listitem><para>
@@ -1476,32 +1466,29 @@ msgstr ""
#. type: Content of: <section><note><mediaobject>
#: en/doPartitionDisks.xml:169
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
"imageobject>"
#. type: Content of: <section><note><mediaobject>
#: en/doPartitionDisks.xml:175
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
#. type: Content of: <section><note><mediaobject>
#: en/doPartitionDisks.xml:181
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
#. type: Content of: <section><warning><para>
@@ -1535,7 +1522,7 @@ msgstr ""
#. type: Content of: <article><info><title>
#: en/DrakLive-cover.xml:4 en/DrakLive-cover.xml:30 en/DrakLive.xml:3
msgid "Installation from LIVE medium"
-msgstr ""
+msgstr "Namestitev z Medija Live"
#. type: Content of: <book><info>
#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
@@ -1639,14 +1626,12 @@ msgstr "Čestitke"
#. Lebarhon 20170209 updated SC
#. type: Content of: <section><mediaobject>
#: en/exitInstall.xml:9
-#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
#. type: Content of: <section><para>
#: en/exitInstall.xml:14
@@ -2334,10 +2319,10 @@ msgstr "Povzetek raznih nastavitev"
#. Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
#. type: Content of: <section><mediaobject>
#: en/misc-params.xml:10
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
#. type: Content of: <section><para>
#: en/misc-params.xml:15
@@ -2523,14 +2508,12 @@ msgstr "Za več informacij poglejte <xref linkend=\"configureX_chooser\"/>."
#. type: Content of: <section><section><mediaobject>
#: en/misc-params.xml:147
-#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
#: en/misc-params.xml:155
@@ -2641,10 +2624,8 @@ msgstr ""
#. type: Content of: <section><mediaobject>
#: en/reboot.xml:15
-#, fuzzy
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
#. type: Content of: <section><para>
#: en/reboot.xml:20
@@ -2656,13 +2637,12 @@ msgstr ""
#. type: Content of: <section><mediaobject>
#: en/reboot.xml:25
-#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
msgstr ""
-"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
-"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
#. type: Content of: <section><info><title>
#: en/resizeFATChoose.xml:16
@@ -2908,9 +2888,8 @@ msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:170
-#, fuzzy
msgid "Xfce desktop environment only."
-msgstr "Uporablja samo namizje Xfce."
+msgstr ""
#. type: Content of: <section><section><section><title>
#: en/SelectAndUseISOs2.xml:185
@@ -2941,9 +2920,8 @@ msgstr "samo angleščina."
#. type: Content of: <section><section><section><section><title>
#: en/SelectAndUseISOs2.xml:218
-#, fuzzy
msgid "netinstall.iso"
-msgstr "Zagon namestitve"
+msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:222
@@ -2954,9 +2932,8 @@ msgstr ""
#. type: Content of: <section><section><section><section><title>
#: en/SelectAndUseISOs2.xml:229
-#, fuzzy
msgid "netinstall-nonfree.iso"
-msgstr "boot-nonfree.iso"
+msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:233
@@ -3297,14 +3274,12 @@ msgstr "Izbor države/regije"
#. Lebarhon 2016 12 16 updated for Mageia 6
#. type: Content of: <section><mediaobject>
#: en/selectCountry.xml:9
-#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
#. type: Content of: <section><para>
#: en/selectCountry.xml:14
@@ -3641,9 +3616,8 @@ msgstr "Glavne možnosti zagonskega nalagalnika"
#. type: Content of: <section><section><title>
#: en/setupBootloader.xml:13
-#, fuzzy
msgid "Bootloader interface"
-msgstr "Glavne možnosti zagonskega nalagalnika"
+msgstr ""
#. type: Content of: <section><section><para>
#: en/setupBootloader.xml:15
@@ -3673,21 +3647,19 @@ msgstr ""
#. type: Content of: <section><section><section><mediaobject>
#: en/setupBootloader.xml:36
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
#. type: Content of: <section><section><section><mediaobject>
#: en/setupBootloader.xml:42
-#, fuzzy
msgid ""
"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
"setupBootloader.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
@@ -3708,21 +3680,21 @@ msgstr ""
#. type: Content of: <section><section><section><mediaobject>
#: en/setupBootloader.xml:58
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
#. type: Content of: <section><section><section><mediaobject>
#: en/setupBootloader.xml:64
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
#. type: Content of: <section><section><section><para>
#: en/setupBootloader.xml:69
@@ -3769,20 +3741,21 @@ msgstr ""
#. type: Content of: <section><section><mediaobject>
#: en/setupBootloader.xml:105
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
"imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+"imageobject>"
#. type: Content of: <section><section><mediaobject>
#: en/setupBootloader.xml:111
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+"imageobject>"
#. type: Content of: <section><section><title>
#: en/setupBootloader.xml:118
@@ -3814,20 +3787,21 @@ msgstr ""
#. type: Content of: <section><section><mediaobject>
#: en/setupBootloader.xml:136
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
"imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
#. type: Content of: <section><section><mediaobject>
#: en/setupBootloader.xml:142
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
#. type: Content of: <section><section><para>
#: en/setupBootloader.xml:147
@@ -3838,16 +3812,17 @@ msgstr ""
#. type: Content of: <section><section><mediaobject>
#: en/setupBootloader.xml:151
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
"imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
#. type: Content of: <section><section><title>
#: en/setupBootloader.xml:158
msgid "Options"
-msgstr ""
+msgstr "Možnosti"
#. type: Content of: <section><section><section><title>
#: en/setupBootloader.xml:161
@@ -3886,9 +3861,8 @@ msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
-#, fuzzy
msgid "<guilabel>Advanced</guilabel>"
-msgstr "<guilabel>Storitve</guilabel>:"
+msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
#: en/setupBootloader.xml:192
@@ -4013,13 +3987,12 @@ msgstr "Nastavitve zvoka"
#. Lebarhon 20170209 updated SC
#. type: Content of: <section><mediaobject>
#: en/soundConfig.xml:9
-#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
#. type: Content of: <section><para>
#: en/soundConfig.xml:14
@@ -4301,96 +4274,3 @@ msgid ""
"The next step is the copying of files on hard disk. This takes some minutes. "
"At the end, you get a blank screen for some time, it's normal."
msgstr ""
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
-#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
-#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
-#~ "png\"/> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
-#~ "png\"/> </imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
-#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
-#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
-#~ "imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
-#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
-#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
-
-#~ msgid "DVD dual arch"
-#~ msgstr "DVD z dvojno arhitekturo"
-
-#~ msgid "It contains non free software."
-#~ msgstr "Vsebuje lastniško programsko opremo."
-
-#~ msgid "boot.iso"
-#~ msgstr "boot.iso"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
-#~ "</imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
-#~ "</imageobject>"
-
-#~ msgid ""
-#~ "<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>"
-#~ msgstr ""
-#~ "<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>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
-#~ "imageobject>"
-
-#~ msgid ""
-#~ "<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>"
-#~ msgstr ""
-#~ "<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>"
-
-#~ msgid "Bootloader advanced option"
-#~ msgstr "Napredne možnosti zagonskega nalagalnika"
diff --git a/docs/installer/sl/DrakLive-cover.xml b/docs/installer/sl/DrakLive-cover.xml
index 98130c3e..ac077fbf 100644
--- a/docs/installer/sl/DrakLive-cover.xml
+++ b/docs/installer/sl/DrakLive-cover.xml
@@ -1,7 +1,7 @@
<?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="sl" xml:id="Quick-Startup">
<info>
- <title>Installation from LIVE medium</title>
+ <title>Namestitev z Medija Live</title>
<publisher> <publishername>Mageia.org</publishername> </publisher>
<revhistory>
<revision>
@@ -27,7 +27,7 @@ dokumentiranje</link>, če jih želite izboljšati.</para>
</cover>
</info>
<article>
- <title>Installation from LIVE medium</title>
+ <title>Namestitev z Medija Live</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
diff --git a/docs/installer/sl/DrakLive.xml b/docs/installer/sl/DrakLive.xml
index 6e56ecba..fd92900a 100644
--- a/docs/installer/sl/DrakLive.xml
+++ b/docs/installer/sl/DrakLive.xml
@@ -1,6 +1,6 @@
<?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="sl" xml:id="Quick-Startup">
<info>
- <title>Installation from LIVE medium</title>
+ <title>Namestitev z Medija Live</title>
<cover>
<para><note>
diff --git a/docs/installer/sl/SelectAndUseISOs2.xml b/docs/installer/sl/SelectAndUseISOs2.xml
index 2ab159ca..0867f07e 100644
--- a/docs/installer/sl/SelectAndUseISOs2.xml
+++ b/docs/installer/sl/SelectAndUseISOs2.xml
@@ -1,8 +1,10 @@
-<?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="Select-and-use-ISOs" 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/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="sl" xml:id="Select-and-use-ISOs">
<info>
- <!-- Made by Lebarhon 2014 03 26 -->
+ <!-- Made by Lebarhon 2014 03 26
+
+Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
<title xml:id="Select-and-use-ISOs-ti1">Izbor in uporaba odtisa diska: ISO</title>
</info>
@@ -85,30 +87,6 @@ Hardware Detection Tool.</para>
</listitem>
</itemizedlist>
</section>
-
- <section>
- <title>DVD z dvojno arhitekturo</title>
-
- <itemizedlist>
- <listitem>
- <para>Both architectures are present on the same medium, the choice is made
-automatically according to the detected CPU.</para>
- </listitem>
-
- <listitem>
- <para>Uporablja samo namizje Xfce.</para>
- </listitem>
-
- <listitem>
- <para>Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl,
-pt, ru, sv, uk) TO BE CHECKED!</para>
- </listitem>
-
- <listitem>
- <para>Vsebuje lastniško programsko opremo.</para>
- </listitem>
- </itemizedlist>
- </section>
</section>
<section>
@@ -124,7 +102,7 @@ optionally install Mageia on to your HDD.</para>
</listitem>
<listitem>
- <para>Each ISO contains only one desktop environment (KDE or GNOME).</para>
+ <para>Each ISO contains only one desktop environment (KDE, GNOME or Xfce).</para>
</listitem>
<listitem>
@@ -144,25 +122,25 @@ releases.</emphasis></para>
</section>
<section>
- <title>Live CD KDE</title>
+ <title>Live DVD Plasma</title>
<itemizedlist>
<listitem>
- <para>KDE desktop environment only.</para>
+ <para>Plasma desktop environment only.</para>
</listitem>
<listitem>
- <para>samo angleščina.</para>
+ <para>Prisotni so vsi jeziki.</para>
</listitem>
<listitem>
- <para>32 bit only.</para>
+ <para>Different media for 32 or 64 bit architectures.</para>
</listitem>
</itemizedlist>
</section>
<section>
- <title>Live CD GNOME</title>
+ <title>Live DVD GNOME</title>
<itemizedlist>
<listitem>
@@ -170,24 +148,6 @@ releases.</emphasis></para>
</listitem>
<listitem>
- <para>samo angleščina.</para>
- </listitem>
-
- <listitem>
- <para>32 bit only.</para>
- </listitem>
- </itemizedlist>
- </section>
-
- <section>
- <title>Live DVD KDE</title>
-
- <itemizedlist>
- <listitem>
- <para>KDE desktop environment only.</para>
- </listitem>
-
- <listitem>
<para>Prisotni so vsi jeziki.</para>
</listitem>
@@ -198,11 +158,11 @@ releases.</emphasis></para>
</section>
<section>
- <title>Live DVD GNOME</title>
+ <title>Live DVD Xfce</title>
<itemizedlist>
<listitem>
- <para>GNOME desktop environment only.</para>
+ <para>Xfce desktop environment only.</para>
</listitem>
<listitem>
@@ -248,7 +208,7 @@ PC that can't boot from a USB stick.</para>
</section>
<section>
- <title>boot.iso</title>
+ <title>netinstall.iso</title>
<itemizedlist>
<listitem>
@@ -259,7 +219,7 @@ software.</para>
</section>
<section>
- <title>boot-nonfree.iso</title>
+ <title>netinstall-nonfree.iso</title>
<itemizedlist>
<listitem>
diff --git a/docs/installer/sl/addUser.xml b/docs/installer/sl/addUser.xml
index ae2e22ce..2e525fe7 100644
--- a/docs/installer/sl/addUser.xml
+++ b/docs/installer/sl/addUser.xml
@@ -1,42 +1,16 @@
-<?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="sl">
+<?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="sl" xml:id="addUser">
<info>
<title xml:id="addUser-ti1">Upravljanje z naprednimi in navadnimi uporabniki</title>
</info>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
<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 -->
-<!-- removed para xml:id's, finished the page using Led43's text in the wiki, but
- changed his text about the Advanced User Managment screen (the only thing
- about guest account there, is the box you can tick or untick to enable or
- disable it, the rest is about the normal user you're adding in the previous
- screen), marja, 20120409-->
-<!-- barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
- "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 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>
+<!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
+<imageobject condition="classical"> <imagedata format="PNG"
+fileref="dx2-setRootPassword.png" align="center" revision="1"
+xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
+format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
<section xml:id="root-password">
<info>
@@ -98,25 +72,18 @@ password text boxes.</para>
</itemizedlist>
<note>
- <para>Any user you add while installing Mageia, will have a world readable (but
-write protected) home directory.</para>
-
- <para>However, while using your new install, any user you add in <emphasis>MCC -
-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>
+ <para>Any user you add while installing Mageia, will have a both read and write
+protected home directory (umask=0027).</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>You can add all extra needed users in the <emphasis>Configuration -
+Summary</emphasis> step during the install. Choose <emphasis>User
+management</emphasis>.</para>
<para>Dovoljenje dostopa lahko spremenite tudi po namestitvi</para>
</note>
</section>
- <section condition="classical" xml:id="addUserAdvanced">
+ <section xml:id="addUserAdvanced" condition="classical">
<info>
<title xml:id="addUserAdvanced-ti3">Napredno upravljanje z uporabniki</title>
</info>
diff --git a/docs/installer/sl/chooseDesktop.xml b/docs/installer/sl/chooseDesktop.xml
index 6f1eec7e..4a007dfa 100644
--- a/docs/installer/sl/chooseDesktop.xml
+++ b/docs/installer/sl/chooseDesktop.xml
@@ -1,33 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sl" xml:id="chooseDesktop">
-
-
- <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<?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="sl" xml:id="chooseDesktop">
+ <!--Lebarhon 20170209 updated SC-->
<info>
- <title xml:id="chooseDesktop-ti1">Izbira namizja</title>
- </info>
-
-
+ <title xml:id="chooseDesktop-ti1">Izbira namizja</title>
+ </info>
+
- <para>Depending on your selection here, you may be offered further screens to fine
+ <para>Depending on your selection here, you may be offered further screens to fine
tune your choice.</para>
- <para>After the selection step(s), you will see a slide show during package
+ <para>After the selection step(s), you will see a slide show during package
installation. The slide show can be disabled by pressing the
<guilabel>Details</guilabel> button</para>
+ <mediaobject>
+<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png"
+align="center"/> </imageobject></mediaobject>
-
-<mediaobject>
-<imageobject> <imagedata fileref="dx2-chooseDesktop.png" align="center"
-format="PNG" ></imagedata> </imageobject></mediaobject>
-
- <para>Choose whether you prefer to use the <application>KDE</application> or
+ <para>Choose whether you prefer to use the <application>KDE</application> or
<application>Gnome</application> desktop environment. Both come with a full
set of useful applications and tools. Tick <guilabel>Custom</guilabel> if
you want to use neither or both, or if you want something other than the
default software choices for these desktop environments. The
<application>LXDE</application> desktop is lighter than the previous two,
sporting less eye candy and fewer packages installed by default.</para>
- </section>
-
+</section> \ No newline at end of file
diff --git a/docs/installer/sl/choosePackageGroups.xml b/docs/installer/sl/choosePackageGroups.xml
index 7c6a4b19..b6c6eb8e 100644
--- a/docs/installer/sl/choosePackageGroups.xml
+++ b/docs/installer/sl/choosePackageGroups.xml
@@ -1,40 +1,39 @@
-<?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="sl" xml:id="choosePackageGroups">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sl" xml:id="choosePackageGroups">
+ <info>
+ <title xml:id="choosePackageGroups-ti1">Izbira skupin paketov</title>
+ </info>
- <info>
- <title xml:id="choosePackageGroups-ti1">Izbira skupin paketov</title>
- </info>
+
-
+ <mediaobject>
+<!--Lebarhon 20170209 Updated SC-->
+<imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
+align="center"/> </imageobject></mediaobject>
-<mediaobject>
-<!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
-<imageobject> <imagedata fileref="dx2-choosePackageGroups.png"
-align="center" format="PNG" ></imagedata> </imageobject></mediaobject>
-
- <para>Packages have been sorted into groups, to make choosing what you need on
+ <para>Packages have been sorted into groups, to make choosing what you need on
your system a lot easier. The groups are fairly self explanatory, however
more information about the content of each is available in tool-tips which
become visible as the mouse is hovered over them.</para>
- <itemizedlist>
- <listitem>
- <para>Delovna postaja.</para>
- </listitem>
+ <itemizedlist>
+ <listitem>
+ <para>Delovna postaja.</para>
+ </listitem>
- <listitem>
- <para>Strežnik.</para>
- </listitem>
+ <listitem>
+ <para>Strežnik.</para>
+ </listitem>
- <listitem>
- <para>Grafično okolje.</para>
- </listitem>
+ <listitem>
+ <para>Grafično okolje.</para>
+ </listitem>
- <listitem>
- <para>Individual Package Selection: You can use this option to manually add or
+ <listitem>
+ <para>Individual Package Selection: You can use this option to manually add or
remove packages.</para>
- </listitem>
- </itemizedlist>
- <para>Read <xref linkend="minimal-install"></xref> for instructions on how to do a
-minimal install (without or with X &amp; IceWM).</para>
- </section>
+ </listitem>
+ </itemizedlist>
+ <para>Read <xref linkend="minimal-install"/> for instructions on how to do a
+minimal install (without or with X &amp; IceWM).</para>
+</section> \ No newline at end of file
diff --git a/docs/installer/sl/diskdrake.xml b/docs/installer/sl/diskdrake.xml
index e0842c73..6e7f311c 100644
--- a/docs/installer/sl/diskdrake.xml
+++ b/docs/installer/sl/diskdrake.xml
@@ -1,36 +1,16 @@
<?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="sl" xml:id="diskdrake">
-
-
-
-
-
-
-
-
-
-
-
-
<info>
- <!-- Started by marja on 2012 03 29 -->
-<!-- NEEDS TO BE WRITTEN AND THEN REVIEWED! -->
-<!-- JohnR added note for bug 133 re encrypted partitions -->
-<!-- JohnR 2012-04-10 - tidy up module formatting -->
-<!-- Marja, 2012-04-18 changed "If you wish to use encryption on
- any of your partitions" into "If you wish to use encryption on
- your <literal>
-/</literal> partition" because pterjan said this is only for root
- Also added some text. -->
-<!--marja 20120418 moved section end tag down to where it belongs-->
-<!--marja 20120418 added para 6a-->
+ <!-- Lebarhon 2016 12 16 updated for Mageia 6
+
+Lebarhon 20170902 added SC-->
<title xml:id="diskdrake-ti1">Razdeljevanje diska po meri s programom DiskDrake</title>
</info>
<mediaobject>
-<imageobject condition='classical'> <imagedata fileref="dx2-diskdrake.png"
-align="center"/> </imageobject> <imageobject condition='live' > <imagedata
+<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
+align="center"/> </imageobject> <imageobject condition="live"> <imagedata
fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
<warning>
@@ -40,28 +20,39 @@ encryption option for the <literal>/boot</literal> partition must NOT be
set, otherwise your system will be unbootable.</para>
</warning>
- <para revision="2" xml:id="diskdrake-pa3">Adjust the layout of your disk(s) here. You can remove or create
+ <para xml:id="diskdrake-pa3" revision="2">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="1" xml:id="diskdrake-pa4">There is a tab for every detected hard disk or other storage device, like an
+ <para xml:id="diskdrake-pa4" revision="1">There is a tab for every detected hard disk or other storage device, like an
USB key. For example sda, sdb and sdc if there are three of them.</para>
- <para revision="1" xml:id="diskdrake-pa5">Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected
+ <para xml:id="diskdrake-pa5" revision="1">Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected
storage device</para>
- <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+ <para xml:id="diskdrake-pa6" revision="1">For all other actions: click on the desired partition first. Then view it,
or choose a filesystem and a mount point, resize it or wipe it.</para>
<para xml:id="diskdrake-pa6a" revision="1">Continue until you adjusted everything to your wishes.</para>
- <para revision="1" xml:id="diskdrake-pa7">Klikni <guibutton>Končano</guibutton> ko bo v redu.</para>
+ <para xml:id="diskdrake-pa7" revision="1">Klikni <guibutton>Končano</guibutton> ko bo v redu.</para>
<note>
<para>If you are installing Mageia on an UEFI system, check that an ESP (EFI
-System Partition) is present and correctly mounted on /boot/EFI (see above)</para>
+System Partition) is present and correctly mounted on /boot/EFI (see below)</para>
<para><mediaobject>
-<imageobject> <imagedata fileref="dx2-diskdrake2.png"/> </imageobject></mediaobject></para>
+<imageobject> <imagedata fileref="dx2-diskdrake2.png"/> </imageobject></mediaobject><mediaobject>
+<imageobject> <imagedata fileref="live-diskdrake2.png"/> </imageobject></mediaobject></para>
+ </note>
+
+ <note>
+ <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present with a correct type</para>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="dx2-doPartitionDisks3.png"/>
+</imageobject> <imageobject> <imagedata
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
</note>
</section> \ No newline at end of file
diff --git a/docs/installer/sl/doPartitionDisks.xml b/docs/installer/sl/doPartitionDisks.xml
index 32f994d5..0e39feed 100644
--- a/docs/installer/sl/doPartitionDisks.xml
+++ b/docs/installer/sl/doPartitionDisks.xml
@@ -5,47 +5,53 @@
<info>
<!---->
-<!-- lebarhon 2015-07-03 Suggested updates for Mageia 5 -->
+<!-- lebarhon 20161216 updated for Mageia 6
+
+lebarhon 20170209 added SC-->
<title xml:id="doPartitionDisks-ti1">Razdelitev diska</title>
</info>
- <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) and see the
+ <para xml:id="doPartitionDisks-pa1" revision="1">In this screen you can see the content of your hard drive(s) and see the
solutions the DrakX partitioning wizard found for where to install
<application>Mageia</application>.</para>
- <para revision="1" xml:id="doPartitionDisks-pa2">The options available from the list below will vary depending on your
+ <para xml:id="doPartitionDisks-pa2" revision="1">The options available from the list below will vary depending on your
particular hard drive(s) layout and content.</para>
<mediaobject>
-<imageobject> <imagedata align="center" fileref="dx2-doPartitionDisks.png"/>
+<imageobject> <imagedata fileref="dx2-doPartitionDisks.png" align="center"/>
+</imageobject></mediaobject>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="live-doPartitionDisks.png"/>
</imageobject></mediaobject>
<para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist>
<listitem>
<para revision="1" xml:id="doPartitionDisks-pa4">Uporabi obstoječe razdelke</para>
- <para revision="1" xml:id="doPartitionDisks-pa5">If this option is available, then existing Linux compatible partitions have
+ <para xml:id="doPartitionDisks-pa5" revision="1">If this option is available, then existing Linux compatible partitions have
been found and may be used for the installation.</para>
</listitem>
<listitem>
- <para revision="1" xml:id="doPartitionDisks-pa6">Uporabi razpoložljivi prostor</para>
+ <para xml:id="doPartitionDisks-pa6" revision="1">Uporabi razpoložljivi prostor</para>
- <para revision="1" xml:id="doPartitionDisks-pa7">If you have unused space on your hard drive then this option will use it for
+ <para xml:id="doPartitionDisks-pa7" revision="1">If you have unused space on your hard drive then this option will use it for
your new Mageia installation.</para>
</listitem>
<listitem>
- <para revision="1" xml:id="doPartitionDisks-pa8">Uporabi razpoložljivi prostor v razdelku za Windows</para>
+ <para xml:id="doPartitionDisks-pa8" revision="1">Uporabi razpoložljivi prostor v razdelku za Windows</para>
- <para revision="1" xml:id="doPartitionDisks-pa9">If you have unused space on an existing Windows partition, the installer may
+ <para xml:id="doPartitionDisks-pa9" revision="1">If you have unused space on an existing Windows partition, the installer may
offer to use it.</para>
<para xml:id="doPartitionDisks-pa10" revision="2">This can be a useful way of making room for your new Mageia installation,
but is a risky operation so you should make sure you have backed up all
important files!</para>
- <para xml:id="doPartitionDisks-pa11" revision="3">Note that this involves shrinking the size of the Windows partition. The
+ <para revision="3" xml:id="doPartitionDisks-pa11">Note that this involves shrinking the size of the Windows partition. The
partition must be "clean", meaning that Windows must have closed down
correctly the last time it was used. It must also have been defragmented,
although this is not a guarantee that all files in the partition have been
@@ -60,24 +66,28 @@ and dragging the gap between both partitions. See the screen-shot below.</para>
<mediaobject>
<imageobject> <imagedata fileref="dx2-doPartitionDisks2.png"/>
</imageobject></mediaobject>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="live-doPartitionDisks2.png"/>
+</imageobject></mediaobject>
</listitem>
</itemizedlist> <itemizedlist>
<listitem>
- <para revision="1" xml:id="doPartitionDisks-pa12">Zbriši in uporabi celoten disk.</para>
+ <para xml:id="doPartitionDisks-pa12" revision="1">Zbriši in uporabi celoten disk.</para>
- <para revision="1" xml:id="doPartitionDisks-pa13">Ta možnost bo uporabila celoten pogon za Magejo.</para>
+ <para xml:id="doPartitionDisks-pa13" revision="1">Ta možnost bo uporabila celoten pogon za Magejo.</para>
- <para revision="1" xml:id="doPartitionDisks-pa14">Pozor! To bo pobrisalo VSE podatke na izbrani napravi. Pazljivo!</para>
+ <para xml:id="doPartitionDisks-pa14" revision="1">Pozor! To bo pobrisalo VSE podatke na izbrani napravi. Pazljivo!</para>
- <para revision="1" xml:id="doPartitionDisks-pa15">If you intend to use part of the disk for something else, or you already
+ <para xml:id="doPartitionDisks-pa15" revision="1">If you intend to use part of the disk for something else, or you already
have data on the drive that you are not prepared to lose, then do not use
this option.</para>
</listitem>
</itemizedlist><itemizedlist>
<listitem>
- <para revision="1" xml:id="doPartitionDisks-pa16">Po meri</para>
+ <para xml:id="doPartitionDisks-pa16" revision="1">Po meri</para>
- <para revision="1" xml:id="doPartitionDisks-pa17">S tem imate popoln nadzor nad namestitvijo na (enem ali več) vaših diskov.</para>
+ <para xml:id="doPartitionDisks-pa17" revision="1">S tem imate popoln nadzor nad namestitvijo na (enem ali več) vaših diskov.</para>
</listitem>
</itemizedlist></para>
@@ -123,6 +133,26 @@ automatically detected, or created if it does not exist yet, and mounted on
been correctly done</para>
</note>
+ <note>
+ <para>If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk,
+you need to create a Bios boot partition if not already existing. It is an
+about 1 MiB partition with no mount point. Choose the "Custom disk
+partitioning" option to be able to create it with the Installer like any
+other partition, just select BIOS boot partition as filesystem type.</para>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="dx2-doPartitionDisks3.png"/>
+</imageobject></mediaobject>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="live-doPartitionDisks3.png"/>
+</imageobject></mediaobject>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
+</imageobject></mediaobject>
+ </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
diff --git a/docs/installer/sl/exitInstall.xml b/docs/installer/sl/exitInstall.xml
index 49addb1b..666b54bc 100644
--- a/docs/installer/sl/exitInstall.xml
+++ b/docs/installer/sl/exitInstall.xml
@@ -1,38 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="exitInstall" 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/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="exitInstall" version="5.0" xml:lang="sl">
<info>
<title xml:id="exitInstall-ti1">Čestitke</title>
</info>
-
-
-
-
-
- <mediaobject>
-<!-- Started by marja on 2012 03 29 -->
-<!-- NEEDS TO BE WRITTEN AND THEN REVIEWED! -->
-<!-- marja - 2012-04-24 added screenshot and text -->
-<!-- same day, added "s" to "sytems"-->
-<imageobject> <imagedata revision="1" fileref="dx2-exitInstall.png"
-format="PNG" align="center" xml:id="exitInstall-im1"> </imagedata>
-</imageobject></mediaobject>
- <para revision="2" xml:id="exitInstall-pa1">You have finished installing and configuring
+ <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
+align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
+
+ <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring
<application>Mageia</application> and it is now safe to remove the
installation medium and reboot your computer.</para>
- <para revision="2" xml:id="exitInstall-pa2">After reboot, in the bootloader screen, you can choose between the operating
+ <para xml:id="exitInstall-pa2" revision="2">After reboot, in the bootloader screen, you can choose between the operating
systems on your computer (if you have more than one).</para>
- <para revision="1" xml:id="exitInstall-pa3">If you didn't adjust the settings for the bootloader, your Mageia install
-will be automatically selected and started. </para>
-
- <para revision="1" xml:id="exitInstall-pa4">Uživajte</para>
-
- <para revision="1" xml:id="exitInstall-pa5">Visit www.mageia.org if you have any questions or want to contribute to
-Mageia </para>
-
-
+ <para xml:id="exitInstall-pa3" revision="1">If you didn't adjust the settings for the bootloader, your Mageia install
+will be automatically selected and started.</para>
+
+ <para xml:id="exitInstall-pa4" revision="1">Uživajte</para>
+
+ <para xml:id="exitInstall-pa5" revision="1">Visit www.mageia.org if you have any questions or want to contribute to
+Mageia</para>
</section> \ No newline at end of file
diff --git a/docs/installer/sl/misc-params.xml b/docs/installer/sl/misc-params.xml
index 6b499367..1879f460 100644
--- a/docs/installer/sl/misc-params.xml
+++ b/docs/installer/sl/misc-params.xml
@@ -1,54 +1,36 @@
-<?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="misc-params" 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/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="sl" xml:id="misc-params">
<info>
<title xml:id="misc-params-ti1">Povzetek raznih nastavitev</title>
</info>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
<mediaobject>
-<!-- Started by marja on 2012 03 31 -->
-<!-- NEEDS TO BE WRITTEN AND REVIEWED! -->
-<!--marja - 2012 04 15 added some text, not much, unfortunately :( -->
-<!--marja 2012-04-24 added screenshots -->
-<!--JohnR 2012-04-25 Added text as requested by Psec :-)-->
-<!--marja 2012-04-24 added 2 links to other help pages -->
-<!--marja 2012-04-24 added some text in the drakxid-configureServices and
- the drakxid-miscellaneous section -->
-<!--marja 2012-04-24 corrected "Magaia" in the last paragraph -->
-<!--marja 2012-04-24 corrected para xml:id number in the last paragraph -->
-<!-- 2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. -->
-<!-- 2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" -->
-<!--2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files-->
-<imageobject> <imagedata fileref="dx2-summary.png" revision="1"
-align="center" format="PNG" xml:id="summary-im1" /> </imageobject></mediaobject>
-
- <para revision="1" xml:id="misc-params-pa1">DrakX made smart choices for the configuration of your system depending on
+<!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject>
+
+ <para xml:id="misc-params-pa1" revision="1">DrakX made smart choices for the configuration of your system depending on
the choices you made and on the hardware DrakX detected. You can check the
settings here and change them if you want after pressing
<guibutton>Configure</guibutton>.</para>
+ <note>
+ <para>As a general rule, default settings are recommended and you can keep them
+with 3 exceptions:<itemizedlist>
+ <listitem>
+ <para>there are known issues with a default setting</para>
+ </listitem>
+
+ <listitem>
+ <para>the default setting has already been tried and it fails</para>
+ </listitem>
+
+ <listitem>
+ <para>something else is said in the detailed sections below</para>
+ </listitem>
+ </itemizedlist></para>
+ </note>
+
<section xml:id="misc-params-system">
<info>
<title xml:id="misc-params-system-ti2">Sistemske nastavitve</title>
@@ -64,31 +46,31 @@ linkend="configureTimezoneUTC"/></para>
</listitem>
<listitem>
- <para xml:id="misc-params-system-pa3" revision="1"><guilabel>Država</guilabel></para>
+ <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Država</guilabel></para>
- <para revision="1" xml:id="misc-params-system-pa3a">If you are not in the selected country, it is very important that you
+ <para xml:id="misc-params-system-pa3a" revision="1">If you are not in the selected country, it is very important that you
correct the setting. See <xref linkend="selectCountry"/></para>
</listitem>
<listitem>
- <para xml:id="misc-params-system-pa4" revision="1"><guilabel>Zagonski nalagalnik</guilabel></para>
+ <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Zagonski nalagalnik</guilabel></para>
- <para revision="2" xml:id="misc-params-system-pa4a">DrakX has made good choices for the bootloader setting.</para>
+ <para xml:id="misc-params-system-pa4a" revision="2">DrakX has made good choices for the bootloader setting.</para>
- <para revision="2" xml:id="misc-params-system-pa4b">Do not change anything, unless you know how to configure Grub and/or Lilo</para>
+ <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure Grub2</para>
- <para revision="2" xml:id="misc-params-system-pa4c">Za več informacij poglejte <xref linkend="setupBootloader"/></para>
+ <para xml:id="misc-params-system-pa4c" revision="2">Za več informacij poglejte <xref linkend="setupBootloader"/></para>
</listitem>
<listitem>
- <para revision="1" xml:id="misc-params-system-pa5"><guilabel>Upravljanje z uporabniki</guilabel></para>
+ <para xml:id="misc-params-system-pa5" revision="1"><guilabel>Upravljanje z uporabniki</guilabel></para>
- <para revision="2" xml:id="misc-params-system-pa5a">You can add extra users here. They will each get their own
+ <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each get their own
<literal>/home</literal> directories.</para>
</listitem>
<listitem>
- <para revision="1" xml:id="misc-params-system-pa6"><guilabel>Storitve</guilabel>:</para>
+ <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Storitve</guilabel>:</para>
<para xml:id="misc-params-system-pa6a" revision="1">System services refer to those small programs which run the background
(daemons). This tool allows you to enable or disable certain tasks.</para>
@@ -108,23 +90,28 @@ prevent your computer from operating correctly.</para>
<itemizedlist>
<listitem>
- <para revision="1" xml:id="misc-params-hardware-pa1"><guilabel>Tipkovnica</guilabel>:</para>
+ <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Tipkovnica</guilabel>:</para>
<para xml:id="misc-params-hardware-pa1a" revision="1">This is where you setup or change your keyboard layout which will depend on
your location, language or type of keyboard.</para>
+
+ <note>
+ <para>If you notice a wrong keyboard layout and want to change it, keep in mind
+that your passwords are going to change too.</para>
+ </note>
</listitem>
<listitem>
- <para revision="1" xml:id="misc-params-hardware-pa2"><guilabel>Miška</guilabel>:</para>
+ <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Miška</guilabel>:</para>
- <para revision="1" xml:id="misc-params-hardware-pa2a">Here you can add or configure other pointing devices, tablets, trackballs
+ <para xml:id="misc-params-hardware-pa2a" revision="1">Here you can add or configure other pointing devices, tablets, trackballs
etc.</para>
</listitem>
<listitem>
- <para revision="1" xml:id="misc-params-hardware-pa3"><guilabel>Zvočna kartica</guilabel>:</para>
+ <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Zvočna kartica</guilabel>:</para>
- <para revision="1" xml:id="misc-params-hardware-pa3a">The installer uses the default driver, if there is a default one. The option
+ <para xml:id="misc-params-hardware-pa3a" revision="1">The installer uses the default driver, if there is a default one. The option
to select a different driver is only given when there is more than one
driver for your card, but none of them is the default one.</para>
</listitem>
@@ -132,16 +119,15 @@ driver for your card, but none of them is the default one.</para>
<listitem>
<para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Grafični vmesnik</guilabel>:</para>
- <para revision="1" xml:id="misc-params-hardware-pa4a">V tem delu lahko nastavljate (eno ali več) grafičnih kartic in zaslonov.</para>
+ <para xml:id="misc-params-hardware-pa4a" revision="1">V tem delu lahko nastavljate (eno ali več) grafičnih kartic in zaslonov.</para>
- <para revision="1" xml:id="misc-params-hardware-pa4b">Za več informacij poglejte <xref linkend="configureX_chooser"/>.</para>
+ <para xml:id="misc-params-hardware-pa4b" revision="1">Za več informacij poglejte <xref linkend="configureX_chooser"/>.</para>
</listitem>
</itemizedlist>
<mediaobject>
-<imageobject> <imagedata xml:id="summaryBottom-im1" revision="1"
-align="center" format="PNG" fileref="dx2-summaryBottom.png" />
-</imageobject></mediaobject>
+<imageobject> <imagedata format="PNG" xml:id="summaryBottom-im1"
+align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></mediaobject>
</section>
<section xml:id="misc-params-network">
@@ -151,7 +137,7 @@ align="center" format="PNG" fileref="dx2-summaryBottom.png" />
<itemizedlist>
<listitem>
- <para revision="1" xml:id="misc-params-network-pa1"><guilabel>Omrežje</guilabel>:</para>
+ <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Omrežje</guilabel>:</para>
<para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
drivers it is better to do that after reboot, in the <application>Mageia
@@ -171,7 +157,7 @@ that interface as well.</para>
internet. This section allows you to configure your computer to utilize a
proxy service.</para>
- <para revision="1" xml:id="misc-params-network-pa4b">You may need to consult your systems administrator to get the parameters you
+ <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to get the parameters you
need to enter here</para>
</listitem>
</itemizedlist>
@@ -184,27 +170,28 @@ need to enter here</para>
<itemizedlist>
<listitem>
- <para xml:id="misc-params-security-pa1" revision="1"><guilabel>Stopnja varnosti</guilabel>:</para>
+ <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Stopnja varnosti</guilabel>:</para>
- <para revision="1" xml:id="misc-params-security-pa1a">Here you set the Security level for your computer, in most cases the default
+ <para xml:id="misc-params-security-pa1a" revision="1">Here you set the Security level for your computer, in most cases the default
setting (Standard) is adequate for general use.</para>
- <para revision="1" xml:id="misc-params-security-pa1b">Check the option which best suits your usage.</para>
+ <para xml:id="misc-params-security-pa1b" revision="1">Check the option which best suits your usage.</para>
</listitem>
<listitem>
<para xml:id="misc-params-security-pa2" revision="1"><guilabel>Požarni zid</guilabel>:</para>
- <para xml:id="misc-params-security-pa2a" revision="1">A firewall is intended to be a barrier between your important data and the
+ <para revision="1" xml:id="misc-params-security-pa2a">A firewall is intended to be a barrier between your important data and the
rascals out there on the internet who would compromise or steal it.</para>
- <para revision="1" xml:id="misc-params-security-pa2b">Select the services that you wish to have access to your system. Your
-selections will depend on what you use your computer for.</para>
+ <para xml:id="misc-params-security-pa2b" revision="1">Select the services that you wish to have access to your system. Your
+selections will depend on what you use your computer for. For more
+information, see <xref linkend="firewall"/>.</para>
<warning>
- <para revision="1" xml:id="misc-params-security-pa2c">Bear in mind that allowing everything (no firewall) may be very risky.</para>
+ <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing everything (no firewall) may be very risky.</para>
</warning>
</listitem>
</itemizedlist>
</section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/installer/sl/reboot.xml b/docs/installer/sl/reboot.xml
index 5b05bfe2..17d401ca 100644
--- a/docs/installer/sl/reboot.xml
+++ b/docs/installer/sl/reboot.xml
@@ -1,20 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="sl" 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>
+<?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="sl" xml:id="reboot">
+ <!--Lebarhon 20170210 updated for Mageia6-->
+<info>
<title xml:id="reboot-ti1">Ponovni zagon</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>
+computer, remove the live CD and restart the computer, click on <emphasis
+role="bold"><guibutton>Finish</guibutton></emphasis> and act as
+asked<emphasis role="bold"> in this order!</emphasis></para>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
+
+ <para>When you restart, you will see a succession of download progress bars.
+These indicate that the software media are being downloaded (see Software
+management).</para>
+
+ <mediaobject condition="live">
+<imageobject> <imagedata format="PNG" xml:id="reboot-im1"
+fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
+</section> \ No newline at end of file
diff --git a/docs/installer/sl/selectCountry.xml b/docs/installer/sl/selectCountry.xml
index d07d060e..00ea1383 100644
--- a/docs/installer/sl/selectCountry.xml
+++ b/docs/installer/sl/selectCountry.xml
@@ -1,63 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1999/xhtml"
- xmlns:ns2="http://www.w3.org/1999/xlink"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="selectCountry" version="5.0" xml:lang="sl">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="sl">
+ <info>
+ <title xml:id="selectCountry-ti1">Izbor države/regije</title>
+ </info>
+
+ <mediaobject>
+<!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
+align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
- <info>
- <title xml:id="selectCountry-ti1">Izbor države/regije</title>
- </info>
-
-
-
-
-<mediaobject>
-<!-- 2012-12-25 marja - moved this section out of misc-params -->
-<!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-selectCountry.png"
-align="center" format="PNG" xml:id="selectCountry-im1"></imagedata>
-</imageobject></mediaobject>
-
-
- <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
+ <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
like the currency and wireless regulatory domain. Setting the wrong country
can lead to not being able to use a Wireless network.</para>
- <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <guilabel>Other
+ <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <guilabel>Other
Countries</guilabel> button and choose your country / region there.</para>
- <note>
- <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <guilabel>Other Countries</guilabel> list,
+ <note>
+ <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <guilabel>Other Countries</guilabel> list,
after clicking <guibutton>OK</guibutton> it may seem a country from the
first list was chosen. Please ignore this, DrakX will follow your real
choice.</para>
- </note>
+ </note>
- <section xml:id="inputMethod">
-
- <info>
- <title xml:id="inputMethod-ti7">Način vnosa</title>
- </info>
+ <section xml:id="inputMethod">
+ <info>
+ <title xml:id="inputMethod-ti7">Način vnosa</title>
+ </info>
- <para revision="1" xml:id="selectCountry-pa4">In the <guilabel>Other Countries</guilabel> screen you can also select an
+ <para xml:id="selectCountry-pa4" revision="1">In the <guilabel>Other Countries</guilabel> screen you can also select an
input method (at the bottom of the list). Input methods allow users to input
multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
-default input method in Mageia DVDs, Africa/India and Asia/no-India
-Live-CDs. For Asian and African locales, IBus will be set as default input
-method so users should not need to configure it manually. Other input
-methods(SCIM, GCIN, HIME, etc) also provide similar functions and can be
-installed if you added HTTP/FTP media before package selection.</para>
-
- <note>
- <para revision="1" xml:id="selectCountry-pa5">If you missed the input method setup during installation, you can access it
-after you boot your installed system via "Configure your Computer" -&gt;
+default input method, so users should not need to configure it
+manually. Other input methods(SCIM, GCIN, HIME, etc) also provide similar
+functions and can be installed if you added HTTP/FTP media before package
+selection.</para>
+
+ <note>
+ <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
+after you boot your installed system via "Configure your Computer" ->
"System", or by running localedrake as root.</para>
- </note>
- </section>
+ </note>
</section>
-
+</section> \ No newline at end of file
diff --git a/docs/installer/sl/setupBootloader.xml b/docs/installer/sl/setupBootloader.xml
index dc4973fa..0e33e881 100644
--- a/docs/installer/sl/setupBootloader.xml
+++ b/docs/installer/sl/setupBootloader.xml
@@ -5,115 +5,226 @@
<info>
<!---->
-<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page-->
+<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
+
+Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<title xml:id="setupBootloader-ti1">Glavne možnosti zagonskega nalagalnika</title>
</info>
- <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>
+ <title>Bootloader interface</title>
- <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>By default, Mageia uses exclusively:</para>
- <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>
+ <itemizedlist>
+ <listitem>
+ <para>Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</para>
+ </listitem>
+
+ <listitem>
+ <para>Grub2-efi for a UEFI system.</para>
+ </listitem>
+ </itemizedlist>
<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>
+ <title>Grub2 on Legacy/MBR and Legacy/GPT systems</title>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="dx2-setupBootloader.png"/> </imageobject></mediaobject>
+
+ <mediaobject>
+<imageobject> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
+
+ <para>Don't modify the "Boot Device" unless really knowing what you do.</para>
+ </section>
+
+ <section>
+ <title>Grub2-efi on UEFI systems</title>
+
+ <para>With an UEFI system, the user interface is slightly different as you cannot
+choose between with or without graphical menu</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>
+ <mediaobject>
+<imageobject> <imagedata fileref="dx2-setupBootloader2.png"/> </imageobject></mediaobject>
- <para revision="3">Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB
-legacy and Lilo.</para>
+ <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader2.png"/>
+</imageobject></mediaobject>
- <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>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 adds 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 revision="3">The best solution here is to use the GRUB2 bootloader which is available at
-the Summary page during installation.</para>
- </warning>
+ <para>Don't modify the "Boot Device" unless really knowing what you do.</para>
</section>
+ </section>
- <section xml:id="usingExistingBootloader">
- <info>
- <title xml:id="usingExistingBootloader-ti4" revision="2">Using an existing bootloader</title>
- </info>
+ <section>
+ <title xml:id="setupMageiaBootloader">Using a Mageia bootloader</title>
+
+ <para>By default, according to your system, Mageia writes a new:</para>
- <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>
+ <itemizedlist>
+ <listitem>
+ <para>GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard
+drive or in the BIOS boot partition.</para>
+ </listitem>
- <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>
+ <listitem>
+ <para>Grub2-efi bootloader into the ESP</para>
+ </listitem>
+ </itemizedlist>
- <para xml:id="setupBootloader-pa48" revision="1">To be clear, sda is a device, sda7 is a partition on that device.</para>
+ <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+click on <guibutton>Next</guibutton> and then uncheck the box
+<guilabel>Probe Foreign OS</guilabel></para>
- <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>
+ <mediaobject>
+<imageobject> <imagedata fileref="dx2-setupBootloader3.png"/> </imageobject></mediaobject>
- <para xml:id="setupBootloader-pa49" revision="2">The exact procedure for adding your Mageia system to an existing bootloader
+ <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader3.png"/>
+</imageobject></mediaobject>
+ </section>
+
+ <section>
+ <title>Using an existing bootloader</title>
+
+ <para>The exact procedure for adding your Mageia system to an existing bootloader
is beyond the scope of this 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 xml:id="advancedOptionBootloader">
- <info>
- <title xml:id="advancedOptionBootloader-ti5" revision="2">Napredne možnosti zagonskega nalagalnika</title>
- </info>
-
- <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>
+ <title xml:id="setupChainLoading">Using the chain loading</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>
+ <para>If you don't want a bootable Mageia, but chain load it from another OS,
+click on <guibutton>Next</guibutton>, then on
+<guibutton>Advanced</guibutton> and Check the box <guilabel>Do not touch ESP
+or MBR</guilabel>.</para>
<mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader2.png"/>
+<imageobject> <imagedata fileref="dx2-setupBootloader4.png"/> </imageobject></mediaobject>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader4.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>You will get a warning that the bootloader will lack, ignore it by a click
+on <guibutton>OK</guibutton>.</para>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="dx2-setupBootloader5.png"/> </imageobject></mediaobject>
+ </section>
- <para>Don't modify the "Boot Device" unless really knowing what you do.</para>
+ <section>
+ <title>Možnosti</title>
+
+ <section>
+ <title>First page</title>
+
+ <para><itemizedlist>
+ <listitem>
+ <para><guilabel>Delay before booting the default image</guilabel>: This text box
+lets you set a delay in seconds before the default operating system is
+started up.</para>
+ </listitem>
+
+ <listitem>
+ <para><guilabel>Security</guilabel>: This allows you to set a password for the
+bootloader. This means other people can not enter single user mode or change
+settings at the boot time.</para>
+ </listitem>
+
+ <listitem>
+ <para><guilabel>Password</guilabel>: This text box is where you actually put the
+password</para>
+ </listitem>
+
+ <listitem>
+ <para><guilabel>Password (again)</guilabel>: Retype the password and Drakx will
+check that it matches with the one set above.</para>
+ </listitem>
+
+ <listitem>
+ <para><guilabel>Advanced</guilabel></para>
+
+ <itemizedlist>
+ <listitem>
+ <para><guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power
+Interface) is a standard for the power management. It can save energy by
+stopping unused devices, this was the method used before APM. Uncheck it be
+useful, for example, if your computer does not support ACPI or if you think
+the ACPI implementation might cause some problems (for instance random
+reboots or system lockups).</para>
+ </listitem>
+
+ <listitem>
+ <para><guilabel>Enable SMP</guilabel>: This option enables / disables symmetric
+multiprocessing for multi core processors.</para>
+ </listitem>
+
+ <listitem>
+ <para><guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the
+operating system access to the Advanced Programmable Interrupt
+Controller. APIC devices permit more complex priority models, and Advanced
+IRQ (Interrupt Request) management.</para>
+ </listitem>
+
+ <listitem>
+ <para><guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which
+manage all external interrupts for some specific processor in an SMP system.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ </itemizedlist></para>
+ </section>
+
+ <section>
+ <title>Next page</title>
+
+ <itemizedlist>
+ <listitem>
+ <para><guilabel>Default:</guilabel> Operating system started up by default</para>
+ </listitem>
+
+ <listitem>
+ <para><guilabel>Append:</guilabel> This option lets you pass the kernel
+information or tell the kernel to give you more information as it boots.</para>
+ </listitem>
+
+ <listitem>
+ <para><guilabel>Probe foreign OS</guilabel>: see above <link
+linkend="setupMageiaBootloader">Using a Mageia bootloader</link></para>
+ </listitem>
+
+ <listitem>
+ <para><guilabel>Advanced</guilabel><itemizedlist>
+ <listitem>
+ <para><guilabel>Video mode:</guilabel> This sets the screen size and colour depth
+the boot menu will use. If you click the down triangle you will be offered
+other size and colour depth options.</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis role="bold">Do not touch ESP or MBR</emphasis>: see above <link
+linkend="setupChainLoading">Using the chain loading</link></para>
+ </listitem>
+ </itemizedlist></para>
+ </listitem>
+ </itemizedlist>
+ </section>
</section>
</section> \ No newline at end of file
diff --git a/docs/installer/sl/setupBootloaderAddEntry.xml b/docs/installer/sl/setupBootloaderAddEntry.xml
index 52ae73ca..050653b1 100644
--- a/docs/installer/sl/setupBootloaderAddEntry.xml
+++ b/docs/installer/sl/setupBootloaderAddEntry.xml
@@ -2,67 +2,17 @@
<info>
- <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page-->
+ <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
+
+Lebarhon 2016 12 16 Updated for Mageia 6-->
<title xml:id="setupBootloaderAddEntry-ti1">Add or Modify a Boot Menu Entry</title>
</info>
- <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
-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, 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 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
-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>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
-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>
+ <para>To do that you need to manually edit /boot/grub2/custom.cfg or use the
+software grub-customizer instead (Available in the Mageia repositories).</para>
- <mediaobject>
-<imageobject> <imagedata fileref="dx2-bootloaderConfiguration2.png"/>
-</imageobject></mediaobject>
- </section>
+ <note>
+ <para>For more information, see our wiki: <link
+ns2:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+ </note>
</section> \ No newline at end of file
diff --git a/docs/installer/sl/soundConfig.xml b/docs/installer/sl/soundConfig.xml
index 6fcd9bee..9764a58e 100644
--- a/docs/installer/sl/soundConfig.xml
+++ b/docs/installer/sl/soundConfig.xml
@@ -1,12 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1999/xhtml"
- xmlns:ns2="http://www.w3.org/1999/xlink"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="soundConfig" 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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="sl">
<info>
<title xml:id="soundConfig-ti1">Nastavitve zvoka</title>
</info>
@@ -14,25 +6,24 @@
<mediaobject>
-<!-- Started by marja on 2013-12-07 -->
-<imageobject> <imagedata fileref="dx2-soundConfig.png" revision="1"
-format="PNG" xml:id="soundConfig-im1" /> </imageobject></mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png"
+xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject>
<para>In this screen the name of the driver that the installer chose for your
sound card is given, which will be the default driver if we have a default
-one.
- </para>
+one.</para>
+
<para>The default driver should work without problems. However, if after install
you do encounter problems, then run <command>draksound</command> or start
this tool via MCC (Mageia Control Center), by choosing the
<guilabel>Hardware</guilabel> tab and clicking on <guilabel>Sound
-Configuration</guilabel> at the top right of the screen.
- </para>
+Configuration</guilabel> at the top right of the screen.</para>
+
<para>Then, in the draksound or "Sound Configuration" tool screen, click on
<guibutton>Advanced</guibutton> and then on
<guibutton>Troubleshooting</guibutton> to find very useful advice about how
-to solve the problem.
- </para>
+to solve the problem.</para>
<section xml:id="soundConfig-Advanced">
<info>
@@ -41,12 +32,9 @@ to solve the problem.
<para>Clicking <guibutton>Advanced</guibutton> in this screen, during install, is
useful if there is no default driver and there are several drivers
-available, but you think the installer selected the wrong one.
- </para>
+available, but you think the installer selected the wrong one.</para>
<para>In that case you can select a different driver after clicking on
-<guibutton>Let me pick any driver</guibutton>.
- </para>
-
+<guibutton>Let me pick any driver</guibutton>.</para>
</section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/installer/sl/uninstall-Mageia.xml b/docs/installer/sl/uninstall-Mageia.xml
index 603eeb83..a2fa6def 100644
--- a/docs/installer/sl/uninstall-Mageia.xml
+++ b/docs/installer/sl/uninstall-Mageia.xml
@@ -1,5 +1,6 @@
-<?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="sl" xml:id="uninstall-Mageia">
- <!--Lebarhon 2015-07-06 Not true with UEFI -->
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="sl">
+ <!--Lebarhon 2015-07-06 Not true with UEFI
+Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
<info>
<title xml:id="uninstall-Mageia-ti1">Odstrani Magejo</title>
</info>