aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuri Chornoivan <yurchor@ukr.net>2017-03-14 21:48:39 +0200
committerYuri Chornoivan <yurchor@ukr.net>2017-03-14 21:48:39 +0200
commit92d1abeed348f1d5703583674bb0049ba62c2246 (patch)
tree0af25fd09e956d0e35e6f1d02151f35317f81ef4
parenta50f2a7053d0666be801cd98a87ae7db329539de (diff)
downloadtools-92d1abeed348f1d5703583674bb0049ba62c2246.tar
tools-92d1abeed348f1d5703583674bb0049ba62c2246.tar.gz
tools-92d1abeed348f1d5703583674bb0049ba62c2246.tar.bz2
tools-92d1abeed348f1d5703583674bb0049ba62c2246.tar.xz
tools-92d1abeed348f1d5703583674bb0049ba62c2246.zip
Updates (fixes)
-rw-r--r--docs/installer/ca.po602
-rw-r--r--docs/installer/cs.po747
-rw-r--r--docs/installer/de.po746
-rw-r--r--docs/installer/el.po958
-rw-r--r--docs/installer/en/SelectAndUseISOs2.xml118
-rw-r--r--docs/installer/en/addUser.xml39
-rw-r--r--docs/installer/en/diskdrake.xml17
-rw-r--r--docs/installer/en/doPartitionDisks.xml30
-rw-r--r--docs/installer/en/reboot.xml14
-rw-r--r--docs/installer/en/setupBootloader.xml92
-rw-r--r--docs/installer/eo.po750
-rw-r--r--docs/installer/es.po749
-rw-r--r--docs/installer/et.po765
-rw-r--r--docs/installer/eu.po751
-rw-r--r--docs/installer/fr.po767
-rw-r--r--docs/installer/help.pot544
-rw-r--r--docs/installer/hr.po725
-rw-r--r--docs/installer/hu.po543
-rw-r--r--docs/installer/id.po742
-rw-r--r--docs/installer/it.po712
-rw-r--r--docs/installer/ja.po745
-rw-r--r--docs/installer/nl.po749
-rw-r--r--docs/installer/pl.po583
-rw-r--r--docs/installer/pt_BR.po769
-rw-r--r--docs/installer/ro.po749
-rw-r--r--docs/installer/ru.po749
-rw-r--r--docs/installer/sk.po767
-rw-r--r--docs/installer/sl.po730
-rw-r--r--docs/installer/sq.po743
-rw-r--r--docs/installer/sv.po745
-rw-r--r--docs/installer/tr.po767
-rw-r--r--docs/installer/uk.po755
-rw-r--r--docs/installer/uk/SelectAndUseISOs2.xml100
-rw-r--r--docs/installer/uk/addUser.xml25
-rw-r--r--docs/installer/uk/diskdrake.xml12
-rw-r--r--docs/installer/uk/doPartitionDisks.xml30
-rw-r--r--docs/installer/uk/reboot.xml10
-rw-r--r--docs/installer/uk/setupBootloader.xml36
-rw-r--r--docs/installer/zh_CN.po920
39 files changed, 10836 insertions, 9559 deletions
diff --git a/docs/installer/ca.po b/docs/installer/ca.po
index 71bfbf56..c15805d6 100644
--- a/docs/installer/ca.po
+++ b/docs/installer/ca.po
@@ -15,7 +15,7 @@ msgid ""
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"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
"PO-Revision-Date: 2017-02-13 15:29+0000\n"
"Last-Translator: Davidmp <medipas@gmail.com>\n"
"Language-Team: Catalan (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -187,7 +187,7 @@ msgstr "Gestió d'usuaris i superusuari"
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -196,12 +196,12 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr "Estableix la contrasenya d'administrador (root):"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -222,7 +222,7 @@ msgstr ""
"comparació que no heu teclejat malament la primera contrasenya."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
@@ -232,16 +232,16 @@ msgstr ""
"nombres i altres caràcters."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr "Introduïu un usuari"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
"Afegiu aquí un usuari. Un usuari té menys permisos que el superusuari "
"(root), però prou per a navegar per Internet, fer servir aplicacions "
@@ -249,26 +249,26 @@ msgstr ""
"el seu ordinador."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr ""
"<guibutton>Icona</guibutton>: si hi cliqueu, canviarà la icona d'usuari."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr "<guilabel>Nom real</guilabel>: poseu-hi el nom real de l'usuari."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
"<guilabel>Nom de connexió</guilabel>: poseu-hi el nom de connexió de "
"l'usuari o deixeu que drakx en creï un a partir del nom real de l'usuari. "
@@ -276,7 +276,7 @@ msgstr ""
"emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -284,7 +284,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -295,14 +295,14 @@ msgstr ""
"dues caselles."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
"protected home directory (umask=0027)."
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - Summary</"
"emphasis> step during the install. Choose <emphasis>User management</"
@@ -310,30 +310,30 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr ""
"Els permisos d'accés també es poden modificar després de la instal·lació."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr "Gestió avançada d'usuaris"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr ""
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -344,7 +344,7 @@ msgstr ""
"El convidat hauria de desar els fitxers importants en una memòria USB."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -356,7 +356,7 @@ msgstr ""
"restringit que els usuaris normals."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -367,7 +367,7 @@ msgstr ""
"d'afegir a la pantalla anterior. Les opcions són Bash, Dash i Sh."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -378,7 +378,7 @@ msgstr ""
"en blanc excepte si sabeu què esteu fent."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -1366,37 +1366,44 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
-msgid ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
msgstr ""
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:56
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
-msgstr ""
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
"partition is present with a correct type"
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
-"> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
#. type: Content of: <section><info><title>
#: en/doPartitionDisks.xml:9
@@ -1425,25 +1432,26 @@ msgstr ""
#. type: Content of: <section><mediaobject>
#: en/doPartitionDisks.xml:22
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr "Utilitza les particions existents"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
@@ -1452,12 +1460,12 @@ msgstr ""
"compatibles amb Linux i es podrien fer servir per a la instal·lació."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr "Utilitza l'espai lliure"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
@@ -1466,12 +1474,12 @@ msgstr ""
"instal·lació de Mageia."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr "Utilitza l'espai lliure en una partició Windows"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
@@ -1480,7 +1488,7 @@ msgstr ""
"l'instal·lador us proposi utilitzar-la."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"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 "
@@ -1491,7 +1499,7 @@ msgstr ""
"una còpia de seguretat dels fitxers importants."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1509,7 +1517,7 @@ msgstr ""
"personals."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1518,37 +1526,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
+#: en/doPartitionDisks.xml:77
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr "Esborra i utilitza el disc sencer."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr "Aquesta opció utilitzarà tota la unitat per a Mageia."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr ""
"Nota! Això esborrarà TOTES les dades del disc dur seleccionat. Vigileu!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"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 "
@@ -1558,12 +1567,12 @@ msgstr ""
"teniu dades al disc que no voleu perdre, llavors no feu servir aquesta opció."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr "Personalitzat"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
@@ -1572,55 +1581,55 @@ msgstr ""
"al(s) disc(s) dur(s)."
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are created"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid ""
"6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
msgstr ""
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on /"
@@ -1629,7 +1638,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"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 "
@@ -1639,28 +1648,29 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
#. type: Content of: <section><note><mediaobject>
#: en/doPartitionDisks.xml:175
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-msgstr ""
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
-msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
@@ -1680,17 +1690,17 @@ msgstr ""
"alternativa, com ara gparted, i feu servir la configuració següent:"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr "\"Alinea a\" \"MiB\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr "\"Espai lliure que precedeix a (MiB)\" \"2\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid ""
"Also make sure all partitions are created with an even number of megabytes."
msgstr ""
@@ -1975,11 +1985,6 @@ msgstr ""
"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -2902,7 +2907,7 @@ msgid "Reboot"
msgstr "Reinicia"
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
"computer, remove the live CD and restart the computer, click on <emphasis "
@@ -2911,20 +2916,20 @@ msgid ""
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -2990,29 +2995,29 @@ msgstr ""
"de Mageia."
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr "Selecció i utilització de les ISOs"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr "Introducció"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target system. "
@@ -3021,7 +3026,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -3029,22 +3034,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr "Suport"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr "Definició"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
@@ -3052,7 +3057,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
"\">here</link>."
@@ -3061,23 +3066,23 @@ msgstr ""
"\">aquí</link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr "Suports d'instal·lació clàssics"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78
+#: en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr "Característiques comunes"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr "Aquestes ISOs fan servir l'instal·lador clàssic anomenat drakx."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid ""
"They are able to make a clean install or an update from previous releases."
msgstr ""
@@ -3085,30 +3090,32 @@ msgstr ""
"anteriors."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr "DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
msgstr "Suports diferents per a arquitectura de 32 ó 64 bits."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr ""
"Cada DVD conté diversos entorns d'escriptori disponible i diversos idiomes."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid ""
"You'll be given the choice during the installation to add non free software."
msgstr ""
@@ -3116,12 +3123,12 @@ msgstr ""
"propietat."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr "Mitjà autònom"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
@@ -3131,19 +3138,12 @@ msgstr ""
"dur si ho voleu."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr "Suports diferents per a arquitectura de 32 ó 64 bits."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous releases.</"
@@ -3151,53 +3151,53 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr "Contenen programari de propietat."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
msgid "Live DVD Plasma"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
msgid "Plasma desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
-#: en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122
+#: en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr "Conté tots els idiomes."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr "DVD autònom de GNOME"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr "Només entorn d'escriptori GNOME."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
msgid "Live DVD Xfce"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
msgid "Xfce desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr "Suport CD només d'arrencada"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -3206,7 +3206,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -3214,17 +3214,17 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr "Només en anglès."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
msgid "netinstall.iso"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
@@ -3233,12 +3233,12 @@ msgstr ""
"programari de propietat."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
msgid "netinstall-nonfree.iso"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
@@ -3247,17 +3247,17 @@ msgstr ""
"qui el necessiti."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr "Baixada i comprovació del mitjà"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr "Baixada"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -3266,12 +3266,12 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
@@ -3279,37 +3279,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr "Comprovació de la integritat del suport baixat"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr "Obriu una consola, no cal que sigueu l'usuari primari, i:"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
"file.iso</userinput>."
@@ -3318,7 +3319,7 @@ msgstr ""
"cap/a/la/imatge/fitxer.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
"image/file.iso</userinput>."
@@ -3327,36 +3328,36 @@ msgstr ""
"camí/cap/a/la/imatge/fitxer.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr "Enregistrament o bolcat de l'ISO"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a boot-able medium."
+"These operations are not a simple copy and aim to make a bootable medium."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr "Enregistrament de l'ISO a un CD/DVD"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -3365,12 +3366,12 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr "Bolcat de l'ISO a un llapis de memòria USB"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
@@ -3380,51 +3381,51 @@ msgstr ""
"el sistema."
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr "Podeu provar:"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
@@ -3433,29 +3434,29 @@ msgstr ""
"Disk Imager</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr ""
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr "També podeu fer servir l'eina dd en una consola:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr "Obriu una consola"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
@@ -3464,29 +3465,29 @@ msgstr ""
"oblideu el «-» final)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr "Introduïu l'ordre <userinput>fdisk -l</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command <code>dmesg</"
"code>: at end, you see the device name starting with <emphasis>sd</"
@@ -3494,7 +3495,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3518,14 +3519,14 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example <code>/"
"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
@@ -3534,12 +3535,12 @@ msgstr ""
"userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr "On X=nom del dispositiu, per exemple: /dev/sdc"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
"dev/sdb bs=1M</userinput>"
@@ -3548,12 +3549,12 @@ msgstr ""
"of=/dev/sdb bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr "Introduïu l'ordre: # <userinput>sync</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr "Desconnecteu el llapis de memòria USB, ja està"
@@ -3994,84 +3995,88 @@ msgstr ""
#. type: Content of: <section><section><section><mediaobject>
#: en/setupBootloader.xml:36
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
"setupBootloader.png\"/> </imageobject>"
msgstr ""
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid ""
+"Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
msgid "Grub2-efi on UEFI systems"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
"choose between with or without graphical menu"
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:58
+#: en/setupBootloader.xml:56
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-msgstr ""
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:64
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only 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 "
+"If there are already UEFI operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer detects the existing ESP "
+"created by Windows and adds grub2-efi. Although it is possible to have "
"several ESPs, only one is advised and enough whatever the number of "
"operating systems you have."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr "Ús del gestor d'arrencada de Mageia"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
msgid ""
"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, "
@@ -4080,26 +4085,27 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:100
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-"imageobject>"
-msgstr ""
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr "Ús d'un gestor d'arrencada existent"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
msgid ""
"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 "
@@ -4114,58 +4120,59 @@ msgstr ""
"del sistema operatiu corresponent."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:136
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
-msgstr ""
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:129
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
"imageobject>"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
msgid "Options"
msgstr "Opcions"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<guilabel>Delay before booting the default image</guilabel>: This text box "
"lets you set a delay in seconds before the default operating system is "
@@ -4173,7 +4180,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: en/setupBootloader.xml:162
msgid ""
"<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 "
@@ -4181,44 +4188,44 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
msgid ""
"<guilabel>Password</guilabel>: This text box is where you actually put the "
"password"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:182
+#: en/setupBootloader.xml:173
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
"check that it matches with the one set above."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
msgid "<guilabel>Advanced</guilabel>"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
msgid ""
"<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)."
+"stopping unused devices, this was the method used before APM. Unchecking it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:208
+#: en/setupBootloader.xml:199
msgid ""
"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
"operating system access to the Advanced Programmable Interrupt Controller. "
@@ -4227,38 +4234,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:232
msgid ""
"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:247
+#: en/setupBootloader.xml:239
msgid ""
"<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 "
@@ -4266,7 +4273,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -4623,3 +4630,6 @@ 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 "Different media for architecture 32 or 64 bits."
+#~ msgstr "Suports diferents per a arquitectura de 32 ó 64 bits."
diff --git a/docs/installer/cs.po b/docs/installer/cs.po
index 40ce7218..8a971e70 100644
--- a/docs/installer/cs.po
+++ b/docs/installer/cs.po
@@ -17,7 +17,7 @@ msgid ""
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"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
"PO-Revision-Date: 2017-03-08 07:57+0000\n"
"Last-Translator: fri\n"
"Language-Team: Czech (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -193,7 +193,7 @@ msgstr "Správa uživatele a superuživatele"
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -206,12 +206,12 @@ msgstr ""
"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr "Nastavení hesla správce (uživatele root):"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -232,7 +232,7 @@ msgstr ""
"neudělali překlep."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
@@ -241,45 +241,45 @@ msgstr ""
"písmen (velkých a malých), čísel a ostatních znaků."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr "Zadejte uživatele"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
"Zde přidejte uživatele. Uživatel má méně oprávnění než superuživatel (root), "
"ale dost na procházení internetu, používání kancelářskych aplikací anebo "
"hraní her a pro cokoli jiného, co se svým počítačem provádí běžný uživatel."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr ""
"<guibutton>Ikona</guibutton>: Pokud klepnete na toto tlačítko, změní se "
"ikona uživatele."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr ""
"<guilabel>Skutečné jméno</guilabel>: Vložte uživatelům do tohoto textového "
"pole skutečné jméno."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
"<guilabel>Přihlašovací jméno</guilabel>: Zde můžete zadat uživatelské "
"přihlašovací jméno, nebo nechat instalační program pokusit se použít "
@@ -287,7 +287,7 @@ msgstr ""
"velikost písmen.</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -298,7 +298,7 @@ msgstr ""
"(Podívejte se i na <xref linkend=\"givePassword\"/>)"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -309,7 +309,7 @@ msgstr ""
"textových polí pro uživatelské heslo."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
"protected home directory (umask=0027)."
@@ -318,7 +318,7 @@ msgstr ""
"domovský adresář proti čtení a zápisu (umask=0027)"
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - Summary</"
"emphasis> step during the install. Choose <emphasis>User management</"
@@ -329,17 +329,17 @@ msgstr ""
"emphasis>."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr "Přístupová oprávnění lze změnit také po instalaci."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr "Rozšířená správa uživatelů"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
@@ -349,12 +349,12 @@ msgstr ""
"kterého přidáváte."
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr "Dodatečně můžete zakázat anebo povolit účet hosta."
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -365,7 +365,7 @@ msgstr ""
"odhlásí. Host by si měl uložit svoje důležité soubory na zařízení USB."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -376,7 +376,7 @@ msgstr ""
"používat jej, ale má více omezený přístup než normální uživatelé."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -387,7 +387,7 @@ msgstr ""
"předchozí obrazovce, možnostmi jsou Bash, Dash a Sh."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -398,7 +398,7 @@ msgstr ""
"je prázdné, pokud nevíte, co děláte."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -1454,29 +1454,23 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
-msgid ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </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><note><para>
-#: en/diskdrake.xml:56
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
-msgstr ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
"partition is present with a correct type"
@@ -1485,15 +1479,17 @@ msgstr ""
"oddíl BIOS je přítomen se správným typem"
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
-"> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
-"> </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><info><title>
#: en/doPartitionDisks.xml:9
@@ -1522,29 +1518,24 @@ msgstr ""
#. type: Content of: <section><mediaobject>
#: en/doPartitionDisks.xml:22
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr "Použít existující oddíly"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
@@ -1553,12 +1544,12 @@ msgstr ""
"kompatibilní oddíly a tyto mohou být použity pro instalaci."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr "Použít volné místo"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
@@ -1567,12 +1558,12 @@ msgstr ""
"využije pro novou instalaci Mageii."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr "Použít volné místo na oddílu Windows"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
@@ -1581,7 +1572,7 @@ msgstr ""
"může nabídnout jeho použití."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"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 "
@@ -1592,7 +1583,7 @@ msgstr ""
"zazálohovány všechny důležité soubory!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1608,7 +1599,7 @@ msgstr ""
"použita. Velice se doporučuje provedení zálohy vašich osobních souborů."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1621,40 +1612,35 @@ msgstr ""
"přesunutím mezery mezi oběma oddíly. Viz snímek obrazovky níže."
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
+#: en/doPartitionDisks.xml:77
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr "Smazat a použít celý disk"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr "Tato volba použije celé diskové zařízení pro Mageiu."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr "Pozor, toto smaže všechna data na vybraném disku. Buďte opatrní!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"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 "
@@ -1664,12 +1650,12 @@ msgstr ""
"disku, která nejste připraveni ztratit, potom tuto volbu nepoužívejte."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr "Vlastní"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
@@ -1678,19 +1664,19 @@ msgstr ""
"(resp. discích)."
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr "<emphasis role=\"bold\">Měnění velikostí oddílů:</emphasis>"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
msgstr "Instalátor rozdělí dostupné místo podle následujících pravidel:"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
@@ -1699,30 +1685,30 @@ msgstr ""
"oddíl pro /, nebude tu žádný samostatný oddíl pro /home."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are created"
msgstr "Pokud je celkové dostupné místo nad 50 GB, potom se vytvoří tři oddíly"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid ""
"6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr ""
"6/19 z celkového dostupného místa je přideleno pro / , nanejvýš však 50 GB"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr "1/19 je přiděleno pro swap , nanejvýš však 4 GB"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr "zbytek (přinejmenším 12/19) je přiděleno pro /home"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1731,7 +1717,7 @@ msgstr ""
"tři oddíly: 50 GB pro /, 4 GB pro swap a zbytek pro adresář /home."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on /"
@@ -1744,7 +1730,7 @@ msgstr ""
"provedeno správně."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"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 "
@@ -1754,26 +1740,21 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"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><note><mediaobject>
#: en/doPartitionDisks.xml:175
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
-msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
@@ -1781,7 +1762,7 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
@@ -1800,17 +1781,17 @@ msgstr ""
"gparted, pokud vlastníte takové zařízení, a použít následující nastavení:"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr "\"Zarovnat na\" \"MiB\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr "\"Předcházející volné místo (MiB)\" \"2\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid ""
"Also make sure all partitions are created with an even number of megabytes."
msgstr ""
@@ -2105,11 +2086,6 @@ msgstr ""
"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -3115,7 +3091,7 @@ msgid "Reboot"
msgstr "Restartovat"
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
"computer, remove the live CD and restart the computer, click on <emphasis "
@@ -3128,22 +3104,23 @@ msgstr ""
"požadavků<emphasis role=\"bold\">, v tomto pořadí!</emphasis>"
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
+#, fuzzy
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
"Když restartujete, uvidíte následnost ukazovatelů postupu stahování. Tyto "
"naznačují, že softwarová média jsou stahována (viz Správa software)."
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -3211,17 +3188,17 @@ msgstr ""
"<guilabel>Bezpečnost</guilabel> Ovládacího centra Mageii."
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr "Vyberte a používejte ISO"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr "Úvod"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
@@ -3230,12 +3207,12 @@ msgstr ""
"obraz vyhovuje vašim potřebám."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr "Jsou tu dvě rodiny nosičů:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target system. "
@@ -3249,7 +3226,7 @@ msgstr ""
"nainstalujete."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -3260,22 +3237,22 @@ msgstr ""
"jednodušší, ale dostanete méně možností výběru."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr "Podrobnosti jsou uvedeny v dalších částech."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr "Média"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr "Definice"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
@@ -3286,7 +3263,7 @@ msgstr ""
"kterou je soubor ISO zkopírován."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
"\">here</link>."
@@ -3295,39 +3272,41 @@ msgstr ""
"link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr "Klasické instalační nosiče"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78
+#: en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr "Běžné vlastnosti"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr "Tyto soubory ISO používají tradiční instalátor nazvaný drakx."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid ""
"They are able to make a clean install or an update from previous releases."
msgstr "Dokáží udělat čistou instalaci nebo aktualizovat z předchozích vydání."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr "DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
-msgstr "Rozličné nosiče pro 32 nebo 64 bitovou architekturu."
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
+msgstr "Různé nosiče pro 32 nebo 64 bitové architektury."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
@@ -3336,23 +3315,23 @@ msgstr ""
"paměťový test, nástroj na zjištění hardware."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr "Každé DVD obsahuje mnohá dostupná prostředí pracovní plochy a jazyky."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid ""
"You'll be given the choice during the installation to add non free software."
msgstr "Během instalace vám bude dána volba přidat si nesvobodný software."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr "Živé nosiče"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
@@ -3361,20 +3340,13 @@ msgstr ""
"disk i na volitelné nainstalování Mageii na váš pevný disk."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr ""
"Každé ISO obsahuje pouze jedno grafické prostředí (KDE, GNOME nebo Xfce)"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr "Různé nosiče pro 32 nebo 64 bitové architektury."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous releases.</"
@@ -3385,53 +3357,53 @@ msgstr ""
"emphasis>"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr "Obsahují nesvobodný software."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
msgid "Live DVD Plasma"
msgstr "Živé DVD Plasma"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
msgid "Plasma desktop environment only."
msgstr "Pouze KDE Plasma."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
-#: en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122
+#: en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr "Všechny jazyky jsou přítomny."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr "Live DVD GNOME"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr "Jen prostředí pracovní plochy GNOME."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
msgid "Live DVD Xfce"
msgstr "Živé DVD Xfce"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
msgid "Xfce desktop environment only."
msgstr "Pouze Xfce."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr "Jen zaváděcí nosiče CD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -3445,7 +3417,7 @@ msgstr ""
"anebo na internetu."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -3456,17 +3428,17 @@ msgstr ""
"mechaniku anebo když PC nedokáže nastartovat ze zařízení USB."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr "Jen anglický jazyk."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
msgid "netinstall.iso"
msgstr "netinstall.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
@@ -3475,12 +3447,12 @@ msgstr ""
"nesvobodný software."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
msgid "netinstall-nonfree.iso"
msgstr "netinstall-nonfree.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
@@ -3489,17 +3461,17 @@ msgstr ""
"jej potřebují."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr "Stahování a zkontrolování nosiče"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr "Stažení"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -3512,12 +3484,12 @@ msgstr ""
"nízká. Pokud je vybráno http, můžete uvidět i něco takového"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
@@ -3528,28 +3500,30 @@ msgstr ""
"link>. Potom se objeví toto okno:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr "Zaškrtněte přepínací tlačítko Uložit soubor."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr "Kontrolování neporušenosti stáhnutého nosiče"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
"Oba kontrolní součty jsou hexadecimální čísla vypočítaná algoritmem ze "
"souboru, který má být stáhnut. Když tyto algoritmy požádáte o přepočítání "
@@ -3558,12 +3532,12 @@ msgstr ""
"soubor. Poškození nabádá k tomu, že byste se měli pokusit stáhnout ISO znovu."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr "Otevřete konzoli, netřeba být superuživatelem (root), a:"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
"file.iso</userinput>."
@@ -3572,7 +3546,7 @@ msgstr ""
"obrazovému/souboru.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
"image/file.iso</userinput>."
@@ -3581,7 +3555,7 @@ msgstr ""
"obrazovému/souboru.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
@@ -3590,32 +3564,32 @@ msgstr ""
"chvilku počkat) s číslem daným Mageiou. Například:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr "Vypálení nebo vepsání souboru ISO"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a boot-able medium."
+"These operations are not a simple copy and aim to make a bootable medium."
msgstr ""
"Zkontrolované ISO může být nyní vypáleno na CD nebo DVD anebo vepsané "
"(zapsané) na zařízení USB. Tyto operace nejsou obyčejným kopírováním a cílí "
"k vytvoření zaveditelného nosiče."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr "Vypálení souboru ISO na CD/DVD"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -3629,12 +3603,12 @@ msgstr ""
"Writing_CD_and_DVD_images\">Mageia wiki</link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr "Zapsat ISO na USB flash"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
@@ -3644,9 +3618,9 @@ msgstr ""
"systému."
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
@@ -3655,7 +3629,7 @@ msgstr ""
"oddílu bude zmenšena na velikost obrazu."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
@@ -3664,12 +3638,12 @@ msgstr ""
"naformátovat ho."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr "Použitím grafického nástroje v Mageii"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3678,17 +3652,17 @@ msgstr ""
"mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr "Použitím grafického nástroje ve Windows"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr "Můžete vyzkoušet:"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
@@ -3697,7 +3671,7 @@ msgstr ""
"použitím volby \"obraz ISO\";"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
@@ -3706,12 +3680,12 @@ msgstr ""
"Disk Imager</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr "Použitím příkazového řádku v systému GNU/Linux"
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
@@ -3720,17 +3694,17 @@ msgstr ""
"diskový oddíl, zadáte-li nesprávně ID zařízení."
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr "Též můžete použít nástroj dd v konzoli:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr "Otevřete konzoli"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
@@ -3739,14 +3713,14 @@ msgstr ""
"userinput> (nezapomeňte na koncovou pomlčku '-')"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr ""
"Vsuňte vaše zařízení USB (nepřipojujte je příkazem mount, což znamená, "
@@ -3754,17 +3728,17 @@ msgstr ""
"zpřístupnit nebo z něho číst)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr "Použijte příkaz <userinput>fdisk -l</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command <code>dmesg</"
"code>: at end, you see the device name starting with <emphasis>sd</"
@@ -3775,7 +3749,7 @@ msgstr ""
"<emphasis>sdd</emphasis> v tomto případě:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3817,7 +3791,7 @@ msgstr ""
"[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example <code>/"
"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
@@ -3826,7 +3800,7 @@ msgstr ""
"například <code>/dev/sdb</code> na obrázku výše, je to zařízení 8GB USB."
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
@@ -3835,12 +3809,12 @@ msgstr ""
"userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr "kde X=název vašeho zařízení, např. /dev/sdc"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
"dev/sdb bs=1M</userinput>"
@@ -3849,12 +3823,12 @@ msgstr ""
"of=/dev/sdb bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr "Vložte příkaz: # <userinput>sync</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr "Odpojte vaše zařízení USB. Je hotovo."
@@ -4333,32 +4307,30 @@ 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=\"dx2-setupBootloader.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
"setupBootloader.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
-"setupBootloader.png\"/> </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><section><section><para>
-#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid ""
+"Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr "Neupravujte \"Zaváděcí zařízení\", pokud s jistotou nevíte, co děláte."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
msgid "Grub2-efi on UEFI systems"
msgstr "Grub2-efi na UEFI systémech"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
"choose between with or without graphical menu"
@@ -4367,31 +4339,27 @@ msgstr ""
"volit postup s nebo bez grafické nabídky"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:58
+#: en/setupBootloader.xml:56
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:64
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"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><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
+#, fuzzy
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only 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 "
+"If there are already UEFI operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer detects the existing ESP "
+"created by Windows and adds grub2-efi. Although it is possible to have "
"several ESPs, only one is advised and enough whatever the number of "
"operating systems you have."
msgstr ""
@@ -4404,29 +4372,29 @@ msgstr ""
"systémů, které máte v počítači."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr "Použití zavaděče Mageii"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr "Grub2-efi zavaděč do ESP"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
msgid ""
"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, "
@@ -4435,30 +4403,25 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:100
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"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><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr "Použití už existujícího zavaděče"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
msgid ""
"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 "
@@ -4473,45 +4436,40 @@ msgstr ""
"systému, o nějž jde."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:136
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:129
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"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><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
"imageobject>"
@@ -4520,17 +4478,17 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
msgid "Options"
msgstr "Volby"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr "První strana"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<guilabel>Delay before booting the default image</guilabel>: This text box "
"lets you set a delay in seconds before the default operating system is "
@@ -4538,7 +4496,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: en/setupBootloader.xml:162
msgid ""
"<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 "
@@ -4546,14 +4504,14 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
msgid ""
"<guilabel>Password</guilabel>: This text box is where you actually put the "
"password"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:182
+#: en/setupBootloader.xml:173
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
"check that it matches with the one set above."
@@ -4562,30 +4520,30 @@ msgstr ""
"zda odpovídá heslu zadanému výše."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
msgid "<guilabel>Advanced</guilabel>"
msgstr "<guilabel>Pokročilé</guilabel>"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
msgid ""
"<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)."
+"stopping unused devices, this was the method used before APM. Unchecking it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:208
+#: en/setupBootloader.xml:199
msgid ""
"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
"operating system access to the Advanced Programmable Interrupt Controller. "
@@ -4594,38 +4552,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr "Další strana"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:232
msgid ""
"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:247
+#: en/setupBootloader.xml:239
msgid ""
"<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 "
@@ -4633,7 +4591,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -5044,3 +5002,130 @@ msgid ""
msgstr ""
"Dalším krokem je kopírování souborů na pevný disk. Toto zabere několik "
"minut. Na konci dostanete na určitý čas prázdnou obrazovku. To je normální."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
+#~ "\"mediaobject\" id=\"1\"/>"
+#~ msgstr ""
+#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
+#~ "\"mediaobject\" id=\"1\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png"
+#~ "\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png"
+#~ "\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Different media for architecture 32 or 64 bits."
+#~ msgstr "Rozličné nosiče pro 32 nebo 64 bitovou architekturu."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+#~ "setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+#~ "setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
diff --git a/docs/installer/de.po b/docs/installer/de.po
index e1fc800e..09d0e488 100644
--- a/docs/installer/de.po
+++ b/docs/installer/de.po
@@ -20,7 +20,7 @@ msgid ""
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"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
"PO-Revision-Date: 2017-02-26 20:27+0000\n"
"Last-Translator: psyca\n"
"Language-Team: German (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -200,7 +200,7 @@ msgstr "Verwaltung des Benutzers und des Superusers"
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -213,12 +213,12 @@ msgstr ""
"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr "Setzen des Administrator (root) Passworts:"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -241,7 +241,7 @@ msgstr ""
"vertippt haben."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
@@ -251,16 +251,16 @@ msgstr ""
"Sonderzeichen in einem Passwort verwenden."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr "Einen Benutzer eingeben"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
"Hier fügen Sie einen Benutzer hinzu. Ein Benutzer hat weniger Rechte als der "
"Superuser (root), aber genügend, um im Internet zu surfen, Büroanwendungen "
@@ -268,29 +268,29 @@ msgstr ""
"einem Computer macht."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr ""
"<guibutton>Symbol</guibutton>: Wenn Sie auf diesen Knopf klicken, so ändert "
"sich das Symbol für den Benutzer."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr ""
"<guilabel>Vollständiger Name</guilabel>: Fügen Sie in dieser Textbox den "
"wirklichen Namen des Benutzers ein."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
"<guilabel>Anmeldename</guilabel>: Hier geben Sie den Anmeldenamen des "
"Benutzers ein, oder lassen Sie den von <emphasis role=\"bold\">drakx</"
@@ -298,7 +298,7 @@ msgstr ""
"Anmeldename beachtet die Groß-/Kleinschreibung</emphasis>."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -309,7 +309,7 @@ msgstr ""
"Passwort ist. (Siehe auch <xref linkend=\"givePassword\"/>)"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -321,7 +321,7 @@ msgstr ""
"Benutzer in den beiden Textboxen."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
"protected home directory (umask=0027)."
@@ -330,7 +330,7 @@ msgstr ""
"ein lese- und schreibgeschütztes home Verzeichnis (umask=0027)."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - Summary</"
"emphasis> step during the install. Choose <emphasis>User management</"
@@ -342,18 +342,18 @@ msgstr ""
"emphasis> aus."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr ""
"Die Zugriffsrechte können auch nach der Installation abgeändert werden."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr "Fortgeschrittene Benutzerverwaltung"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
@@ -363,12 +363,12 @@ msgstr ""
"Benutzer editiert werden können."
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr "Zudem können Sie einen Gastzugang aktivieren oder deaktivieren."
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -380,7 +380,7 @@ msgstr ""
"wichtigen Daten auf einen USB-Stick sichern."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -392,7 +392,7 @@ msgstr ""
"Gast hat aber eingeschränktere Rechte als ein normaler Benutzer."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -403,7 +403,7 @@ msgstr ""
"hinzugefügt haben. Zur Auswahl stehen Bash, Dash und Sh"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -415,7 +415,7 @@ msgstr ""
"solange leer, bis Sie wissen, was Sie tun."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -1509,29 +1509,23 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
-msgid ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </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><note><para>
-#: en/diskdrake.xml:56
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
-msgstr ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
"partition is present with a correct type"
@@ -1540,15 +1534,17 @@ msgstr ""
"das eine BIOS Bootpartition mit dem richtigen Dateisystemtyp vorhanden ist"
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
-"> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
-"> </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><info><title>
#: en/doPartitionDisks.xml:9
@@ -1577,29 +1573,24 @@ msgstr ""
#. type: Content of: <section><mediaobject>
#: en/doPartitionDisks.xml:22
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr "Verwende vorhandene Partitionen"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
@@ -1608,12 +1599,12 @@ msgstr ""
"Partitionen gefunden und können für die Installation genutzt werden."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr "Nutze freien Speicherplatz"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
@@ -1622,12 +1613,12 @@ msgstr ""
"dann wird diese Option diesen für die neue Mageia-Installation verwenden."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr "Nutze den freien Speicherplatz einer Windows Partition"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
@@ -1636,7 +1627,7 @@ msgstr ""
"Partition verfügbar haben, kann der Installer diesen zur Nutzung vorschlagen."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"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 "
@@ -1648,7 +1639,7 @@ msgstr ""
"Datenträger gesichert sind."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1666,7 +1657,7 @@ msgstr ""
"die persönlichen Daten vor dem Vorgang zu sichern."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1681,42 +1672,37 @@ msgstr ""
"dazu den Screenshot unten."
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
+#: en/doPartitionDisks.xml:77
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr "Komplette Platte löschen und freien Platz benutzen"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr "Diese Option wird das vollständige Laufwerk für Mageia nutzen."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr ""
"Beachte! Dies wird ALLE Daten auf dem gewählten Laufwerk löschen. Bitte "
"Vorsicht walten lassen!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"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 "
@@ -1727,12 +1713,12 @@ msgstr ""
"dürfen, dann nutzen Sie bitte nicht diese Option."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr "Benutzerdefiniert"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
@@ -1741,12 +1727,12 @@ msgstr ""
"Installation auf den Festplatten."
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr "<emphasis role=\"bold\">Partitionsaufteilung:</emphasis>"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
@@ -1755,7 +1741,7 @@ msgstr ""
"aufteilen:"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
@@ -1764,7 +1750,7 @@ msgstr ""
"eine Partition für / erstellt und keine seperate Partition für /home."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are created"
msgstr ""
@@ -1772,7 +1758,7 @@ msgstr ""
"Partitionen erstellt"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid ""
"6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr ""
@@ -1780,17 +1766,17 @@ msgstr ""
"maximalen Größe von 50 GB "
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr "1/19 wird swap zugewiesen mit einer maximalen Größe von 4 GB"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr "der Rest (die übrigen 12/19) wird /home zugewiesen."
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1800,7 +1786,7 @@ msgstr ""
"der Rest für /home."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on /"
@@ -1813,7 +1799,7 @@ msgstr ""
"Möglichkeit um nachzuprüfen, ob dies erfolgreich durchgeführt wurde."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"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 "
@@ -1829,26 +1815,21 @@ msgstr ""
"Partitionen geschieht. Wähle als Dateisystem \"BIOS boot partition\" aus."
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"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><note><mediaobject>
#: en/doPartitionDisks.xml:175
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
-msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
@@ -1856,7 +1837,7 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
@@ -1875,17 +1856,17 @@ msgstr ""
"folgende Einstellungen zu partitionieren:"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr "\"Ausrichten an:\" \"MiB\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr "\"Vorhergehender freier Speicherplatz (MiB):\" \"2\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid ""
"Also make sure all partitions are created with an even number of megabytes."
msgstr ""
@@ -2191,11 +2172,6 @@ msgstr ""
"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -3244,7 +3220,7 @@ msgid "Reboot"
msgstr "Neustart"
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
"computer, remove the live CD and restart the computer, click on <emphasis "
@@ -3258,20 +3234,20 @@ msgstr ""
"Reihenfolge</emphasis> durch."
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -3341,17 +3317,17 @@ msgstr ""
"<guilabel>Sicherheit</guilabel> an der linken Seite des Fensters wählen."
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr "Auswählen und verwenden der ISOs"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr "Einleitung"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
@@ -3360,12 +3336,12 @@ msgstr ""
"Wahl des zu Ihren bedürfnissen passenden Images helfen."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr "Es gibt zwei Arten von Medien:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target system. "
@@ -3379,7 +3355,7 @@ msgstr ""
"Desktop-Umgebung auswählen, die Sie nutzen möchten."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -3391,22 +3367,22 @@ msgstr ""
"Auswahlmöglichkeiten."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr "Näheres hierzu finden Sie in den nächsten Abschnitten."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr "Medien"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr "Definition"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
@@ -3417,7 +3393,7 @@ msgstr ""
"auf verschiedene physische Datenträger übertragen werden."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
"\">here</link>."
@@ -3426,24 +3402,24 @@ msgstr ""
"\">hier</link> finden."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr "Klassische Installationsmedien"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78
+#: en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr "Grundsätzliche Eigenschaften"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr ""
"Diese ISOs verwenden ein traditionelles Installationsprogramm namens drakx."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid ""
"They are able to make a clean install or an update from previous releases."
msgstr ""
@@ -3451,17 +3427,19 @@ msgstr ""
"vorrigen Veröffentlichung zu machen."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr "DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
-msgstr "Verschiedene Medien für die 32-Bit oder 64-Bit Architektur."
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
+msgstr "Verschiedene Medien für 32- oder 64-Bit-Architekturen."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
@@ -3470,12 +3448,12 @@ msgstr ""
"Speichertest, Hardware-Erkennungswerkzeug."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr "Jede DVD enthält viele verfügbare Desktop-Umgebungen und Sprachen."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid ""
"You'll be given the choice during the installation to add non free software."
msgstr ""
@@ -3483,12 +3461,12 @@ msgstr ""
"hinzuzufügen."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr "Live Medien"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
@@ -3498,19 +3476,12 @@ msgstr ""
"installiert werden."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr "Jede ISO enthält nur eine Desktop-Umgebung (KDE, GNOME oder Xfce)."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr "Verschiedene Medien für 32- oder 64-Bit-Architekturen."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous releases.</"
@@ -3521,53 +3492,53 @@ msgstr ""
"um vorrige Veröffentlichungen zu aktualisieren.</emphasis>"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr "Sie enthält unfreie Software."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
msgid "Live DVD Plasma"
msgstr "Live-DVD Plasma"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
msgid "Plasma desktop environment only."
msgstr "Nur Plasma Desktop-Umgebung."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
-#: en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122
+#: en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr "Alle Sprachen sind vorhanden."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr "Live-DVD GNOME"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr "Nur GNOME Desktop-Umgebung."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
msgid "Live DVD Xfce"
msgstr "Live-DVD Xfce"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
msgid "Xfce desktop environment only."
msgstr "Nur Xfce Desktop-Umgebung."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr "Boot-only CD Medien"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -3581,7 +3552,7 @@ msgstr ""
"Netzwerk oder im Internet befinden."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -3592,17 +3563,17 @@ msgstr ""
"kein DVD-Laufwerk verfügt oder nicht von einem USB-Stick booten kann."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr "Nur englische Sprache."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
msgid "netinstall.iso"
msgstr "netinstall.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
@@ -3611,12 +3582,12 @@ msgstr ""
"ablehnen."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
msgid "netinstall-nonfree.iso"
msgstr "netinstall-nonfree.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
@@ -3625,17 +3596,17 @@ msgstr ""
"diese benötigen."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr "Medien herunterladen und überprüfen"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr "Herunterladen"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -3649,12 +3620,12 @@ msgstr ""
"ausgewählt wurde sehen Sie womöglich etwas wie"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
@@ -3666,28 +3637,30 @@ msgstr ""
"Anschließend wird dieses Fenster erscheinen:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr "Wähle den Auswahlknopf \"Datei speichern\"."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr "Überprüfen der integrietät der heruntergeladenen Datei"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
"Beide Prüfsummen sind hexadezimal Zahlen, welche durch einen Algorithmus von "
"der Datei berechnet wurde, welche heruntergeladen werden soll. Wenn Sie den "
@@ -3698,12 +3671,12 @@ msgstr ""
"Download erneut versuchen."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr "Öffne eine Konsole, Sie müssen hierfür nicht root sein, und:"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
"file.iso</userinput>."
@@ -3712,7 +3685,7 @@ msgstr ""
"Pfad/zu/der/Abbild/Datei.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
"image/file.iso</userinput>."
@@ -3721,7 +3694,7 @@ msgstr ""
"<userinput>sha1sum Pfad/zu/der/Abbild/Datei.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
@@ -3731,32 +3704,32 @@ msgstr ""
"erhalten. Beispiel:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr "Brennen oder übertragen der ISO"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a boot-able medium."
+"These operations are not a simple copy and aim to make a bootable medium."
msgstr ""
"Die überprüfte ISO kann nun auf eine CD oder DVD gebrannt oder auf einen USB-"
"Stick gedumpt werden. Diese Tätigkeit ist nicht ein einfaches kopieren und "
"zielt darauf ab ein bootbares Medium zu erstellen."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr "ISO auf eine CD/DVD brennen"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -3770,12 +3743,12 @@ msgstr ""
"Images_auf_CD_und_DVD_brennen\">Mageia Wiki</link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr "ISO auf einen USB-Stick übertragen"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
@@ -3784,9 +3757,9 @@ msgstr ""
"'dumpen' können um davon zu booten und das System zu installieren."
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
@@ -3795,7 +3768,7 @@ msgstr ""
"auf die Imagegröße reduziert."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
@@ -3804,12 +3777,12 @@ msgstr ""
"neu partitionieren und formatieren."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr "Verwenden eines grafischen Werkzeugs in Mageia"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3819,17 +3792,17 @@ msgstr ""
"link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr "Verwenden eines grafischen Werkzeugs in Windows"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr "Sie können versuchen:"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
@@ -3838,7 +3811,7 @@ msgstr ""
"Verwendung der Auswahl \"ISO-Abbild\";"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
@@ -3847,12 +3820,12 @@ msgstr ""
"Disk Imager</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr "Verwenden der Befehlzeile in einem GNU/Linux System"
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
@@ -3862,17 +3835,17 @@ msgstr ""
"Versehen die falsche Geräte-ID verwenden."
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr "Sie können auch das dd Werkzeug in der Konsole verwenden:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr "Öffnen Sie eine Konsole"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
@@ -3881,14 +3854,14 @@ msgstr ""
"nicht das '-' am Ende)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr ""
"Schließen Sie Ihren USB-Stick an (hängen Sie diesen nicht ein, das bedeutet "
@@ -3896,17 +3869,17 @@ msgstr ""
"auf diesen zugreift oder liest)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr "Geben Sie den Befehl <userinput>fdisk -l</userinput> ein"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command <code>dmesg</"
"code>: at end, you see the device name starting with <emphasis>sd</"
@@ -3918,7 +3891,7 @@ msgstr ""
"emphasis> ist:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3960,7 +3933,7 @@ msgstr ""
"[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example <code>/"
"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
@@ -3969,7 +3942,7 @@ msgstr ""
"Beispiel ist <code>/dev/sdb</code> in dem Screenshot oben, ein 8GB USB-Stick."
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
@@ -3978,12 +3951,12 @@ msgstr ""
"bs=1M</userinput> ein"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr "Wobei X = der Name Ihres Gerätes ist, z.B. /dev/sdc"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
"dev/sdb bs=1M</userinput>"
@@ -3992,12 +3965,12 @@ msgstr ""
"of=/dev/sdb bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr "Geben Sie den Befehl # <userinput>sync</userinput> ein"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr "Entferne den USB-Stick, es ist fertig"
@@ -4484,33 +4457,31 @@ msgstr "Grub2 auf Legacy/MBR und Legacy/GPT Systeme"
#. type: Content of: <section><section><section><mediaobject>
#: en/setupBootloader.xml:36
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
"setupBootloader.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
-"setupBootloader.png\"/> </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><section><section><para>
-#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid ""
+"Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr ""
"Änderen Sie nicht das Boot-Medium, außer Sie wissen genau, was Sie tun."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
msgid "Grub2-efi on UEFI systems"
msgstr "Grub2-efi auf UEFI Systeme"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
"choose between with or without graphical menu"
@@ -4519,31 +4490,27 @@ msgstr ""
"nicht zwischen einer Oberfläche mit oder ohne grafischem Menü wählen können"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:58
+#: en/setupBootloader.xml:56
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:64
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"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><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
+#, fuzzy
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only 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 "
+"If there are already UEFI operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer detects the existing ESP "
+"created by Windows and adds grub2-efi. Although it is possible to have "
"several ESPs, only one is advised and enough whatever the number of "
"operating systems you have."
msgstr ""
@@ -4557,18 +4524,18 @@ msgstr ""
"ausreichend, egal wie viele Betriebssysteme Sie verwenden."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr "Verwenden des Mageia Bootloaders"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr ""
"Standardmäßig, entsprechend Ihres Systems, schreibt Mageia folgendes neu:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
@@ -4577,12 +4544,12 @@ msgstr ""
"Festplatte oder in die BIOS Bootpartition."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr "Grub2-efi Bootloader in die ESP"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
msgid ""
"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, "
@@ -4595,30 +4562,25 @@ msgstr ""
"<guilabel>Fremdes OS testen</guilabel>"
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:100
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"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><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr "Verwenden eines bestehenden Bootloaders"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
msgid ""
"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 "
@@ -4634,45 +4596,40 @@ msgstr ""
"offen sind."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr "Verwenden des Chain-Loader"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:136
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:129
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"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><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
"imageobject>"
@@ -4681,17 +4638,17 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
msgid "Options"
msgstr "Optionen"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr "Erste Seite"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<guilabel>Delay before booting the default image</guilabel>: This text box "
"lets you set a delay in seconds before the default operating system is "
@@ -4702,7 +4659,7 @@ msgstr ""
"Standard-Betriebssystem gestartet wird."
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: en/setupBootloader.xml:162
msgid ""
"<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 "
@@ -4710,7 +4667,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
msgid ""
"<guilabel>Password</guilabel>: This text box is where you actually put the "
"password"
@@ -4719,7 +4676,7 @@ msgstr ""
"Passwort ein"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:182
+#: en/setupBootloader.xml:173
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
"check that it matches with the one set above."
@@ -4728,30 +4685,30 @@ msgstr ""
"an und Drakx überprüft, ob dieses mit dem oben angegebenen übereinstimmt."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
msgid "<guilabel>Advanced</guilabel>"
msgstr "<guilabel>Fortgeschrittene Optionen</guilabel>"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
msgid ""
"<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)."
+"stopping unused devices, this was the method used before APM. Unchecking it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:208
+#: en/setupBootloader.xml:199
msgid ""
"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
"operating system access to the Advanced Programmable Interrupt Controller. "
@@ -4760,31 +4717,31 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr "Nächste Seite"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:232
msgid ""
"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
@@ -4793,7 +4750,7 @@ msgstr ""
"\"setupMageiaBootloader\">Verwenden des Mageia Bootloaders</link>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:247
+#: en/setupBootloader.xml:239
msgid ""
"<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 "
@@ -4801,7 +4758,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -5222,3 +5179,130 @@ msgstr ""
"Der nächste Schritt ist das kopieren der Dateien auf die Festplatte. Dies "
"dauert einige Minuten. Am Ende erhalten Sie für eine gewisse Zeit einen "
"leeren Bildschirm, was normal ist."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
+#~ "\"mediaobject\" id=\"1\"/>"
+#~ msgstr ""
+#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
+#~ "\"mediaobject\" id=\"1\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png"
+#~ "\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png"
+#~ "\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Different media for architecture 32 or 64 bits."
+#~ msgstr "Verschiedene Medien für die 32-Bit oder 64-Bit Architektur."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+#~ "setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+#~ "setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
diff --git a/docs/installer/el.po b/docs/installer/el.po
index 48fe5f3a..3f412ee0 100644
--- a/docs/installer/el.po
+++ b/docs/installer/el.po
@@ -10,7 +10,7 @@ msgid ""
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"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
"PO-Revision-Date: 2017-02-18 08:22+0100\n"
"Last-Translator: Dimitrios Glentadakis <dglent@free.fr>\n"
"Language-Team: Greek <kde-i18n-el@kde.org>\n"
@@ -110,9 +110,9 @@ msgstr "el"
msgid "Media Selection (Configure Supplemental Installation Media)"
msgstr "Επιλογή μέσων (Διαμόρφωση επιπρόσθετων μέσων εγκατάστασης)"
-#. papoteur 2013-04-13 - created
-#. marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection
-#. marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell
+#. papoteur 2013-04-13 - created
+#. marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection
+#. marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell
#. type: Content of: <section><mediaobject>
#: en/add_supplemental_media.xml:18
msgid ""
@@ -186,7 +186,7 @@ msgstr "Διαχείριση χρήστη και διαχειριστή"
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -199,12 +199,12 @@ msgstr ""
"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr "Ορίστε τον κωδικό πρόσβασης του διαχειριστή (root):"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -226,7 +226,7 @@ msgstr ""
"συγκρίνοντάς τους."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
@@ -236,16 +236,16 @@ msgstr ""
"σε έναν κωδικό."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr "Εισαγωγή ενός χρήστη"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
"Προσθέστε έναν χρήστη εδώ. Ένας χρήστης έχει λιγότερα δικαιώματα από τον "
"διαχειριστή (root), αλλά αρκετά από προεπιλογή ώστε να πλοηγηθεί στο "
@@ -253,29 +253,29 @@ msgstr ""
"οτιδήποτε άλλο κάνει ένας μέσος χρήστης με τον υπολογιστή του."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr ""
"<guibutton>Εικονίδιο</guibutton>: Αν κάνετε κλικ σε αυτό το κουμπί θα "
"αλλάξει το εικονίδιο του χρήστη."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr ""
"<guilabel>Πραγματικό όνομα</guilabel>: Εισάγετε το πραγματικό όνομα του "
"χρήστη σε αυτό το πλαίσιο κειμένου."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
"<guilabel>Όνομα χρήστη</guilabel>: Εδώ μπορείτε να πληκτρολογήσετε ένα όνομα "
"σύνδεσης χρήστη ή το drakx θα χρησιμοποιήσει μια μορφή του πραγματικού "
@@ -283,7 +283,7 @@ msgstr ""
"και κεφαλαίων.</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -295,7 +295,7 @@ msgstr ""
"κωδικός πρόσβασης του χρήστη. (Δείτε επίσης <xref linkend=\"givePassword\"/>)"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -307,7 +307,7 @@ msgstr ""
"πρόσβασης του χρήστη."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
"protected home directory (umask=0027)."
@@ -316,7 +316,7 @@ msgstr ""
"κατάλογο με προστασία εγγραφής και ανάγνωσης (umask=27)."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - Summary</"
"emphasis> step during the install. Choose <emphasis>User management</"
@@ -327,18 +327,18 @@ msgstr ""
"<emphasis>Διαχείριση χρηστών</emphasis>."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr ""
"Οι άδειες πρόσβασης μπορούν επίσης να τροποποιηθούν και μετά την εγκατάσταση."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr "Προχωρημένη διαχείριση χρήστη"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
@@ -348,14 +348,14 @@ msgstr ""
"για τον χρήστη που κάνετε προσθέτετε."
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr ""
"Επιπροσθέτως, μπορείτε να απενεργοποιήσετε ή να ενεργοποιήσετε ένα "
"λογαριασμό επισκέπτη."
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -366,7 +366,7 @@ msgstr ""
"Ο guest θα πρέπει να αποθηκεύει τα σημαντικά του αρχεία σε ένα stick USB."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -379,7 +379,7 @@ msgstr ""
"τυπικούς χρήστες."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -390,7 +390,7 @@ msgstr ""
"προηγούμενη οθόνη. Οι επιλογές είναι Bash, Dash και Sh."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -401,7 +401,7 @@ msgstr ""
"Μην εισάγετε κάτι εδώ αν δεν γνωρίζετε για το τι πρόκειται."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -416,17 +416,17 @@ msgstr ""
msgid "Choose the mount points"
msgstr "Επιλογή των σημείων προσάρτησης"
-#. Made by marja on 2012 03 28
-#. NEEDS TO BE REVIEWED!
-#. SimonNZG 2012-04-03 has taken a look but needs to come back
-#. removed para xml:id's, marja, 20120409
+#. Made by marja on 2012 03 28
+#. NEEDS TO BE REVIEWED!
+#. SimonNZG 2012-04-03 has taken a look but needs to come back
+#. removed para xml:id's, marja, 20120409
#. barjac 14/04/2012 Minor edit to improve grammar and replaced "at least ONE"
-#. with "a", as I can't imagine having more than one root partition ;)
-#. Lebarhon : I put [] where it seems having mistakes
+#. with "a", as I can't imagine having more than one root partition ;)
+#. Lebarhon : I put [] where it seems having mistakes
#. Marja: you're right, in English English it is "its type", however, the Americans
#. write "it's type". And you're right about the redundant part, too, I removed it
-#. And JohnR says the Americans are WRONG! :-))
-#. 2012-04-19 Language proofreading done
+#. And JohnR says the Americans are WRONG! :-))
+#. 2012-04-19 Language proofreading done
#. type: Content of: <section><mediaobject>
#: en/ask_mntpoint_s.xml:27
msgid ""
@@ -900,8 +900,8 @@ msgid ""
"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
"minimal install (without or with X &amp; IceWM)."
msgstr ""
-"Ανατρέξτε στο <xref linkend=\"minimal-install\"/> για οδηγίες σχετικά "
-"με το πώς να κάνετε μια ελάχιστη εγκατάσταση (δίχως ή με X &amp; IceWM)."
+"Ανατρέξτε στο <xref linkend=\"minimal-install\"/> για οδηγίες σχετικά με το "
+"πώς να κάνετε μια ελάχιστη εγκατάσταση (δίχως ή με X &amp; IceWM)."
#. type: Content of: <section><info><title>
#: en/choosePackagesTree.xml:4
@@ -948,8 +948,8 @@ msgstr ""
msgid "Configure your Services"
msgstr "Διαμορφώστε τις υπηρεσίες σας"
-#. 2012-12-25 marja - moved this section out of misc-params.xml
-#. 2013-05-05 marja - added screenshot
+#. 2012-12-25 marja - moved this section out of misc-params.xml
+#. 2013-05-05 marja - added screenshot
#. type: Content of: <section><mediaobject>
#: en/configureServices.xml:21
msgid ""
@@ -1002,8 +1002,8 @@ msgstr "Αλλάξτε κάτι μόνο αν γνωρίζετε πολύ καλ
msgid "Configure your Timezone"
msgstr "Διαμόρφωση της ζώνης ώρας"
-#. 2012-12-25 marja - moved this part out of misc-params.xml
-#. 2013-05-05 marja - added screenshot
+#. 2012-12-25 marja - moved this part out of misc-params.xml
+#. 2013-05-05 marja - added screenshot
#. type: Content of: <section><mediaobject>
#: en/configureTimezoneUTC.xml:11
msgid ""
@@ -1478,29 +1478,23 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
-msgid ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </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><note><para>
-#: en/diskdrake.xml:56
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
-msgstr ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
"partition is present with a correct type"
@@ -1509,15 +1503,17 @@ msgstr ""
"ότι μια κατάτμηση εκκίνησης BIOS είναι παρούσα με έναν σωστό τύπο"
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
-"> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
-"> </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><info><title>
#: en/doPartitionDisks.xml:9
@@ -1546,29 +1542,24 @@ 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-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr "Χρήση των υπαρχουσών κατατμήσεων"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
@@ -1577,12 +1568,12 @@ msgstr ""
"συμβατές με το Linux και μπορούν να χρησιμοποιηθούν για την εγκατάσταση."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr "Χρήση του ελεύθερου χώρου"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
@@ -1591,12 +1582,12 @@ msgstr ""
"θα τον χρησιμοποιήσει για τη νέα σας εγκατάσταση της Mageia."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr "Χρήση του ελεύθερου χώρου σε μια κατάτμηση των Windows"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
@@ -1605,7 +1596,7 @@ msgstr ""
"οδηγός εγκατάστασης μπορεί να σας επιτρέψει να τον χρησιμοποιήσετε."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"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 "
@@ -1615,7 +1606,7 @@ msgstr ""
"εγκατάσταση της Mageia."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1634,7 +1625,7 @@ msgstr ""
"αρχείων. Θα πρέπει να το ελέγξετε προσεκτικά πριν συνεχίσετε."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1648,42 +1639,37 @@ msgstr ""
"διαστήματος μεταξύ των δυο κατατμήσεων. Δείτε στο παρακάτω στιγμιότυπο."
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:77
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr "Διαγραφή και χρήση ολόκληρου του δίσκου."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr "Αυτή η επιλογή θα χρησιμοποιήσει ολόκληρο τον δίσκο για τη Mageia."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr ""
"Προσοχή! Αυτή η ενέργεια θα διαγράψει ΟΛΑ τα δεδομένα στον επιλεγμένο σκληρό "
"δίσκο. Να είστε προσεκτικός-ή!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"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 "
@@ -1694,12 +1680,12 @@ msgstr ""
"τότε μην χρησιμοποιήσετε αυτήν την επιλογή."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr "Προσαρμοσμένο"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
@@ -1708,13 +1694,13 @@ msgstr ""
"σας δίσκους."
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr ""
"<emphasis role=\"bold\">Διαμόρφωση του μεγέθους των κατατμήσεων:</emphasis>"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
@@ -1723,7 +1709,7 @@ msgstr ""
"ακόλουθων κανόνων:"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
@@ -1732,7 +1718,7 @@ msgstr ""
"μόνο η ριζική κατάτμηση «/» και δεν θα"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are created"
msgstr ""
@@ -1740,7 +1726,7 @@ msgstr ""
"δημιουργούνται τρεις κατατμήσεις"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid ""
"6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr ""
@@ -1748,21 +1734,21 @@ msgstr ""
"μέγιστο χώρο 50 GB"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr ""
"1/19 του συνολικού διαθέσιμου χώρου εκχωρούνται στην κατάτμηση «swap» με "
"μέγιστο χώρο 4 GB"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr ""
"και το υπόλοιπο (τουλάχιστον 12/19) εκχωρείται στον προσωπικό κατάλογο «/"
"home» "
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1772,7 +1758,7 @@ msgstr ""
"και το υπόλοιπο για το /home."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on /"
@@ -1785,7 +1771,7 @@ msgstr ""
"έλεγχο επικύρωσης."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"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 "
@@ -1801,26 +1787,21 @@ msgstr ""
"κατάτμηση εκκίνησης BIOS ως τύπο συστήματος αρχείων."
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"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><note><mediaobject>
#: en/doPartitionDisks.xml:175
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
-msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
@@ -1828,7 +1809,7 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
@@ -1848,17 +1829,17 @@ msgstr ""
"χρησιμοποιήσετε την παρακάτω διαμόρφωση:"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr "\"Στοίχιση σε\" \"MiB\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr "\"Free space preceding (MiB)\" \"2\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid ""
"Also make sure all partitions are created with an even number of megabytes."
msgstr ""
@@ -2035,10 +2016,10 @@ msgstr ""
msgid "Formatting"
msgstr "Μορφοποίηση"
-#. Made by marja on 2012 03 29
-#. NEEDS TO BE REVIEWED!
-#. marja 2012-04-24 added screenshot
-#. marja 2012-04-24 added emphasis tags in formatPartitions-pa1
+#. Made by marja on 2012 03 29
+#. NEEDS TO BE REVIEWED!
+#. marja 2012-04-24 added screenshot
+#. marja 2012-04-24 added emphasis tags in formatPartitions-pa1
#. type: Content of: <section><mediaobject>
#: en/formatPartitions.xml:18
msgid ""
@@ -2161,11 +2142,6 @@ msgstr ""
"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -2594,10 +2570,10 @@ msgstr ""
msgid "Updates"
msgstr "Ενημερώσεις"
-#. Made by marja on 2012 03 30
-#. NEEDS TO BE REVIEWED!
+#. Made by marja on 2012 03 30
+#. NEEDS TO BE REVIEWED!
#. marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
-#. marja, 2012-04-24 added screenshot
+#. marja, 2012-04-24 added screenshot
#. type: Content of: <section><mediaobject>
#: en/installUpdates.xml:13
msgid ""
@@ -2684,9 +2660,9 @@ msgstr ""
msgid "Media Selection (Nonfree)"
msgstr "Επιλογή μέσων (Nonfree)"
-#. papoteur 2013-04-11 - created
+#. papoteur 2013-04-11 - created
#. marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)
-#. marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell
+#. marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell
#. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
#. type: Content of: <section><mediaobject>
#: en/media_selection.xml:12
@@ -3184,8 +3160,8 @@ msgid ""
msgstr ""
"Επιλέξτε τις υπηρεσίες που επιθυμείτε να έχετε πρόσβαση στο σύστημά σας. Οι "
"επιλογές σας θα εξαρτώνται με την χρήση για την οποία προορίζεται ο "
-"υπολογιστής σας. Για περισσότερες πληροφορίες ανατρέξτε στο <xref "
-"linkend=\"firewall\"/>."
+"υπολογιστής σας. Για περισσότερες πληροφορίες ανατρέξτε στο <xref linkend="
+"\"firewall\"/>."
#. type: Content of: <section><section><itemizedlist><listitem><warning><para>
#: en/misc-params.xml:222
@@ -3200,29 +3176,30 @@ msgid "Reboot"
msgstr "Επανεκκίνηση"
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
"computer, remove the live CD and restart the computer, click on <emphasis "
"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
"asked<emphasis role=\"bold\"> in this order!</emphasis>"
msgstr ""
-"Μετά το πέρας της εγκατάστασης του προγράμματος εκκίνησης, θα σας προταθεί να "
-"κλείσετε τον υπολογιστή, να αφαιρέσετε το live CD και να κάνετε επανεκκίνηση "
-"του υπολογιστή, κάντε κλικ στο <emphasis role=\"bold\"><guibutton>"
-"Τερματισμός</guibutton></emphasis> και ακολουθήστε τις οδηγίες<emphasis "
-"role=\"bold\"> σε αυτήν την σειρά!</emphasis>"
+"Μετά το πέρας της εγκατάστασης του προγράμματος εκκίνησης, θα σας προταθεί "
+"να κλείσετε τον υπολογιστή, να αφαιρέσετε το live CD και να κάνετε "
+"επανεκκίνηση του υπολογιστή, κάντε κλικ στο <emphasis role=\"bold"
+"\"><guibutton>Τερματισμός</guibutton></emphasis> και ακολουθήστε τις "
+"οδηγίες<emphasis role=\"bold\"> σε αυτήν την σειρά!</emphasis>"
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
+#, fuzzy
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
"Κατά την επανεκκίνηση θα παρατηρήσετε μια ακολουθία ράβδων προόδου λήψεων. "
@@ -3230,7 +3207,7 @@ msgstr ""
"του λογισμικού)."
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -3264,8 +3241,8 @@ msgstr ""
msgid "Security Level"
msgstr "Επίπεδο ασφάλειας"
-#. 2012-12-25 marja - moved this part out of misc-params.xml"
-#. 2013-05-05 marja - added screenshot
+#. 2012-12-25 marja - moved this part out of misc-params.xml"
+#. 2013-05-05 marja - added screenshot
#. type: Content of: <section><mediaobject>
#: en/securityLevel.xml:19
msgid ""
@@ -3300,17 +3277,17 @@ msgstr ""
"την ενότητα <guilabel>Ασφάλεια</guilabel> του Κέντρου Ελέγχου Mageia."
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr "Επιλογή και χρήση των ISO"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr "Εισαγωγή"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
@@ -3319,12 +3296,12 @@ msgstr ""
"επιλέξετε ποια εικόνα ταιριάζει στις ανάγκες σας."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr "Υπάρχουν δυο οικογένειες μέσων:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target system. "
@@ -3338,7 +3315,7 @@ msgstr ""
"εργασίας."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -3350,22 +3327,22 @@ msgstr ""
"αλλά με λιγότερες επιλογές."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr "Στις επόμενες ενότητες δίνονται περισσότερες πληροφορίες."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr "Μέσα"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr "Ορισμός"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
@@ -3376,7 +3353,7 @@ msgstr ""
"μέσο όπου το αρχείο ISO έχει αντιγραφεί."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
"\">here</link>."
@@ -3385,23 +3362,23 @@ msgstr ""
"\">εδώ</link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr "Μέσο κλασσικής εγκατάστασης"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78
+#: en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr "Κοινά χαρακτηριστικά"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr "Τα ISO χρησιμοποιούν το παραδοσιακό πρόγραμμα εγκαταστάτης drakx."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid ""
"They are able to make a clean install or an update from previous releases."
msgstr ""
@@ -3409,17 +3386,19 @@ msgstr ""
"προηγούμενη έκδοση."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr "DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
msgstr "Διαφορετικά μέσα για αρχιτεκτονική 32 ή 64 bit."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
@@ -3428,24 +3407,24 @@ msgstr ""
"Έλεγχος της μνήμης, Εργαλείο εντοπισμού υλικού."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr "Κάθε DVD περιέχει πολλά διαθέσιμα γραφικά περιβάλλοντα και γλώσσες."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid ""
"You'll be given the choice during the installation to add non free software."
msgstr ""
"Κατά την εγκατάσταση θα ερωτηθείτε για την προσθήκη ιδιόκτητου λογισμικού."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr "Μέσο Live"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
@@ -3455,19 +3434,12 @@ msgstr ""
"στον σκληρό δίσκο."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr "Κάθε ISO περιέχει μόνο ένα περιβάλλον εργασίας (KDE, GNOME ή XFCE)."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr "Διαφορετικά μέσα για αρχιτεκτονική 32 ή 64 bit."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous releases.</"
@@ -3478,53 +3450,53 @@ msgstr ""
"προηγούμενη έκδοση.</emphasis>"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr "Περιέχουν ιδιόκτητο λογισμικό."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
msgid "Live DVD Plasma"
msgstr "Ζωντανό DVD Plasma"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
msgid "Plasma desktop environment only."
msgstr "Μόνο το περιβάλλον επιφάνειας εργασίας Plasma."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
-#: en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122
+#: en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr "Περιέχονται όλες οι γλώσσες."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr "Live DVD GNOME"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr "Μόνο το περιβάλλον επιφάνειας εργασίας GNOME."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
msgid "Live DVD Xfce"
msgstr "Ζωντανό DVD XFCE"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
msgid "Xfce desktop environment only."
msgstr "Μόνο το περιβάλλον επιφάνειας εργασίας XFCE."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr "CD αποκλειστικά για εκκίνηση"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -3539,7 +3511,7 @@ msgstr ""
"διαδίκτυο."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -3551,17 +3523,17 @@ msgstr ""
"εκκίνηση από ένα κλειδί USB. "
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr "Μόνο Αγγλική γλώσσα."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
msgid "netinstall.iso"
msgstr "netinstall.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
@@ -3570,12 +3542,12 @@ msgstr ""
"χρησιμοποιήσουν ιδιόκτητο λογισμικό."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
msgid "netinstall-nonfree.iso"
msgstr "netinstall-nonfree.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
@@ -3584,17 +3556,17 @@ msgstr ""
"για αυτούς που το χρειάζονται."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr "Λήψη και έλεγχος των μέσων"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr "Λήψη"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -3608,12 +3580,12 @@ msgstr ""
"επιλέξετε http, μπορεί να δείτε επίσης κάτι σαν αυτό"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
@@ -3624,28 +3596,30 @@ msgstr ""
"\">μελλοντική χρήση</link>. Στη συνέχεια ανοίγει αυτό το παράθυρο:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr "Επιλέξτε το κουμπί επιλογών Αποθήκευση του αρχείου."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr "Έλεγχος της ακεραιότητας του ληφθέντος αρχείου"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
"Και τα δυο εργαλεία ελέγχου της ακεραιότητας είναι δεκαεξαδικοί αριθμοί "
"αποτέλεσμα υπολογισμού ενός αλγόριθμου από το αρχείο προς τηλεφόρτωση. Όταν "
@@ -3655,12 +3629,12 @@ msgstr ""
"προσπαθήσετε την εκ νέου λήψη του αρχείου."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr "Ανοίξτε ένα τερματικό -δεν χρειάζεται σύνδεση ως root - και:"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
"file.iso</userinput>."
@@ -3669,7 +3643,7 @@ msgstr ""
"path/to/the/image/file.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
"image/file.iso</userinput>."
@@ -3678,7 +3652,7 @@ msgstr ""
"path/to/the/image/file.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
@@ -3687,32 +3661,32 @@ msgstr ""
"να περιμένετε λίγο) με τον αριθμό που δίνεται από τη Mageia. Για παράδειγμα:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr "Εγγραφή ή αποτύπωση του ISO"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a boot-able medium."
+"These operations are not a simple copy and aim to make a bootable medium."
msgstr ""
"To επιβεβαιωμένο ISO μπορεί να εγγραφεί σε ένα CD/DVD ή να αποτυπωθεί σε ένα "
"κλειδί USB. Αυτές οι διεργασίες δεν πρόκειται για μια απλή αντιγραφή και "
"σκοπεύουν στην δημιουργία ενός εκκινήσιμου μέσου."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr "Εγγραφή του ISO σε ένα CD/DVD"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -3727,12 +3701,12 @@ msgstr ""
"wiki</link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr "Αποτύπωση του ISO σε ένα κλειδί USB"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
@@ -3742,9 +3716,9 @@ msgstr ""
"και εγκατάσταση του συστήματος."
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
@@ -3754,7 +3728,7 @@ msgstr ""
"της εικόνας ISO."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
@@ -3763,12 +3737,12 @@ msgstr ""
"νέου την κατάτμηση και την μορφοποίηση του κλειδιού USB."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr "Χρήση ενός εργαλείου γραφικού περιβάλλοντος στην Mageia"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3778,17 +3752,17 @@ msgstr ""
"IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr "Χρήση ενός εργαλείου γραφικού περιβάλλοντος στα Windows"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr "Μπορείτε να δοκιμάσετε:"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
@@ -3797,7 +3771,7 @@ msgstr ""
"χρησιμοποιώντας την επιλογή της «εικόνας ISO»·"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
@@ -3806,12 +3780,12 @@ msgstr ""
"\">Win32 Disk Imager</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr "Χρήση της γραμμής εντολών σε ένα σύστημα GNU/Linux "
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
@@ -3821,17 +3795,17 @@ msgstr ""
"λανθασμένα το αναγνωριστικό της συσκευής."
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr "Μπορείτε επίσης να χρησιμοποιήσετε το εργαλείο dd σε ένα τερματικό:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr "Ανοίξτε ένα τερματικό"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
@@ -3840,14 +3814,14 @@ msgstr ""
"ξεχάσετε το τελικό «-» )"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr ""
"Συνδέστε το κλειδί USB (μην το προσαρτήσετε, και μην ανοίξετε μια εφαρμογή ή "
@@ -3855,17 +3829,17 @@ msgstr ""
"κλειδί)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr "Εισάγετε την εντολή <userinput>fdisk -l</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command <code>dmesg</"
"code>: at end, you see the device name starting with <emphasis>sd</"
@@ -3876,26 +3850,21 @@ msgstr ""
"<emphasis>sd</emphasis>, και <emphasis>sdd</emphasis> στην περίπτωσή μας:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
"[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000\n"
-"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, "
-"SerialNumber=3\n"
+"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3\n"
"[72594.770536] usb 1-1: Product: Mass Storage Device\n"
"[72594.770537] usb 1-1: Manufacturer: JetFlash\n"
"[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB\n"
-"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep "
-"desc says 255 microframes\n"
-"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep "
-"desc says 255 microframes\n"
+"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
+"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
"[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected\n"
"[72594.772447] scsi host8: usb-storage 1-1:1.0\n"
-"[72595.963238] scsi 8:0:0:0: Direct-Access JetFlash Transcend 2GB 1100 "
-"PQ: 0 ANSI: 4\n"
-"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 "
-"GB/2.00 GiB)\n"
+"[72595.963238] scsi 8:0:0:0: Direct-Access JetFlash Transcend 2GB 1100 PQ: 0 ANSI: 4\n"
+"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)\n"
"[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off\n"
"[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00\n"
"[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found\n"
@@ -3905,21 +3874,16 @@ msgid ""
msgstr ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
"[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000\n"
-"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, "
-"SerialNumber=3\n"
+"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3\n"
"[72594.770536] usb 1-1: Product: Mass Storage Device\n"
"[72594.770537] usb 1-1: Manufacturer: JetFlash\n"
"[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB\n"
-"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep "
-"desc says 255 microframes\n"
-"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep "
-"desc says 255 microframes\n"
+"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
+"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
"[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected\n"
"[72594.772447] scsi host8: usb-storage 1-1:1.0\n"
-"[72595.963238] scsi 8:0:0:0: Direct-Access JetFlash Transcend 2GB 1100 "
-"PQ: 0 ANSI: 4\n"
-"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 "
-"GB/2.00 GiB)\n"
+"[72595.963238] scsi 8:0:0:0: Direct-Access JetFlash Transcend 2GB 1100 PQ: 0 ANSI: 4\n"
+"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)\n"
"[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off\n"
"[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00\n"
"[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found\n"
@@ -3928,7 +3892,7 @@ msgstr ""
"[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example <code>/"
"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
@@ -3938,7 +3902,7 @@ msgstr ""
"ένα κλειδί USB 8GB."
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
@@ -3947,12 +3911,12 @@ msgstr ""
"bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr "Όπου «X» = το όνομα της συσκευής, πχ: /dev/sdc"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
"dev/sdb bs=1M</userinput>"
@@ -3961,12 +3925,12 @@ msgstr ""
"of=/dev/sdb bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr "Εισάγετε την εντολή: # <userinput>sync</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr "Αποσυνδέστε το κλειδί USB, όλα ολοκληρώθηκαν"
@@ -4035,13 +3999,13 @@ msgid ""
"and can be installed if you added HTTP/FTP media before package selection."
msgstr ""
"Στην οθόνη <guilabel>Άλλες χώρες</guilabel> μπορείτε επίσης να επιλέξετε μια "
-"μέθοδο εισαγωγής (στο κάτω μέρος της λίστας). Οι μέθοδοι "
-"εισαγωγής επιτρέπουν στους χρήστες να εισάγουν πολυγλωσσικούς χαρακτήρες "
-"(Κινέζικα, Ιαπωνικά, Κορεάτικα, κλπ). Το IBus είναι η προκαθορισμένη μέθοδος "
-"εισαγωγής ώστε οι χρήστες να μην χρειαστεί να κάνουν τη διαμόρφωση "
-"χειροκίνητα. Άλλες μέθοδοι εισαγωγής (SCIM, GCIN, HIME, κλπ) παρέχουν επίσης "
-"πανομοιότυπες λειτουργίες και μπορούν να εγκατασταθούν αν προσθέσατε ένα μέσο "
-"HTTP/FTP πριν την επιλογή των πακέτων."
+"μέθοδο εισαγωγής (στο κάτω μέρος της λίστας). Οι μέθοδοι εισαγωγής "
+"επιτρέπουν στους χρήστες να εισάγουν πολυγλωσσικούς χαρακτήρες (Κινέζικα, "
+"Ιαπωνικά, Κορεάτικα, κλπ). Το IBus είναι η προκαθορισμένη μέθοδος εισαγωγής "
+"ώστε οι χρήστες να μην χρειαστεί να κάνουν τη διαμόρφωση χειροκίνητα. Άλλες "
+"μέθοδοι εισαγωγής (SCIM, GCIN, HIME, κλπ) παρέχουν επίσης πανομοιότυπες "
+"λειτουργίες και μπορούν να εγκατασταθούν αν προσθέσατε ένα μέσο HTTP/FTP "
+"πριν την επιλογή των πακέτων."
#. type: Content of: <section><section><note><para>
#: en/selectCountry.xml:44
@@ -4052,8 +4016,8 @@ msgid ""
msgstr ""
"Αν παραλείψατε τη ρύθμιση της μεθόδου εισαγωγής κατά την εγκατάσταση, "
"μπορείτε να μεταβείτε εκ νέου σε αυτή μετά την επανεκκίνηση του "
-"εγκατεστημένου συστήματός σας μέσω του μενού «Ρυθμίστε τον υπολογιστή σας» -> "
-"«Σύστημα», ή εκτελώντας localedrake ως root."
+"εγκατεστημένου συστήματός σας μέσω του μενού «Ρυθμίστε τον υπολογιστή σας» -"
+"> «Σύστημα», ή εκτελώντας localedrake ως root."
#. type: Content of: <section><info><title>
#: en/selectInstallClass.xml:21
@@ -4351,10 +4315,10 @@ msgstr ""
msgid "Select mouse"
msgstr "Επιλογή ποντικιού"
-#. Made by marja on 2012 04 11
-#. NEEDS TO BE REVIEWED!
+#. Made by marja on 2012 04 11
+#. NEEDS TO BE REVIEWED!
#. adding some "real" text now that we know the page shows up in the right place
-#. marja 2012-04-24 adding screenshot
+#. marja 2012-04-24 adding screenshot
#. type: Content of: <section><mediaobject>
#: en/selectMouse.xml:16
msgid ""
@@ -4403,8 +4367,8 @@ msgid ""
"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
"software grub-customizer instead (Available in the Mageia repositories)."
msgstr ""
-"Για να τοπ κάνετε αυτό θα πρέπει να επεξεργαστείτε χειροκίνητα το "
-"/boot/grub2/custom.cfg ή να χρησιμοποιήσετε το λογισμικό grub-customizer "
+"Για να τοπ κάνετε αυτό θα πρέπει να επεξεργαστείτε χειροκίνητα το /boot/"
+"grub2/custom.cfg ή να χρησιμοποιήσετε το λογισμικό grub-customizer "
"(Διαθέσιμο στα αποθετήρια της Mageia)."
#. type: Content of: <section><note><para>
@@ -4414,9 +4378,9 @@ msgid ""
"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
"link>"
msgstr ""
-"Για περισσότερες πληροφορίες ανατρέξτε στο wiki μας <link "
-"ns2:href=\"https://wiki.mageia.org/en/Grub2-efi_and_Mageia\">"
-"https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
+"Για περισσότερες πληροφορίες ανατρέξτε στο wiki μας <link ns2:href=\"https://"
+"wiki.mageia.org/en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia</link>"
#. type: Content of: <section><info><title>
#: en/setupBootloader.xml:9
@@ -4456,34 +4420,34 @@ msgstr "Grub2 σε παλιό σύστημα με MBR/GPT"
#. type: Content of: <section><section><section><mediaobject>
#: en/setupBootloader.xml:36
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
"setupBootloader.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
-"setupBootloader.png\"/> </imageobject>"
+"<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>"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid ""
+"Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr ""
"Μην τροποποιήσετε το περιφερειακό εκκίνησης εκτός και αν γνωρίζεται τι "
"ακριβώς πράττετε."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
msgid "Grub2-efi on UEFI systems"
msgstr "Grub2 σε συστήματα UEFI"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
"choose between with or without graphical menu"
@@ -4492,31 +4456,27 @@ msgstr ""
"δεν μπορείτε να επιλέξετε με ή χωρίς γραφικό περιβάλλον"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:58
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:64
+#: en/setupBootloader.xml:56
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"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><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
+#, fuzzy
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only 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 "
+"If there are already UEFI operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer detects the existing ESP "
+"created by Windows and adds grub2-efi. Although it is possible to have "
"several ESPs, only one is advised and enough whatever the number of "
"operating systems you have."
msgstr ""
@@ -4530,17 +4490,17 @@ msgstr ""
"του αριθμού των λειτουργικών συστημάτων που διαθέτετε."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr "Χρησιμοποιώντας το πρόγραμμα εκκίνησης της Mageia"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr "Εξ ορισμού, αναλόγως με το σύστημά σας, η Mageia δημιουργεί ένα νέο:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
@@ -4549,12 +4509,12 @@ msgstr ""
"σκληρού δίσκου ή στην κατάτμηση εκκίνησης του BIOS."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr "Ένα πρόγραμμα εκκίνησης Grub2-efi στο ESP"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
msgid ""
"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, "
@@ -4562,35 +4522,30 @@ msgid ""
"<guilabel>Probe Foreign OS</guilabel>"
msgstr ""
"Αν έχετε και άλλα λειτουργικά συστήματα εγκατεστημένα, η Mageia προσπαθεί να "
-"τα προσθέσει στο νέο μενού εκκίνησης Mageia. Αν δεν το επιθυμείτε, κάντε κλικ "
-"στο <guibutton>Επόμενο</guibutton> και αποεπιλέξτε το πλαίσιο <guilabel>"
-"Εντοπισμός ξένου λειτουργικού</guilabel>"
+"τα προσθέσει στο νέο μενού εκκίνησης Mageia. Αν δεν το επιθυμείτε, κάντε "
+"κλικ στο <guibutton>Επόμενο</guibutton> και αποεπιλέξτε το πλαίσιο "
+"<guilabel>Εντοπισμός ξένου λειτουργικού</guilabel>"
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:100
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"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><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr "Χρήση ενός υπάρχοντος μενού εκκίνησης"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
msgid ""
"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 "
@@ -4606,51 +4561,46 @@ msgstr ""
"εν λόγω λειτουργικού συστήματος."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr "Χρήση αλυσιδωτής φόρτωσης"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
msgstr ""
"Αν δεν επιθυμείτε μια εκκινήσιμη Mageia, αλλά την αλυσιδωτή φόρτωση από άλλο "
-"λειτουργικό σύστημα, κάντε κλικ στο <guibutton>Επόμενο</guibutton>, και στο <"
-"guibutton>Προηγμένες</guibutton> και επιλέξτε το πλαίσιο <guilabel>Μην "
+"λειτουργικό σύστημα, κάντε κλικ στο <guibutton>Επόμενο</guibutton>, και στο "
+"<guibutton>Προηγμένες</guibutton> και επιλέξτε το πλαίσιο <guilabel>Μην "
"αγγίξεις το ESP ή το MBR</guilabel>."
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:136
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:129
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"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><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
msgstr ""
"Θα λάβετε μια προειδοποίηση ότι το πρόγραμμα εκκίνησης θα αποτύχει, αγνοήστε "
"το με κλικ στο <guibutton>Εντάξει</guibutton>."
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
"imageobject>"
@@ -4659,28 +4609,28 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
msgid "Options"
msgstr "Επιλογές"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr "Πρώτη σελίδα"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<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."
msgstr ""
-"<guilabel>Καθυστέρηση πριν την εκκίνηση της προεπιλεγμένης εικόνας</guilabel>"
-": Το πλαίσιο κειμένου σας επιτρέπει τον ορισμό μιας καθυστέρησης σε "
+"<guilabel>Καθυστέρηση πριν την εκκίνηση της προεπιλεγμένης εικόνας</"
+"guilabel>: Το πλαίσιο κειμένου σας επιτρέπει τον ορισμό μιας καθυστέρησης σε "
"δευτερόλεπτα πριν την εκκίνηση του εξ ορισμού λειτουργικού συστήματος."
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: en/setupBootloader.xml:162
msgid ""
"<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 "
@@ -4692,7 +4642,7 @@ msgstr ""
"ρυθμίσεις κατά την εκκίνηση."
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
msgid ""
"<guilabel>Password</guilabel>: This text box is where you actually put the "
"password"
@@ -4700,7 +4650,7 @@ msgstr ""
"<guilabel>Κωδικός πρόσβασης</guilabel>: Εδώ εισαγάγετε τον κωδικό πρόσβασης"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:182
+#: en/setupBootloader.xml:173
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
"check that it matches with the one set above."
@@ -4710,76 +4660,77 @@ msgstr ""
"ταιριάζει με τον ανωτέρω."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
msgid "<guilabel>Advanced</guilabel>"
msgstr "<guilabel>Προηγμένες</guilabel>"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
+#, fuzzy
msgid ""
"<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)."
+"stopping unused devices, this was the method used before APM. Unchecking it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
msgstr ""
"<guilabel>Ενεργοποίηση του ACPI:</guilabel> Το ACPI (Advanced Configuration "
"and Power Interface - Εξελιγμένη διεπαφή ρύθμισης και διαχείρισης ενέργειας) "
"είναι ένα πρότυπο διαχείρισης ενέργειας. Μπορεί να εξοικονομεί ενέργεια "
"διακόπτοντας αχρησιμοποίητες συσκευές· αυτή ήταν η χρησιμοποιούμενη μέθοδος "
-"πριν το APM. Η αποεπιλογή του μπορεί να φανεί χρήσιμη ειδικά αν ο υπολογιστής "
-"σας δεν υποστηρίζει το ACPI ή αν εκτιμάτε ότι η ενσωμάτωση του ACPI μπορεί να "
-"προκαλέσει κάποια προβλήματα (για παράδειγμα τυχαίες επανεκκινήσεις ή "
-"κωλύματα του συστήματος)."
+"πριν το APM. Η αποεπιλογή του μπορεί να φανεί χρήσιμη ειδικά αν ο "
+"υπολογιστής σας δεν υποστηρίζει το ACPI ή αν εκτιμάτε ότι η ενσωμάτωση του "
+"ACPI μπορεί να προκαλέσει κάποια προβλήματα (για παράδειγμα τυχαίες "
+"επανεκκινήσεις ή κωλύματα του συστήματος)."
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
msgstr ""
-"<guilabel>Ενεργοποίηση του SMP</guilabel>: Αυτή η επιλογή (απ)ενεργοποιεί την "
-"συμμετρική πολυδιεργασία για επεξεργαστές πολλαπλών πυρήνων. "
+"<guilabel>Ενεργοποίηση του SMP</guilabel>: Αυτή η επιλογή (απ)ενεργοποιεί "
+"την συμμετρική πολυδιεργασία για επεξεργαστές πολλαπλών πυρήνων. "
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:208
+#: en/setupBootloader.xml:199
msgid ""
"<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."
msgstr ""
-"<guilabel>Ενεργοποίηση του APIC</guilabel>: (απ)ενεργοποιώντας το δίνεται στο "
-"λειτουργικό σύστημα πρόσβαση στον προηγμένο προγραμματιζόμενο ελεγκτή "
+"<guilabel>Ενεργοποίηση του APIC</guilabel>: (απ)ενεργοποιώντας το δίνεται "
+"στο λειτουργικό σύστημα πρόσβαση στον προηγμένο προγραμματιζόμενο ελεγκτή "
"διακοπών ( Advanced Programmable Interrupt Controller). Οι συσκευές APIC "
"επιτρέπουν περισσότερο πολύπλοκα πρότυπα, και προηγμένη διαχείριση IRQ "
"(Αιτήσεις διακοπτών)."
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
"<guilabel>Ενεργοποίηση τοπικού APIC</guilabel>: Εδώ μπορείτε να ορίσετε το "
"τοπικό APIC, το οποίο διαχειρίζεται όλους τους εξωτερικούς διακόπτες για "
"μερικούς εξειδικευμένους επεξεργαστές σε ένα σύστημα SMP."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr "Επόμενη σελίδα"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr ""
"<guilabel>Εξ ορισμού:</guilabel> Το λειτουργικό σύστημα που εκκινείται εξ "
"ορισμού"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
@@ -4789,17 +4740,17 @@ msgstr ""
"περισσότερες πληροφορίες κατά την εκκίνηση."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:232
msgid ""
"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
msgstr ""
-"<guilabel>Εντοπισμός ξένου λειτουργικού συστήματος</guilabel>: Δείτε παραπάνω "
-"<link linkend=\"setupMageiaBootloader\">Χρήση του προγράμματος εκκίνησης "
-"Mageia</link>"
+"<guilabel>Εντοπισμός ξένου λειτουργικού συστήματος</guilabel>: Δείτε "
+"παραπάνω <link linkend=\"setupMageiaBootloader\">Χρήση του προγράμματος "
+"εκκίνησης Mageia</link>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:247
+#: en/setupBootloader.xml:239
msgid ""
"<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 "
@@ -4810,28 +4761,29 @@ msgstr ""
"στο κάτω τρίγωνο θα εμφανιστούν οι επιλογές μεγέθους και χρωματικού βάθους."
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
+#, fuzzy
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"
msgstr ""
"<emphasis role=\"bold\">Μην αγγίξεις το ESP ή το MBR</emphasis>: δείτε "
-"παραπάνω <link linkend=\"setupChainLoading\">Χρήση της αλυσιδωτής φόρτωσης<"
-"/link>"
+"παραπάνω <link linkend=\"setupChainLoading\">Χρήση της αλυσιδωτής φόρτωσης</"
+"link>"
#. type: Content of: <section><info><title>
#: en/setupSCSI.xml:11
msgid "Setup SCSI"
msgstr "Διαμόρφωση SCSI"
-#. Made by marja on 2012 04 02
-#. NEEDS TO BE REVIEWED!
-#. JohnR - edited 2012-03-03
-#. SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-)
-#. barjac has re-reviewed and made some minor tweaks. Revisions incremented.
-#. marja 2012-04-24 added screenshot
+#. Made by marja on 2012 04 02
+#. NEEDS TO BE REVIEWED!
+#. JohnR - edited 2012-03-03
+#. SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-)
+#. barjac has re-reviewed and made some minor tweaks. Revisions incremented.
+#. marja 2012-04-24 added screenshot
#. marja 2012-04-25 replacing John's version 1.6 because that one was based on the
-#. Mdv doc instead of on our setupSCSI file
+#. Mdv doc instead of on our setupSCSI file
#. type: Content of: <section><mediaobject>
#: en/setupSCSI.xml:26
msgid ""
@@ -4954,12 +4906,12 @@ msgstr ""
msgid "Confirm hard disk to be formatted"
msgstr "Επιβεβαίωση του σκληρού δίσκου προς μορφοποίηση"
-#. Made by marja on 2012 04 03
-#. test comment - johnr
+#. Made by marja on 2012 04 03
+#. test comment - johnr
#. 2012-04-24 marja - replaced "if you are not sure you selected the correct
#. hard disk." with "if you are not sure about your choice", because I'm sure I
-#. saw this help screen when I had only one HD
-#. 2013-05-05 marja added screenshot
+#. saw this help screen when I had only one HD
+#. 2013-05-05 marja added screenshot
#. type: Content of: <section><mediaobject>
#: en/takeOverHdConfirm.xml:19
msgid ""
@@ -5237,6 +5189,133 @@ msgstr ""
"λίγο, είναι κανονικό."
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
+#~ "\"mediaobject\" id=\"1\"/>"
+#~ msgstr ""
+#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
+#~ "\"mediaobject\" id=\"1\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png"
+#~ "\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png"
+#~ "\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Different media for architecture 32 or 64 bits."
+#~ msgstr "Διαφορετικά μέσα για αρχιτεκτονική 32 ή 64 bit."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+#~ "setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+#~ "setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
#~ "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."
@@ -5436,19 +5515,6 @@ msgstr ""
#~ "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 ""
#~ "If you prefer different bootloader settings to those chosen automatically "
#~ "by the installer, you can change them here."
#~ msgstr ""
diff --git a/docs/installer/en/SelectAndUseISOs2.xml b/docs/installer/en/SelectAndUseISOs2.xml
index dca3b62f..18ea8d5d 100644
--- a/docs/installer/en/SelectAndUseISOs2.xml
+++ b/docs/installer/en/SelectAndUseISOs2.xml
@@ -1,20 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="Select-and-use-ISOs">
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:id="Select-and-use-ISOs">
<!-- Made by Lebarhon 2014 03 26
Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
-
<info>
<title xml:id="Select-and-use-ISOs-ti1">Select and use ISOs</title>
</info>
-
<section>
<title>Introduction</title>
-
<para>Mageia is distributed via ISO images. This page will help you to
choose which image match your needs.</para>
-
<para>There is two families of media:</para>
-
<itemizedlist>
<listitem>
<para>Classical installer: After booting the media, it will follow a
@@ -23,7 +18,6 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
installation, in particular to choose which Desktop Environment you
will install.</para>
</listitem>
-
<listitem>
<para>LIVE media: you can boot the media in a real Mageia system
without installing it, to see what you will get after installation.
@@ -31,60 +25,46 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
choices.</para>
</listitem>
</itemizedlist>
-
<para>Details are given in the next sections.</para>
</section>
-
<section>
<title>Media</title>
-
<section>
<title>Definition</title>
-
<para>Here, a medium (plural: media) is an ISO image file that allows
you to install and/or update Mageia and by extension any physical
support the ISO file is copied to.</para>
-
<para>You can find them <link ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
</section>
-
<section>
<title>Classical installation media</title>
-
<section>
<title>Common features</title>
-
<itemizedlist>
<listitem>
<para>These ISOs use the traditional installer called
drakx.</para>
</listitem>
-
<listitem>
<para>They are able to make a clean install or an update from
previous releases.</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>DVD</title>
-
<itemizedlist>
<listitem>
- <para>Different media for architecture 32 or 64 bits.</para>
+ <para>Different media for 32 or 64 bit architectures.</para>
</listitem>
-
<listitem>
<para>Some tools are available in the Welcome screen: Rescue
System, Memory Test, Hardware Detection Tool.</para>
</listitem>
-
<listitem>
<para>Each DVD contains many available desktop environments and
languages.</para>
</listitem>
-
<listitem>
<para>You'll be given the choice during the installation to add
non free software.</para>
@@ -92,101 +72,79 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
</itemizedlist>
</section>
</section>
-
<section>
<title>Live media</title>
-
<section>
<title>Common features</title>
-
<itemizedlist>
<listitem>
<para>Can be used to preview the distribution without installing
it on a HDD, and optionally install Mageia on to your HDD.</para>
</listitem>
-
<listitem>
<para>Each ISO contains only one desktop environment (KDE, GNOME
or Xfce).</para>
</listitem>
-
<listitem>
<para>Different media for 32 or 64 bit architectures.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Live ISOs can only be used to create
clean installations, they cannot be used to upgrade from previous
releases.</emphasis></para>
</listitem>
-
<listitem>
<para>They contain non free software.</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>Live DVD Plasma</title>
-
<itemizedlist>
<listitem>
<para>Plasma desktop environment only.</para>
</listitem>
-
<listitem>
<para>All languages are present.</para>
</listitem>
-
<listitem>
<para>Different media for 32 or 64 bit architectures.</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>Live DVD GNOME</title>
-
<itemizedlist>
<listitem>
<para>GNOME desktop environment only.</para>
</listitem>
-
<listitem>
<para>All languages are present.</para>
</listitem>
-
<listitem>
<para>Different media for 32 or 64 bit architectures.</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>Live DVD Xfce</title>
-
<itemizedlist>
<listitem>
<para>Xfce desktop environment only.</para>
</listitem>
-
<listitem>
<para>All languages are present.</para>
</listitem>
-
<listitem>
<para>Different media for 32 or 64 bit architectures.</para>
</listitem>
</itemizedlist>
</section>
</section>
-
<section>
<title>Boot-only CD media</title>
-
<section>
<title>Common features</title>
-
<itemizedlist>
<listitem>
<para>Each one is a small image that contains no more than that
@@ -196,27 +154,22 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
hard disk, on a local drive, on a local network or on the
Internet.</para>
</listitem>
-
<listitem>
<para>These media are very light (less than 100 MB) and are
convenient when bandwidth is too low to download a full DVD, a PC
without a DVD drive or a PC that can't boot from a USB
stick.</para>
</listitem>
-
<listitem>
<para>Different media for 32 or 64 bit architectures.</para>
</listitem>
-
<listitem>
<para>English language only.</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>netinstall.iso</title>
-
<itemizedlist>
<listitem>
<para>Contains only free software, for those people who refuse to
@@ -224,10 +177,8 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
</listitem>
</itemizedlist>
</section>
-
<section>
<title>netinstall-nonfree.iso</title>
-
<itemizedlist>
<listitem>
<para>Contains non-free software (mostly drivers, codecs...) for
@@ -237,165 +188,114 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
</section>
</section>
</section>
-
<section>
<title>Downloading and Checking Media</title>
-
<section>
<title>Downloading</title>
-
<para>Once you have chosen your ISO file, you can download it using
either http or BitTorrent. In both cases, a window gives you some
information, such as the mirror in use and the possibility to change if
the bandwidth is to low. If http is chosen, you may also see something
like</para>
-
<mediaobject>
<imageobject>
<imagedata fileref="Checking.png"/>
</imageobject>
</mediaobject>
-
<para>md5sum and sha1sum are tools to check the ISO integrity. Use only
one of them. Keep one of them <link linkend="integrity">for further
usage</link>. Then this window appears:</para>
-
<mediaobject>
<imageobject>
<imagedata fileref="Download.png"/>
</imageobject>
</mediaobject>
-
<para>Check the radio button Save File.</para>
</section>
-
<section>
<title xml:id="integrity">Checking the downloaded media
integrity</title>
-
- <para>Both checksums are hexadecimal numbers calculated by an algorithm
- from the file to be downloaded. When you ask these algorithms to
- recalculate this number from your downloaded file, either you have the
- same number and your downloaded file is correct, or the number is
- different and you have a failure. A failure infers that you should retry
- the download.</para>
-
+ <para>Both checksums are hexadecimal numbers calculated by an algorithm from the file to be downloaded. When you ask these algorithms to recalculate this number from your downloaded file, either you have the same number and your downloaded file is correct, or the number is different and you have a failure. A failure infers that you should retry the download or attempt a repair using BitTorrent.</para>
<para>Open a console, no need to be root, and:</para>
-
<para>- To use md5sum, type: [sam@localhost]$ <userinput>md5sum
path/to/the/image/file.iso</userinput>.</para>
-
<para>- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum
path/to/the/image/file.iso</userinput>.</para>
-
<para>and compare the obtained number on your computer (you may have to
wait for a while) with the number given by Mageia. Example:</para>
-
<mediaobject>
<imageobject>
<imagedata fileref="../Md5sum.png"/>
</imageobject>
</mediaobject>
-
<para/>
</section>
</section>
-
<section>
<title>Burn or dump the ISO</title>
-
- <para>The checked ISO can now be burned to a CD or DVD or dumped to a USB
- stick. These operations are not a simple copy and aim to make a boot-able
- medium.</para>
-
+ <para>The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. These operations are not a simple copy and aim to make a bootable medium.</para>
<section>
<title>Burning the ISO to a CD/DVD</title>
-
<para>Use whatever burner you wish but ensure the burning device is set
correctly to <emphasis role="bold">burn an image</emphasis>, burn data
or files is not correct. There is more information in <link ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the
Mageia wiki</link>.</para>
</section>
-
<section>
<title>Dump the ISO to a USB stick</title>
-
<para>All Mageia ISOs are hybrids, which means you can 'dump' them to a
USB stick and then use it to boot and install the system.</para>
-
<warning>
- <para>"dumping" an image onto a flash device destroys any previous
- file-system on the device; any other data will be lost and the
- partition capacity will be reduced to the image size.</para>
+ <para>"Dumping" an image onto a flash device destroys any previous file-system on the device; any other data will be lost and the partition capacity will be reduced to the image size.</para>
</warning>
-
<para>To recover the original capacity, you must redo partitioning and
re-format the USB stick.</para>
-
<section>
<title>Using a graphical tool within Mageia</title>
-
<para>You can use a graphical tool like <link ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks">IsoDumper</link></para>
</section>
-
<section>
<title>Using a graphical tool within Windows</title>
-
<para>You could try:</para>
-
<para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
"ISO image" option;</para>
-
<para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
Imager</link></para>
</section>
-
<section>
<title>Using Command line within a GNU/Linux system</title>
-
<warning>
<para>It is potentially *dangerous* to do this by hand. You risk to
overwrite a disc partition if you get the device-ID wrong.</para>
</warning>
-
<para>You can also use the dd tool in a console:</para>
-
<orderedlist>
<listitem>
<para>Open a console</para>
</listitem>
-
<listitem>
<para>Become root with the command <userinput>su -</userinput>
(don't forget the final '-' )</para>
-
<mediaobject>
<imageobject>
<imagedata fileref="../Root.png"/>
</imageobject>
</mediaobject>
</listitem>
-
<listitem>
- <para>Plug your USB stick (do not mount it, this also means do not
- open any application or file manager that could access or read
- it)</para>
+ <para>Plug in your USB stick (do not mount it, this also means do not open any application or file manager that could access or read it)</para>
</listitem>
-
<listitem>
<para>Enter the command <userinput>fdisk -l</userinput></para>
-
<mediaobject>
<imageobject>
<imagedata fileref="../Fdisk.png"/>
</imageobject>
</mediaobject>
-
<para>Alternatively, you can get the device name with the command
<code>dmesg</code>: at end, you see the device name starting with
<emphasis>sd</emphasis>, and <emphasis>sdd</emphasis> in this
case:</para>
-
<screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
@@ -415,28 +315,22 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
[72595.967251] <emphasis>sdd</emphasis>: sdd1
[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen>
</listitem>
-
<listitem>
<para>Find the device name for your USB stick (by its size), for
example <code>/dev/sdb</code> in the screenshot above, it is a 8GB
USB stick.</para>
</listitem>
-
<listitem>
<para>Enter the command: # <userinput>dd if=path/to/the/ISO/file
of=/dev/sdX bs=1M</userinput></para>
-
<para>Where X=your device name eg: /dev/sdc</para>
-
<para>Example: # <userinput>dd
if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/dev/sdb
bs=1M</userinput></para>
</listitem>
-
<listitem>
<para>Enter the command: # <userinput>sync</userinput></para>
</listitem>
-
<listitem>
<para>Unplug your USB stick, it is done</para>
</listitem>
diff --git a/docs/installer/en/addUser.xml b/docs/installer/en/addUser.xml
index 680847ba..eb20c08e 100644
--- a/docs/installer/en/addUser.xml
+++ b/docs/installer/en/addUser.xml
@@ -1,26 +1,21 @@
-<?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:id="addUser">
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:id="addUser">
<info>
<title xml:id="addUser-ti1">User and Superuser Management</title>
</info>
-
<!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-
<mediaobject>
<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>
<title xml:id="root-password-ti2">Set Administrator (root)
Password:</title>
</info>
-
<para>It is advisable for all <application>Mageia</application>
installations to set a superuser or administrator's password, usually
called the <emphasis>root password</emphasis> in Linux. As you type a
@@ -29,84 +24,63 @@
shows you are using a strong password. You need to repeat the same
password in the box just below the first password box, this checks that
you have not mistyped the first password by comparing them.</para>
-
<note xml:id="givePassword">
<para>All passwords are case sensitive, it is best to use a mixture of
letters (upper and lower case), numbers and other characters in a
password.</para>
</note>
</section>
-
<section xml:id="enterUser">
<info>
<title xml:id="enterUser-ti3">Enter a user</title>
</info>
-
- <para>Add a user here. A user has fewer rights than the superuser (root),
- but enough to surf the internet, use office applications or play games and
- anything else the average user does with his computer</para>
-
+ <para>Add a user here. A user has fewer rights than the superuser (root), but enough to use the internet, office applications or play games and anything else the average user does with his computer</para>
<itemizedlist>
<listitem>
- <para><guibutton>Icon</guibutton>: if you click on this button it will
- change the users icon.</para>
+ <para><guibutton>Icon</guibutton>: if you click on this button it will change the user's icon.</para>
</listitem>
-
<listitem>
- <para><guilabel>Real Name</guilabel>: Insert the users real name into
- this text box.</para>
+ <para><guilabel>Real Name</guilabel>: Insert the user's real name into this text box.</para>
</listitem>
-
<listitem>
- <para><guilabel>Login Name</guilabel>: Here you enter the user login
- name or let drakx use a version of the users real name. <emphasis>The
+ <para><guilabel>Login Name</guilabel>: Here you enter the user login name or let drakx use a version of the user's real name. <emphasis>The
login name is case sensitive.</emphasis></para>
</listitem>
-
<listitem>
<para><guilabel>Password</guilabel>: In this text box you should type
in the user password. There is a shield at the end of the text box
that indicates the strength of the password. (See also <xref linkend="givePassword"/>)</para>
</listitem>
-
<listitem>
<para><guilabel>Password (again)</guilabel>: Retype the user password
into this text box and drakx will check you have the same password in
each of the user password text boxes.</para>
</listitem>
</itemizedlist>
-
<note>
<para>Any user you add while installing Mageia, will have a both read
and write protected home directory (umask=0027).</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>The access permissions can also be changed after the
install.</para>
</note>
</section>
-
<section xml:id="addUserAdvanced" condition="classical">
<info>
<title xml:id="addUserAdvanced-ti3">Advanced User Management</title>
</info>
-
<para>If the <guibutton>advanced</guibutton> button is clicked you are
offered a screen that allows you to edit the settings for the user you are
adding.</para>
-
<para condition="classical">Additionally, you can disable or enable a
guest account.</para>
-
<warning condition="classical">
<para>Anything a guest with a default <emphasis>rbash</emphasis> guest
account saves to his /home directory will be erased when he logs out.
The guest should save his important files to a USB key.</para>
</warning>
-
<itemizedlist>
<listitem condition="classical">
<para><guilabel>Enable guest account</guilabel>: Here you can enable
@@ -114,19 +88,16 @@
into and use the PC, but he has more restricted access than normal
users.</para>
</listitem>
-
<listitem>
<para><guilabel>Shell</guilabel>: This drop down list allows you to
change the shell used by the user you are adding in the previous
screen, options are Bash, Dash and Sh</para>
</listitem>
-
<listitem>
<para><guilabel>User ID</guilabel>: Here you can set the user ID for
the user you are adding in the previous screen. This is a number.
Leave it blank unless you know what you are doing.</para>
</listitem>
-
<listitem>
<para><guilabel>Group ID</guilabel>: This lets you set the group ID.
Also a number, usually the same one as for the user. Leave it blank
diff --git a/docs/installer/en/diskdrake.xml b/docs/installer/en/diskdrake.xml
index a4eb1a53..71f78be6 100644
--- a/docs/installer/en/diskdrake.xml
+++ b/docs/installer/en/diskdrake.xml
@@ -54,12 +54,11 @@ Lebarhon 20170902 added SC-->
below)</para>
<para><mediaobject>
- <imageobject>
- <imagedata fileref="dx2-diskdrake2.png"/>
+ <imageobject condition="classical">
+ <imagedata fileref="dx2-diskdrake2.png" align="center"/>
</imageobject>
- </mediaobject><mediaobject>
- <imageobject>
- <imagedata fileref="live-diskdrake2.png"/>
+ <imageobject condition="live">
+ <imagedata fileref="live-diskdrake2.png" align="center"/>
</imageobject>
</mediaobject></para>
</note>
@@ -69,12 +68,12 @@ Lebarhon 20170902 added SC-->
BIOS boot partition is present with a correct type</para>
<mediaobject>
- <imageobject>
- <imagedata fileref="dx2-doPartitionDisks3.png"/>
+ <imageobject condition="classical">
+ <imagedata fileref="dx2-doPartitionDisks3.png" align="center"/>
</imageobject>
- <imageobject>
- <imagedata fileref="live-doPartitionDisks3.png"/>
+ <imageobject condition="live">
+ <imagedata fileref="live-doPartitionDisks3.png" align="center"/>
</imageobject>
</mediaobject>
</note>
diff --git a/docs/installer/en/doPartitionDisks.xml b/docs/installer/en/doPartitionDisks.xml
index aead94ea..8bfd8903 100644
--- a/docs/installer/en/doPartitionDisks.xml
+++ b/docs/installer/en/doPartitionDisks.xml
@@ -19,14 +19,12 @@ lebarhon 20170209 added SC-->
and content.</para>
<mediaobject>
- <imageobject>
+ <imageobject condition="classical">
<imagedata fileref="dx2-doPartitionDisks.png" align="center"/>
</imageobject>
- </mediaobject>
- <mediaobject>
- <imageobject>
- <imagedata fileref="live-doPartitionDisks.png"/>
+ <imageobject condition="live">
+ <imagedata fileref="live-doPartitionDisks.png" align="center"/>
</imageobject>
</mediaobject>
@@ -76,14 +74,12 @@ lebarhon 20170209 added SC-->
partitions. See the screen-shot below.</para>
<mediaobject>
- <imageobject>
- <imagedata fileref="dx2-doPartitionDisks2.png"/>
+ <imageobject condition="classical">
+ <imagedata fileref="dx2-doPartitionDisks2.png" align="center"/>
</imageobject>
- </mediaobject>
-
- <mediaobject>
- <imageobject>
- <imagedata fileref="live-doPartitionDisks2.png"/>
+
+ <imageobject condition="live">
+ <imagedata fileref="live-doPartitionDisks2.png" align="center"/>
</imageobject>
</mediaobject>
</listitem>
@@ -166,13 +162,11 @@ lebarhon 20170209 added SC-->
filesystem type.</para>
<mediaobject>
- <imageobject>
- <imagedata fileref="dx2-doPartitionDisks3.png"/>
+ <imageobject condition="classical">
+ <imagedata fileref="dx2-doPartitionDisks3.png" align="center"/>
</imageobject>
- </mediaobject>
-
- <mediaobject>
- <imageobject>
+
+ <imageobject condition="live">
<imagedata fileref="live-doPartitionDisks3.png"/>
</imageobject>
</mediaobject>
diff --git a/docs/installer/en/reboot.xml b/docs/installer/en/reboot.xml
index a0241fc5..ba527d96 100644
--- a/docs/installer/en/reboot.xml
+++ b/docs/installer/en/reboot.xml
@@ -1,26 +1,18 @@
-<?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:id="reboot">
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:id="reboot">
<info>
<title xml:id="reboot-ti1">Reboot</title>
</info>
-
-<!--Lebarhon 20170210 updated for Mageia6-->
-
-
+ <!--Lebarhon 20170210 updated for Mageia6-->
<para>Once the bootloader has been installed, you will be prompted to halt
your computer, remove the live CD and restart the computer, click on
<emphasis role="bold"><guibutton>Finish</guibutton></emphasis> and act as
asked<emphasis role="bold"> in this order!</emphasis></para>
-
<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>
-
+ <para>When you restart, you will see a succession of download progress bars. These indicate that the software media lists are being downloaded (see Software management).</para>
<mediaobject condition="live">
<imageobject>
<imagedata format="PNG" xml:id="reboot-im1" fileref="live-reboot.png" align="center" revision="1"/>
diff --git a/docs/installer/en/setupBootloader.xml b/docs/installer/en/setupBootloader.xml
index 6c57ff2c..edfe1115 100644
--- a/docs/installer/en/setupBootloader.xml
+++ b/docs/installer/en/setupBootloader.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/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:id="setupBootloader">
+<?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:id="setupBootloader">
<!---->
<!--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
@@ -33,19 +33,17 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<title>Grub2 on Legacy/MBR and Legacy/GPT systems</title>
<mediaobject>
- <imageobject>
- <imagedata fileref="dx2-setupBootloader.png"/>
+ <imageobject condition="classical">
+ <imagedata fileref="dx2-setupBootloader.png" align="center"/>
</imageobject>
- </mediaobject>
-
- <mediaobject>
- <imageobject>
+
+ <imageobject condition="live">
<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>
+ <para>Don't modify the "Boot Device" unless you really know what you are
+ doing.</para>
</section>
<section>
@@ -55,28 +53,25 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
you cannot choose between with or without graphical menu</para>
<mediaobject>
- <imageobject>
- <imagedata fileref="dx2-setupBootloader2.png"/>
+ <imageobject condition="classical">
+ <imagedata fileref="dx2-setupBootloader2.png" align="center"/>
</imageobject>
- </mediaobject>
-
- <mediaobject>
- <imageobject>
+
+ <imageobject condition="live">
<imagedata fileref="live-setupBootloader2.png"/>
</imageobject>
</mediaobject>
- <para>If Mageia is the first system installed on your computer, the
+ <para>If Mageia is the only 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>Don't modify the "Boot Device" unless really knowing what you
- do.</para>
+ bootloader (Grub2-efi). If there are already UEFI operating systems
+ installed on your computer (Windows 8 for example), the Mageia installer
+ detects the existing ESP created by Windows and adds grub2-efi. Although
+ it is possible to have several ESPs, only one is advised and enough
+ whatever the number of operating systems you have.</para>
+
+ <para>Don't modify the "Boot Device" unless you really know what you are
+ doing.</para>
</section>
</section>
@@ -102,14 +97,12 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<guilabel>Probe Foreign OS</guilabel></para>
<mediaobject>
- <imageobject>
- <imagedata fileref="dx2-setupBootloader3.png"/>
+ <imageobject condition="classical">
+ <imagedata fileref="dx2-setupBootloader3.png" align="center"/>
</imageobject>
- </mediaobject>
-
- <mediaobject>
- <imageobject>
- <imagedata fileref="live-setupBootloader3.png"/>
+
+ <imageobject condition="live">
+ <imagedata fileref="live-setupBootloader3.png" align="center"/>
</imageobject>
</mediaobject>
</section>
@@ -125,27 +118,25 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
</section>
<section>
- <title xml:id="setupChainLoading">Using the chain loading</title>
+ <title xml:id="setupChainLoading">Using chain loading</title>
- <para>If you don't want a bootable Mageia, but chain load it from another
- OS, click on <guibutton>Next</guibutton>, then on
+ <para>If you don't want a bootable Mageia, but to chain load it from
+ another OS, click on <guibutton>Next</guibutton>, then on
<guibutton>Advanced</guibutton> and Check the box <guilabel>Do not touch
ESP or MBR</guilabel>.</para>
<mediaobject>
- <imageobject>
- <imagedata fileref="dx2-setupBootloader4.png"/>
+ <imageobject condition="classical">
+ <imagedata fileref="dx2-setupBootloader4.png" align="center"/>
</imageobject>
- </mediaobject>
-
- <mediaobject>
- <imageobject>
- <imagedata fileref="live-setupBootloader4.png"/>
+
+ <imageobject condition="live">
+ <imagedata fileref="live-setupBootloader4.png" align="center"/>
</imageobject>
</mediaobject>
- <para>You will get a warning that the bootloader will lack, ignore it by a
- click on <guibutton>OK</guibutton>.</para>
+ <para>You will get a warning that the bootloader is missing, ignore it by
+ clicking <guibutton>OK</guibutton>.</para>
<mediaobject>
<imageobject>
@@ -192,10 +183,10 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<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>
+ this was the method used before APM. Unchecking it could be
+ useful if, for example, your computer does not support ACPI or
+ if you think the ACPI implementation might cause some problems
+ (for instance random reboots or system lockups).</para>
</listitem>
<listitem>
@@ -214,7 +205,7 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<listitem>
<para><guilabel>Enable Local APIC</guilabel>: Here you can set
- local APIC, which manage all external interrupts for some
+ local APIC, which manages all external interrupts for a
specific processor in an SMP system.</para>
</listitem>
</itemizedlist>
@@ -238,7 +229,8 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
</listitem>
<listitem>
- <para><guilabel>Probe foreign OS</guilabel>: see above <link linkend="setupMageiaBootloader">Using a Mageia bootloader</link></para>
+ <para><guilabel>Probe foreign OS</guilabel>: see above <link linkend="setupMageiaBootloader">Using a Mageia
+ bootloader</link></para>
</listitem>
<listitem>
diff --git a/docs/installer/eo.po b/docs/installer/eo.po
index 2abafc9e..ea5b16ef 100644
--- a/docs/installer/eo.po
+++ b/docs/installer/eo.po
@@ -9,7 +9,7 @@ msgid ""
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"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
"PO-Revision-Date: 2016-07-17 11:38+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -166,7 +166,7 @@ msgstr "Uzula kaj superuzula administrado"
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -180,12 +180,12 @@ msgstr ""
"fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr "Kreo de mastrumanta pasvorto (Set administrator (root) password):"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -205,7 +205,7 @@ msgstr ""
"mistajpis la unuan pasvorton dank'al komparo inter ambaŭ."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
@@ -215,45 +215,45 @@ msgstr ""
"karaktroj en pasvorto."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr "Enigo de uzulo (Enter a user)"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
"Aldonu uzulon ĉi tie. Uzulo havas malpli da rajtoj ol la superuzulo (root), "
"sed sufiĉajn por retumi, utiligi oficej-programojn aŭ ludi komputil-ludojn "
"kaj por io ajn kion la averaĝa uzulo faras perkomputile"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr ""
"<guibutton>Piktogramo</guibutton>: se vi klakas sur ĉi tiu butono vi ŝanĝos "
"la uzulan ikonon."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr ""
"<guilabel>Vera nomo</guilabel>: Metu la uzulan realan nomon en ĉi tiu teksta "
"skatolo."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
"<guilabel>Saluta nomo (login name)</guilabel>: Ĉi tie eniru la uzulan "
"salutan nomon aŭ lasu ke drakx-o utiligu version de la uzula vera nomo. "
@@ -261,7 +261,7 @@ msgstr ""
"emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -272,7 +272,7 @@ msgstr ""
"forton de la pasvorto. (Vidu ankaŭ <xref linkend=\"givePassword\"/>)"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -283,7 +283,7 @@ msgstr ""
"uzulaj pasvortaj teksto-skatoloj."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
#, fuzzy
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
@@ -293,7 +293,7 @@ msgstr ""
"write protected) home directory."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
#, fuzzy
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - Summary</"
@@ -305,17 +305,17 @@ msgstr ""
"during the install. Choose <emphasis>User management</emphasis>."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr "The access permissions can also be changed after the install."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr "Sperta uzulo-administrado"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
@@ -324,12 +324,12 @@ msgstr ""
"ebliganta eldoni la konfiguron de la aldonata uzulo."
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr ""
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -340,7 +340,7 @@ msgstr ""
"gasto devus konservi gravajn dosierojn en USB-ŝlosilo."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -352,7 +352,7 @@ msgstr ""
"normalaj uzuloj."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -363,7 +363,7 @@ msgstr ""
"on, Dash-on kaj Sh-on"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -374,7 +374,7 @@ msgstr ""
"ĝin malplena se vi ne scias kion fari."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -1344,40 +1344,36 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:56
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr ""
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
"partition is present with a correct type"
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
-"> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1411,29 +1407,22 @@ msgstr ""
#: en/doPartitionDisks.xml:22
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr "Uzu ekzistantajn subdiskojn"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
@@ -1442,12 +1431,12 @@ msgstr ""
"kiuj povas esti utiligataj por la instalo."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr "Uzu liberan spacon"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
@@ -1456,12 +1445,12 @@ msgstr ""
"nova Mageja instalo."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr "Uzu la liberan spacon de vindoza subdisko"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
@@ -1470,7 +1459,7 @@ msgstr ""
"povas proponi utiligi ĝin."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"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 "
@@ -1481,7 +1470,7 @@ msgstr ""
"dosieroj antaŭe!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1498,7 +1487,7 @@ msgstr ""
"personaj dosieroj."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1507,43 +1496,37 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
+#: en/doPartitionDisks.xml:77
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr "Forviŝu kaj uzu la tutan diskon."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr "Ĉi tiu elekto utiligos la tutan diskon por Magejo."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr ""
"Atentu! Ĉi tio forigos ĈIUJN datumojn en la elektita fiksita disko. Estu "
"zorgema!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"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 "
@@ -1553,12 +1536,12 @@ msgstr ""
"disko kiujn vi ne volas perdi, ne elektu ĉi tion."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr "Subdiskigo"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
@@ -1567,55 +1550,55 @@ msgstr ""
"fiksita(j) disko(j)."
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are created"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid ""
"6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
msgstr ""
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on /"
@@ -1624,7 +1607,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"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 "
@@ -1634,29 +1617,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.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>"
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
-#, fuzzy
-msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
@@ -1664,7 +1640,7 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
@@ -1683,17 +1659,17 @@ msgstr ""
"settings:"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr "\"Align to\" \"MiB\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr "\"Free space preceding (MiB)\" \"2\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid ""
"Also make sure all partitions are created with an even number of megabytes."
msgstr ""
@@ -1982,11 +1958,6 @@ msgid ""
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
msgstr ""
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr ""
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -2893,7 +2864,7 @@ msgid "Reboot"
msgstr ""
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
"computer, remove the live CD and restart the computer, click on <emphasis "
@@ -2902,22 +2873,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
#, fuzzy
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr ""
"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
@@ -2985,29 +2956,29 @@ msgstr ""
"<guilabel>Sekureco</guilabel> en la Mageja Kontrolilo."
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target system. "
@@ -3016,7 +2987,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -3024,22 +2995,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
@@ -3047,88 +3018,83 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
"\">here</link>."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78
+#: en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid ""
"They are able to make a clean install or an update from previous releases."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr "DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid ""
"You'll be given the choice during the installation to add non free software."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous releases.</"
@@ -3136,53 +3102,53 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
msgid "Live DVD Plasma"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
msgid "Plasma desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
-#: en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122
+#: en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
msgid "Live DVD Xfce"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
msgid "Xfce desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -3191,7 +3157,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -3199,47 +3165,47 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
#, fuzzy
msgid "netinstall.iso"
msgstr "La instal-paŝoj"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
msgid "netinstall-nonfree.iso"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -3248,12 +3214,12 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
@@ -3261,80 +3227,81 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
"file.iso</userinput>."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
"image/file.iso</userinput>."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a boot-able medium."
+"These operations are not a simple copy and aim to make a bootable medium."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -3343,121 +3310,121 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
msgstr ""
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr ""
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command <code>dmesg</"
"code>: at end, you see the device name starting with <emphasis>sd</"
@@ -3465,7 +3432,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3489,38 +3456,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example <code>/"
"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
"dev/sdb bs=1M</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr ""
@@ -3986,94 +3953,84 @@ msgstr ""
#: en/setupBootloader.xml:36
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"></imagedata> </imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
"setupBootloader.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"></imagedata> </imageobject>"
+"<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>"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid ""
+"Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
msgid "Grub2-efi on UEFI systems"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
"choose between with or without graphical menu"
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-doPartitionDisks.png\" align=\"center"
-"\"></imagedata> </imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:64
+#: en/setupBootloader.xml:56
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only 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 "
+"If there are already UEFI operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer detects the existing ESP "
+"created by Windows and adds grub2-efi. Although it is possible to have "
"several ESPs, only one is advised and enough whatever the number of "
"operating systems you have."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr "Uzi la lanĉilon de Magejo"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
msgid ""
"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, "
@@ -4082,32 +4039,25 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:100
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"></imagedata> </imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr "Uzi ekzistantan lanĉilon"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
msgid ""
"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 "
@@ -4121,47 +4071,40 @@ msgstr ""
"ĝin aŭtomate. Vidu la dokumentaron por la konkreta operacia sistemo."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:136
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"></imagedata> </imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:129
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
@@ -4171,17 +4114,17 @@ msgstr ""
"\"></imagedata> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
msgid "Options"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<guilabel>Delay before booting the default image</guilabel>: This text box "
"lets you set a delay in seconds before the default operating system is "
@@ -4189,7 +4132,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: en/setupBootloader.xml:162
msgid ""
"<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 "
@@ -4197,14 +4140,14 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
msgid ""
"<guilabel>Password</guilabel>: This text box is where you actually put the "
"password"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:182
+#: en/setupBootloader.xml:173
#, fuzzy
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
@@ -4215,31 +4158,31 @@ msgstr ""
"uzulaj pasvortaj teksto-skatoloj."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
#, fuzzy
msgid "<guilabel>Advanced</guilabel>"
msgstr "<guilabel>Servoj</guilabel>:"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
msgid ""
"<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)."
+"stopping unused devices, this was the method used before APM. Unchecking it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:208
+#: en/setupBootloader.xml:199
msgid ""
"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
"operating system access to the Advanced Programmable Interrupt Controller. "
@@ -4248,38 +4191,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:232
msgid ""
"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:247
+#: en/setupBootloader.xml:239
msgid ""
"<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 "
@@ -4287,7 +4230,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -4634,6 +4577,138 @@ msgid ""
msgstr ""
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, 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>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"></imagedata> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+#~ "setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"></imagedata> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"></imagedata> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"></imagedata> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"></imagedata> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"></imagedata> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"></imagedata> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"></imagedata> </imageobject>"
+
+#~ msgid ""
#~ "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."
@@ -4721,19 +4796,6 @@ msgstr ""
#~ "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 ""
#~ "If you prefer different bootloader settings to those chosen automatically "
#~ "by the installer, you can change them here."
#~ msgstr ""
diff --git a/docs/installer/es.po b/docs/installer/es.po
index f0e1a944..9a334911 100644
--- a/docs/installer/es.po
+++ b/docs/installer/es.po
@@ -23,7 +23,7 @@ msgid ""
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"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
"PO-Revision-Date: 2017-01-13 14:09+0000\n"
"Last-Translator: Jose Manuel López <joselp@outlook.es>\n"
"Language-Team: Spanish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -200,7 +200,7 @@ msgstr "Administración de usuarios y del administrador"
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -214,12 +214,12 @@ msgstr ""
"fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr "Establezca la Contraseña del Administrador (root)"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -240,7 +240,7 @@ msgstr ""
"ningún error en la primera contraseña,comparándolas."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
@@ -250,16 +250,16 @@ msgstr ""
"minúsculas), números y otros símbolos."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr "Introduzca un usuario"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
"Aquí puede añadir un usuario. Un usuario tiene menos permisos que el "
"administrador, pero suficientes para navegar en Internet, usar aplicaciones "
@@ -267,29 +267,29 @@ msgstr ""
"ordenador."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr ""
"<guibutton>Icono</guibutton>: Si hace click en este botón cambiará el icono "
"del usuario."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr ""
"<guilabel>Nombre y Apellidos</guilabel>: Introduzca el nombre real del "
"usuario en este recuadro."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
"<guilabel>Nombre de conexión</guilabel>: Aquí puede introducir el nombre de "
"conexión del usuario o dejar a Drakx que cree un nombre de usuario a partir "
@@ -297,7 +297,7 @@ msgstr ""
"las mayúsculas.</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -308,7 +308,7 @@ msgstr ""
"la fortaleza de la contraseña. (Vea también <xref linkend=\"givePassword\"/>)"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -319,7 +319,7 @@ msgstr ""
"recuadro anterior."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
#, fuzzy
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
@@ -329,7 +329,7 @@ msgstr ""
"home legible por todos (pero protegido contra escritura)."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
#, fuzzy
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - Summary</"
@@ -341,17 +341,17 @@ msgstr ""
"la instalación. Elija <emphasis>Administrar usuarios</emphasis>."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr "Los permisos de acceso se pueden cambiar también tras la instalación."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr "Administración Avanzada de Usuarios"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
@@ -360,12 +360,12 @@ msgstr ""
"permite editar la configuración del usuario que está añadiendo. "
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr "Adicionalmente, puede activar o desactivar una cuenta de invitado."
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -376,7 +376,7 @@ msgstr ""
"debe de guardar sus archivos importantes en una unidad USB."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -388,7 +388,7 @@ msgstr ""
"que los usuarios normales."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -398,7 +398,7 @@ msgstr ""
"el usuario que está añadiendo. Las opciones son Bash, Dash y Sh."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -409,7 +409,7 @@ msgstr ""
"salvo que sepa lo que está haciendo."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -1476,29 +1476,23 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </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><note><para>
-#: en/diskdrake.xml:56
-#, fuzzy
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
#, fuzzy
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
@@ -1509,16 +1503,17 @@ msgstr ""
"EFI (ver más arriba)"
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
#, 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>"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.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>"
#. type: Content of: <section><info><title>
#: en/doPartitionDisks.xml:9
@@ -1549,29 +1544,22 @@ msgstr ""
#: en/doPartitionDisks.xml:22
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr "Usar la partición existente"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
@@ -1580,12 +1568,12 @@ msgstr ""
"compatibles con Linux que pueden ser usadas para la instalación."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr "Usar el espacio libre"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
@@ -1594,12 +1582,12 @@ msgstr ""
"nueva instalación de Mageia."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr "Usar espacio libre en una partición de Windows"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
@@ -1608,7 +1596,7 @@ msgstr ""
"puede ofrecer usarlo."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"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 "
@@ -1619,7 +1607,7 @@ msgstr ""
"de seguridad de todos sus archivos importantes!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1637,7 +1625,7 @@ msgstr ""
"de sus archivos personales."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1651,43 +1639,37 @@ msgstr ""
"imagen siguiente."
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
+#: en/doPartitionDisks.xml:77
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr "Borrar y usar el disco entero"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr "Esta opción usará el disco completo para Mageia."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr ""
"¡Aviso! Esto borrara TODA la información en el disco duro seleccionado. "
"¡Tenga cuidado!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"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 "
@@ -1697,12 +1679,12 @@ msgstr ""
"en la unidad que no quiere perder, no use esta opción."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr "Particionamiento personalizado"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
@@ -1711,12 +1693,12 @@ msgstr ""
"en su(s) disco(s) duro(s)."
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr "<emphasis role=\"bold\">Tamaño de las particiones:</emphasis>"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
@@ -1725,7 +1707,7 @@ msgstr ""
"reglas:"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
@@ -1734,7 +1716,7 @@ msgstr ""
"partición para /, y no hay una partición separada para /home."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are created"
msgstr ""
@@ -1742,23 +1724,23 @@ msgstr ""
"particiones"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid ""
"6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr "6/19 del espacio total disponible se asigna a / con un máximo de 50 GB"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr "1/19 se asigna a swap con un máximo de 4 GB"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr "el resto (por lo menos 12/19) se asigna a /home"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1767,7 +1749,7 @@ msgstr ""
"creará tres particiones: 50 GB para /, 4 GB para swap y el resto para /home"
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on /"
@@ -1780,7 +1762,7 @@ msgstr ""
"hizo correctamente."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"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 "
@@ -1790,29 +1772,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><note><mediaobject>
#: en/doPartitionDisks.xml:175
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
-#, fuzzy
-msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
@@ -1820,7 +1795,7 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
@@ -1839,17 +1814,17 @@ msgstr ""
"siguientes configuraciones:"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr "\"Alinear a\" \"MiB\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr "\"Espacio libre que precede a (MiB)\" \"2\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid ""
"Also make sure all partitions are created with an even number of megabytes."
msgstr ""
@@ -2146,11 +2121,6 @@ msgstr ""
"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -3161,7 +3131,7 @@ msgid "Reboot"
msgstr "Reiniciar"
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
#, fuzzy
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
@@ -3176,18 +3146,18 @@ msgstr ""
"software)."
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
#, fuzzy
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr ""
"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
#, fuzzy
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
"Una vez el cargador de arranque se ha instalado, se le pedirá que detenga su "
@@ -3197,7 +3167,7 @@ msgstr ""
"software)."
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
@@ -3266,17 +3236,17 @@ msgstr ""
"Mageia."
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr "Seleccione y use una ISO"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr "Introducción"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
@@ -3285,12 +3255,12 @@ msgstr ""
"que imagen se ajusta a sus necesidades."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr "Hay dos familias de medios:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target system. "
@@ -3303,7 +3273,7 @@ msgstr ""
"escritorio quiere instalar."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -3314,22 +3284,22 @@ msgstr ""
"instalación es más sencillo, pero tiene menos opciones."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr "En las siguientes secciones se dan los detalles."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr "Medio"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr "Definicion"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
@@ -3340,7 +3310,7 @@ msgstr ""
"archivo ISO sea copiado."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
"\">here</link>."
@@ -3349,23 +3319,23 @@ msgstr ""
"\">aquí</link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr "Medio de instalación clásico."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78
+#: en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr "Caracterśticas comunes."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr "Estas ISOs utilizan el instalador tradicional llamado drakx."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid ""
"They are able to make a clean install or an update from previous releases."
msgstr ""
@@ -3373,17 +3343,19 @@ msgstr ""
"lanzamientos previos."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr "DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
msgstr "Medios diferentes para arquitecturas de 32 o 64 bits."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
@@ -3392,13 +3364,13 @@ msgstr ""
"de Rescate, Prueba de Memoria, Herramienta de Detección de Hardware."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr ""
"Cada DVD contiene todos los entornos de escritorio y lenguajes disponibles."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid ""
"You'll be given the choice during the installation to add non free software."
msgstr ""
@@ -3406,12 +3378,12 @@ msgstr ""
"libre."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr "Medio Live"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
@@ -3421,20 +3393,13 @@ msgstr ""
"disco rígido."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
#, fuzzy
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr "El ISO solo contiene un entorno de escritorio (KDE o GNOME)"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr "Medios diferentes para arquitecturas de 32 o 64 bits."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous releases.</"
@@ -3445,57 +3410,57 @@ msgstr ""
"versiones previas.</emphasis>"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr "Ellos contienen software no libre."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
#, fuzzy
msgid "Live DVD Plasma"
msgstr "Live DVD KDE"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
#, fuzzy
msgid "Plasma desktop environment only."
msgstr "Sólo entorno de escritorio KDE."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
-#: en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122
+#: en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr "Todos los idiomas presentes."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr "Live DVD GNOME"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr "Sólo entorno de escritorio GNOME."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
#, fuzzy
msgid "Live DVD Xfce"
msgstr "Live DVD KDE"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
#, fuzzy
msgid "Xfce desktop environment only."
msgstr "Sólo entorno de escritorio KDE."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr "Medio CD sólo de arranque"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -3509,7 +3474,7 @@ msgstr ""
"Internet."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -3520,18 +3485,18 @@ msgstr ""
"sin una unidad de DVD o PC que no pueden arrancar desde USB."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr "Sólo idioma Inglés."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
#, fuzzy
msgid "netinstall.iso"
msgstr "Iniciar la instalación"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
@@ -3540,13 +3505,13 @@ msgstr ""
"propietario."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
#, fuzzy
msgid "netinstall-nonfree.iso"
msgstr "boot-nonfree.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
@@ -3555,17 +3520,17 @@ msgstr ""
"aquellos que lo necesiten."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr "Descargando y verificando medios."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr "Descargando"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -3578,12 +3543,12 @@ msgstr ""
"demasiado bajo. Si elige http, además puede ver algo como"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
@@ -3594,28 +3559,30 @@ msgstr ""
"uso posterior</link>. Entonces aparece esta ventana:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr "Marque el botón Guardar Archivo."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr "Verificar integridad del medio descargado"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
"Ambas sumas son números hexadecimales calculados por ciertos algoritmos a "
"partir del fichero que se va descargar. Cuando se pide a estos algoritmos "
@@ -3625,12 +3592,12 @@ msgstr ""
"descargar de nuevo."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr "Abra una consola, no es necesario ser root, y:"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
"file.iso</userinput>."
@@ -3639,7 +3606,7 @@ msgstr ""
"archivo.iso</userinput>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
"image/file.iso</userinput>."
@@ -3648,7 +3615,7 @@ msgstr ""
"archivo.iso</userinput>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
@@ -3657,32 +3624,32 @@ msgstr ""
"poco) con el número provisto por Mageia. Ejemplo:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr "Grabar o volcar el ISO"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a boot-able medium."
+"These operations are not a simple copy and aim to make a bootable medium."
msgstr ""
"La ISO ahora se puede grabar en un CD o DVD o descargarse en una memoria "
"USB. Estas operaciones no son una simple copia y tienen como objetivo crear "
"un medio arrancable."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr "Grabar el ISO en un CD/DVD"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -3696,12 +3663,12 @@ msgstr ""
"Writing_CD_and_DVD_images\">la wiki de Mageia</link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr "Volvar el ISO en un USB"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
@@ -3710,9 +3677,9 @@ msgstr ""
"en un USB y usarlas para arrancar e instalar el sistema."
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
@@ -3721,7 +3688,7 @@ msgstr ""
"capacidad de la partición se reducirá al tamaño de la imagen."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
@@ -3730,12 +3697,12 @@ msgstr ""
"dispositivo USB."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr "Usando una herramienta gráfica dentro de Mageia"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3744,17 +3711,17 @@ msgstr ""
"org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr "Usando una herramienta gráfica dentro de Windows"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr "Usted puede probar:"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
@@ -3763,7 +3730,7 @@ msgstr ""
"la opción \"imagen ISO\";"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
@@ -3772,12 +3739,12 @@ msgstr ""
"Disco de Imagenes</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr "Usando la Línea de comandos dentro de un sistema GNU/Linux"
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
@@ -3786,48 +3753,48 @@ msgstr ""
"una partición del disco si obtiene un identificador de dispositivo erróneo."
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr "También puede utilizar el comando \"dd\" en una consola:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr "Abrir consola"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
msgstr "Conviértase en root con el comando su - (no se olvide del - al final)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr ""
"Conecte su memoria USB (no montar, no habrá cualquier aplicación o gestor de "
"archivos que pueda leerlo)."
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr "Introduzca el comando \"fdisk-l\"."
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command <code>dmesg</"
"code>: at end, you see the device name starting with <emphasis>sd</"
@@ -3838,7 +3805,7 @@ msgstr ""
"<emphasis>sd</emphasis> y <emphasis>sdd</emphasis> in este caso:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3880,7 +3847,7 @@ msgstr ""
"[72595.969446] sd 8:0:0:0: [sdd] Disco extraíble SCSI adjunto"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example <code>/"
"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
@@ -3889,19 +3856,19 @@ msgstr ""
"sdb/</code> in la imagen siguiente es un dispositivo USB de 8GB."
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
msgstr "Introduzca el comando: # dd if=/ruta al archivo ISO of=/dev/sdX bs=1M"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr "Donde X=nombre de tu dispositivo ej:/dev/sdc"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
"dev/sdb bs=1M</userinput>"
@@ -3910,12 +3877,12 @@ msgstr ""
"dev/sdb bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr "Introduce el comando: # <userinput>sync</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr "Desconecta tu pendrive USB, esta echo"
@@ -4401,35 +4368,33 @@ msgstr ""
#: en/setupBootloader.xml:36
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <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 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>"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid ""
+"Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr ""
"No modifique el \"Dispositivo de Arranque\" a menos que sepa realmente qué "
"está hace."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
#, fuzzy
msgid "Grub2-efi on UEFI systems"
msgstr "Con un sistema UEFI"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
#, fuzzy
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
@@ -4440,32 +4405,27 @@ msgstr ""
"está disponible."
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:58
+#: en/setupBootloader.xml:56
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:64
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </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><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
#, fuzzy
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only 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 "
+"If there are already UEFI operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer detects the existing ESP "
+"created by Windows and adds grub2-efi. Although it is possible to have "
"several ESPs, only one is advised and enough whatever the number of "
"operating systems you have."
msgstr ""
@@ -4478,29 +4438,29 @@ msgstr ""
"cual sea el número de sistemas operativos que tenga."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr "Usando el cargador de arranque de Mageia"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
msgid ""
"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, "
@@ -4509,29 +4469,25 @@ msgid ""
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>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:100
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </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><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr "Usando un cargador de arranque existente"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
msgid ""
"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 "
@@ -4546,44 +4502,40 @@ msgstr ""
"sistema operativo en cuestión."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
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>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:129
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </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><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
@@ -4591,17 +4543,17 @@ msgid ""
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
msgid "Options"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<guilabel>Delay before booting the default image</guilabel>: This text box "
"lets you set a delay in seconds before the default operating system is "
@@ -4609,7 +4561,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: en/setupBootloader.xml:162
msgid ""
"<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 "
@@ -4617,14 +4569,14 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
msgid ""
"<guilabel>Password</guilabel>: This text box is where you actually put the "
"password"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:182
+#: en/setupBootloader.xml:173
#, fuzzy
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
@@ -4635,31 +4587,31 @@ msgstr ""
"recuadro anterior."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
#, fuzzy
msgid "<guilabel>Advanced</guilabel>"
msgstr "<guilabel>Servicios</guilabel>:"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
msgid ""
"<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)."
+"stopping unused devices, this was the method used before APM. Unchecking it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:208
+#: en/setupBootloader.xml:199
msgid ""
"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
"operating system access to the Advanced Programmable Interrupt Controller. "
@@ -4668,38 +4620,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:232
msgid ""
"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:247
+#: en/setupBootloader.xml:239
msgid ""
"<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 "
@@ -4707,7 +4659,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -5124,6 +5076,138 @@ msgstr ""
"normal."
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
+#~ "\"mediaobject\" id=\"1\"/>"
+#~ msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
+#, 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>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Different media for architecture 32 or 64 bits."
+#~ msgstr "Medios diferentes para arquitecturas de 32 o 64 bits."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, 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>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#~ msgid ""
#~ "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."
@@ -5316,19 +5400,6 @@ msgstr ""
#~ "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 ""
#~ "If you prefer different bootloader settings to those chosen automatically "
#~ "by the installer, you can change them here."
#~ msgstr ""
diff --git a/docs/installer/et.po b/docs/installer/et.po
index 5fce7685..b58cf7d4 100644
--- a/docs/installer/et.po
+++ b/docs/installer/et.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia Installer Help\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-02-10 19:18+0200\n"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
"PO-Revision-Date: 2016-07-25 06:19+0300\n"
"Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
"Language-Team: Estonian <i18n-et@ml.mageia.org>\n"
@@ -181,7 +181,7 @@ msgstr "Kasutajate ja administraatori haldamine"
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -195,12 +195,12 @@ msgstr ""
"fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr "Administraatori (root) parooli määramine"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -221,7 +221,7 @@ msgstr ""
"kirjutatud, neid kahte omavahel võrreldes."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
@@ -231,16 +231,16 @@ msgstr ""
"väiketähti kui ka numbreid ja muid märke."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr "Kasutaja lisamine"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
"Siin saab lisada kasutaja. Kasutajal on vähem õigusi kui administraatoril "
"(root), kuid siiski piisavalt internetis liikumiseks, kontoritöörakenduste "
@@ -248,35 +248,35 @@ msgstr ""
"arvutis teeb"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr ""
"<guibutton>Ikoon</guibutton>: sellele nupule klõpsates saab muuta kasutaja "
"ikooni."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr ""
"<guilabel>Pärisnimi</guilabel>: siin saab kirja panna kasutaja tegeliku nime."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
"<guilabel>Kasutajatunnus</guilabel>: siin saab kirja panna kasutajanime või "
"lasta DrakXil pakkuda pärisnimest tuletatud variandi. "
"<emphasis>Kasutajatunnus on tõstutundlik.</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -287,7 +287,7 @@ msgstr ""
"\"givePassword\"/>)."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -298,7 +298,7 @@ msgstr ""
"ülal asuvasse kasti."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
#, fuzzy
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
@@ -308,7 +308,7 @@ msgstr ""
"näha (\"loetav\"), kuid siiski kirjutuskaitstud."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
#, fuzzy
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - Summary</"
@@ -321,17 +321,17 @@ msgstr ""
"haldamine</emphasis>."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr "Ligipääsuõigusi saab mõistagi muuta ka pärast paigaldamist."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr "Põhjalikum kasutajate haldamine"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
@@ -340,12 +340,12 @@ msgstr ""
"muuta lisatava kasutaja mõningaid seadistusi."
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr " Samuti saab siin lubada või keelata külaliskonto."
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -356,7 +356,7 @@ msgstr ""
"failid peaks külaline salvestama USB-pulgale."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -368,7 +368,7 @@ msgstr ""
"kasutajaga võrreldes palju piiratumad."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -378,7 +378,7 @@ msgstr ""
"kasutab eelmisel ekraanil lisatud kasutaja. Valikuteks on Bash, Dash ja Sh."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -389,7 +389,7 @@ msgstr ""
"siia midagi kirjutage."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -1445,29 +1445,23 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </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><note><para>
-#: en/diskdrake.xml:56
-#, fuzzy
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
#, fuzzy
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
@@ -1478,16 +1472,17 @@ msgstr ""
"EFI (vt eespool)."
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
#, 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>"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.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>"
#. type: Content of: <section><info><title>
#: en/doPartitionDisks.xml:9
@@ -1518,29 +1513,22 @@ msgstr ""
#: en/doPartitionDisks.xml:22
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr "Olemasolevate partitsioonide kasutamine"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
@@ -1549,12 +1537,12 @@ msgstr ""
"neid võib kasutada paigaldamiseks."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr "Vaba ruumi kasutamine"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
@@ -1563,12 +1551,12 @@ msgstr ""
"uuele Mageia paigaldusele."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr "Vaba ruumi kasutamine Windowsi partitsioonil"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
@@ -1577,7 +1565,7 @@ msgstr ""
"paigaldusprogramm seda kasutada."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"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 "
@@ -1588,7 +1576,7 @@ msgstr ""
"kõigist olulistest failidest varukoopia!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1605,7 +1593,7 @@ msgstr ""
"äärmiselt soovitatav kõik vähegi olulised failid eelnevalt varundada."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1619,43 +1607,37 @@ msgstr ""
"Seda näitab allolev pilt."
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
+#: en/doPartitionDisks.xml:77
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr "Kogu ketta tühjendamine ja kasutamine"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr "Selle valimisel kasutatakse kogu ketast ainult Mageia jaoks."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr ""
"Tähelepanu! Sellega kustutatakse valitud kõvakettalt KÕIK andmed. Olge "
"ettevaatlik!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"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 "
@@ -1665,12 +1647,12 @@ msgstr ""
"kettal andmeid, mida te ei soovi kaotada, ärge seda võimalust valige."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr "Ketta jagamine oma tahtmist mööda"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
@@ -1679,12 +1661,12 @@ msgstr ""
"või -ketastel paigaldatakse."
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr "<emphasis role=\"bold\">Partitsioonide suurus:</emphasis>"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
@@ -1692,7 +1674,7 @@ msgstr ""
"Paigaldusprogramm jagab saadaoleva ruumi ära järgmiste reeglite kohaselt:"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
@@ -1701,30 +1683,30 @@ msgstr ""
"ning /home jaoks eraldi partitsiooni ei looda."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are created"
msgstr "Kui kokku on saadaval üle 50 GB, luuakse kolm partitsiooni"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid ""
"6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr ""
"6/19 saadaolevast koguruumist eraldatakse / jaoks maksimaalse suurusega 50 GB"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr "1/19 eraldatakse saalealaks maksimaalse suurusega 4 GB"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr "ülejäänu (vähemalt 12/19) eraldatakse /home jaoks"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1733,7 +1715,7 @@ msgstr ""
"partitsiooni: 50 GB / jaoks, 4 GB saaleala jaoks ja ülejäänu /home jaoks."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on /"
@@ -1746,7 +1728,7 @@ msgstr ""
"õigesti tehtud."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"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 "
@@ -1756,29 +1738,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><note><mediaobject>
#: en/doPartitionDisks.xml:175
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
-#, fuzzy
-msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
@@ -1786,7 +1761,7 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
@@ -1805,17 +1780,17 @@ msgstr ""
"gparted."
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr "\"Align to\" \"MiB\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr "\"Free space preceding (MiB)\" \"2\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid ""
"Also make sure all partitions are created with an even number of megabytes."
msgstr ""
@@ -2113,11 +2088,6 @@ msgstr ""
"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -3108,7 +3078,7 @@ msgid "Reboot"
msgstr "Taaskäivitamine"
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
#, fuzzy
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
@@ -3122,18 +3092,18 @@ msgstr ""
"tarkvaraallikaid (vt täpsemalt tarkvarahalduse osast)."
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
#, fuzzy
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr ""
"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
#, fuzzy
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
"Kui alglaadur on paigaldatud, palutakse teil arvuti seisata, Live-CD "
@@ -3142,7 +3112,7 @@ msgstr ""
"tarkvaraallikaid (vt täpsemalt tarkvarahalduse osast)."
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
@@ -3212,17 +3182,17 @@ msgstr ""
"Mageia juhtimiskeskuse sektsioonis <guilabel>Turvalisus</guilabel>."
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr "ISO-tõmmise valimine ja kasutamine"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr "Sissejuhatus"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
@@ -3231,12 +3201,12 @@ msgstr ""
"tõmmist, mis vastab teie vajadustele."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr "Andmekandjaid on kaht tüüpi:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target system. "
@@ -3250,7 +3220,7 @@ msgstr ""
"hakata."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -3261,22 +3231,22 @@ msgstr ""
"Paigaldamine on lihtsam, aga ka valikuid on vähem."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr "Üksikasjadest kõneldakse järgmistes osades."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr "Andmekandjad"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr "Määratlus"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
@@ -3287,7 +3257,7 @@ msgstr ""
"seadet, millele ISO-tõmmis on kopeeritud."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
"\">here</link>."
@@ -3296,40 +3266,42 @@ msgstr ""
"\">siit</link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr "Klassikalised paigaldusandmekandjad"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78
+#: en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr "Ühised omadused"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr "Kasutavad traditsioonilist paigaldusprogrammi drakx"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid ""
"They are able to make a clean install or an update from previous releases."
msgstr ""
"Saab teha nii puhta paigalduse kui ka uuendada varasematelt väljalasetelt"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr "DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
msgstr "Eri andmekandjad 32- ja 64-bitisele arhitektuurile"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
@@ -3338,12 +3310,12 @@ msgstr ""
"riistvara tuvastamise tööriist"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr "Iga DVD sisaldab paljusid saadaolevaid töökeskkondi ja keeli"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid ""
"You'll be given the choice during the installation to add non free software."
msgstr ""
@@ -3351,12 +3323,12 @@ msgstr ""
"mitte"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr "Live-andmekandjad"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
@@ -3365,20 +3337,13 @@ msgstr ""
"paigaldamata, aga soovi korral siiski ka Mageia paigaldamiseks"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
#, fuzzy
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr "ISO sisaldab ainult üht töökeskkonda (KDE või GNOME)"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr "Eri andmekandjad 32- ja 64-bitisele arhitektuurile"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous releases.</"
@@ -3388,57 +3353,57 @@ msgstr ""
"mitte aga uuendamise jaoks varasemalt versioonilt.</emphasis>"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr "Sisaldavad mittevaba tarkvara"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
#, fuzzy
msgid "Live DVD Plasma"
msgstr "KDE LiveDVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
#, fuzzy
msgid "Plasma desktop environment only."
msgstr "Ainult KDE töökeskkond"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
-#: en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122
+#: en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr "Sisaldab kõiki keeli"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr "GNOME LiveDVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr "Ainult GNOME töökeskkond"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
#, fuzzy
msgid "Live DVD Xfce"
msgstr "KDE LiveDVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
#, fuzzy
msgid "Xfce desktop environment only."
msgstr "Ainult KDE töökeskkond"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr "CD-d ainult alglaadimiseks"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -3451,7 +3416,7 @@ msgstr ""
"muul kohalikul kettal, kohalikus võrgus või internetis."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -3462,18 +3427,18 @@ msgstr ""
"ilma DVD-seadmeta või ei saa arvutit käivitada USB-pulga pealt."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr "Ainult inglise keeles"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
#, fuzzy
msgid "netinstall.iso"
msgstr "Paigaldamise käivitamine"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
@@ -3482,13 +3447,13 @@ msgstr ""
"kasutama"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
#, fuzzy
msgid "netinstall-nonfree.iso"
msgstr "boot-nonfree.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
@@ -3497,17 +3462,17 @@ msgstr ""
"seda vajavad"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr "Andmekandja allalaadimine ja kontrollimine"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr "Allalaadimine"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -3520,12 +3485,12 @@ msgstr ""
"liiga väike. HTTP valimise korral peaks pilt olema umbes selline:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
@@ -3536,28 +3501,30 @@ msgstr ""
"\">edasiseks kasutamiseks</link>. Seejärel ilmub selline aken:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr "Märkige raadionupp Salvestama."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr "Allalaaditud andmekandja terviklikkuse kontrollimine"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
"Mõlemad kontrollsummad on kuueteistkümnendarvud, mis arvutatakse kindla "
"algoritmiga allalaaditava faili põhjal. Kui paluda algoritmil arv uuesti "
@@ -3567,12 +3534,12 @@ msgstr ""
"laadida."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr "Avage konsool (selleks ei pea olema administraator) ja kirjutage:"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
"file.iso</userinput>."
@@ -3581,7 +3548,7 @@ msgstr ""
"iso/asukoht</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
"image/file.iso</userinput>."
@@ -3590,7 +3557,7 @@ msgstr ""
"tõmmisefail.iso/asukoht</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
@@ -3599,31 +3566,31 @@ msgstr ""
"allalaadimissaidil näidatuga:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr "ISO kirjutamine"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a boot-able medium."
+"These operations are not a simple copy and aim to make a bootable medium."
msgstr ""
"Kontrollitud ISO võib nüüd kirjutada CD-le, DVD-le või USB-pulgale. See ei "
"ole tavaline kopeerimine, vaid eesmärk on luua käivitatav andmekandja."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr "ISO kirjutamine CD-le või DVD-le"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -3636,12 +3603,12 @@ msgstr ""
"wiki.mageia.org/en/Writing_CD_and_DVD_images\">Mageia wikist</link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr "ISO kirjutamine USB-pulgale"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
@@ -3650,9 +3617,9 @@ msgstr ""
"pulgale, mis on käivitatav ja mille pealt saab süsteemi paigaldada."
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
@@ -3661,7 +3628,7 @@ msgstr ""
"suurusele."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
@@ -3669,12 +3636,12 @@ msgstr ""
"Algse mahu taastamiseks tuleb USB-pulk uuesti partitsioneerida ja vormindada."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr "Graafilise tööriista kasutamine Mageias"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3684,17 +3651,17 @@ msgstr ""
"link>."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr "Graafilise tööriista kasutamine Windowsis"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr "Võite proovida järgmisi programme:"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
@@ -3703,7 +3670,7 @@ msgstr ""
"valikuga \"ISO image\";"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
@@ -3712,12 +3679,12 @@ msgstr ""
"Disk Imager</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr "Käsurea kasutamine GNU/Linuxi süsteemis"
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
@@ -3726,17 +3693,17 @@ msgstr ""
"võib ketta partitsiooni sootuks üle kirjutada."
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr "Samuti võib kasutada konsoolis tööriista dd:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr "Avage konsool"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
@@ -3745,31 +3712,31 @@ msgstr ""
"unustage kriipsukest lõpus)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr ""
"Ühendage USB-pulk (ärge haakige seda, see tähendab ärge avage ühtegi "
"rakendust või failihaldurit, mis seda lugeda võiks)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr "Sisestage käsk <userinput>fdisk -l</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command <code>dmesg</"
"code>: at end, you see the device name starting with <emphasis>sd</"
@@ -3780,7 +3747,7 @@ msgstr ""
"<emphasis>sdd</emphasis>:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3822,7 +3789,7 @@ msgstr ""
"[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example <code>/"
"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
@@ -3831,7 +3798,7 @@ msgstr ""
"selleks <code>/dev/sdb</code>, mis on 8 GB suurune USB-pulk."
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
@@ -3840,12 +3807,12 @@ msgstr ""
"userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr "kus X on teie seadme nimi, nt: /dev/sdc"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
"dev/sdb bs=1M</userinput>"
@@ -3854,12 +3821,12 @@ msgstr ""
"dev/sdb bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr "Sisestage käsk: # <userinput>sync</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr "Eemaldage USB-pulk, kõik on valmis"
@@ -4341,36 +4308,33 @@ msgstr ""
#: en/setupBootloader.xml:36
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
"setupBootloader.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<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>"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid ""
+"Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr ""
"Ärge muutke \"Alglaadimisseadet\", kui te pole täiesti kindel, et teate, "
"mida teete."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
#, fuzzy
msgid "Grub2-efi on UEFI systems"
msgstr "UEFI süsteemiga"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
#, fuzzy
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
@@ -4380,33 +4344,27 @@ msgstr ""
"valida alglaadurit, kuna saadaval on ainult Grub2-efi."
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:58
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:64
+#: en/setupBootloader.xml:56
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"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><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
#, fuzzy
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only 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 "
+"If there are already UEFI operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer detects the existing ESP "
+"created by Windows and adds grub2-efi. Although it is possible to have "
"several ESPs, only one is advised and enough whatever the number of "
"operating systems you have."
msgstr ""
@@ -4419,29 +4377,29 @@ msgstr ""
"palju on arvutis operatsioonisüsteeme."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr "Mageia alglaaduri kasutamine"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
msgid ""
"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, "
@@ -4450,32 +4408,25 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:105
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:100
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"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><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr "Olemasoleva alglaaduri kasutamine"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
msgid ""
"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 "
@@ -4490,47 +4441,40 @@ msgstr ""
"dokumentatsiooni."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:136
+#: en/setupBootloader.xml:129
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"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><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
@@ -4540,18 +4484,18 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
#, fuzzy
msgid "Options"
msgstr "Kerneli võtmed"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<guilabel>Delay before booting the default image</guilabel>: This text box "
"lets you set a delay in seconds before the default operating system is "
@@ -4559,7 +4503,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: en/setupBootloader.xml:162
msgid ""
"<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 "
@@ -4567,14 +4511,14 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
msgid ""
"<guilabel>Password</guilabel>: This text box is where you actually put the "
"password"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:182
+#: en/setupBootloader.xml:173
#, fuzzy
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
@@ -4585,31 +4529,31 @@ msgstr ""
"ülal asuvasse kasti."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
#, fuzzy
msgid "<guilabel>Advanced</guilabel>"
msgstr "<guilabel>Teenused</guilabel>"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
msgid ""
"<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)."
+"stopping unused devices, this was the method used before APM. Unchecking it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:208
+#: en/setupBootloader.xml:199
msgid ""
"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
"operating system access to the Advanced Programmable Interrupt Controller. "
@@ -4618,38 +4562,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:232
msgid ""
"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:247
+#: en/setupBootloader.xml:239
msgid ""
"<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 "
@@ -4657,7 +4601,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -5071,6 +5015,146 @@ msgstr ""
"lasta."
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
+#~ "\"mediaobject\" id=\"1\"/>"
+#~ msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
+#, 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>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Different media for architecture 32 or 64 bits."
+#~ msgstr "Eri andmekandjad 32- ja 64-bitisele arhitektuurile"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+#~ "setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
#~ "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."
@@ -5264,19 +5348,6 @@ msgstr ""
#~ "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 ""
#~ "If you prefer different bootloader settings to those chosen automatically "
#~ "by the installer, you can change them here."
#~ msgstr ""
diff --git a/docs/installer/eu.po b/docs/installer/eu.po
index 392802a1..36779792 100644
--- a/docs/installer/eu.po
+++ b/docs/installer/eu.po
@@ -10,7 +10,7 @@ msgid ""
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"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
"PO-Revision-Date: 2016-10-04 13:35+0000\n"
"Last-Translator: Egoitz Rodriguez Obieta <egoitzro@gmail.com>\n"
"Language-Team: Basque (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -185,7 +185,7 @@ msgstr "Erabiltzaile eta Supererabiltzaileen Kudeaketa"
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -199,12 +199,12 @@ msgstr ""
"fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr "Ezarri administratzaile (root) pasahitza:"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -225,7 +225,7 @@ msgstr ""
"egiaztatzeko."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
@@ -234,16 +234,16 @@ msgstr ""
"minuskulak), zenbakiak eta bestelako karaktereak nahastea pasahitz batean."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr "Sartu erabiltzaile bat"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
"Hemen erabiltzaile bat gehi daiteke. Erabiltzaile batek administratzaileak "
"baino baimen gutxiago ditu, baina nahikoak Interneten nabigatzeko, aplikazio "
@@ -251,29 +251,29 @@ msgstr ""
"ordenagailuarekin edozer egiteko."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr ""
"<guibutton>Ikonoa</guibutton>: botoi honetan klik egiten baduzu, "
"erabiltzaile ikonoa aldatu egingo da."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr ""
"<guilabel>Benetako Izena</guilabel>: Erabiltzaileen benetako izena sartu "
"ezazu testu-kutxa honetan."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
"<guilabel>Saio Hasiera Izena</guilabel>: Erabiltzailearen saio-hasierako "
"izena hemen sartzen da edo drakx bertsioari uzten diozu erabiltzaileen "
@@ -281,7 +281,7 @@ msgstr ""
"minuskulei sentibera da.</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -293,7 +293,7 @@ msgstr ""
"\"givePassword\"/>)"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -304,7 +304,7 @@ msgstr ""
"pasahitzeko testuko kutxetako bakoitzean pasahitz bera duzula."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
#, fuzzy
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
@@ -314,7 +314,7 @@ msgstr ""
"bat irakurgarri izango du (baina idazteko babesarekin) home direktorioan."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
#, fuzzy
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - Summary</"
@@ -326,17 +326,17 @@ msgstr ""
"guztiak gehi ditzakezu. Aukeratu <emphasis>Erabiltzaileak kudeatu</emphasis>."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr "Sarbide baimena instalatu ondoren ere aldatu egin daiteke."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr "Erabiltzailearen Kudeaketa Aurreratua"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
@@ -345,12 +345,12 @@ msgstr ""
"duen erabiltzailearentzat editatzea baimentzen dion pantaila eskaintzen zaio."
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr "Gainera, baliogabetu edo gaitu ahal izango duzu gonbidatu kontu bat."
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -361,7 +361,7 @@ msgstr ""
"Gonbidatuak bere fitxategi garrantzitsuak USB disko baten gorde behar ditu."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -373,7 +373,7 @@ msgstr ""
"murritzagoak izaten dira."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -384,7 +384,7 @@ msgstr ""
"a aldatzeko aukera, aukerak dira Bash, Dash eta Sh"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -395,7 +395,7 @@ msgstr ""
"utzi ezazu ez badakizu zer egiten ari zaren."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -1461,29 +1461,23 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </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><note><para>
-#: en/diskdrake.xml:56
-#, fuzzy
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
#, fuzzy
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
@@ -1494,16 +1488,17 @@ msgstr ""
"goian)"
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
#, 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>"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.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>"
#. type: Content of: <section><info><title>
#: en/doPartitionDisks.xml:9
@@ -1534,29 +1529,22 @@ msgstr ""
#: en/doPartitionDisks.xml:22
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr "Lehendik dauden Partizioak"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
@@ -1565,12 +1553,12 @@ msgstr ""
"egin dira eta instalazioa erabili ahal izango du."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr "Erabili Espazio Hutsa"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
@@ -1579,12 +1567,12 @@ msgstr ""
"erabiliko da zure Mageia instalazio berriarentzat."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr "Erabili Espazio Librea Windows-en Partizioan"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
@@ -1593,7 +1581,7 @@ msgstr ""
"instalatzaileak, erabili ahal izateko eskainiko dizu."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"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 "
@@ -1604,7 +1592,7 @@ msgstr ""
"garrantzitsuen babeskopia egin behar duzu!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1621,7 +1609,7 @@ msgstr ""
"gomendagarria da zure fitxategi pertsonalaren babeskopia bat egitea."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1634,43 +1622,37 @@ msgstr ""
"partizioen arteko hutsunea arrastatuz. Ikusi beheko pantaila."
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
+#: en/doPartitionDisks.xml:77
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr "Ezabatu eta erabili disko osoa."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr "Aukera honek disko osoa erabiliko du Mageia-rantzat."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr ""
"Oharra! Aukeratutako disko gogorraren datu guztiak ezabatuko dira. Kontuz "
"ibili!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"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 "
@@ -1680,12 +1662,12 @@ msgstr ""
"informazioa baduzu,, ez ezazu aukera hau erabili."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr "Pertsonalizatua"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
@@ -1694,12 +1676,12 @@ msgstr ""
"gogorrean."
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr "<emphasis role=\"bold\">Partizioak dimentsionatzen:</emphasis>"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
@@ -1708,7 +1690,7 @@ msgstr ""
"arabera:"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
@@ -1717,7 +1699,7 @@ msgstr ""
"ez da sortuko /, ez baitago /home partizioa bereizita ."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are created"
msgstr ""
@@ -1725,24 +1707,24 @@ msgstr ""
"partizio sortuko dira"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid ""
"6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr ""
"6/19 erabateko espazio libretik /-ra esleitzen da 50 GB-ko gehiengoarekin"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr "1/19 4 GB gehienez trukatzeko esleitzen da"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr "gainerakoa (gutxienez 12/19) da / home-ra esleitzen da"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1752,7 +1734,7 @@ msgstr ""
"home-entzako."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on /"
@@ -1765,7 +1747,7 @@ msgstr ""
"frogatzen du."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"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 "
@@ -1775,29 +1757,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><note><mediaobject>
#: en/doPartitionDisks.xml:175
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
-#, fuzzy
-msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
@@ -1805,7 +1780,7 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
@@ -1823,17 +1798,17 @@ msgstr ""
"gero, eta hurrengo konfigurazioak erabil ditzala:"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr "\"lerrokatu\" \"MiB\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr "\"Aurreko espazio librea (MiB)\" \"2\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid ""
"Also make sure all partitions are created with an even number of megabytes."
msgstr "Ziurtatzen partizio guztiak sortzen diturela megabyte kopuru batekin."
@@ -2129,11 +2104,6 @@ msgstr ""
"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -3137,7 +3107,7 @@ msgid "Reboot"
msgstr "Berrabiarazi"
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
#, fuzzy
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
@@ -3151,18 +3121,18 @@ msgstr ""
"baliabideetatik deskargatzen ari dela (ikus Software kudeaketa)."
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
#, fuzzy
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr ""
"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
#, fuzzy
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
"Behin kargatzailea instalatuta, eskatuko dizu zure ordenagailua gelditzeko, "
@@ -3171,7 +3141,7 @@ msgstr ""
"baliabideetatik deskargatzen ari dela (ikus Software kudeaketa)."
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
@@ -3239,17 +3209,17 @@ msgstr ""
"Kontrol Gunean segurtasun ezarpenak aldatzea."
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr "Aukeratu eta erabili ISOa"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr "Sarrera"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
@@ -3258,12 +3228,12 @@ msgstr ""
"aukeratzen lagunduko dizu."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr "Bi media famili daude:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target system. "
@@ -3276,7 +3246,7 @@ msgstr ""
"Idazmahaiko Ingurunea aukeratzeko."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -3287,22 +3257,22 @@ msgstr ""
"da, baina aukera txikiagoak lortuko dituzu."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr "Xehetasunak ematen dira hurrengo ataletan."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr "Baliabidea"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr "Definizioa"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
@@ -3313,7 +3283,7 @@ msgstr ""
"kopiatzen den edozein fisiko sostengatzen du."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
"\">here</link>."
@@ -3322,24 +3292,24 @@ msgstr ""
"\">hemen</link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr "Instalazioa Klasiko baliabidea"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78
+#: en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr "Ezaugarri komunak"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr ""
"ISO hauek DrakX deituriko Instalatzaile tradizionalak erabilitzen dituzte."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid ""
"They are able to make a clean install or an update from previous releases."
msgstr ""
@@ -3347,17 +3317,19 @@ msgstr ""
"batetatik."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr "DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
-msgstr "Baliabide ezberdinak 32 edo 64 biteko arkitekturentzat."
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
+msgstr "32 edo 64 biteko arkitektura media ezberdinak."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
@@ -3366,23 +3338,23 @@ msgstr ""
"Sistema, Memoria Testa, Hardware hautemate tresna."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr "DVD bakoitzak mahaigaineko ingurune eta hizkuntza asko dauka."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid ""
"You'll be given the choice during the installation to add non free software."
msgstr "Instalazioan zehar software ez librea gehitzeko aukera izango duzue."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr "Live baliabidea"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
@@ -3391,20 +3363,13 @@ msgstr ""
"HDD-an instalatzeko erabil daiteke."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
#, fuzzy
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr "ISO bakoitzak mahaigain ingurune bakarra (KDE edo GNOME) dauka."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr "32 edo 64 biteko arkitektura media ezberdinak."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous releases.</"
@@ -3415,57 +3380,57 @@ msgstr ""
"emphasis>"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr "Software ez librea dute."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
#, fuzzy
msgid "Live DVD Plasma"
msgstr "KDE-ren Live DVD-a"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
#, fuzzy
msgid "Plasma desktop environment only."
msgstr "KDE mahaigaineko ingurunea soilik."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
-#: en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122
+#: en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr "Hizkuntza guztiak presente daude."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr "GNOME-ren Live DVD-a"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr "GNOME mahaigaineko ingurunea soilik."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
#, fuzzy
msgid "Live DVD Xfce"
msgstr "KDE-ren Live DVD-a"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
#, fuzzy
msgid "Xfce desktop environment only."
msgstr "KDE mahaigaineko ingurunea soilik."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr "Abioko CD baliabidea soilik"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -3479,7 +3444,7 @@ msgstr ""
"Interneten."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -3490,18 +3455,18 @@ msgstr ""
"gabea edo USB batetik ezin abiarazi dezakeen PC bat."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr "Ingelera hizkuntza soilik"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
#, fuzzy
msgid "netinstall.iso"
msgstr "Instalaketa abiarazi"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
@@ -3510,13 +3475,13 @@ msgstr ""
"dutenentzat."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
#, fuzzy
msgid "netinstall-nonfree.iso"
msgstr "boot-nonfree.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
@@ -3525,17 +3490,17 @@ msgstr ""
"dauzka."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr "Media Deskargatu eta Egiaztatzen"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr "Deskargatzen"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -3549,12 +3514,12 @@ msgstr ""
"ahal izango duzu"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
@@ -3565,28 +3530,30 @@ msgstr ""
"erabiltzeko</link>. Ondoren leiho hau agertuko da:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr "Egiaztatu Fitxategia Gorde botoia."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr "Deskargatutako baliabide osotasunaren egiaztapena"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
"Checksum zenbaki biak deskargaturiko fitxategitik algoritmo batek "
"kalkulatzen hamaseitarrak dira. Algoritmo hauei eskatzen diezunean zenbaki "
@@ -3596,12 +3563,12 @@ msgstr ""
"ondorioztatzen du. "
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr "Ireki kontsola bat, ez da root izan beharrik, eta:"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
"file.iso</userinput>."
@@ -3610,7 +3577,7 @@ msgstr ""
"image/file.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
"image/file.iso</userinput>."
@@ -3619,7 +3586,7 @@ msgstr ""
"the/image/file.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
@@ -3628,32 +3595,32 @@ msgstr ""
"zenbakiarekin (pixka bat itxaron beharko duzu). Adibidea:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr "Grabatu edo irauli ISOa"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a boot-able medium."
+"These operations are not a simple copy and aim to make a bootable medium."
msgstr ""
"Hautatutako ISOa orain CD edo DVD batean erre daiteke edo USB baten irauli. "
"Eragiketa hauek ez dira kopia sinple bat eta helburua abiatzeko gai den "
"baliabide bat egitea da."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr "ISOa CD/DVDan grabatzen"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -3667,12 +3634,12 @@ msgstr ""
"\">Mageia wikia</link>n."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr "Irauli ISOa USB baten"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
@@ -3682,9 +3649,9 @@ msgstr ""
"instalatzeko."
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
@@ -3693,7 +3660,7 @@ msgstr ""
"ahalmena irudiaren tamainara murriztuko da."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
@@ -3702,12 +3669,12 @@ msgstr ""
"duzu USB makila."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr "Tresna grafiko bat erabiliz Mageia-ren barnean"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3717,17 +3684,17 @@ msgstr ""
"tresna grafiko bat erabil dezakezu"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr "Tresna grafiko bat erabiliz Windows-en barnean"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr "Zu saiatuko zinateke:"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
@@ -3736,7 +3703,7 @@ msgstr ""
"irudia\" aukera erabiliz;"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
@@ -3745,12 +3712,12 @@ msgstr ""
"Disk Imager</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr "Komando lerroa erabiliz GNU/Linux sistema barnean"
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
@@ -3759,17 +3726,17 @@ msgstr ""
"okerreko identifikatzailea lortzeko arriskua dago."
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr "dd kontsola tresna bezala ere erabil dezakezu:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr "Kontsola bat ireki"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
@@ -3777,31 +3744,31 @@ msgstr ""
"Bihurtu root komando <userinput> su - </userinput> (ez ahaztu finalean '-')"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr ""
"Entxufatu zure USBa (ez muntatu, hau ere esan dezake edozein aplikazio edo "
"fitxategi kudeatzaile ez ireki hori eskuratu eta irakurri, ezin)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr "Idatzi <userinput>fdisk-l</userinput> komandoa"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command <code>dmesg</"
"code>: at end, you see the device name starting with <emphasis>sd</"
@@ -3812,7 +3779,7 @@ msgstr ""
"<emphasis>sdd</emphasis> honetan kasu:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3854,7 +3821,7 @@ msgstr ""
"[72595.969446] sd 8:0:0:0-a: [sdd-a] Attached SCSI-ren desmuntagarri|ateratzeko moduko diskoa"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example <code>/"
"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
@@ -3863,7 +3830,7 @@ msgstr ""
"dev/sdb</code> goiko irudian, 8GB USB-makila."
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
@@ -3872,12 +3839,12 @@ msgstr ""
"userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr "Non X=zure dispositiboaren izena adibidez: /dev/sdc"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
"dev/sdb bs=1M</userinput>"
@@ -3886,12 +3853,12 @@ msgstr ""
"of=/dev/sdb bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr "Agindua sartu: # <userinput>sync</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr "Deskonektatu zure USB, eginda dago"
@@ -4378,33 +4345,31 @@ msgstr ""
#: en/setupBootloader.xml:36
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <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 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>"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid ""
+"Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr "Ez aldatu \"Abio Gailua\" zer egiten duzun benetan jakin gabe."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
#, fuzzy
msgid "Grub2-efi on UEFI systems"
msgstr "UEFI sistemarekin"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
#, fuzzy
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
@@ -4414,32 +4379,27 @@ msgstr ""
"ezin duzu abiarazlea aukeratu Grub2-efi soilik dagoelako eskuragarri"
#. 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>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:64
+#: en/setupBootloader.xml:56
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </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><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
#, fuzzy
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only 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 "
+"If there are already UEFI operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer detects the existing ESP "
+"created by Windows and adds grub2-efi. Although it is possible to have "
"several ESPs, only one is advised and enough whatever the number of "
"operating systems you have."
msgstr ""
@@ -4452,29 +4412,29 @@ msgstr ""
"eragileetako kopurua edozein izanik ere."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr "Mageia abio kargatzailea erabiliz"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
msgid ""
"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, "
@@ -4483,29 +4443,25 @@ msgid ""
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>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:100
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </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><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr "Existitzen den abio kargatzaile bat erabiliz"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
msgid ""
"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 "
@@ -4519,44 +4475,40 @@ msgstr ""
"sistema eragilearen dokumentazioa."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:136
+#: en/setupBootloader.xml:129
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </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><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
@@ -4564,17 +4516,17 @@ msgid ""
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
msgid "Options"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<guilabel>Delay before booting the default image</guilabel>: This text box "
"lets you set a delay in seconds before the default operating system is "
@@ -4582,7 +4534,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: en/setupBootloader.xml:162
msgid ""
"<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 "
@@ -4590,14 +4542,14 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
msgid ""
"<guilabel>Password</guilabel>: This text box is where you actually put the "
"password"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:182
+#: en/setupBootloader.xml:173
#, fuzzy
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
@@ -4608,31 +4560,31 @@ msgstr ""
"pasahitzeko testuko kutxetako bakoitzean pasahitz bera duzula."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
#, fuzzy
msgid "<guilabel>Advanced</guilabel>"
msgstr "<guilabel>Zerbitzuak</guilabel>:"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
msgid ""
"<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)."
+"stopping unused devices, this was the method used before APM. Unchecking it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:208
+#: en/setupBootloader.xml:199
msgid ""
"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
"operating system access to the Advanced Programmable Interrupt Controller. "
@@ -4641,38 +4593,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:232
msgid ""
"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:247
+#: en/setupBootloader.xml:239
msgid ""
"<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 "
@@ -4680,7 +4632,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -5092,6 +5044,138 @@ msgstr ""
"normala da."
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
+#~ "\"mediaobject\" id=\"1\"/>"
+#~ msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
+#, 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>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Different media for architecture 32 or 64 bits."
+#~ msgstr "Baliabide ezberdinak 32 edo 64 biteko arkitekturentzat."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, 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>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#~ msgid ""
#~ "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."
@@ -5285,19 +5369,6 @@ msgstr ""
#~ "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 ""
#~ "If you prefer different bootloader settings to those chosen automatically "
#~ "by the installer, you can change them here."
#~ msgstr ""
diff --git a/docs/installer/fr.po b/docs/installer/fr.po
index bbe86a1a..cc5b7b72 100644
--- a/docs/installer/fr.po
+++ b/docs/installer/fr.po
@@ -19,7 +19,7 @@ msgid ""
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"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
"PO-Revision-Date: 2016-07-17 11:40+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -198,7 +198,7 @@ msgstr "Gestion de l'Utilisateur et du Superutilisateur"
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -212,12 +212,12 @@ msgstr ""
"fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr "Définir le mot de passe Administrateur (Root) :"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -238,7 +238,7 @@ msgstr ""
"fait une erreur de saisie."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
@@ -248,16 +248,16 @@ msgstr ""
"autres caractères."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr "Indiquer un utilisateur"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
"Ajouter ici un utilisateur. Il a moins de droits que le superutilisateur "
"(root), mais suffisamment par défaut pour naviguer sur internet, utiliser "
@@ -265,36 +265,36 @@ msgstr ""
"habituellement réalisées par un utilisateur ordinaire avec son PC."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr ""
"<guibutton>Icône </guibutton>: en cliquant sur ce bouton, vous changerez "
"l'icône de l'utilisateur."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr ""
"<guilabel>Nom et prénom </guilabel>: inscrire ici le nom réel de "
"l'utilisateur."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
"<guilabel>Identifiant de connexion</guilabel> : inscrire ici un identifiant "
"de connexion ou bien drakx transposera les nom et prénom pour en créer un. "
"<emphasis>L'identifiant de connexion est sensible à la casse.</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -305,7 +305,7 @@ msgstr ""
"mot de passe (voir également <xref linkend=\"givePassword\"/>)."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -316,7 +316,7 @@ msgstr ""
"dans les deux champs."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
#, fuzzy
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
@@ -327,7 +327,7 @@ msgstr ""
"protégé en écriture."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
#, fuzzy
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - Summary</"
@@ -339,18 +339,18 @@ msgstr ""
"l'installation, avec le bouton <emphasis>Gestion des utilisateurs</emphasis>."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr ""
"Les permissions d'accès peuvent aussi être changées après l'installation."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr "Gestion avancée de l'Utilisateur"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
@@ -359,12 +359,12 @@ msgstr ""
"permet de modifier les réglages pour l'utilisateur que vous avez ajouté."
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr "En complément, vous pouvez activer ou désactiver un compte invité."
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -376,7 +376,7 @@ msgstr ""
"USB."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -388,7 +388,7 @@ msgstr ""
"restreints qu'un utilisateur ordinaire."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -399,7 +399,7 @@ msgstr ""
"choix possibles sont Bash, Dash et Sh"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -410,7 +410,7 @@ msgstr ""
"entrer ici si vous ne le connaissez pas."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -1494,29 +1494,23 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </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><note><para>
-#: en/diskdrake.xml:56
-#, fuzzy
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
#, fuzzy
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
@@ -1527,16 +1521,17 @@ msgstr ""
"montée sur /boot/EFI (voir ci-dessus)."
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
#, 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>"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.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>"
#. type: Content of: <section><info><title>
#: en/doPartitionDisks.xml:9
@@ -1567,29 +1562,22 @@ msgstr ""
#: en/doPartitionDisks.xml:22
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr "Utiliser les partitions existantes"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
@@ -1598,12 +1586,12 @@ msgstr ""
"ont été trouvées et sont utilisables pour l'installation de Mageia."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr "Utiliser l'espace libre"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
@@ -1612,12 +1600,12 @@ msgstr ""
"l'utilisera pour l'installation de Mageia."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr "Utiliser l'espace libre sur une partition Microsoft Windows"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
@@ -1626,7 +1614,7 @@ msgstr ""
"l'installateur propose de l'utiliser."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"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 "
@@ -1637,7 +1625,7 @@ msgstr ""
"assurer de posséder une sauvegarde de tous les fichiers importants."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1655,7 +1643,7 @@ msgstr ""
"préalable."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1669,43 +1657,37 @@ msgstr ""
"capture d'écran ci-dessous."
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
+#: en/doPartitionDisks.xml:77
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr "Effacer et utiliser le disque tout entier"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr "Cette option utilise le disque complet pour Mageia."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr ""
"Attention ! Cela effacera TOUTES les données sur le disque sélectionné. "
"Faites attention !"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"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 "
@@ -1716,12 +1698,12 @@ msgstr ""
"perdues, alors ne pas utiliser cette option."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr "Partitionnement de disque personnalisé"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
@@ -1730,12 +1712,12 @@ msgstr ""
"installation sur le(s) disque(s)."
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr "<emphasis role=\"bold\">Dimensionnement des partitions :</emphasis>"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
@@ -1743,7 +1725,7 @@ msgstr ""
"L'installeur partagera l'espace disponible selon les règles suivantes :"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
@@ -1753,7 +1735,7 @@ msgstr ""
"home."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are created"
msgstr ""
@@ -1761,7 +1743,7 @@ msgstr ""
"sont créées. "
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid ""
"6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr ""
@@ -1769,18 +1751,18 @@ msgstr ""
"répertoires /, jusqu'à un maximum de 50 Go."
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr "1/19ème est alloué au SWAP avec un maximum de 4 Go."
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr ""
"Le reste (à minima 12/19ème) est alloué au répertoire utilisateur /home."
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1790,7 +1772,7 @@ msgstr ""
"home."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on /"
@@ -1803,7 +1785,7 @@ msgstr ""
"vérifier si l'opération a été effectuée correctement "
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"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 "
@@ -1813,29 +1795,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><note><mediaobject>
#: en/doPartitionDisks.xml:175
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
-#, fuzzy
-msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
@@ -1843,7 +1818,7 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
@@ -1863,17 +1838,17 @@ msgstr ""
"suivante :"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr "\"Align to\" \"MiB\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr "\"Free space preceding (MiB)\" \"2\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid ""
"Also make sure all partitions are created with an even number of megabytes."
msgstr ""
@@ -2177,11 +2152,6 @@ msgstr ""
"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -3208,7 +3178,7 @@ msgid "Reboot"
msgstr "Redémarrage"
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
#, fuzzy
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
@@ -3223,18 +3193,18 @@ msgstr ""
"des logiciels)."
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
#, fuzzy
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr ""
"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
#, fuzzy
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
"Une fois le chargeur d'amorçage installé, vous serez invité à arrêter "
@@ -3244,7 +3214,7 @@ msgstr ""
"des logiciels)."
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
@@ -3313,17 +3283,17 @@ msgstr ""
"Contrôle de Mageia."
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr "Sélectionner et utiliser les ISOs"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr "Introduction"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
@@ -3332,12 +3302,12 @@ msgstr ""
"quelle image correspond à vos besoins."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr "Il existe deux familles de media :"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target system. "
@@ -3351,7 +3321,7 @@ msgstr ""
"souhaitez installer. "
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -3362,22 +3332,22 @@ msgstr ""
"processus d'installation est plus simple, mais vous aurez moins de choix."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr "Des précisions sont fournies dans les sections suivantes."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr "Média"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr "Définition"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
@@ -3388,7 +3358,7 @@ msgstr ""
"physique sur lequel le fichier ISO est copié."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
"\">here</link>."
@@ -3397,23 +3367,23 @@ msgstr ""
"\">ici</link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr "Média d'installation classique"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78
+#: en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr "Caractéristiques communes"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr "Ces images ISOs utilisent l'installeur classique appelé Drakx."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid ""
"They are able to make a clean install or an update from previous releases."
msgstr ""
@@ -3421,17 +3391,19 @@ msgstr ""
"de versions précédentes."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr "DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
-msgstr "Un média différent pour les architectures 32 ou 64 bits."
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
+msgstr "Des média différents pour les architectures 32 ou 64 bits."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
@@ -3440,13 +3412,13 @@ msgstr ""
"secours, test de mémoire, outil de détection de matériel."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr ""
"Chaque DVD contient plusieurs environnements de bureau et plusieurs langues."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid ""
"You'll be given the choice during the installation to add non free software."
msgstr ""
@@ -3454,12 +3426,12 @@ msgstr ""
"libres."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr "Média \"Live\""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
@@ -3468,21 +3440,14 @@ msgstr ""
"disque dur, puis éventuellement l'installer par la suite."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
#, fuzzy
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr ""
"Chaque image ISO contient un seul environnement de bureau (KDE ou GNOME)."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr "Des média différents pour les architectures 32 ou 64 bits."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous releases.</"
@@ -3493,57 +3458,57 @@ msgstr ""
"niveau de précédentes versions.</emphasis>"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr "Ils contiennent des logiciels non-libres."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
#, fuzzy
msgid "Live DVD Plasma"
msgstr "DVD live KDE"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
#, fuzzy
msgid "Plasma desktop environment only."
msgstr "Environnement de bureau KDE uniquement."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
-#: en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122
+#: en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr "Toutes les langues sont présentes."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr "DVD Live GNOME"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr "Environnement de bureau GNOME uniquement."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
#, fuzzy
msgid "Live DVD Xfce"
msgstr "DVD live KDE"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
#, fuzzy
msgid "Xfce desktop environment only."
msgstr "Environnement de bureau KDE uniquement."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr "Média de simple démarrage"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -3557,7 +3522,7 @@ msgstr ""
"périphérique de stockage, un réseau local ou sur Internet. "
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -3568,18 +3533,18 @@ msgstr ""
"pas de lecteur de DVD ou s'il ne peut pas démarrer sur une clé USB."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr "En anglais uniquement."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
#, fuzzy
msgid "netinstall.iso"
msgstr "Lancer l'installation"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
@@ -3588,13 +3553,13 @@ msgstr ""
"d'utiliser des logiciels non-libres."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
#, fuzzy
msgid "netinstall-nonfree.iso"
msgstr "boot-nonfree.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
@@ -3603,17 +3568,17 @@ msgstr ""
"codecs,...) pour les personnes qui en ont besoin."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr "Télécharger et vérifier les média"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr "Téléchargement"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -3627,12 +3592,12 @@ msgstr ""
"(HTTP), vous pouvez également voir quelque chose comme"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
@@ -3644,28 +3609,30 @@ msgstr ""
"suivante apparaît alors :"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr "Cochez le bouton radio \"Sauvegarder un fichier\""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr "Vérification de l'intégrité du média téléchargé"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
"Les deux checksums sont des nombres hexadécimaux calculés par un algorithme "
"à partir du fichier à télécharger. Lorsque vous demandez à ces algorithmes "
@@ -3675,12 +3642,12 @@ msgstr ""
"obligera à retélécharger celui-ci."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr "Ouvrir une console, sans être administrateur, et :"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
"file.iso</userinput>."
@@ -3689,7 +3656,7 @@ msgstr ""
"vers/le/fichier/image.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
"image/file.iso</userinput>."
@@ -3698,7 +3665,7 @@ msgstr ""
"vers/le/fichier/image.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
@@ -3707,32 +3674,32 @@ msgstr ""
"certain temps) avec le nombre fourni par Mageia. Exemple :"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr "Graver ou copier l'ISO"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a boot-able medium."
+"These operations are not a simple copy and aim to make a bootable medium."
msgstr ""
"L'ISO peut désormais être gravée sur un CD, un DVD ou copiée sur une clé "
"USB. Ces opérations ne sont pas de simples copies et sont destinées à créer "
"un moyen de démarrage."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr "Graver l'image ISO sur un CD/DVD"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -3746,12 +3713,12 @@ msgstr ""
"mageia.org/en/Writing_CD_and_DVD_images\">le wiki Mageia</link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr "Copier l'image ISO sur une clé USB"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
@@ -3761,9 +3728,9 @@ msgstr ""
"le système."
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
@@ -3772,7 +3739,7 @@ msgstr ""
"perdues et la capacité de la partition sera réduite à la taille de l'image."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
@@ -3781,12 +3748,12 @@ msgstr ""
"le partitionnement et reformater la clé."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr "Utiliser un outil graphique dans Mageia"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3796,17 +3763,17 @@ msgstr ""
"link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr "Utiliser un outil graphique dans Windows"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr "Vous pouvez essayer :"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
@@ -3815,7 +3782,7 @@ msgstr ""
"utilisant l'option \"image ISO\" ;"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
@@ -3824,12 +3791,12 @@ msgstr ""
"Disk Imager</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr "Utiliser la ligne de commande avec le système GNU/Linux"
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
@@ -3838,17 +3805,17 @@ msgstr ""
"d'écrire par-dessus une partition du disque si vous saisissez le mauvais ID."
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr "Vous pouvez également utiliser l'outil dd dans une console :"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr "Ouvrir une console"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
@@ -3857,14 +3824,14 @@ msgstr ""
"oublier le '-' final)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr ""
"Brancher votre clé USB (ne pas la monter, ce qui veut également dire ne pas "
@@ -3872,17 +3839,17 @@ msgstr ""
"ou la lire)."
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr "Saisissez la commande <userinput>fdisk -l</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command <code>dmesg</"
"code>: at end, you see the device name starting with <emphasis>sd</"
@@ -3894,7 +3861,7 @@ msgstr ""
"emphasis> comme dans ce cas :"
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3936,7 +3903,7 @@ msgstr ""
"[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example <code>/"
"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
@@ -3946,7 +3913,7 @@ msgstr ""
"clé USB de 8 Go."
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
@@ -3955,12 +3922,12 @@ msgstr ""
"bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr "Où X=le nom de votre périphérique, par exemple : /dev/sdc"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
"dev/sdb bs=1M</userinput>"
@@ -3969,12 +3936,12 @@ msgstr ""
"of=/dev/sdb bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr "Saisissez la commande : # <userinput>sync</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr "Débranchez votre clé USB, c'est terminé."
@@ -4474,36 +4441,33 @@ msgstr ""
#: en/setupBootloader.xml:36
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
"setupBootloader.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<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>"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid ""
+"Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr ""
"Ne modifiez pas le \"Périphérique de démarrage\", à moins que vous ne "
"sachiez réellement ce que vous faites."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
#, fuzzy
msgid "Grub2-efi on UEFI systems"
msgstr "Avec un système UEFI"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
#, fuzzy
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
@@ -4514,33 +4478,27 @@ msgstr ""
"disponible."
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:58
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:64
+#: en/setupBootloader.xml:56
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"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><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
#, fuzzy
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only 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 "
+"If there are already UEFI operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer detects the existing ESP "
+"created by Windows and adds grub2-efi. Although it is possible to have "
"several ESPs, only one is advised and enough whatever the number of "
"operating systems you have."
msgstr ""
@@ -4554,29 +4512,29 @@ msgstr ""
"systèmes d'exploitation que vous utilisez."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr "Utiliser un chargeur de démarrage Mageia"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
msgid ""
"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, "
@@ -4585,32 +4543,25 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:105
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:100
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"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><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr "Utiliser un chargeur de démarrage existant. "
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
msgid ""
"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 "
@@ -4625,47 +4576,40 @@ msgstr ""
"Voir la documentation du système d'exploitation en question."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:136
+#: en/setupBootloader.xml:129
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"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><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
@@ -4675,17 +4619,17 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
msgid "Options"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<guilabel>Delay before booting the default image</guilabel>: This text box "
"lets you set a delay in seconds before the default operating system is "
@@ -4693,7 +4637,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: en/setupBootloader.xml:162
msgid ""
"<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 "
@@ -4701,14 +4645,14 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
msgid ""
"<guilabel>Password</guilabel>: This text box is where you actually put the "
"password"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:182
+#: en/setupBootloader.xml:173
#, fuzzy
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
@@ -4719,31 +4663,31 @@ msgstr ""
"dans les deux champs."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
#, fuzzy
msgid "<guilabel>Advanced</guilabel>"
msgstr "<guilabel>Services :</guilabel>"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
msgid ""
"<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)."
+"stopping unused devices, this was the method used before APM. Unchecking it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:208
+#: en/setupBootloader.xml:199
msgid ""
"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
"operating system access to the Advanced Programmable Interrupt Controller. "
@@ -4752,38 +4696,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:232
msgid ""
"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:247
+#: en/setupBootloader.xml:239
msgid ""
"<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 "
@@ -4791,7 +4735,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -5211,6 +5155,146 @@ msgstr ""
"vide pendant un certain temps, c'est normal."
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
+#~ "\"mediaobject\" id=\"1\"/>"
+#~ msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
+#, 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>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Different media for architecture 32 or 64 bits."
+#~ msgstr "Un média différent pour les architectures 32 ou 64 bits."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+#~ "setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
#~ "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."
@@ -5409,19 +5493,6 @@ msgstr ""
#~ "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 ""
#~ "If you prefer different bootloader settings to those chosen automatically "
#~ "by the installer, you can change them here."
#~ msgstr ""
diff --git a/docs/installer/help.pot b/docs/installer/help.pot
index df577e37..f877199b 100644
--- a/docs/installer/help.pot
+++ b/docs/installer/help.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia Installer Help 3.0\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-02-10 19:18+0200\n"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -148,7 +148,7 @@ msgstr ""
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" "
"fileref=\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" "
@@ -157,12 +157,12 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -175,49 +175,49 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -225,7 +225,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -233,14 +233,14 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
"protected home directory (umask=0027)."
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - "
"Summary</emphasis> step during the install. Choose <emphasis>User "
@@ -248,29 +248,29 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr ""
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -278,7 +278,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -286,7 +286,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -294,7 +294,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -302,7 +302,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -1131,34 +1131,32 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
-msgid "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
-msgid "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata "
+"fileref=\"dx2-diskdrake2.png\" align=\"center\"/> </imageobject> "
+"<imageobject condition=\"live\"> <imagedata fileref=\"live-diskdrake2.png\" "
+"align=\"center\"/> </imageobject>"
msgstr ""
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:56
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder "
-"type=\"mediaobject\" id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr ""
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
"partition is present with a correct type"
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> "
-"</imageobject> <imageobject> <imagedata "
-"fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata "
+"fileref=\"dx2-doPartitionDisks3.png\" align=\"center\"/> </imageobject> "
+"<imageobject condition=\"live\"> <imagedata "
+"fileref=\"live-doPartitionDisks3.png\" align=\"center\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><info><title>
@@ -1184,55 +1182,50 @@ msgstr ""
#. type: Content of: <section><mediaobject>
#: en/doPartitionDisks.xml:22
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" "
-"align=\"center\"/> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> "
-"</imageobject>"
+"<imageobject condition=\"classical\"> <imagedata "
+"fileref=\"dx2-doPartitionDisks.png\" align=\"center\"/> </imageobject> "
+"<imageobject condition=\"live\"> <imagedata "
+"fileref=\"live-doPartitionDisks.png\" align=\"center\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"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 "
@@ -1240,7 +1233,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1251,7 +1244,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1260,36 +1253,31 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> "
-"</imageobject>"
-msgstr ""
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
+#: en/doPartitionDisks.xml:77
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> "
-"</imageobject>"
+"<imageobject condition=\"classical\"> <imagedata "
+"fileref=\"dx2-doPartitionDisks2.png\" align=\"center\"/> </imageobject> "
+"<imageobject condition=\"live\"> <imagedata "
+"fileref=\"live-doPartitionDisks2.png\" align=\"center\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"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 "
@@ -1297,67 +1285,67 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are "
"created"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid "6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
msgstr ""
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on "
@@ -1366,7 +1354,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"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 "
@@ -1376,28 +1364,23 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> "
-"</imageobject>"
+"<imageobject condition=\"classical\"> <imagedata "
+"fileref=\"dx2-doPartitionDisks3.png\" align=\"center\"/> </imageobject> "
+"<imageobject condition=\"live\"> <imagedata "
+"fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><note><mediaobject>
#: en/doPartitionDisks.xml:175
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> "
-"</imageobject>"
-msgstr ""
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
-msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> "
"</imageobject>"
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
@@ -1409,17 +1392,17 @@ msgid ""
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid "Also make sure all partitions are created with an even number of megabytes."
msgstr ""
@@ -1657,11 +1640,6 @@ msgid ""
"</imageobject>"
msgstr ""
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr ""
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -2465,7 +2443,7 @@ msgid "Reboot"
msgstr ""
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
"computer, remove the live CD and restart the computer, click on <emphasis "
@@ -2474,20 +2452,20 @@ msgid ""
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" "
"fileref=\"live-reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -2542,29 +2520,29 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target "
@@ -2573,7 +2551,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -2581,22 +2559,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
@@ -2604,83 +2582,78 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link "
"ns4:href=\"http://www.mageia.org/en/downloads/\">here</link>."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100 en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78 en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid "They are able to make a clean install or an update from previous releases."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89 en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125 en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid "You'll be given the choice during the installation to add non free software."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142 en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178 en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous "
@@ -2688,52 +2661,52 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
msgid "Live DVD Plasma"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
msgid "Plasma desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122 en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
msgid "Live DVD Xfce"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
msgid "Xfce desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -2743,7 +2716,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -2751,46 +2724,46 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
msgid "netinstall.iso"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
msgid "netinstall-nonfree.iso"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -2799,12 +2772,12 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further "
@@ -2812,81 +2785,82 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum "
"path/to/the/image/file.iso</userinput>."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum "
"path/to/the/image/file.iso</userinput>."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB "
-"stick. These operations are not a simple copy and aim to make a boot-able "
+"stick. These operations are not a simple copy and aim to make a bootable "
"medium."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -2896,121 +2870,121 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
msgstr ""
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link "
"ns4:href=\"https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr ""
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command "
"<code>dmesg</code>: at end, you see the device name starting with "
@@ -3018,7 +2992,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3048,38 +3022,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example "
"<code>/dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso "
"of=/dev/sdb bs=1M</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr ""
@@ -3450,84 +3424,74 @@ msgstr ""
#. type: Content of: <section><section><section><mediaobject>
#: en/setupBootloader.xml:36
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> "
-"</imageobject>"
-msgstr ""
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" "
+"<imageobject condition=\"classical\"> <imagedata "
+"fileref=\"dx2-setupBootloader.png\" align=\"center\"/> </imageobject> "
+"<imageobject condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" "
"fileref=\"live-setupBootloader.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid "Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
msgid "Grub2-efi on UEFI systems"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
"choose between with or without graphical menu"
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:58
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> "
-"</imageobject>"
-msgstr ""
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:64
+#: en/setupBootloader.xml:56
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> "
-"</imageobject>"
+"<imageobject condition=\"classical\"> <imagedata "
+"fileref=\"dx2-setupBootloader2.png\" align=\"center\"/> </imageobject> "
+"<imageobject condition=\"live\"> <imagedata "
+"fileref=\"live-setupBootloader2.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only 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."
+"(Grub2-efi). If there are already UEFI operating systems installed on your "
+"computer (Windows 8 for example), the Mageia installer detects the existing "
+"ESP created by Windows and adds grub2-efi. Although it is possible to have "
+"several ESPs, only one is advised and enough whatever the number of "
+"operating systems you have."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
msgid ""
"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, "
@@ -3536,26 +3500,21 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:105
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> "
-"</imageobject>"
-msgstr ""
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:100
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> "
-"</imageobject>"
+"<imageobject condition=\"classical\"> <imagedata "
+"fileref=\"dx2-setupBootloader3.png\" align=\"center\"/> </imageobject> "
+"<imageobject condition=\"live\"> <imagedata "
+"fileref=\"live-setupBootloader3.png\" align=\"center\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
msgid ""
"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 "
@@ -3565,59 +3524,54 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on "
"<guibutton>Advanced</guibutton> and Check the box <guilabel>Do not touch ESP "
"or MBR</guilabel>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:136
+#: en/setupBootloader.xml:129
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> "
-"</imageobject>"
-msgstr ""
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> "
-"</imageobject>"
+"<imageobject condition=\"classical\"> <imagedata "
+"fileref=\"dx2-setupBootloader4.png\" align=\"center\"/> </imageobject> "
+"<imageobject condition=\"live\"> <imagedata "
+"fileref=\"live-setupBootloader4.png\" align=\"center\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> "
"</imageobject>"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
msgid "Options"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<guilabel>Delay before booting the default image</guilabel>: This text box "
"lets you set a delay in seconds before the default operating system is "
@@ -3625,7 +3579,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: en/setupBootloader.xml:162
msgid ""
"<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 "
@@ -3633,44 +3587,44 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
msgid ""
"<guilabel>Password</guilabel>: This text box is where you actually put the "
"password"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:182
+#: en/setupBootloader.xml:173
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
"check that it matches with the one set above."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
msgid "<guilabel>Advanced</guilabel>"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
msgid ""
"<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)."
+"stopping unused devices, this was the method used before APM. Unchecking it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:208
+#: en/setupBootloader.xml:199
msgid ""
"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
"operating system access to the Advanced Programmable Interrupt "
@@ -3679,38 +3633,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:232
msgid ""
"<guilabel>Probe foreign OS</guilabel>: see above <link "
"linkend=\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:247
+#: en/setupBootloader.xml:239
msgid ""
"<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 "
@@ -3718,7 +3672,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"
diff --git a/docs/installer/hr.po b/docs/installer/hr.po
index 77674a23..f74342ef 100644
--- a/docs/installer/hr.po
+++ b/docs/installer/hr.po
@@ -11,7 +11,7 @@ msgid ""
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"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
"PO-Revision-Date: 2016-09-15 12:17+0000\n"
"Last-Translator: Ivica Kolić <ikoli@yahoo.com>\n"
"Language-Team: Croatian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -180,7 +180,7 @@ msgstr "Upravljanje korisnikom i superkorisnikom"
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -194,12 +194,12 @@ msgstr ""
"fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr "Poostavi administratorsku (root) lozinku:"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -219,7 +219,7 @@ msgstr ""
"lozinku uspoređujući ih."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
@@ -228,52 +228,52 @@ msgstr ""
"mješavinu slova (velikih i malih), brojeva i ostalih znakova u lozinki."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr "Unesite korisnika"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
"Dodajte korisnika ovdje. korisnik ima manje ovlasti od superkorisnika "
"(root), ali dovoljno da koristi internet,uredske programe ili igra igre i "
"sve ostalo što prosječan korisnik radi sa svojim računalom."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr ""
"<guibutton>Ikona</guibutton>: ako kliknete na ovo dugme promjeniti će ikonu "
"korisnika."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr ""
"<guilabel>Pravo ime</guilabel>: Umetni korisničko pravo ime u ovo tekstualno "
"polje."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
"<guilabel>Ime prijave</guilabel>: Ovdje unesite korisnikovo ie prijave ili "
"dopustite da drakx koristi verziju korisničkih pravih imena. <emphasis>Ime "
"prijave je osjetljivo na mala i velika slova.</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -284,7 +284,7 @@ msgstr ""
"lozinke.(Također vidi <xref linkend=\"givePassword\"/>)"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -295,7 +295,7 @@ msgstr ""
"tekstualnom polju."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
#, fuzzy
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
@@ -305,7 +305,7 @@ msgstr ""
"( ali zaštićen za pisanje) osobni direktorij."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - Summary</"
"emphasis> step during the install. Choose <emphasis>User management</"
@@ -313,17 +313,17 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr "Dozvole pristupa također se mogu promjeniti nakon instlacije."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr "Napredno korisničko upravljanje"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
@@ -332,12 +332,12 @@ msgstr ""
"gdje možete urediti postavke korisnika kojega dodajete."
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr "Dodatno, možete onemogućiti ili omogućiti račun gosta."
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -345,7 +345,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -356,7 +356,7 @@ msgstr ""
"ja, ali ima ograničeniji pristup od normalnih korisnika."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -364,7 +364,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -372,7 +372,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -1283,39 +1283,36 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:56
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr ""
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
"partition is present with a correct type"
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
-"> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1345,59 +1342,53 @@ msgstr ""
#: en/doPartitionDisks.xml:22
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr "Koristi postojeće particije"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr "Koristi slobodni prostor"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"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 "
@@ -1405,7 +1396,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1416,7 +1407,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1425,38 +1416,35 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
+#: en/doPartitionDisks.xml:77
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr "Izbriši i koristi cijeli disk."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr "Ova će opcija koristiti cijeli pogon za Mageiu."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"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 "
@@ -1464,67 +1452,67 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr "Prilagođeno"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are created"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid ""
"6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
msgstr ""
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on /"
@@ -1533,7 +1521,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"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 "
@@ -1543,28 +1531,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.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=\"live-liveMode.png\"/> </imageobject>"
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
-#, fuzzy
-msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
@@ -1572,7 +1554,7 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
@@ -1584,17 +1566,17 @@ msgid ""
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid ""
"Also make sure all partitions are created with an even number of megabytes."
msgstr ""
@@ -1845,11 +1827,6 @@ msgid ""
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
msgstr ""
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr ""
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -2658,7 +2635,7 @@ msgid "Reboot"
msgstr "Ponovno pokretanje sustava"
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
"computer, remove the live CD and restart the computer, click on <emphasis "
@@ -2667,22 +2644,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
#, fuzzy
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr ""
"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
@@ -2740,29 +2717,29 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr "Uvod"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target system. "
@@ -2771,7 +2748,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -2779,22 +2756,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
@@ -2802,88 +2779,83 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
"\">here</link>."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78
+#: en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid ""
"They are able to make a clean install or an update from previous releases."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr "DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid ""
"You'll be given the choice during the installation to add non free software."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous releases.</"
@@ -2891,53 +2863,53 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
msgid "Live DVD Plasma"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
msgid "Plasma desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
-#: en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122
+#: en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
msgid "Live DVD Xfce"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
msgid "Xfce desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -2946,7 +2918,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -2954,46 +2926,46 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
msgid "netinstall.iso"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
msgid "netinstall-nonfree.iso"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -3002,12 +2974,12 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
@@ -3015,80 +2987,81 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
"file.iso</userinput>."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
"image/file.iso</userinput>."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a boot-able medium."
+"These operations are not a simple copy and aim to make a bootable medium."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -3097,121 +3070,121 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
msgstr ""
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr ""
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command <code>dmesg</"
"code>: at end, you see the device name starting with <emphasis>sd</"
@@ -3219,7 +3192,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3243,38 +3216,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example <code>/"
"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
"dev/sdb bs=1M</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr ""
@@ -3658,94 +3631,84 @@ msgstr ""
#: en/setupBootloader.xml:36
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <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 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>"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid ""
+"Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
msgid "Grub2-efi on UEFI systems"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
"choose between with or without graphical menu"
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:58
+#: en/setupBootloader.xml:56
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:64
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only 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 "
+"If there are already UEFI operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer detects the existing ESP "
+"created by Windows and adds grub2-efi. Although it is possible to have "
"several ESPs, only one is advised and enough whatever the number of "
"operating systems you have."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
msgid ""
"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, "
@@ -3754,31 +3717,25 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:105
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:100
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
msgid ""
"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 "
@@ -3788,46 +3745,40 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:136
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:129
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
@@ -3837,17 +3788,17 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
msgid "Options"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<guilabel>Delay before booting the default image</guilabel>: This text box "
"lets you set a delay in seconds before the default operating system is "
@@ -3855,7 +3806,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: en/setupBootloader.xml:162
msgid ""
"<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 "
@@ -3863,14 +3814,14 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
msgid ""
"<guilabel>Password</guilabel>: This text box is where you actually put the "
"password"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:182
+#: en/setupBootloader.xml:173
#, fuzzy
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
@@ -3881,30 +3832,30 @@ msgstr ""
"tekstualnom polju."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
msgid "<guilabel>Advanced</guilabel>"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
msgid ""
"<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)."
+"stopping unused devices, this was the method used before APM. Unchecking it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:208
+#: en/setupBootloader.xml:199
msgid ""
"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
"operating system access to the Advanced Programmable Interrupt Controller. "
@@ -3913,38 +3864,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:232
msgid ""
"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:247
+#: en/setupBootloader.xml:239
msgid ""
"<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 "
@@ -3952,7 +3903,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -4290,6 +4241,121 @@ msgid ""
"At the end, you get a blank screen for some time, it's normal."
msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#, 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>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+
+#, 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>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
#~ msgid ""
#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
@@ -4311,16 +4377,3 @@ msgstr ""
#~ "condition=\"live\"> <imagedata format=\"PNG\" xml:id="
#~ "\"bootloaderConfiguration-im1\" fileref=\"live-bootloaderConfiguration.png"
#~ "\" align=\"center\" revision=\"1\"/> </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>"
diff --git a/docs/installer/hu.po b/docs/installer/hu.po
index 4b1a71fe..5a67365e 100644
--- a/docs/installer/hu.po
+++ b/docs/installer/hu.po
@@ -10,7 +10,7 @@ msgid ""
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"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
"PO-Revision-Date: 2016-08-24 11:58+0000\n"
"Last-Translator: gergo huba <hubasetech@gmail.com>\n"
"Language-Team: Hungarian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -151,7 +151,7 @@ msgstr ""
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -160,12 +160,12 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr "A rendszergazdai (root) jelszó beállítása"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -178,51 +178,51 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr "Adjon meg egy felhasználót"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr ""
"<guibutton>Ikon</guibutton>: Ha erre a gombra kattint akkor a felhasználók "
"ikonja megváltozik."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr "<guilabel>Igazi Név</guilabel>: Adja meg a felhasználó igazi nevét."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -230,7 +230,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -238,14 +238,14 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
"protected home directory (umask=0027)."
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - Summary</"
"emphasis> step during the install. Choose <emphasis>User management</"
@@ -253,29 +253,29 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr "Speciális Felhasználókezelés"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr ""
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -283,7 +283,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -291,7 +291,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -299,7 +299,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -307,7 +307,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -1136,35 +1136,30 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
-msgid ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
msgstr ""
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:56
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr ""
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
"partition is present with a correct type"
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
-"> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><info><title>
@@ -1190,55 +1185,50 @@ msgstr ""
#. type: Content of: <section><mediaobject>
#: en/doPartitionDisks.xml:22
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"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 "
@@ -1246,7 +1236,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1257,7 +1247,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1266,36 +1256,31 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
+#: en/doPartitionDisks.xml:77
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"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 "
@@ -1303,67 +1288,67 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr "Egyéni"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are created"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid ""
"6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
msgstr ""
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on /"
@@ -1372,7 +1357,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"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 "
@@ -1382,28 +1367,23 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
#. type: Content of: <section><note><mediaobject>
#: en/doPartitionDisks.xml:175
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-msgstr ""
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
-msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
@@ -1415,17 +1395,17 @@ msgid ""
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid ""
"Also make sure all partitions are created with an even number of megabytes."
msgstr ""
@@ -1669,11 +1649,6 @@ msgid ""
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
msgstr ""
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr ""
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -2474,7 +2449,7 @@ msgid "Reboot"
msgstr "Újraindítás"
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
"computer, remove the live CD and restart the computer, click on <emphasis "
@@ -2483,20 +2458,20 @@ msgid ""
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -2551,29 +2526,29 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr "Bevezetés"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target system. "
@@ -2582,7 +2557,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -2590,22 +2565,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
@@ -2613,88 +2588,83 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
"\">here</link>."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78
+#: en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid ""
"They are able to make a clean install or an update from previous releases."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr "DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid ""
"You'll be given the choice during the installation to add non free software."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous releases.</"
@@ -2702,53 +2672,53 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
msgid "Live DVD Plasma"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
msgid "Plasma desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
-#: en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122
+#: en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
msgid "Live DVD Xfce"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
msgid "Xfce desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -2757,7 +2727,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -2765,46 +2735,46 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
msgid "netinstall.iso"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
msgid "netinstall-nonfree.iso"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -2813,12 +2783,12 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
@@ -2826,80 +2796,81 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
"file.iso</userinput>."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
"image/file.iso</userinput>."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a boot-able medium."
+"These operations are not a simple copy and aim to make a bootable medium."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -2908,121 +2879,121 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
msgstr ""
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr ""
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command <code>dmesg</"
"code>: at end, you see the device name starting with <emphasis>sd</"
@@ -3030,7 +3001,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3054,38 +3025,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example <code>/"
"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
"dev/sdb bs=1M</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr ""
@@ -3457,83 +3428,75 @@ msgstr ""
#. type: Content of: <section><section><section><mediaobject>
#: en/setupBootloader.xml:36
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
"setupBootloader.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid ""
+"Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
msgid "Grub2-efi on UEFI systems"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
"choose between with or without graphical menu"
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:58
+#: en/setupBootloader.xml:56
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-msgstr ""
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:64
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only 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 "
+"If there are already UEFI operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer detects the existing ESP "
+"created by Windows and adds grub2-efi. Although it is possible to have "
"several ESPs, only one is advised and enough whatever the number of "
"operating systems you have."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
msgid ""
"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, "
@@ -3542,26 +3505,21 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:105
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-"imageobject>"
-msgstr ""
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:100
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
msgid ""
"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 "
@@ -3571,58 +3529,53 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:136
+#: en/setupBootloader.xml:129
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
-msgstr ""
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
"imageobject>"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
msgid "Options"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<guilabel>Delay before booting the default image</guilabel>: This text box "
"lets you set a delay in seconds before the default operating system is "
@@ -3630,7 +3583,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: en/setupBootloader.xml:162
msgid ""
"<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 "
@@ -3638,44 +3591,44 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
msgid ""
"<guilabel>Password</guilabel>: This text box is where you actually put the "
"password"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:182
+#: en/setupBootloader.xml:173
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
"check that it matches with the one set above."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
msgid "<guilabel>Advanced</guilabel>"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
msgid ""
"<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)."
+"stopping unused devices, this was the method used before APM. Unchecking it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:208
+#: en/setupBootloader.xml:199
msgid ""
"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
"operating system access to the Advanced Programmable Interrupt Controller. "
@@ -3684,38 +3637,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:232
msgid ""
"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:247
+#: en/setupBootloader.xml:239
msgid ""
"<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 "
@@ -3723,7 +3676,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"
diff --git a/docs/installer/id.po b/docs/installer/id.po
index 9c89ea4e..45e43e5c 100644
--- a/docs/installer/id.po
+++ b/docs/installer/id.po
@@ -11,7 +11,7 @@ msgid ""
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"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
"PO-Revision-Date: 2016-07-17 09:04+0000\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Indonesian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -180,7 +180,7 @@ msgstr "Pengelolaan Pengguna dan Pengguna Super"
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -194,12 +194,12 @@ msgstr ""
"fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr "Atur Sandi Administrator (root):"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -220,7 +220,7 @@ msgstr ""
"sandi pada sandi pertama dengan membandingkannya."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
@@ -229,16 +229,16 @@ msgstr ""
"penggabungan huruf (besar dan kecil), nomor dan karakter lain sebagai sandi."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr "Masukkan pengguna"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
"Tambahkan pengguna di sini. Pengguna memiliki hak yang lebih sedikit "
"dibanding superuser (root), tapi cukup untuk menjelajah internet, "
@@ -246,36 +246,36 @@ msgstr ""
"biasa dilakukan pengguna dengan komputernya"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr ""
"<guibutton>Ikon</guibutton>: jika Anda mengklik tombol ini akan mengubah "
"ikon pengguna."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr ""
"<guilabel>Nama Asli</guilabel>: Masukkan nama asli pengguna pada kotak teks "
"ini."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
"<guilabel>Nama Login</guilabel>: Di sini Anda memasukkan nama login pengguna "
"atau biarkan drakx menggunakan versi dari nama asli pengguna. <emphasis>Nama "
"login berlaku sensitif.</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -286,7 +286,7 @@ msgstr ""
"kekuatan sandi. (Lihat juga <xref linkend=\"givePassword\"/>)"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -297,7 +297,7 @@ msgstr ""
"tiap kotak teks."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
#, fuzzy
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
@@ -307,7 +307,7 @@ msgstr ""
"direktori home yang terbaca oleh semua (tapi terlindungi dari penulisan)."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
#, fuzzy
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - Summary</"
@@ -320,17 +320,17 @@ msgstr ""
"emphasis>."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr "Perizinan hak akses juga bisa diubah setelah instalasi."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr "Pengelolaan Pengguna Lanjutan"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
@@ -340,12 +340,12 @@ msgstr ""
"tambahkan."
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr ""
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -356,7 +356,7 @@ msgstr ""
"menyimpan file pentingnya ke dalam flashdisk."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -368,7 +368,7 @@ msgstr ""
"normal."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -379,7 +379,7 @@ msgstr ""
"sebelumnya, pilihannya adalah Bash, Dash dan Sh"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -391,7 +391,7 @@ msgstr ""
"sini."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -1408,29 +1408,23 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:56
-#, fuzzy
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
#, fuzzy
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
@@ -1440,12 +1434,13 @@ msgstr ""
"Partition) tersedia dan dimount dengan benar pada /boot/EFI (lihat di atas)"
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
-"> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1480,29 +1475,22 @@ msgstr ""
#: en/doPartitionDisks.xml:22
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr "Gunakan Partisi yang Tersedia"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
@@ -1511,12 +1499,12 @@ msgstr ""
"ditemukan dan mungkin bisa digunakan untuk instalasi."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr "Gunakan Ruang Kosong"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
@@ -1525,12 +1513,12 @@ msgstr ""
"ini akan menggunakannya untuk menginstall Mageia."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr "Gunakan Ruang Kosong pada Partisi Windows"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
@@ -1539,7 +1527,7 @@ msgstr ""
"installer akan menawarkan untuk menggunakannya."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"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 "
@@ -1549,7 +1537,7 @@ msgstr ""
"beresiko sehingga Anda harus membuat cadangan file penting Anda!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1565,7 +1553,7 @@ msgstr ""
"Sangat disarankan untuk membuat cadangan semua file pribadi."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1579,43 +1567,37 @@ msgstr ""
"kedua partisi. Lihat gambar di bawah."
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
+#: en/doPartitionDisks.xml:77
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr "Hapus dan gunakan Seluruh Disk."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr "Pilihan ini akan menggunakan seluruh perangkat untuk Mageia."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr ""
"Perhatikan! Ini akan menghapus SEMUA data pada harddisk yang dipilih. Hati-"
"hati!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"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 "
@@ -1626,12 +1608,12 @@ msgstr ""
"gunakan pilihan ini."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr "Sesuaian"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
@@ -1639,55 +1621,55 @@ msgstr ""
"Ini memberi Anda kendali penuh untuk menempatkan instalasi pada harddisk."
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are created"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid ""
"6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
msgstr ""
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on /"
@@ -1696,7 +1678,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"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 "
@@ -1706,29 +1688,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.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>"
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
-#, fuzzy
-msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
@@ -1736,7 +1711,7 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
@@ -1755,17 +1730,17 @@ msgstr ""
"berikut:"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr "\"Selaraskan ke\" \"MiB\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr "\"Ruang kosong di awal (MiB)\" \"2\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid ""
"Also make sure all partitions are created with an even number of megabytes."
msgstr "Juga pastikan semua partisi dibuat dengan penomoran megabite."
@@ -2061,11 +2036,6 @@ msgstr ""
"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -3052,7 +3022,7 @@ msgid "Reboot"
msgstr "Boot Ulang"
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
"computer, remove the live CD and restart the computer, click on <emphasis "
@@ -3061,22 +3031,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
#, fuzzy
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr ""
"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
@@ -3146,29 +3116,29 @@ msgstr ""
"bagian <guilabel>Keamanan</guilabel> pada Pusat Kendali Mageia."
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr "Pilih dan gunakan ISO"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr "Pengantar"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target system. "
@@ -3177,7 +3147,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -3185,22 +3155,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr "Media"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr "Definisi"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
@@ -3211,7 +3181,7 @@ msgstr ""
"fisik ke mana berkas ISO disalin."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
"\">here</link>."
@@ -3220,39 +3190,41 @@ msgstr ""
"\">di sini</link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr "Media instalasi klasik"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78
+#: en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr "Fitur umum"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr "ISO ini menggunakan installer tradisional yang disebut drakx."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid ""
"They are able to make a clean install or an update from previous releases."
msgstr "Mereka bisa membuat instalasi baru atau update dari rilis sebelumnya."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr "DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
msgstr "Media berbeda untuk arsitektur 32 atau 64 bit."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
@@ -3261,24 +3233,24 @@ msgstr ""
"Pengujian Memori, Peralatan Pendeteksi Perangkat Keras."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr "Setiap DVD berisi banyak lingkungan desktop dan bahasa yang tersedia."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid ""
"You'll be given the choice during the installation to add non free software."
msgstr ""
"Anda akan diberikan untuk memilih perangkat lunak non free saat instalasi."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr "Media live"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
@@ -3287,20 +3259,13 @@ msgstr ""
"opsi untuk menginstall Mageia pada HDD Anda."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
#, fuzzy
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr "Setiap ISO hanya berisi satu lingkungan desktop (KDE atau GNOME)."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr "Media berbeda untuk arsitektur 32 atau 64 bit."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous releases.</"
@@ -3311,57 +3276,57 @@ msgstr ""
"sebelumnya.</emphasis>"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr "Mereka berisi perangkat lunak non free."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
#, fuzzy
msgid "Live DVD Plasma"
msgstr "Live DVD KDE"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
#, fuzzy
msgid "Plasma desktop environment only."
msgstr "Hanya lingkungan desktop KDE."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
-#: en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122
+#: en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr "Menyediakan semua bahasa."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr "Live DVD GNOME"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr "Hanya lingkungan desktop GNOME."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
#, fuzzy
msgid "Live DVD Xfce"
msgstr "Live DVD KDE"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
#, fuzzy
msgid "Xfce desktop environment only."
msgstr "Hanya lingkungan desktop KDE."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr "Media CD hanya-boot"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -3375,7 +3340,7 @@ msgstr ""
"drive lokal, jaringan lokal atau Internet."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -3386,17 +3351,17 @@ msgstr ""
"bisa boot dari USB."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr "Hanya bahasa Inggris."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
msgid "netinstall.iso"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
@@ -3405,13 +3370,13 @@ msgstr ""
"menggunakan perangkat lunak tidak bebas."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
#, fuzzy
msgid "netinstall-nonfree.iso"
msgstr "boot-nonfree.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
@@ -3420,17 +3385,17 @@ msgstr ""
"untuk orang-orang yang membutuhkannya."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr "Mengunduh dan Memeriksa Media"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr "Mengunduh"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -3443,12 +3408,12 @@ msgstr ""
"terlalu lambat. Jika http dipilih, Anda juga mungkin melihat"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
@@ -3456,37 +3421,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr "Centang tombol Simpan Berkas."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr "Memeriksa keabsahan media yang diunduh"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr "Buka konsol, tidak perlu menjadi root, dan:"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
"file.iso</userinput>."
@@ -3495,7 +3461,7 @@ msgstr ""
"to/the/image/file.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
"image/file.iso</userinput>."
@@ -3504,7 +3470,7 @@ msgstr ""
"to/the/image/file.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
@@ -3513,32 +3479,32 @@ msgstr ""
"menunggu beberapa saat) dengan nomor yang diberikan oleh Mageia. Contoh:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr "Bakar atau salin ISO"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a boot-able medium."
+"These operations are not a simple copy and aim to make a bootable medium."
msgstr ""
"ISO yang telah diperiksa sekarang bisa dibakar ke sebuah CD atau DVD atau "
"disalin ke sebuah flashdisk. Pekerjaan ini bukan penyalinan sederhana dan "
"bertujuan untuk membuat media yang dapat diboot."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr "Membakar ISO ke CD/DVD"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -3551,12 +3517,12 @@ msgstr ""
"\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images\">wiki Mageia</link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr "Salin ISO ke flashdisk"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
@@ -3565,9 +3531,9 @@ msgstr ""
"flashdisk lalu menggunakannya untuk memboot dan menginstall sistem."
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
@@ -3576,19 +3542,19 @@ msgstr ""
"menjadi sebesar ukuran image."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3597,24 +3563,24 @@ msgstr ""
"org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr "Anda bisa mencoba:"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
@@ -3623,29 +3589,29 @@ msgstr ""
"Disk Imager</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr ""
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr "Anda juga bisa menggunakan dd dari konsol:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr "Buka konsol"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
@@ -3654,31 +3620,31 @@ msgstr ""
"'-' di akhir)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr ""
"Pasang flashdisk (jangan dimount, artinya juga jangan buka aplikasi atau "
"manajer berkas apapun yang bisa membuka atau membacanya)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr "Masukkan perintah <userinput>fdisk -l</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command <code>dmesg</"
"code>: at end, you see the device name starting with <emphasis>sd</"
@@ -3686,7 +3652,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3710,14 +3676,14 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example <code>/"
"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
@@ -3726,12 +3692,12 @@ msgstr ""
"bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr "Dimana X=nama perangkat Anda misal: /dev/sdc"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
"dev/sdb bs=1M</userinput>"
@@ -3740,12 +3706,12 @@ msgstr ""
"dev/sdb bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr "Masukkan perintah: # <userinput>sync</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr "Lepas flashdisk, selesai"
@@ -4229,91 +4195,84 @@ msgstr ""
#: en/setupBootloader.xml:36
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <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 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>"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid ""
+"Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
msgid "Grub2-efi on UEFI systems"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
"choose between with or without graphical menu"
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>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:64
+#: en/setupBootloader.xml:56
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only 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 "
+"If there are already UEFI operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer detects the existing ESP "
+"created by Windows and adds grub2-efi. Although it is possible to have "
"several ESPs, only one is advised and enough whatever the number of "
"operating systems you have."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr "Gunakan bootloader Mageia"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
msgid ""
"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, "
@@ -4322,29 +4281,25 @@ msgid ""
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>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:100
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr "Gunakan bootloader yang ada"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
msgid ""
"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 "
@@ -4358,44 +4313,40 @@ msgstr ""
"menambahkan secara otomatis. Lihat pada dokumentasi sistem operasi."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
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>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:129
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
@@ -4403,17 +4354,17 @@ msgid ""
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
msgid "Options"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<guilabel>Delay before booting the default image</guilabel>: This text box "
"lets you set a delay in seconds before the default operating system is "
@@ -4421,7 +4372,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: en/setupBootloader.xml:162
msgid ""
"<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 "
@@ -4429,14 +4380,14 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
msgid ""
"<guilabel>Password</guilabel>: This text box is where you actually put the "
"password"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:182
+#: en/setupBootloader.xml:173
#, fuzzy
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
@@ -4447,31 +4398,31 @@ msgstr ""
"tiap kotak teks."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
#, fuzzy
msgid "<guilabel>Advanced</guilabel>"
msgstr "<guilabel>Layanan</guilabel>:"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
msgid ""
"<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)."
+"stopping unused devices, this was the method used before APM. Unchecking it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:208
+#: en/setupBootloader.xml:199
msgid ""
"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
"operating system access to the Advanced Programmable Interrupt Controller. "
@@ -4480,38 +4431,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:232
msgid ""
"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:247
+#: en/setupBootloader.xml:239
msgid ""
"<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 "
@@ -4519,7 +4470,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -4908,6 +4859,138 @@ msgid ""
msgstr ""
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
+#~ "\"mediaobject\" id=\"1\"/>"
+#~ msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
+#, 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>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Different media for architecture 32 or 64 bits."
+#~ msgstr "Media berbeda untuk arsitektur 32 atau 64 bit."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, 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>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#~ msgid ""
#~ "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."
@@ -5070,19 +5153,6 @@ msgstr ""
#~ "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 ""
#~ "If you prefer different bootloader settings to those chosen automatically "
#~ "by the installer, you can change them here."
#~ msgstr ""
diff --git a/docs/installer/it.po b/docs/installer/it.po
index f966ebef..89c5e538 100644
--- a/docs/installer/it.po
+++ b/docs/installer/it.po
@@ -15,7 +15,7 @@ msgid ""
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"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
"PO-Revision-Date: 2016-07-17 11:45+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -180,7 +180,7 @@ msgstr "Gestione dell'utente e del superuser"
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -193,12 +193,12 @@ msgstr ""
"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr "Imposta la password dell'amministratore (root):"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -211,7 +211,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
@@ -221,46 +221,46 @@ msgstr ""
"e altri caratteri."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr "Inserisci un utente"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr ""
"<guibutton>Icon</guibutton>: se premi su questo bottone cambierà l'icona "
"utente."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr ""
"<guilabel>Vero nome</guilabel>: Inserisci il vero nome dell'utente in questo "
"spazio."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -268,7 +268,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -276,14 +276,14 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
"protected home directory (umask=0027)."
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - Summary</"
"emphasis> step during the install. Choose <emphasis>User management</"
@@ -291,30 +291,30 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr ""
"I permessi di accesso possono anche essere cambiati dopo l'installazione."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr "Gestione Avanzata Utenti"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr "Inoltre, puoi disattivare o attivare un account speciale."
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -322,7 +322,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -334,7 +334,7 @@ msgstr ""
"rispetto a un utente normale."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -342,7 +342,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -353,7 +353,7 @@ msgstr ""
"vuoto nel caso in cui tu non sappia cosa fare."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -1253,39 +1253,36 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-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=\"../Fdisk.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:56
-#, fuzzy
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
"partition is present with a correct type"
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
-"> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1315,29 +1312,22 @@ msgstr ""
#: en/doPartitionDisks.xml:22
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr "Utilizza le partizioni esistenti"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
@@ -1346,12 +1336,12 @@ msgstr ""
"Linux compatibili e potrebbero essere usate per l'installazione."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr "Utilizza lo spazio libero"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
@@ -1360,12 +1350,12 @@ msgstr ""
"per la tua nuova installazione di Mageia."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr "Usa lo spazio libero di una partizione Windows"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
@@ -1374,7 +1364,7 @@ msgstr ""
"l'installer potrebbe offrirti di utilizzarla."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"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 "
@@ -1382,7 +1372,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1393,7 +1383,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1402,41 +1392,37 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
+#: en/doPartitionDisks.xml:77
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr "Formatta e utilizza tutto il disco"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr "Questa opzione userà l'intero disco per Mageia."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr ""
"Nota bene! Questo cancellerà TUTTI i dati sull'hard drive selezionato. Fai "
"attenzione!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"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 "
@@ -1444,67 +1430,67 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr "Personalizzato"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are created"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid ""
"6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
msgstr ""
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on /"
@@ -1513,7 +1499,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"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 "
@@ -1523,29 +1509,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><note><mediaobject>
#: en/doPartitionDisks.xml:175
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
-"\"/> </imageobject>"
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
-#, fuzzy
-msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
@@ -1553,7 +1532,7 @@ msgstr ""
"\"/> </imageobject>"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
@@ -1565,17 +1544,17 @@ msgid ""
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid ""
"Also make sure all partitions are created with an even number of megabytes."
msgstr ""
@@ -1855,11 +1834,6 @@ msgstr ""
"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -2752,7 +2726,7 @@ msgid "Reboot"
msgstr "Riavvia"
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
"computer, remove the live CD and restart the computer, click on <emphasis "
@@ -2761,22 +2735,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
#, fuzzy
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr ""
"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
@@ -2845,29 +2819,29 @@ msgstr ""
"Center."
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr "Seleziona e utilizza dei file ISO"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr "Introduzione"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target system. "
@@ -2876,7 +2850,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -2884,22 +2858,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr "Media"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr "Definizione"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
@@ -2907,7 +2881,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
"\">here</link>."
@@ -2916,23 +2890,23 @@ msgstr ""
"link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr "Media di installazione classico"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78
+#: en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr "Funzioni comuni"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr "Queste ISO usano l'installer tradizionale chiamato drakx"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid ""
"They are able to make a clean install or an update from previous releases."
msgstr ""
@@ -2940,17 +2914,19 @@ msgstr ""
"precedente."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr "DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
-msgstr "Media diversi per le architetture a 32 o 64 bits."
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
+msgstr "Diversi media per architetture a 32 o 64 bit."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
@@ -2959,12 +2935,12 @@ msgstr ""
"Sistema, Test della Memoria, Strumento di Identificazione Hardware."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr "Ogni DVD contiene diversi desktop environments e lingue."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid ""
"You'll be given the choice during the installation to add non free software."
msgstr ""
@@ -2972,12 +2948,12 @@ msgstr ""
"non free."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr "Media live"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
@@ -2986,20 +2962,13 @@ msgstr ""
"installarla su di un HDD avendo comunque la possibilità di farlo."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
#, fuzzy
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr "Ogni ISO contiene un solo desktop environment (KDE o GNOME)."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr "Diversi media per architetture a 32 o 64 bit."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous releases.</"
@@ -3010,57 +2979,57 @@ msgstr ""
"precedente release.</emphasis>"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr "Contengono del software non libero."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
#, fuzzy
msgid "Live DVD Plasma"
msgstr "DVD Live con KDE"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
#, fuzzy
msgid "Plasma desktop environment only."
msgstr "Solamente l'ambiente KDE."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
-#: en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122
+#: en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr "Sono presenti tutte le lingue."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr "DVD Live con GNOME"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr "Solamente l'ambiente GNOME."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
#, fuzzy
msgid "Live DVD Xfce"
msgstr "DVD Live con KDE"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
#, fuzzy
msgid "Xfce desktop environment only."
msgstr "Solamente l'ambiente KDE."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr "Boot-only CD media"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -3074,7 +3043,7 @@ msgstr ""
"network locale o su internet."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -3085,17 +3054,17 @@ msgstr ""
"senza DVD o un PC che non può eseguire il boot da una chiavetta USB."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr "Solamente la lingua inglese."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
msgid "netinstall.iso"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
@@ -3104,13 +3073,13 @@ msgstr ""
"software proprietario."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
#, fuzzy
msgid "netinstall-nonfree.iso"
msgstr "boot-nonfree.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
@@ -3119,17 +3088,17 @@ msgstr ""
"persone che ne hanno bisogno."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr "Scaricando e controllando il media"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr "Download in corso"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -3142,12 +3111,12 @@ msgstr ""
"bassa. Se è stato scelto http potreste inoltre vedere qualcosa come"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
@@ -3155,37 +3124,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr "Controllando l'integrità del media scaricato."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr "Aprire la console, senza obbligo di essere root, e:"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
"file.iso</userinput>."
@@ -3194,7 +3164,7 @@ msgstr ""
"image/file.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
"image/file.iso</userinput>."
@@ -3203,7 +3173,7 @@ msgstr ""
"the/image/file.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
@@ -3212,32 +3182,32 @@ msgstr ""
"attendere un poco) a quello dato da Mageia. Per esempio:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr "Masterizza o esegui un dump dell'ISO"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a boot-able medium."
+"These operations are not a simple copy and aim to make a bootable medium."
msgstr ""
"L'ISO controllata può essere masterizzata su un CD o un DVD o dumpata su di "
"una chiavetta USB. Queste operazioni non sono una semplice copia e puntano e "
"creare un media avviabile."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr "Masterizzando la ISO su di un CD/DVD"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -3251,12 +3221,12 @@ msgstr ""
"Writing_CD_and_DVD_images\">wiki di Mageia</link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr "Esegui il dump di una ISO su di una chiavetta USB."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
@@ -3265,9 +3235,9 @@ msgstr ""
"una chiavetta USB e usarle per avviare e installare il sistema."
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
@@ -3276,19 +3246,19 @@ msgstr ""
"partizione ridotta alla grandezza dell'immagine del disco."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3297,24 +3267,24 @@ msgstr ""
"org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr "Potresti provare:"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
@@ -3323,29 +3293,29 @@ msgstr ""
"Disk Imager</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr ""
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr "Puoi anche usare il tool dd in una console:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr "Apri una console"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
@@ -3354,31 +3324,31 @@ msgstr ""
"'-' finale)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr ""
"Collega la tua chiavetta USB (non montarla, questo significa anche non "
"aprire alcuna applicazione o file manager che può averne accesso o leggerla)."
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr "Inserisci il comando <userinput>fdisk -l</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command <code>dmesg</"
"code>: at end, you see the device name starting with <emphasis>sd</"
@@ -3386,7 +3356,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3410,14 +3380,14 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example <code>/"
"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
@@ -3426,12 +3396,12 @@ msgstr ""
"bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr "Dove X = nome del tuo dispositivo esempio: /dev/sdc"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
"dev/sdb bs=1M</userinput>"
@@ -3440,12 +3410,12 @@ msgstr ""
"dev/sdb bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr "Inserire il comando: # <userinput>sync</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr "Togli la tua chiavetta USB, hai concluso"
@@ -3887,89 +3857,82 @@ msgstr ""
#: en/setupBootloader.xml:36
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <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 condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid ""
+"Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
msgid "Grub2-efi on UEFI systems"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
"choose between with or without graphical menu"
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:58
+#: en/setupBootloader.xml:56
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:64
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only 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 "
+"If there are already UEFI operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer detects the existing ESP "
+"created by Windows and adds grub2-efi. Although it is possible to have "
"several ESPs, only one is advised and enough whatever the number of "
"operating systems you have."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
msgid ""
"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, "
@@ -3978,28 +3941,25 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:100
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-"imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.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=\"Download.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr "Usare un bootloader esistente"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
msgid ""
"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 "
@@ -4009,43 +3969,40 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:136
+#: en/setupBootloader.xml:129
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.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=\"Download.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
@@ -4053,17 +4010,17 @@ msgid ""
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
msgid "Options"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<guilabel>Delay before booting the default image</guilabel>: This text box "
"lets you set a delay in seconds before the default operating system is "
@@ -4071,7 +4028,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: en/setupBootloader.xml:162
msgid ""
"<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 "
@@ -4079,45 +4036,45 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
msgid ""
"<guilabel>Password</guilabel>: This text box is where you actually put the "
"password"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:182
+#: en/setupBootloader.xml:173
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
"check that it matches with the one set above."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
#, fuzzy
msgid "<guilabel>Advanced</guilabel>"
msgstr "<guilabel>Servizi</guilabel>:"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
msgid ""
"<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)."
+"stopping unused devices, this was the method used before APM. Unchecking it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:208
+#: en/setupBootloader.xml:199
msgid ""
"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
"operating system access to the Advanced Programmable Interrupt Controller. "
@@ -4126,38 +4083,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:232
msgid ""
"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:247
+#: en/setupBootloader.xml:239
msgid ""
"<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 "
@@ -4165,7 +4122,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -4518,6 +4475,121 @@ msgid ""
"At the end, you get a blank screen for some time, it's normal."
msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
+#~ "\"mediaobject\" id=\"1\"/>"
+#~ msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
+#, 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>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/"
+#~ "> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+
+#~ msgid "Different media for architecture 32 or 64 bits."
+#~ msgstr "Media diversi per le architetture a 32 o 64 bits."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, 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>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
#~ msgid ""
#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
diff --git a/docs/installer/ja.po b/docs/installer/ja.po
index fb4dfcba..fb4f5526 100644
--- a/docs/installer/ja.po
+++ b/docs/installer/ja.po
@@ -8,7 +8,7 @@ msgid ""
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"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
"PO-Revision-Date: 2016-07-17 11:51+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -160,7 +160,7 @@ msgstr ""
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -174,12 +174,12 @@ msgstr ""
"fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -192,49 +192,49 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr "ユーザ名を入力"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -242,7 +242,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -250,14 +250,14 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
"protected home directory (umask=0027)."
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - Summary</"
"emphasis> step during the install. Choose <emphasis>User management</"
@@ -265,29 +265,29 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr ""
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -295,7 +295,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -303,7 +303,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -311,7 +311,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -319,7 +319,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -1187,45 +1187,40 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </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><note><para>
-#: en/diskdrake.xml:56
-#, fuzzy
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
"partition is present with a correct type"
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
#, 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>"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.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>"
#. type: Content of: <section><info><title>
#: en/doPartitionDisks.xml:9
@@ -1251,60 +1246,53 @@ msgstr ""
#: en/doPartitionDisks.xml:22
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"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 "
@@ -1312,7 +1300,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1323,7 +1311,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1332,41 +1320,35 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
+#: en/doPartitionDisks.xml:77
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"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 "
@@ -1374,67 +1356,67 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr "カスタム"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are created"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid ""
"6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
msgstr ""
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on /"
@@ -1443,7 +1425,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"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 "
@@ -1453,29 +1435,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><note><mediaobject>
#: en/doPartitionDisks.xml:175
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
-#, fuzzy
-msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
@@ -1483,7 +1458,7 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
@@ -1495,17 +1470,17 @@ msgid ""
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid ""
"Also make sure all partitions are created with an even number of megabytes."
msgstr ""
@@ -1761,11 +1736,6 @@ msgstr ""
"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -2598,7 +2568,7 @@ msgid "Reboot"
msgstr "再起動"
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
"computer, remove the live CD and restart the computer, click on <emphasis "
@@ -2607,22 +2577,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
#, fuzzy
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr ""
"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
@@ -2683,29 +2653,29 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr "序文"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target system. "
@@ -2714,7 +2684,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -2722,22 +2692,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
@@ -2745,88 +2715,83 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
"\">here</link>."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78
+#: en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid ""
"They are able to make a clean install or an update from previous releases."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr "DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid ""
"You'll be given the choice during the installation to add non free software."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous releases.</"
@@ -2834,53 +2799,53 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
msgid "Live DVD Plasma"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
msgid "Plasma desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
-#: en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122
+#: en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
msgid "Live DVD Xfce"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
msgid "Xfce desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -2889,7 +2854,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -2897,46 +2862,46 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
msgid "netinstall.iso"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
msgid "netinstall-nonfree.iso"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -2945,12 +2910,12 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
@@ -2958,80 +2923,81 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
"file.iso</userinput>."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
"image/file.iso</userinput>."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a boot-able medium."
+"These operations are not a simple copy and aim to make a bootable medium."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -3040,121 +3006,121 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
msgstr ""
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr ""
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command <code>dmesg</"
"code>: at end, you see the device name starting with <emphasis>sd</"
@@ -3162,7 +3128,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3186,38 +3152,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example <code>/"
"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
"dev/sdb bs=1M</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr ""
@@ -3607,91 +3573,84 @@ msgstr ""
#: en/setupBootloader.xml:36
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <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 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>"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid ""
+"Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
msgid "Grub2-efi on UEFI systems"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
"choose between with or without graphical menu"
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:58
+#: en/setupBootloader.xml:56
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:64
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </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><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only 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 "
+"If there are already UEFI operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer detects the existing ESP "
+"created by Windows and adds grub2-efi. Although it is possible to have "
"several ESPs, only one is advised and enough whatever the number of "
"operating systems you have."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
msgid ""
"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, "
@@ -3700,29 +3659,25 @@ msgid ""
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>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:100
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </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><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
msgid ""
"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 "
@@ -3732,44 +3687,40 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
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>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:129
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </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><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
@@ -3777,17 +3728,17 @@ msgid ""
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
msgid "Options"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<guilabel>Delay before booting the default image</guilabel>: This text box "
"lets you set a delay in seconds before the default operating system is "
@@ -3795,7 +3746,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: en/setupBootloader.xml:162
msgid ""
"<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 "
@@ -3803,45 +3754,45 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
msgid ""
"<guilabel>Password</guilabel>: This text box is where you actually put the "
"password"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:182
+#: en/setupBootloader.xml:173
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
"check that it matches with the one set above."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
#, fuzzy
msgid "<guilabel>Advanced</guilabel>"
msgstr "<guilabel>プロキシ</guilabel>:"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
msgid ""
"<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)."
+"stopping unused devices, this was the method used before APM. Unchecking it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:208
+#: en/setupBootloader.xml:199
msgid ""
"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
"operating system access to the Advanced Programmable Interrupt Controller. "
@@ -3850,38 +3801,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:232
msgid ""
"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:247
+#: en/setupBootloader.xml:239
msgid ""
"<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 "
@@ -3889,7 +3840,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -4235,6 +4186,135 @@ msgid ""
msgstr ""
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
+#~ "\"mediaobject\" id=\"1\"/>"
+#~ msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
+#, 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>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, 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>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#~ msgid ""
#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
#~ msgstr ""
@@ -4301,16 +4381,3 @@ msgstr ""
#~ 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>"
diff --git a/docs/installer/nl.po b/docs/installer/nl.po
index 1bb3b59f..1ae38fd7 100644
--- a/docs/installer/nl.po
+++ b/docs/installer/nl.po
@@ -15,7 +15,7 @@ msgid ""
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"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
"PO-Revision-Date: 2017-02-21 16:10+0000\n"
"Last-Translator: dragnadh <dragnadh@gmail.com>\n"
"Language-Team: Dutch (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -190,7 +190,7 @@ msgstr "Gebruikersbeheer"
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -203,12 +203,12 @@ msgstr ""
"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr "Beheerderswachtwoord (root) instellen:"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -229,7 +229,7 @@ msgstr ""
"sluiten."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
@@ -239,16 +239,16 @@ msgstr ""
"en andere tekens."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr "Voer een gebruiker in"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
"Voeg hier een gebruiker toe. Een gebruiker heeft minder rechten dan de "
"superuser (root), maar genoeg om over internet te surfen, "
@@ -256,35 +256,35 @@ msgstr ""
"normaal mens zijn computer voor gebruikt."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr ""
"<guibutton>Pictogram</guibutton>: klik op het pictogram om het te veranderen."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr ""
"<guilabel>Volledige naam</guilabel>: Voer hier de volledige naam van de "
"gebruiker in."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
"<guilabel>Aanmeldnaam</guilabel>: Voer hier een aanmeldnaam voor de "
"gebruiker in, of laat DrakX er een kiezen op basis van de ingevoerde "
"volledige naam. <emphasis>De aanmeldnaam is hoofdlettergevoelig.</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -295,7 +295,7 @@ msgstr ""
"wachtwoord weergeeft. (Zie ook <xref linkend=\"givePassword\"/>)"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -305,7 +305,7 @@ msgstr ""
"in dit tekstvak en DrakX zal controleren of beide wachtwoorden gelijk zijn."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
"protected home directory (umask=0027)."
@@ -315,7 +315,7 @@ msgstr ""
"(umask=0027)."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - Summary</"
"emphasis> step during the install. Choose <emphasis>User management</"
@@ -326,17 +326,17 @@ msgstr ""
"<emphasis>Gebruikersbeheer</emphasis> te kiezen."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr "De toegangsrechten kunnen na het installeren ook nog veranderd worden."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr "Geavanceerd gebruikersbeheer"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
@@ -346,12 +346,12 @@ msgstr ""
"wordt."
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr "Daarnaast kunt u een gastaccount activeren of deactiveren."
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -362,7 +362,7 @@ msgstr ""
"belangrijke gegevens kan hij het beste op een USB pen zetten."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -374,7 +374,7 @@ msgstr ""
"gebruiker."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -385,7 +385,7 @@ msgstr ""
"wordt. De mogelijkheden zijn Bash, Dash and Sh"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -396,7 +396,7 @@ msgstr ""
"dit vak leeg, tenzij u weet wat u doet."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -1458,29 +1458,23 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
-msgid ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </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><note><para>
-#: en/diskdrake.xml:56
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
-msgstr ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
"partition is present with a correct type"
@@ -1489,15 +1483,17 @@ msgstr ""
"opstart-partitie beschikbaar is met het juist type"
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
-"> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
-"> </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><info><title>
#: en/doPartitionDisks.xml:9
@@ -1526,29 +1522,24 @@ msgstr ""
#. type: Content of: <section><mediaobject>
#: en/doPartitionDisks.xml:22
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr "Huidige partities gebruiken"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
@@ -1557,12 +1548,12 @@ msgstr ""
"gevonden die gebruikt kunnen worden voor het installeren."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr "Vrije ruimte gebruiken"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
@@ -1571,12 +1562,12 @@ msgstr ""
"Mageia-installatie wilt gebruiken, kies dan deze optie."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr "Gebruik vrije ruimte op een Windows Partitie"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
@@ -1585,7 +1576,7 @@ msgstr ""
"gebruiken."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"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 "
@@ -1596,7 +1587,7 @@ msgstr ""
"van al uw belangrijke bestanden een reservekopie heeft!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1614,7 +1605,7 @@ msgstr ""
"uw persoonlijke bestanden te maken op een andere schijf of lokatie."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1627,42 +1618,37 @@ msgstr ""
"links of rechts te slepen. Zie de schermafbeelding hieronder."
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
+#: en/doPartitionDisks.xml:77
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr "Volledige harde schijf wissen en gebruiken."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr "Met deze optie zal de gehele schijf voor Mageia gebruikt worden."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr ""
"Let op! Hierdoor zullen ALLE gegevens op de geselecteerde harde schijf "
"gewist worden. Wees voorzichtig!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"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 "
@@ -1673,12 +1659,12 @@ msgstr ""
"verliezen."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr "Aangepaste schijfpartitionering"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
@@ -1687,12 +1673,12 @@ msgstr ""
"uw harde schijf of schijven."
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr "<emphasis role=\"bold\">Partitiegroottes:</emphasis>"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
@@ -1701,7 +1687,7 @@ msgstr ""
"de beschikbare ruimte volgens onderstaande regels gebruikt worden:"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
@@ -1710,30 +1696,30 @@ msgstr ""
"partitie aangemaakt, voor /, er is geen aparte partitie voor /home."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are created"
msgstr ""
"Als er meer dan 50 GB beschikbaar is, dan worden drie partities aangemaakt"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid ""
"6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr "6/19e van de beschikbare ruimte gaat naar /, tot een maximum van 50 GB"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr "1/19e gaat naar de swap-partitie, tot een maximum van 4 GB"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr "de rest (minimaal 12/19e) gaat naar /home"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1742,7 +1728,7 @@ msgstr ""
"gemaakt worden: 50 GB /, 4 GB swap en alle overige ruimte gaat naar /home."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on /"
@@ -1755,7 +1741,7 @@ msgstr ""
"waarmee kan worden gecontroleerd of het juist gedaan is"
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"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 "
@@ -1771,26 +1757,21 @@ msgstr ""
"selecteren als bestandssysteem type."
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"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><note><mediaobject>
#: en/doPartitionDisks.xml:175
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
-msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
@@ -1798,7 +1779,7 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
@@ -1817,17 +1798,17 @@ msgstr ""
"gparted, te partitioneren en de volgende instellingen te gebruiken:"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr "\"Uitlijnen met\" \"MiB\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr "\"Vrije ruimte links (MiB)\" \"2\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid ""
"Also make sure all partitions are created with an even number of megabytes."
msgstr ""
@@ -2125,11 +2106,6 @@ msgstr ""
"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -3136,7 +3112,7 @@ msgid "Reboot"
msgstr "Herstarten"
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
"computer, remove the live CD and restart the computer, click on <emphasis "
@@ -3150,15 +3126,16 @@ msgstr ""
"gevraagd<emphasis role=\"bold\"> in deze volgorde!</emphasis>"
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
+#, fuzzy
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
"Als u de computer opnieuw opstart, zult u meerdere downloadvoortgangsbalken "
@@ -3166,7 +3143,7 @@ msgstr ""
"gedownload (zie Softwarebeheer)."
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -3236,17 +3213,17 @@ msgstr ""
"configuratiecentrum (MCC)."
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr "Selecteer en gebruik ISO's"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr "Introductie"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
@@ -3255,12 +3232,12 @@ msgstr ""
"helpen bij het kiezen van een afbeelding die aan uw wensen voldoet."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr "Er zijn twee mediafamilies:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target system. "
@@ -3274,7 +3251,7 @@ msgstr ""
"installeren."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -3286,22 +3263,22 @@ msgstr ""
"minder keuzes."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr "Details worden gegeven in de volgende secties."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr "Media"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr "Definitie"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
@@ -3312,7 +3289,7 @@ msgstr ""
"ISO-bestand op gekopieerd is."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
"\">here</link>."
@@ -3321,23 +3298,23 @@ msgstr ""
"vinden."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr "Klassieke installatiemedia"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78
+#: en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr "Algemene eigenschappen"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr "Deze ISO's gebruiken het traditionele installatieprogramma, drakx."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid ""
"They are able to make a clean install or an update from previous releases."
msgstr ""
@@ -3345,17 +3322,19 @@ msgstr ""
"actualiseren."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr "dvd"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
-msgstr "Verschillende media voor 32- en 64-bits architectuur."
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
+msgstr "Vershillende media voor 32- en 64-bits architectuur."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
@@ -3364,12 +3343,12 @@ msgstr ""
"Test, Hardware Detection Tool."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr "Elke DVD bevat veel beschikbare bureaubladomgevingen en talen."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid ""
"You'll be given the choice during the installation to add non free software."
msgstr ""
@@ -3377,12 +3356,12 @@ msgstr ""
"voegen."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr "Live media"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
@@ -3391,19 +3370,12 @@ msgstr ""
"schijf te installeren. Indien gewenst is installeren wel mogelijk."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr "Elke ISO bevat slechts één werkomgeving (KDE, GNOME of Xfce)."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr "Vershillende media voor 32- en 64-bits architectuur."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous releases.</"
@@ -3414,53 +3386,53 @@ msgstr ""
"mee bij te werken.</emphasis>"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr "Ze bevatten niet-vrije software."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
msgid "Live DVD Plasma"
msgstr "PLASMA Live DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
msgid "Plasma desktop environment only."
msgstr "Enkel PLASMA-werkomgeving."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
-#: en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122
+#: en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr "Alle talen zijn aanwezig."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr "GNOME Live DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr "Enkel GNOME werkomgeving."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
msgid "Live DVD Xfce"
msgstr "Xfce Live DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
msgid "Xfce desktop environment only."
msgstr "Enkel Xfce-werkomgeving."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr "Enkel-opstart CD-media"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -3474,7 +3446,7 @@ msgstr ""
"station, lokaal netwerk of op internet."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -3485,17 +3457,17 @@ msgstr ""
"een pc die niet van een USB-stick kan booten."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr "Enkel de Engelse taal."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
msgid "netinstall.iso"
msgstr "netinstall.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
@@ -3504,12 +3476,12 @@ msgstr ""
"gebruiken."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
msgid "netinstall-nonfree.iso"
msgstr "netinstall-nonfree.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
@@ -3518,17 +3490,17 @@ msgstr ""
"nodig hebben."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr "Een medium downloaden en checken"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr "Downloaden"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -3541,12 +3513,12 @@ msgstr ""
"laag is. Als http werd gekozen, kun u ook iets zien zoals:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
@@ -3557,28 +3529,30 @@ msgstr ""
"\"integrity\">voor verder gebruik</link>. Dan verschijnt er dit venster:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr "Vink het selectierondje 'Bestand opslaan' aan."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr "De integriteit van het gedownloade ISO controleren"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
"Beide checksums zijn hexadecimale getallen die door een algoritme voor het "
"te downloaden bestand berekend zijn. Als u deze checksums opnieuw laat "
@@ -3587,12 +3561,12 @@ msgstr ""
"overdoen."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr "Open een terminal (niet als root), en:"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
"file.iso</userinput>."
@@ -3601,7 +3575,7 @@ msgstr ""
"het/image/bestand.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
"image/file.iso</userinput>."
@@ -3610,7 +3584,7 @@ msgstr ""
"het/image/bestand.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
@@ -3619,32 +3593,32 @@ msgstr ""
"voor het verschijnt) met het getal dat door Mageia gegeven werd. Voorbeeld:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr "Brand of dump het ISO"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a boot-able medium."
+"These operations are not a simple copy and aim to make a bootable medium."
msgstr ""
"De gecontroleerde ISO can nu op een CD of DVD gebrand worden, of worden "
"gedumpt op een USB-stick. Dit is niet hetzelfde als gewoon kopiëren, maar "
"zorgt wel dat een opstartbaar medium gemaakt wordt."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr "De ISO op een CD/DVD branden"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -3658,12 +3632,12 @@ msgstr ""
"link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr "Dump de ISO op een USB-stick"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
@@ -3672,9 +3646,9 @@ msgstr ""
"'dumpen' en dan van die USB-stick op kunt starten en installeren."
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
@@ -3683,7 +3657,7 @@ msgstr ""
"capaciteit zal worden gereduceerd tot de grootte van het beeldbestand."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
@@ -3692,12 +3666,12 @@ msgstr ""
"partitioneren en formatteren."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr "Gebruik een grafisch hulpmiddel binnen Mageia"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3706,17 +3680,17 @@ msgstr ""
"mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr "Gebruik een grafisch hulpmiddel binnen Windows"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr "Probeer bijv.:"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
@@ -3725,7 +3699,7 @@ msgstr ""
"\"ISO-image\"-optie;"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
@@ -3734,12 +3708,12 @@ msgstr ""
"Disk Imager</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr "Gebruik de commandoregel binnen een GNU/Linux-systeem"
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
@@ -3748,17 +3722,17 @@ msgstr ""
"overschrijven van een schijfpartitie als je het apparaat-ID verkeerd krijgt."
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr "U kunt ook de dd tool gebruiken in een terminal:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr "Open een terminal"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
@@ -3767,31 +3741,31 @@ msgstr ""
"het eind niet)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr ""
"Plug uw USB-stick in (koppel hem niet, dat betekent ook geen applicatie of "
"bestandsmanager openen die hem zou kunnen bekijken of lezen)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr "Voer het commando <userinput>fdisk -l</userinput> in"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command <code>dmesg</"
"code>: at end, you see the device name starting with <emphasis>sd</"
@@ -3802,7 +3776,7 @@ msgstr ""
"<emphasis>sdd</emphasis> als volgt zien:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3844,7 +3818,7 @@ msgstr ""
"[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example <code>/"
"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
@@ -3853,7 +3827,7 @@ msgstr ""
"code> in bovenstaande schermafbeelding. Het is een 8GB USB-stick."
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
@@ -3862,12 +3836,12 @@ msgstr ""
"bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr "Waar X=apparaatnaam, bijv: /dev/sdc"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
"dev/sdb bs=1M</userinput>"
@@ -3876,12 +3850,12 @@ msgstr ""
"dev/sdb bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr "Geef het commando: # <userinput>sync</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr "Verwijder uw USB-stick, hij is gereed"
@@ -4362,32 +4336,30 @@ msgstr "Grub2 op Legacy/MBR en Legacy/GPT systemen"
#. type: Content of: <section><section><section><mediaobject>
#: en/setupBootloader.xml:36
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
"setupBootloader.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
-"setupBootloader.png\"/> </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><section><section><para>
-#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid ""
+"Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr "Wijzig het \"Opstartapparaat\" niet, tenzij u weet wat u doet."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
msgid "Grub2-efi on UEFI systems"
msgstr "Grub2-efi op UEFI systemen"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
"choose between with or without graphical menu"
@@ -4396,31 +4368,27 @@ msgstr ""
"niet kiezen of u wel of niet een grafische menu wilt"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:58
+#: en/setupBootloader.xml:56
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:64
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"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><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
+#, fuzzy
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only 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 "
+"If there are already UEFI operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer detects the existing ESP "
+"created by Windows and adds grub2-efi. Although it is possible to have "
"several ESPs, only one is advised and enough whatever the number of "
"operating systems you have."
msgstr ""
@@ -4433,17 +4401,17 @@ msgstr ""
"laten. Één is genoeg, ongeacht het aantal besturingssystemen dat u heeft."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr "De Mageia-opstartlader gebruiken"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr "Afhankelijk van uw systeem schrijft Mageia standaard een nieuw:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
@@ -4452,12 +4420,12 @@ msgstr ""
"schijf of in de BIOS-opstart-partitie."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr "Grub2-efi opstartlader in de ESP"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
msgid ""
"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, "
@@ -4470,30 +4438,25 @@ msgstr ""
"bij het vakje <guilabel>Peil Onbekend OS</guilabel>"
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:100
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"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><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr "Een bestaande opstartlader gebruiken"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
msgid ""
"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 "
@@ -4508,14 +4471,14 @@ msgstr ""
"documentatie van het betreffende besturingssysteem."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr "Met behulp van opeenvolgend laden"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
msgstr ""
@@ -4525,34 +4488,29 @@ msgstr ""
"<guilabel>ESP of MBR niet aanraken</guilabel> aan."
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:136
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:129
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"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><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
msgstr ""
"U zal een waarschuwing krijgen dat de opstartlader ontbreekt, negeer het "
"door te klikken op <guibutton>Oke</guibutton>."
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
"imageobject>"
@@ -4561,17 +4519,17 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
msgid "Options"
msgstr "Opties"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr "Eerste pagina"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<guilabel>Delay before booting the default image</guilabel>: This text box "
"lets you set a delay in seconds before the default operating system is "
@@ -4582,7 +4540,7 @@ msgstr ""
"instellen voordat het standaard besturingssysteem wordt opgestart."
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: en/setupBootloader.xml:162
msgid ""
"<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 "
@@ -4594,7 +4552,7 @@ msgstr ""
"wijzigen tijdens het opstarten."
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
msgid ""
"<guilabel>Password</guilabel>: This text box is where you actually put the "
"password"
@@ -4603,7 +4561,7 @@ msgstr ""
"invoert"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:182
+#: en/setupBootloader.xml:173
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
"check that it matches with the one set above."
@@ -4613,19 +4571,20 @@ msgstr ""
"ingevoerd."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
msgid "<guilabel>Advanced</guilabel>"
msgstr "<guilabel>Gevorderd</guilabel>"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
+#, fuzzy
msgid ""
"<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)."
+"stopping unused devices, this was the method used before APM. Unchecking it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
msgstr ""
"<guilabel>ACPI Inschakelen:</guilabel> ACPI (Advanced Configuration and "
"Power Interface) is een standaard voor energiebeheer. Het kan energie "
@@ -4636,7 +4595,7 @@ msgstr ""
"systeem willekeurige opnieuw opstart of vastloopt)."
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
@@ -4646,7 +4605,7 @@ msgstr ""
"juist uit te schakelen."
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:208
+#: en/setupBootloader.xml:199
msgid ""
"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
"operating system access to the Advanced Programmable Interrupt Controller. "
@@ -4659,27 +4618,27 @@ msgstr ""
"Geavanceerde IRQ (Verzoek voor Onderbreking) beheer toe."
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
"<guilabel>Lokale APIC Inschakelen</guilabel>: Hiermee kunt u de lokale APIC "
"instellen, dit beheert alle externe onderbrekingen voor een aantal "
"specifieke processoren in een SMP-systeem."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr "Volgende pagina"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr "<guilabel>Standaard:</guilabel> Besturingssysteem standaard opgestart"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
@@ -4689,7 +4648,7 @@ msgstr ""
"te geven."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:232
msgid ""
"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
@@ -4698,7 +4657,7 @@ msgstr ""
"\"setupMageiaBootloader\">Met behulp van de Mageia opstartlader</link>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:247
+#: en/setupBootloader.xml:239
msgid ""
"<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 "
@@ -4710,7 +4669,8 @@ msgstr ""
"grootte en kleurdiepte kiezen."
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
+#, fuzzy
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -5117,3 +5077,130 @@ msgid ""
msgstr ""
"De volgende stap is het kopiëren van bestanden naar de harde schijf. Dit "
"duurt enige minuten. Dan ziet u een poos een blanco scherm, dat is normaal."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
+#~ "\"mediaobject\" id=\"1\"/>"
+#~ msgstr ""
+#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
+#~ "\"mediaobject\" id=\"1\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png"
+#~ "\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png"
+#~ "\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Different media for architecture 32 or 64 bits."
+#~ msgstr "Verschillende media voor 32- en 64-bits architectuur."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+#~ "setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+#~ "setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
diff --git a/docs/installer/pl.po b/docs/installer/pl.po
index 96df8c2b..09cf1f51 100644
--- a/docs/installer/pl.po
+++ b/docs/installer/pl.po
@@ -14,7 +14,7 @@ msgid ""
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"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
"PO-Revision-Date: 2017-02-10 17:18+0000\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Polish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -192,7 +192,7 @@ msgstr "Zarządzanie użytkownikami"
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -201,12 +201,12 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr "Ustawienie hasła administratora (root):"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -225,7 +225,7 @@ msgstr ""
"poniżej."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
@@ -234,16 +234,16 @@ msgstr ""
"hasła zawierającego litery (duże i małe), numery oraz inne znaki."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr "Dodaj użytkownika"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
"Tutaj dodajemy użytkownika. Użytkownik ma mniejsze uprawnienia od "
"administratora (root), ale wystarczające, aby przeglądać Internet, używać "
@@ -251,28 +251,28 @@ msgstr ""
"które wykonuje na swoim komputerze przeciętny użytkownik."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr ""
"<guibutton>Ikona</guibutton>: użycie tego przycisku zmieni ikonę użytkownika."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr ""
"<guilabel>Imię i nazwisko</guilabel>: Wpisz swoje imię i nazwisko do tego "
"pola tekstowego"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
"<guilabel>Nazwa użytkownika</guilabel>: Tutaj wpisz nazwę użytkownika - "
"będzie ona używana podczas logowania. Możesz też pozwolić, aby instalator "
@@ -280,7 +280,7 @@ msgstr ""
"ma znaczenie.</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -291,7 +291,7 @@ msgstr ""
"\"givePassword\"/>)"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -301,14 +301,14 @@ msgstr ""
"tym polu, instalator sprawdzi czy hasła się zgadzają."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
"protected home directory (umask=0027)."
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - Summary</"
"emphasis> step during the install. Choose <emphasis>User management</"
@@ -316,17 +316,17 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr "Ustawienia dostępu mogą być również zmienione po instalacji."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr "Zaawansowane Zarządzanie Użytkownikami"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
@@ -335,12 +335,12 @@ msgstr ""
"możliwość edycji ustawień dla użytkownika którego dodajesz."
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr "Dodatkowo, możesz włączyć lub wyłączyć konto gościa"
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -350,7 +350,7 @@ msgstr ""
"wykasowane po jego wylogowaniu. Gość musi zapisywać ważne pliki na USB."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -361,7 +361,7 @@ msgstr ""
"przez gości, ale posiada mniejsze uprawnienia niż zwykły użytkownik."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -371,7 +371,7 @@ msgstr ""
"przez użytkownika, którego dodajesz, do wyboru Bash, Dash oraz Sh"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -382,7 +382,7 @@ msgstr ""
"wiesz, co robisz."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -1376,37 +1376,42 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
-msgid ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:56
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr ""
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
"partition is present with a correct type"
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
-"> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
#. type: Content of: <section><info><title>
#: en/doPartitionDisks.xml:9
@@ -1434,25 +1439,25 @@ msgstr ""
#. type: Content of: <section><mediaobject>
#: en/doPartitionDisks.xml:22
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
"imageobject>"
-msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr "Użyj istniejących partycji"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
@@ -1461,12 +1466,12 @@ msgstr ""
"linuksowe i mogą być użyte do instalacji."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr "Wykorzystaj wolne miejsce"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
@@ -1475,12 +1480,12 @@ msgstr ""
"wykorzystane do instalacji Magei."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr "Wykorzystaj wolne miejsce na partycji Windows"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
@@ -1489,7 +1494,7 @@ msgstr ""
"zaproponuje, aby je wykorzystać."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"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 "
@@ -1500,7 +1505,7 @@ msgstr ""
"kopię zapasową ważnych plików!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1517,7 +1522,7 @@ msgstr ""
"wskazane jest zrobienie kopii zapasowej ważnych plików."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1526,36 +1531,36 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:77
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
"imageobject>"
-msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr "Wymaż i wykorzystaj cały dysk"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr "Ta opcja użyje całego dysku dla Magei."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr "Zauważ! WSZYSTKIE dane z wybranego dysku zostaną wymazane. Uważaj!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"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 "
@@ -1565,12 +1570,12 @@ msgstr ""
"dysku dane, których nie chcesz stracić, nie używaj tej opcji."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr "Własne"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
@@ -1578,12 +1583,12 @@ msgstr ""
"Ta opcja daje Ci całkowitą kontrolę nad sposobem przeprowadzenia instalacji."
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
@@ -1591,7 +1596,7 @@ msgstr ""
"Instalator podzieli obecną przestrzeń odnosząc się do następujących zasad:"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
@@ -1600,7 +1605,7 @@ msgstr ""
"partycja zostanie utworzona dla /, nie ma oddzielnej partycji dla /home."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are created"
msgstr ""
@@ -1608,7 +1613,7 @@ msgstr ""
"utworzone trzy partycje"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid ""
"6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr ""
@@ -1616,18 +1621,18 @@ msgstr ""
"maksimum wynosi 50 GB"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr ""
"1/19 przestrzeni zostanie przydzielona jako swap, jednak maksimum wynosi 4 GB"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr "Cała reszta (conajmniej 12/19) zostanie przydzielone dla /home"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1636,7 +1641,7 @@ msgstr ""
"trzy partycje: 50GB dla /, 4GB dla swap i całą resztę dla /home."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on /"
@@ -1645,7 +1650,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"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 "
@@ -1655,28 +1660,28 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
"imageobject>"
-msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
+#: en/doPartitionDisks.xml:175
msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
@@ -1693,17 +1698,17 @@ msgstr ""
"pomocą innego narzędzia jak np. gparted. przy użyciu następujących ustawień:"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid ""
"Also make sure all partitions are created with an even number of megabytes."
msgstr ""
@@ -1992,11 +1997,6 @@ msgid ""
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
msgstr ""
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr ""
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -2883,7 +2883,7 @@ msgid "Reboot"
msgstr "Uruchom ponownie"
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
"computer, remove the live CD and restart the computer, click on <emphasis "
@@ -2892,20 +2892,20 @@ msgid ""
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -2963,29 +2963,29 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr "Wybierz i użyj obrazu ISO"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr "Wprowadzenie"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target system. "
@@ -2994,7 +2994,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -3002,22 +3002,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr "Nośnik"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr "Definicja"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
@@ -3025,88 +3025,83 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
"\">here</link>."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr "Klasyczne medium instalacji"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78
+#: en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr "Powszechne możliwości"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid ""
"They are able to make a clean install or an update from previous releases."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr "DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
-msgstr "Różne media dla architektur 32 i 64 bitowych."
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
+msgstr "Różne media dla 32 i 64 bitowych architektur."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid ""
"You'll be given the choice during the installation to add non free software."
msgstr "Dostaniesz wybór podczas instalacji aby dodać niewolne oprogramowanie."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr "Nośniki live"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr "Różne media dla 32 i 64 bitowych architektur."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous releases.</"
@@ -3114,53 +3109,53 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr "Zawierają one niewolne oprogramowanie."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
msgid "Live DVD Plasma"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
msgid "Plasma desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
-#: en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122
+#: en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr "Wszystkie języki są obecne."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr "Live DVD GNOME"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr "Tylko środowisko graficzne GNOME."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
msgid "Live DVD Xfce"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
msgid "Xfce desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr "Boot-only urządzenia CD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -3169,7 +3164,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -3177,17 +3172,17 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr "Tylko język angielski."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
msgid "netinstall.iso"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
@@ -3196,29 +3191,29 @@ msgstr ""
"niewolnego oprogramowania."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
msgid "netinstall-nonfree.iso"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr "Pobieranie i Sprawdzanie Mediów"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr "Pobieranie"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -3227,12 +3222,12 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
@@ -3240,80 +3235,81 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr "Sprawdź przycisk Save File."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr "Sprawdzanie integralności pobranych mediów"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr "Otwórz konsolę, root nie wymagany i:"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
"file.iso</userinput>."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
"image/file.iso</userinput>."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr "Wypal lub zrzuć obraz ISO"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a boot-able medium."
+"These operations are not a simple copy and aim to make a bootable medium."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr "Wypalenie obrazu ISO na CD/DVD"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -3322,121 +3318,121 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr "Zrzuć obraz ISO na pamięci USB"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
msgstr ""
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr "Używanie graficznych narzędzi w Magei"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr "Używanie graficznych narzędzi w Windows"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr "Powinieneś spróbować:"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr "Użycie linii poleceń w systemie GNU/Linux"
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr "Możesz także użyć narzędzia dd w konsoli:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr "Otwórz konsolę"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr "Wpisz polecenie <userinput>fdisk -l</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command <code>dmesg</"
"code>: at end, you see the device name starting with <emphasis>sd</"
@@ -3444,7 +3440,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3468,14 +3464,14 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example <code>/"
"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
@@ -3484,12 +3480,12 @@ msgstr ""
"bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr "Gdzie X=twoje urządzenie nazwane np. /dev/sdc"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
"dev/sdb bs=1M</userinput>"
@@ -3498,12 +3494,12 @@ msgstr ""
"of=/dev/sdb bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr "Wpisz polecenie: # <userinput>sync</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr "Odepnij swoją pamięć USB, skończone"
@@ -3938,84 +3934,86 @@ msgstr ""
#. type: Content of: <section><section><section><mediaobject>
#: en/setupBootloader.xml:36
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
"setupBootloader.png\"/> </imageobject>"
msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid ""
+"Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr "Nie modyfikuj \"Boot Device\", chyba że masz pojęcie, co robisz."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
msgid "Grub2-efi on UEFI systems"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
"choose between with or without graphical menu"
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:58
+#: en/setupBootloader.xml:56
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:64
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
"imageobject>"
-msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only 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 "
+"If there are already UEFI operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer detects the existing ESP "
+"created by Windows and adds grub2-efi. Although it is possible to have "
"several ESPs, only one is advised and enough whatever the number of "
"operating systems you have."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr "Używanie bootloader'a Magei"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
msgid ""
"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, "
@@ -4024,26 +4022,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:100
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
"imageobject>"
-msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr "Użyj istniejącego bootloader'a."
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
msgid ""
"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 "
@@ -4053,58 +4051,58 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:136
+#: en/setupBootloader.xml:129
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
"imageobject>"
-msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
"imageobject>"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
msgid "Options"
msgstr "Opcje"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<guilabel>Delay before booting the default image</guilabel>: This text box "
"lets you set a delay in seconds before the default operating system is "
@@ -4112,7 +4110,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: en/setupBootloader.xml:162
msgid ""
"<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 "
@@ -4120,44 +4118,44 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
msgid ""
"<guilabel>Password</guilabel>: This text box is where you actually put the "
"password"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:182
+#: en/setupBootloader.xml:173
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
"check that it matches with the one set above."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
msgid "<guilabel>Advanced</guilabel>"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
msgid ""
"<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)."
+"stopping unused devices, this was the method used before APM. Unchecking it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:208
+#: en/setupBootloader.xml:199
msgid ""
"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
"operating system access to the Advanced Programmable Interrupt Controller. "
@@ -4166,38 +4164,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:232
msgid ""
"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:247
+#: en/setupBootloader.xml:239
msgid ""
"<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 "
@@ -4205,7 +4203,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -4550,3 +4548,6 @@ 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 "Different media for architecture 32 or 64 bits."
+#~ msgstr "Różne media dla architektur 32 i 64 bitowych."
diff --git a/docs/installer/pt_BR.po b/docs/installer/pt_BR.po
index f7efd47b..7f5b97e4 100644
--- a/docs/installer/pt_BR.po
+++ b/docs/installer/pt_BR.po
@@ -12,7 +12,7 @@ msgid ""
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"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
"PO-Revision-Date: 2016-07-17 11:53+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -188,7 +188,7 @@ msgstr "Gerenciador de Usuário e Superusuário"
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -202,12 +202,12 @@ msgstr ""
"fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr "Definir senha do administrador (root):"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -228,7 +228,7 @@ msgstr ""
"digitado corretamente a primeira senha, comparando-as."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
@@ -238,16 +238,16 @@ msgstr ""
"minúsculas), números e outros caracteres em uma senha."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr "Digite um usuário"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
"Adicionar um usuário aqui. Um usuário tem menos direitos do que o "
"superusuário (root), mas o suficiente para navegar na internet, usar "
@@ -255,36 +255,36 @@ msgstr ""
"usuário médio faz com o seu computador."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr ""
"<guibutton>Ícone</guibutton>: se você clicar neste botão irá mudar o ícone "
"de usuários."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr ""
"<guilabel>Nome real</guilabel>: Insira o nome de usuários reais na caixa de "
"texto."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
"<guilabel>nome de Login</guilabel>: Aqui você digita o nome de login do "
"usuário ou deixe DrakX usar uma versão do nome do usuário real. O nome de "
"login é \"case sensitive\"."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -295,7 +295,7 @@ msgstr ""
"força da senha. (Veja também o <xref linkend=\"givePassword\"/>)"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -306,7 +306,7 @@ msgstr ""
"caixas de texto de senha do usuário."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
#, fuzzy
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
@@ -316,7 +316,7 @@ msgstr ""
"legível (estará protegido) o diretório de home."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
#, fuzzy
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - Summary</"
@@ -329,18 +329,18 @@ msgstr ""
"de Usuário </emphasis>."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr ""
"As permissões de acesso também podem ser modificadas depois de instalar."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr "Gerenciamento Avançado de Usuários"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
@@ -350,12 +350,12 @@ msgstr ""
"adicionando."
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr "Além disso, você pode desativar ou ativar uma conta de convidado."
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -367,7 +367,7 @@ msgstr ""
"importantes em um pendrive USB."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -379,7 +379,7 @@ msgstr ""
"usuários normais."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -390,7 +390,7 @@ msgstr ""
"opções são Bash, Dash e Sh."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -401,7 +401,7 @@ msgstr ""
"Deixe em branco se você não sabe o que está fazendo."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -1478,29 +1478,23 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </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><note><para>
-#: en/diskdrake.xml:56
-#, fuzzy
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
#, fuzzy
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
@@ -1511,16 +1505,17 @@ msgstr ""
"(veja acima)"
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
#, 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>"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.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>"
#. type: Content of: <section><info><title>
#: en/doPartitionDisks.xml:9
@@ -1551,29 +1546,22 @@ msgstr ""
#: en/doPartitionDisks.xml:22
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr "Utilizar as partições existentes"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
@@ -1582,12 +1570,12 @@ msgstr ""
"o Linux foram encontrados e podem ser utilizadas para a instalação."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr "Usar o espaço livre"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
@@ -1596,12 +1584,12 @@ msgstr ""
"usá-lo para a sua nova instalação da Mageia."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr "Use o espaço livre na partição do Windows"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
@@ -1610,7 +1598,7 @@ msgstr ""
"instalador pode oferecer para usá-lo."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"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 "
@@ -1621,7 +1609,7 @@ msgstr ""
"ter um backup de todos os arquivos importantes!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1638,7 +1626,7 @@ msgstr ""
"altamente recomendável fazer backup de seus arquivos pessoais."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1651,43 +1639,37 @@ msgstr ""
"arrastando a lacuna entre as duas partições. Veja a captura de tela abaixo."
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
+#: en/doPartitionDisks.xml:77
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr "Apagar e utilizar o Disco Inteiro."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr "Esta opção utilizará a unidade completa para a Mageia."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr ""
"Atenção! Esta operação apagará todos os dados do disco rígido selecionado. "
"Tenha cuidado!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"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 "
@@ -1698,12 +1680,12 @@ msgstr ""
"opção."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr "Personalizado"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
@@ -1712,12 +1694,12 @@ msgstr ""
"rígido(s)."
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr "<emphasis role=\"bold\">Partições de dimensionamento:</emphasis>"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
@@ -1726,7 +1708,7 @@ msgstr ""
"regras:"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
@@ -1735,7 +1717,7 @@ msgstr ""
"criada para /, não haverá nenhuma partição separada para /home."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are created"
msgstr ""
@@ -1743,23 +1725,23 @@ msgstr ""
"criadas"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid ""
"6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr "6/19 do espaço total disponível é atribuída a / com um máximo de 50 GB"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr "1/19 é alocado para área de troca com um máximo de 4 GB"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr "o restante (pelo menos 12/19) é atribuído ao /home"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1769,7 +1751,7 @@ msgstr ""
"para /home."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on /"
@@ -1782,7 +1764,7 @@ msgstr ""
"feita corretamente"
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"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 "
@@ -1792,29 +1774,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><note><mediaobject>
#: en/doPartitionDisks.xml:175
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
-#, fuzzy
-msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
@@ -1822,7 +1797,7 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
@@ -1841,17 +1816,17 @@ msgstr ""
"alternativo, tipo o gparted, e use a seguinte configuração:"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr "\"Arredondar para\" \"MiB\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr "\"Espaço livre Antes (MiB)\" \"2\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid ""
"Also make sure all partitions are created with an even number of megabytes."
msgstr ""
@@ -2151,11 +2126,6 @@ msgstr ""
"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -3171,7 +3141,7 @@ msgid "Reboot"
msgstr "Reboot"
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
#, fuzzy
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
@@ -3186,18 +3156,18 @@ msgstr ""
"transferidas (consulte Gerenciamento de Software)."
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
#, fuzzy
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr ""
"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
#, fuzzy
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
"Uma vez que o carregador de inicialização foi instalado, você será "
@@ -3207,7 +3177,7 @@ msgstr ""
"transferidas (consulte Gerenciamento de Software)."
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
@@ -3276,17 +3246,17 @@ msgstr ""
"segurança na aba <guilabel>Segurança</guilabel> do Centro de Controle Mageia."
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr "Selecionar e usar ISOs"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr "Introdução"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
@@ -3295,12 +3265,12 @@ msgstr ""
"escolher qual imagem corresponde às suas necessidades."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr "Há duas famílias de mídia:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target system. "
@@ -3314,7 +3284,7 @@ msgstr ""
"instalar."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -3325,22 +3295,22 @@ msgstr ""
"instalação é semelhante, mas você fará menos escolhas."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr "Detalhes são fornecidos nas próximas seções."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr "Mídia"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr "Definição"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
@@ -3351,7 +3321,7 @@ msgstr ""
"físico do arquivo ISO é copiado para."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
"\">here</link>."
@@ -3360,23 +3330,23 @@ msgstr ""
"\">aqui</link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr "Classical installation media"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78
+#: en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr "características comuns"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr "Estas ISOs usar o instalador tradicional chamado DrakX."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid ""
"They are able to make a clean install or an update from previous releases."
msgstr ""
@@ -3384,17 +3354,19 @@ msgstr ""
"anteriores."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr "DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
-msgstr "Diferentes meios para arquitetura de 32 ou 64 bits."
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
+msgstr "Meios diferentes para arquiteturas 32 ou 64 bits."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
@@ -3403,12 +3375,12 @@ msgstr ""
"Sistema, teste de memória, hardware ferramenta de detecção."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr "Cada DVD contém muitos ambientes de trabalho disponíveis e idiomas."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid ""
"You'll be given the choice during the installation to add non free software."
msgstr ""
@@ -3416,12 +3388,12 @@ msgstr ""
"free."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr "Mídia Live"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
@@ -3430,20 +3402,13 @@ msgstr ""
"rígido, e, opcionalmente, instalar Mageia no seu Disco Rígido."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
#, fuzzy
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr "Cada ISO contém apenas um Ambiente de Desktop (KDE ou GNOME)."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr "Meios diferentes para arquiteturas 32 ou 64 bits."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous releases.</"
@@ -3454,57 +3419,57 @@ msgstr ""
"anteriores.</emphasis>"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr "Contêm software não livre."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
#, fuzzy
msgid "Live DVD Plasma"
msgstr "Live DVD KDE"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
#, fuzzy
msgid "Plasma desktop environment only."
msgstr "Ambiente de Desktop KDE somente."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
-#: en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122
+#: en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr "Todas as línguas estão presentes."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr "Live DVD GNOME"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr "Ambiente Desktop GNOME somente."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
#, fuzzy
msgid "Live DVD Xfce"
msgstr "Live DVD KDE"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
#, fuzzy
msgid "Xfce desktop environment only."
msgstr "Ambiente de Desktop KDE somente."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr "Mídia de CD somente de Inicialização"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -3518,7 +3483,7 @@ msgstr ""
"local, em uma rede local ou na Internet."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -3529,18 +3494,18 @@ msgstr ""
"drive de DVD ou um PC que não pode arrancar a partir de um stick USB."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr "Somente linguagem Inglês. "
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
#, fuzzy
msgid "netinstall.iso"
msgstr "Inicie a instalação do"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
@@ -3548,13 +3513,13 @@ msgstr ""
"Contém apenas software livre, para aqueles que rejeitam software não-livre."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
#, fuzzy
msgid "netinstall-nonfree.iso"
msgstr "boot-nonfree.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
@@ -3563,17 +3528,17 @@ msgstr ""
"precisa."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr "Baixando e checando Mídia"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr "Baixando"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -3586,12 +3551,12 @@ msgstr ""
"http for escolhido, você também pode ver algo como"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
@@ -3602,28 +3567,30 @@ msgstr ""
"posterior utilização </link>. Em seguida, esta janela será exibida:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr "Verifique a de opção Salvar arquivo."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr "Verificando a integridade de mídia baixada"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
"Ambas as somas de verificação são números hexadecimais calculados por um "
"algoritmo do arquivo a ser baixado. Quando você pede esses algoritmos para "
@@ -3632,12 +3599,12 @@ msgstr ""
"uma falha. Uma falha conclui que você deve repetir o download."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr "Abra um console, não há necessidade de ser root, e:"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
"file.iso</userinput>."
@@ -3646,7 +3613,7 @@ msgstr ""
"para/o/image/file.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
"image/file.iso</userinput>."
@@ -3655,7 +3622,7 @@ msgstr ""
"para/o/image/file.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
@@ -3664,32 +3631,32 @@ msgstr ""
"um tempo) com o número dado pelo Mageia. exemplo:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr "Queimar ou despejar a ISO"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a boot-able medium."
+"These operations are not a simple copy and aim to make a bootable medium."
msgstr ""
"A ISO verificado agora pode ser gravado em um CD ou DVD ou jogados para um "
"stick USB. Estas operações não são uma cópia simples e visam tornar um meio "
"de inicialização-poder."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr "Gravando a ISO para o CD/DVD"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -3703,12 +3670,12 @@ msgstr ""
"da Mageia</link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr "Despejar a ISO para um pendrive USB "
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
@@ -3717,18 +3684,18 @@ msgstr ""
"los para um stick USB e usá-lo para inicializar e instalar o sistema."
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
-"o \"dumping\" uma imagem em um dispositivo flash destrói qualquer sistema de "
+"o \"Dumping\" uma imagem em um dispositivo flash destrói qualquer sistema de "
"arquivo anterior no dispositivo; quaisquer outros dados serão perdidos e a "
"capacidade de separação irá ser reduzida ao tamanho da imagem."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
@@ -3737,12 +3704,12 @@ msgstr ""
"reformatar o dispositivo USB."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr "Usando uma ferramenta gráfica do Mageia"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3751,17 +3718,17 @@ msgstr ""
"mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr "Usando uma ferramenta gráfica do Windows"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr "Você poderia tentar:"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
@@ -3770,7 +3737,7 @@ msgstr ""
"a opção \"ISO image\" ;"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
@@ -3779,12 +3746,12 @@ msgstr ""
"do Disco Win32</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr "Usando linha de comando dentro de um sistema GNU/Linux"
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
@@ -3794,17 +3761,17 @@ msgstr ""
"identificação errado."
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr "Você também pode usar a ferramenta dd em um console:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr "Abra um console"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
@@ -3813,31 +3780,31 @@ msgstr ""
"final '-')"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr ""
"Conecte seu cartão USB (não montá-lo, isso também significa não abrir "
"qualquer aplicativo ou gerenciador de arquivos que podem acessar ou lê-lo)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr "Digite o comando <userinput>fdisk -l</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command <code>dmesg</"
"code>: at end, you see the device name starting with <emphasis>sd</"
@@ -3848,7 +3815,7 @@ msgstr ""
"<emphasis>sd</emphasis>, e <emphasis>sdd</emphasis> neste caso:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3890,7 +3857,7 @@ msgstr ""
"[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example <code>/"
"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
@@ -3899,7 +3866,7 @@ msgstr ""
"por exemplo <code>/dev/sdb</code> na imagem acima, é um pen drive USB 8GB."
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
@@ -3908,12 +3875,12 @@ msgstr ""
"bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr "Onde X=o nome do dispositivo, por exemplo: /dev/sdc"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
"dev/sdb bs=1M</userinput>"
@@ -3922,12 +3889,12 @@ msgstr ""
"dev/sdb bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr "Digite o comando: # <userinput>sync</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr "Desligue o seu dispositivo USB, e pronto"
@@ -4418,35 +4385,32 @@ msgstr ""
#: en/setupBootloader.xml:36
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
"setupBootloader.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<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>"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid ""
+"Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr ""
"Não modifica o \"Boot Device\", a menos que realmente saber o que fazer."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
#, fuzzy
msgid "Grub2-efi on UEFI systems"
msgstr "Com um sistema UEFI"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
#, fuzzy
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
@@ -4457,33 +4421,27 @@ msgstr ""
"disponível."
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:58
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:64
+#: en/setupBootloader.xml:56
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"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><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
#, fuzzy
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only 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 "
+"If there are already UEFI operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer detects the existing ESP "
+"created by Windows and adds grub2-efi. Although it is possible to have "
"several ESPs, only one is advised and enough whatever the number of "
"operating systems you have."
msgstr ""
@@ -4496,29 +4454,29 @@ msgstr ""
"sistemas operacionais que você tem."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr "Usando o Gerenciador de Inicialização da Mageia"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
msgid ""
"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, "
@@ -4527,32 +4485,25 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:105
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:100
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"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><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr "Usando um Gerenciador de Inicialização existente"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
msgid ""
"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 "
@@ -4568,47 +4519,40 @@ msgstr ""
"questão."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:136
+#: en/setupBootloader.xml:129
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"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><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
@@ -4618,17 +4562,17 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
msgid "Options"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<guilabel>Delay before booting the default image</guilabel>: This text box "
"lets you set a delay in seconds before the default operating system is "
@@ -4636,7 +4580,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: en/setupBootloader.xml:162
msgid ""
"<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 "
@@ -4644,14 +4588,14 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
msgid ""
"<guilabel>Password</guilabel>: This text box is where you actually put the "
"password"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:182
+#: en/setupBootloader.xml:173
#, fuzzy
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
@@ -4662,31 +4606,31 @@ msgstr ""
"caixas de texto de senha do usuário."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
#, fuzzy
msgid "<guilabel>Advanced</guilabel>"
msgstr "<guilabel>Serviços</guilabel>:"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
msgid ""
"<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)."
+"stopping unused devices, this was the method used before APM. Unchecking it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:208
+#: en/setupBootloader.xml:199
msgid ""
"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
"operating system access to the Advanced Programmable Interrupt Controller. "
@@ -4695,38 +4639,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:232
msgid ""
"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:247
+#: en/setupBootloader.xml:239
msgid ""
"<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 "
@@ -4734,7 +4678,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -5150,6 +5094,146 @@ msgstr ""
"minutos. No final, você recebe uma tela em branco por algum tempo, é normal."
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
+#~ "\"mediaobject\" id=\"1\"/>"
+#~ msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
+#, 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>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Different media for architecture 32 or 64 bits."
+#~ msgstr "Diferentes meios para arquitetura de 32 ou 64 bits."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+#~ "setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
#~ "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."
@@ -5347,19 +5431,6 @@ msgstr ""
#~ "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 ""
#~ "If you prefer different bootloader settings to those chosen automatically "
#~ "by the installer, you can change them here."
#~ msgstr ""
diff --git a/docs/installer/ro.po b/docs/installer/ro.po
index 1f55f76d..5ae27e40 100644
--- a/docs/installer/ro.po
+++ b/docs/installer/ro.po
@@ -14,7 +14,7 @@ msgid ""
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"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
"PO-Revision-Date: 2016-10-28 16:09+0000\n"
"Last-Translator: Florin Cătălin RUSSEN <cfrussen@yahoo.co.uk>\n"
"Language-Team: Romanian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -189,7 +189,7 @@ msgstr "Gestionare utilizatori și administratori"
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -203,12 +203,12 @@ msgstr ""
"fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr "Definiți parola administratorului (root):"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -228,7 +228,7 @@ msgstr ""
"două parole pentru a vă asigura că nu ați tastat greșit."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
@@ -238,16 +238,16 @@ msgstr ""
"caractere speciale."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr "Introduceți un utilizator"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
"Adăugați un utilizator la această etapă. Un utilizator dispune de mai puține "
"drepturi ca un administrator (root), însă suficiente pentru a putea naviga "
@@ -255,29 +255,29 @@ msgstr ""
"ce un utilizator obișnuit poate face cu calculatorul său."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr ""
"<guibutton>Pictogramă</guibutton>: dacă apăsați acest buton va schimba "
"pictograma utilizatorului."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr ""
"<guilabel>Nume real</guilabel>: introduceți aici numele real al "
"utilizatorului."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
"<guilabel>Numele contului</guilabel>: introduceți aici numele contului "
"utilizatorului sau lăsați drakx să folosească o versiune a numelui real al "
@@ -285,7 +285,7 @@ msgstr ""
"majuscule.</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -296,7 +296,7 @@ msgstr ""
"<xref linkend=\"givePassword\"/>)"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -306,7 +306,7 @@ msgstr ""
"și drakx va verifica dacă ați tastat aceeași parolă în ambele căsuțe."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
#, fuzzy
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
@@ -317,7 +317,7 @@ msgstr ""
"protejat la scriere)."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
#, fuzzy
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - Summary</"
@@ -330,17 +330,17 @@ msgstr ""
"utilizatori</emphasis>."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr "Drepturile de acces pot fi modificate și după instalare."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr "Gestionare avansată utilizatori"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
@@ -350,12 +350,12 @@ msgstr ""
"îi adăugați."
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr "Adițional, puteți dezactiva sau activa un cont invitat."
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -367,7 +367,7 @@ msgstr ""
"importante pe o cheie USB."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -379,7 +379,7 @@ msgstr ""
"restrînse decît un utilizator normal."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -390,7 +390,7 @@ msgstr ""
"iar opțiunile sînt Bash, Dash și Sh."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -401,7 +401,7 @@ msgstr ""
"despre ce este vorba."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -1471,29 +1471,23 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </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><note><para>
-#: en/diskdrake.xml:56
-#, fuzzy
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
#, fuzzy
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
@@ -1503,16 +1497,17 @@ msgstr ""
"EFI (ESP) este prezentă și montată corect în /boot/EFI (a se vedea mai sus)"
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
#, 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>"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.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>"
#. type: Content of: <section><info><title>
#: en/doPartitionDisks.xml:9
@@ -1543,29 +1538,22 @@ msgstr ""
#: en/doPartitionDisks.xml:22
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr "Utilizează partițiile existente"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
@@ -1574,12 +1562,12 @@ msgstr ""
"compatibile Linux au fost găsite și pot fi utilizate pentru instalare."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr "Utilizează spațiul liber"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
@@ -1588,12 +1576,12 @@ msgstr ""
"utiliza pentru noua instalare de Mageia."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr "Utilizează spațiul liber de pe o partiție Windows"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
@@ -1602,7 +1590,7 @@ msgstr ""
"vă poate propune să-l utilizeze."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"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 "
@@ -1613,7 +1601,7 @@ msgstr ""
"că v-ați salvat toate datele importante!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1630,7 +1618,7 @@ msgstr ""
"Este foarte recomandat să vă salvați toate fișierele personale."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1644,43 +1632,37 @@ msgstr ""
"imaginea de mai jos."
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
+#: en/doPartitionDisks.xml:77
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr "Șterge și utilizează tot discul."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr "Această opțiune va utiliza tot discul pentru Mageia."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr ""
"ATENȚIE: aceasta va șterge TOATE datele de pe discul selecționat. Aveți "
"grijă!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"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 "
@@ -1691,12 +1673,12 @@ msgstr ""
"această opțiune."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr "Personalizat"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
@@ -1705,12 +1687,12 @@ msgstr ""
"dure."
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr "<emphasis role=\"bold\">Dimensionarea partițiilor:</emphasis>"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
@@ -1718,7 +1700,7 @@ msgstr ""
"Instalatorul va împărți spațiul disponibil pe disc după următoarele reguli:"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
@@ -1727,7 +1709,7 @@ msgstr ""
"partiție pentru /, nu se va crea și o partiție separată pentru /home."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are created"
msgstr ""
@@ -1735,7 +1717,7 @@ msgstr ""
"partiții"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid ""
"6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr ""
@@ -1743,17 +1725,17 @@ msgstr ""
"Go"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr "1/19 va fi alocat pentru swap cu un maximum de 4 Go"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr "restul spațiului (de cel puțin 12/19) va vi alocat pentru /home"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1762,7 +1744,7 @@ msgstr ""
"crea trei partiții: 50 Go pentru /, 4 Go pentru swap și restul pentru /home."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on /"
@@ -1775,7 +1757,7 @@ msgstr ""
"acest lucru a fost făcut corect."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"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 "
@@ -1785,29 +1767,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><note><mediaobject>
#: en/doPartitionDisks.xml:175
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
-#, fuzzy
-msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
@@ -1815,7 +1790,7 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
@@ -1834,17 +1809,17 @@ msgstr ""
"gparted, sau să folosiți parametrii următori:"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr "\"Aliniază la\" \"MiB\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr "\"Spațiu liber precedent (MiB)\" \"2\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid ""
"Also make sure all partitions are created with an even number of megabytes."
msgstr ""
@@ -2142,11 +2117,6 @@ msgstr ""
"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -3159,7 +3129,7 @@ msgid "Reboot"
msgstr "Repornește"
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
#, fuzzy
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
@@ -3174,18 +3144,18 @@ msgstr ""
"descărcare (vedeți capitolul de gestionare a aplicațiilor)."
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
#, fuzzy
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr ""
"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
#, fuzzy
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
"Odată ce s-a instalat încărcătorul de sistem veți fi invitat să opriți "
@@ -3195,7 +3165,7 @@ msgstr ""
"descărcare (vedeți capitolul de gestionare a aplicațiilor)."
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
@@ -3264,17 +3234,17 @@ msgstr ""
"Control Mageia."
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr "Selectați și utilizați imaginile ISO"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr "Introducere"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
@@ -3283,12 +3253,12 @@ msgstr ""
"alegeți imaginea care se potrivește nevoilor voastre."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr "Există două familii de medii:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target system. "
@@ -3303,7 +3273,7 @@ msgstr ""
"instalați."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -3314,22 +3284,22 @@ msgstr ""
"Procesul de instalare este mai simplu, însă aveți mai puține opțiuni."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr "Detaliile sînt oferite în secțiunile următoare."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr "Medii"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr "Definiție"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
@@ -3340,7 +3310,7 @@ msgstr ""
"care poate fi copiat fișierul ISO."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
"\">here</link>."
@@ -3349,23 +3319,23 @@ msgstr ""
"link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr "Mediile de instalare clasice"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78
+#: en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr "Caracteristici comune"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr "Aceste imagini ISO utilizează instalatorul tradițional numit drakx."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid ""
"They are able to make a clean install or an update from previous releases."
msgstr ""
@@ -3373,17 +3343,19 @@ msgstr ""
"o versiune precedentă."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr "DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
msgstr "Diferitele medii pentru arhitectură pe 32 sau 64 de biți."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
@@ -3392,12 +3364,12 @@ msgstr ""
"Test de memorie, Unealta de detecție materială"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr "Fiecare DVD conține multe medii de birou și limbi disponibile."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid ""
"You'll be given the choice during the installation to add non free software."
msgstr ""
@@ -3405,12 +3377,12 @@ msgstr ""
"proprietare."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr "Mediile Live"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
@@ -3419,20 +3391,13 @@ msgstr ""
"și opțional să o instalați pe discul dur."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
#, fuzzy
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr "Fiecare imagine ISO conține numai un mediu de birou (KDE sau GNOME)."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr "Diferitele medii pentru arhitectură pe 32 sau 64 de biți."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous releases.</"
@@ -3443,57 +3408,57 @@ msgstr ""
"versiunile precedente.</emphasis>"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr "Acestea conțin aplicații proprietare."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
#, fuzzy
msgid "Live DVD Plasma"
msgstr "LiveDVD KDE"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
#, fuzzy
msgid "Plasma desktop environment only."
msgstr "Doar mediul de birou KDE."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
-#: en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122
+#: en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr "Toate limbile sînt prezente."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr "LiveDVD GNOME"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr "Doar mediul de birou GNOME."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
#, fuzzy
msgid "Live DVD Xfce"
msgstr "LiveDVD KDE"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
#, fuzzy
msgid "Xfce desktop environment only."
msgstr "Doar mediul de birou KDE."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr "CD-uri doar pentru demarat"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -3507,7 +3472,7 @@ msgstr ""
"pe Internet."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -3519,18 +3484,18 @@ msgstr ""
"calculator care nu poate demara de pe o cheie USB."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr "Doar limba engleză."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
#, fuzzy
msgid "netinstall.iso"
msgstr "Lansează instalarea"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
@@ -3539,13 +3504,13 @@ msgstr ""
"proprietare."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
#, fuzzy
msgid "netinstall-nonfree.iso"
msgstr "boot-nonfree.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
@@ -3554,17 +3519,17 @@ msgstr ""
"persoanele care au nevoie de ele."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr "Descărcarea și verificarea mediilor"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr "Descărcare"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -3577,12 +3542,12 @@ msgstr ""
"este prea lentă. Dacă alegeți HTTP, puteți vedea și ceva de genul"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
@@ -3594,28 +3559,30 @@ msgstr ""
"această fereastră:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr "Bifați butonul radio „Salvează fișierul”."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr "Se verifică integritatea mediului descărcat"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
"Ambele sume de control sînt numere hexazecimale calculate de un algoritm cu "
"fișierul ce va fi descărcat. Cînd îi cereți algoritmului să recalculeze "
@@ -3624,12 +3591,12 @@ msgstr ""
"un eșec. În caz de eșec trebuie să încercați să-l mai descărcați o dată."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr "Deschideți o consolă, trebuie să fiți root, și:"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
"file.iso</userinput>."
@@ -3638,7 +3605,7 @@ msgstr ""
"to/the/image/file.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
"image/file.iso</userinput>."
@@ -3647,7 +3614,7 @@ msgstr ""
"path/to/the/image/file.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
@@ -3656,32 +3623,32 @@ msgstr ""
"cu numărul dat de Mageia. Exemplu:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr "Inscripționați sau copiați imaginea ISO"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a boot-able medium."
+"These operations are not a simple copy and aim to make a bootable medium."
msgstr ""
"Imaginea ISO verificată poate fi acum inscripționată pe un CD/DVD sau pusă "
"pe o cheie USB. Aceste operații nu sînt simple copieri și au ca scop să "
"producă medie de pe care se poate demara."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr "Inscripționarea imaginii ISO pe un CD/DVD"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -3695,12 +3662,12 @@ msgstr ""
"Writing_CD_and_DVD_images\">Mageia wiki</link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr "Puneți imaginea ISO pe o cheie USB"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
@@ -3709,9 +3676,9 @@ msgstr ""
"cheie USB pentru a demara și instala sistemul."
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
@@ -3720,7 +3687,7 @@ msgstr ""
"pierdute și capacitatea partiției va fi redusă la mărimea fișierului ISO."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
@@ -3729,12 +3696,12 @@ msgstr ""
"reformatați cheia USB."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr "Utilizînd o unealtă grafică din Mageia"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3743,17 +3710,17 @@ msgstr ""
"mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr "Utilizînd o unealtă grafică din Windows"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr "Puteți încerca:"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
@@ -3762,7 +3729,7 @@ msgstr ""
"utilizînd opțiunea „ISO image\";"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
@@ -3771,12 +3738,12 @@ msgstr ""
"Disk Imager</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr "Utilizînd linia de comandă dintr-un sistem GNU/Linux"
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
@@ -3785,17 +3752,17 @@ msgstr ""
"suprascrieți o partiție pe disc dacă aveți un ID de dispozitiv greșit."
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr "Puteți utiliza utilitarul dd într-o consolă:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr "Deschideți o consolă"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
@@ -3804,31 +3771,31 @@ msgstr ""
"la final '-' )"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr ""
"Conectați cheia USB (nu o montați, adică nu deschideți nicio aplicație sau "
"gestionar de fișiere pentru a o citi)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr "Introduceți comanda <userinput>fdisk -l</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command <code>dmesg</"
"code>: at end, you see the device name starting with <emphasis>sd</"
@@ -3839,7 +3806,7 @@ msgstr ""
"emphasis>, sau <emphasis>sdd</emphasis> în acest caz:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3881,7 +3848,7 @@ msgstr ""
"[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example <code>/"
"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
@@ -3890,7 +3857,7 @@ msgstr ""
"<code>/dev/sdb</code> este o cheie USB de 8 Go."
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
@@ -3899,12 +3866,12 @@ msgstr ""
"bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr "Unde X=numele dispozitivului, ex: /dev/sdc"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
"dev/sdb bs=1M</userinput>"
@@ -3913,12 +3880,12 @@ msgstr ""
"dev/sdb bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr "Introduceți comanda: # <userinput>sync</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr "Deconectați cheia USB, ați terminat."
@@ -4409,33 +4376,31 @@ msgstr ""
#: en/setupBootloader.xml:36
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <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 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>"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid ""
+"Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr "Nu modificați „Dispozitivul de demaraj” doar dacă știți ce faceți."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
#, fuzzy
msgid "Grub2-efi on UEFI systems"
msgstr "Cu un sistem UEFI"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
#, fuzzy
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
@@ -4446,32 +4411,27 @@ msgstr ""
"disponibil."
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:58
+#: en/setupBootloader.xml:56
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:64
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </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><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
#, fuzzy
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only 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 "
+"If there are already UEFI operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer detects the existing ESP "
+"created by Windows and adds grub2-efi. Although it is possible to have "
"several ESPs, only one is advised and enough whatever the number of "
"operating systems you have."
msgstr ""
@@ -4484,29 +4444,29 @@ msgstr ""
"sisteme de operare aveți instalate pe calculator."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr "Se utilizează un încărcător de sistem Mageia"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
msgid ""
"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, "
@@ -4515,29 +4475,25 @@ msgid ""
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>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:100
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </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><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr "Se utilizează încărcătorul de sistem existent"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
msgid ""
"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 "
@@ -4552,44 +4508,40 @@ msgstr ""
"sistem Mageia. Consultați documentația sistemului de operare în chestiune."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
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>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:129
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </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><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
@@ -4597,17 +4549,17 @@ msgid ""
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
msgid "Options"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<guilabel>Delay before booting the default image</guilabel>: This text box "
"lets you set a delay in seconds before the default operating system is "
@@ -4615,7 +4567,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: en/setupBootloader.xml:162
msgid ""
"<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 "
@@ -4623,14 +4575,14 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
msgid ""
"<guilabel>Password</guilabel>: This text box is where you actually put the "
"password"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:182
+#: en/setupBootloader.xml:173
#, fuzzy
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
@@ -4640,31 +4592,31 @@ msgstr ""
"și drakx va verifica dacă ați tastat aceeași parolă în ambele căsuțe."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
#, fuzzy
msgid "<guilabel>Advanced</guilabel>"
msgstr "<guilabel>Servicii</guilabel>:"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
msgid ""
"<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)."
+"stopping unused devices, this was the method used before APM. Unchecking it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:208
+#: en/setupBootloader.xml:199
msgid ""
"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
"operating system access to the Advanced Programmable Interrupt Controller. "
@@ -4673,38 +4625,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:232
msgid ""
"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:247
+#: en/setupBootloader.xml:239
msgid ""
"<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 "
@@ -4712,7 +4664,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -5126,6 +5078,138 @@ msgstr ""
"momente, este normal."
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
+#~ "\"mediaobject\" id=\"1\"/>"
+#~ msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
+#, 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>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Different media for architecture 32 or 64 bits."
+#~ msgstr "Diferitele medii pentru arhitectură pe 32 sau 64 de biți."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, 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>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#~ msgid ""
#~ "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."
@@ -5320,19 +5404,6 @@ msgstr ""
#~ "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 ""
#~ "If you prefer different bootloader settings to those chosen automatically "
#~ "by the installer, you can change them here."
#~ msgstr ""
diff --git a/docs/installer/ru.po b/docs/installer/ru.po
index 46a6706a..f94240c0 100644
--- a/docs/installer/ru.po
+++ b/docs/installer/ru.po
@@ -17,7 +17,7 @@ msgid ""
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"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
"PO-Revision-Date: 2016-11-04 13:11+0000\n"
"Last-Translator: AlexL <loginov.alex.valer@gmail.com>\n"
"Language-Team: Russian (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -199,7 +199,7 @@ msgstr "Управление учётными записями пользова
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -213,12 +213,12 @@ msgstr ""
"fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr "Восстановление пароля администратора (root):"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -238,7 +238,7 @@ msgstr ""
"расположенном ниже, чтобы удостовериться, что пароль был введён без ошибок."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
@@ -247,16 +247,16 @@ msgstr ""
"смесь букв (большие и маленькие), цифры и другие символы."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr "Введите пользователя"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
"С помощью этой панели вы можете добавить пользователей. Каждый пользователь "
"имеет меньшие права доступа, чем суперпользователь (root), но достаточно "
@@ -264,29 +264,29 @@ msgstr ""
"любых других задач, которые выполняются обычным пользователем за компьютером."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr ""
"<guibutton>Иконка</guibutton>: с помощью этой кнопки можно изменить значок "
"пользователя."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr ""
"<guilabel>Имя</guilabel>: в этом поле следует указать настоящее имя "
"пользователя."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
"<guilabel>Имя пользователя</guilabel>: здесь вы можете ввести "
"регистрационное имя пользователя или предоставить возможность drakx "
@@ -294,7 +294,7 @@ msgstr ""
"пользователя чувствительно к регистру.</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -305,7 +305,7 @@ msgstr ""
"<xref linkend=\"givePassword\"/>)"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -316,7 +316,7 @@ msgstr ""
"вариантом."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
#, fuzzy
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
@@ -327,7 +327,7 @@ msgstr ""
"записывать в эти каталоги данные)."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
#, fuzzy
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - Summary</"
@@ -341,19 +341,19 @@ msgstr ""
"пользователями </emphasis>."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr ""
"Права доступа к домашним каталогам, конечно же, можно изменить и после "
"завершения установки системы."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr "Дополнительные возможности управления учетными записями пользователей"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
@@ -363,12 +363,12 @@ msgstr ""
"учетной записи, которую вы добавляете."
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr "Кроме того, вы можете отключить или включить учётную запись гостя."
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -380,7 +380,7 @@ msgstr ""
"важных файлов на портативный носитель данных."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -392,7 +392,7 @@ msgstr ""
"ограниченные права доступа даже по сравнению с обычными пользователями."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -403,7 +403,7 @@ msgstr ""
"для работы пользователя. Возможны следующие варианты: Bash, Dash и Sh."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -415,7 +415,7 @@ msgstr ""
"если вам неизвестны последствия ваших действий."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -1507,29 +1507,23 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </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><note><para>
-#: en/diskdrake.xml:56
-#, fuzzy
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
#, fuzzy
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
@@ -1539,16 +1533,17 @@ msgstr ""
"ESP (EFI System Partition) и она смонтирована в /boot/EFI (см. Выше)."
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
#, 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>"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.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>"
#. type: Content of: <section><info><title>
#: en/doPartitionDisks.xml:9
@@ -1579,29 +1574,22 @@ msgstr ""
#: en/doPartitionDisks.xml:22
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr "Использовать существующие разделы"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
@@ -1611,12 +1599,12 @@ msgstr ""
"системы."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr "Использовать свободное место"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
@@ -1625,12 +1613,12 @@ msgstr ""
"свободное место, достаточное для установки новой системы Mageia."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr "Использовать свободное место на разделе Microsoft Windows®"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
@@ -1639,7 +1627,7 @@ msgstr ""
"Windows достаточно свободного места для установки новой операционной системы."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"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 "
@@ -1650,7 +1638,7 @@ msgstr ""
"предварительно создать резервные копии важных для вас файлов!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1668,7 +1656,7 @@ msgstr ""
"создать резервные копии важных для вас файлов."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1682,45 +1670,39 @@ msgstr ""
"ниже снимок экрана."
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
+#: en/doPartitionDisks.xml:77
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr "Стереть и использовать весь диск"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr ""
"При использовании этого варианта для установки Mageia будет использован весь "
"диск."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr ""
"Замечание: все данные на диске будут в таком случае уничтожены. Будьте "
"осторожны!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"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 "
@@ -1731,12 +1713,12 @@ msgstr ""
"вариантом."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr "Вручную"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
@@ -1745,12 +1727,12 @@ msgstr ""
"разделов на вашем диске в соответствии с вашими предпочтениями."
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr "<emphasis role=\"bold\">Размер разделов:</emphasis>"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
@@ -1759,7 +1741,7 @@ msgstr ""
"правилами:"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
@@ -1768,30 +1750,30 @@ msgstr ""
"раздел для / без отдельного раздела для /home."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are created"
msgstr "Если общее доступное место более, чем 50 Гб, то создаются три раздела"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid ""
"6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr ""
"6/19 от общего доступного пространства выделяется под / с максимумом 50 Гб"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr "1/19 выделяется под своп с максимумом 4 Гб"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr "остальное (по крайней мере 12/19) выделяется под /home"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1800,7 +1782,7 @@ msgstr ""
"создаст три раздела: 50 Гб для /, 4 ГБ для свопа, а остальное для /home."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on /"
@@ -1813,7 +1795,7 @@ msgstr ""
"проверить, что это было сделано правильно"
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"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 "
@@ -1823,29 +1805,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><note><mediaobject>
#: en/doPartitionDisks.xml:175
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
-#, fuzzy
-msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
@@ -1853,7 +1828,7 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
@@ -1872,17 +1847,17 @@ msgstr ""
"gparted с такими параметрами:"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr "«Выровнять по» «МиБ»"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr "«Свободное место до (МиБ)» «2»"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid ""
"Also make sure all partitions are created with an even number of megabytes."
msgstr "Также следует создавать разделы только с чётным размером в мегабайтах."
@@ -2182,11 +2157,6 @@ msgstr ""
"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -3231,7 +3201,7 @@ msgid "Reboot"
msgstr "Перезагрузка"
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
#, fuzzy
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
@@ -3245,18 +3215,18 @@ msgstr ""
"программ загружен (см. Управление программным обеспечением)."
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
#, fuzzy
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr ""
"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
#, fuzzy
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
"После того, как загрузчик был установлен, вам будет предложено остановить "
@@ -3265,7 +3235,7 @@ msgstr ""
"программ загружен (см. Управление программным обеспечением)."
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
@@ -3337,17 +3307,17 @@ msgstr ""
"<guilabel>Безопасность</guilabel> в Центре управления Mageia."
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr "Выбор и использование образов ISO"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr "Введение"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
@@ -3356,12 +3326,12 @@ msgstr ""
"какие образы соответствуют вашим потребностям."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr "Существует два семейства источников:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target system. "
@@ -3375,7 +3345,7 @@ msgstr ""
"которое вы будете устанавливать."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -3386,22 +3356,22 @@ msgstr ""
"установки проще, но вы получите меньший выбор."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr "Подробности приведены в следующих разделах."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr "Носитель"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr "Определение"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
@@ -3412,7 +3382,7 @@ msgstr ""
"котором хранятся данные файла ISO."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
"\">here</link>."
@@ -3421,40 +3391,42 @@ msgstr ""
"\">здесь</link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr "Классический носитель для установки"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78
+#: en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr "Типичные возможности"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr "Эти ISO используют традиционный инсталлятор, называемый drakx."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid ""
"They are able to make a clean install or an update from previous releases."
msgstr ""
"Они пригодны для установки «с нуля» или для обновления предыдущих выпусков."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr "DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
msgstr "Различные носители для архитектур 32 или 64 бит."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
@@ -3463,12 +3435,12 @@ msgstr ""
"система восстановления, тест памяти, инструмент обнаружения оборудования."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr "Каждый DVD содержит многие доступные рабочие среды и языки."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid ""
"You'll be given the choice during the installation to add non free software."
msgstr ""
@@ -3476,12 +3448,12 @@ msgstr ""
"программного обеспечения."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr "Live носитель"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
@@ -3490,20 +3462,13 @@ msgstr ""
"жёсткий диск и опционально установить Mageia на ваш жёсткий диск."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
#, fuzzy
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr "Каждый ISO содержит только одну рабочую среду (KDE или GNOME)."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr "Различные носители для архитектур 32 или 64 бит."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous releases.</"
@@ -3514,57 +3479,57 @@ msgstr ""
"предыдущих выпусков.</emphasis>"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr "Они содержат несвободное программное обеспечение."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
#, fuzzy
msgid "Live DVD Plasma"
msgstr "Live DVD KDE"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
#, fuzzy
msgid "Plasma desktop environment only."
msgstr "Только рабочая среда KDE."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
-#: en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122
+#: en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr "Присутствуют все языки."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr "Live DVD GNOME"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr "Только рабочая среда GNOME."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
#, fuzzy
msgid "Live DVD Xfce"
msgstr "Live DVD KDE"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
#, fuzzy
msgid "Xfce desktop environment only."
msgstr "Только рабочая среда KDE."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr "Носители CD только для загрузки"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -3578,7 +3543,7 @@ msgstr ""
"или в интернете."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -3590,18 +3555,18 @@ msgstr ""
"систему с флэш-диска USB."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr "Только английский язык."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
#, fuzzy
msgid "netinstall.iso"
msgstr "Запуск установки"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
@@ -3610,13 +3575,13 @@ msgstr ""
"пользователей, которые не желают пользоваться несвободными пакетами."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
#, fuzzy
msgid "netinstall-nonfree.iso"
msgstr "boot-nonfree.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
@@ -3625,17 +3590,17 @@ msgstr ""
"для тех, кто нуждается в этих компонентах системы."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr "Загрузка и проверка носителя данных"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr "Загрузка"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -3649,12 +3614,12 @@ msgstr ""
"слишком мала. Если будет выбрано http, вы увидите нечто:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
@@ -3665,28 +3630,30 @@ msgstr ""
"дальнейшего использования</link>. Затем появляется это окно:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr "Отметьте пункт «Сохранить файл»."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr "Проверка целостности загруженных данных"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
"Обе контрольные суммы - это шестнадцатеричные числа, рассчитанные по "
"алгоритму из загруженного файла. Когда вы применяете эти алгоритмы чтобы "
@@ -3695,13 +3662,13 @@ msgstr ""
"вас неудача. Неудача означает, что вы должны повторить загрузку."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr ""
"Откройте консоль (от имени обычного пользователя) и дайте следующую команду:"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
"file.iso</userinput>."
@@ -3710,7 +3677,7 @@ msgstr ""
"образа/file.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
"image/file.iso</userinput>."
@@ -3719,7 +3686,7 @@ msgstr ""
"файла/образа/file.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
@@ -3728,32 +3695,32 @@ msgstr ""
"определённое время) с числом, указанным на странице Mageia. Пример:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr "Запись образа ISO"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a boot-able medium."
+"These operations are not a simple copy and aim to make a bootable medium."
msgstr ""
"Проверенный образ ISO можно записать на компакт-диск, DVD или флешку USB. "
"Действие записи не является простым копированием, - она предназначена для "
"создания загрузочного носителя."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr "Записать ISO на CD/DVD"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -3766,12 +3733,12 @@ msgstr ""
"\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images\">вики Mageia</link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr "Запись образа ISO на USB флешку"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
@@ -3780,9 +3747,9 @@ msgstr ""
"USB флешку и пользоваться ею для загрузки и установки системы."
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
@@ -3791,7 +3758,7 @@ msgstr ""
"уничтожены, будут потеряны. Размер диска будет уменьшен на размер образа."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
@@ -3800,12 +3767,12 @@ msgstr ""
"придётся его форматировать."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr "Использование графического инструмента внутри Mageia"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3815,17 +3782,17 @@ msgstr ""
"IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr "Использование графического инструмента внутри Windows"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr "Вы можете попробовать:"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
@@ -3834,7 +3801,7 @@ msgstr ""
"использует опцию \"образа ISO\";"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
@@ -3843,12 +3810,12 @@ msgstr ""
"Disk Imager</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr "Использование командной строки внутри системы GNU/Linux"
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
@@ -3857,17 +3824,17 @@ msgstr ""
"раздел диска, если вы неправильно получите идентификатор устройства."
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr "Вы также можете воспользоваться консольной программой dd:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr "Откройте окно консоли"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
@@ -3876,14 +3843,14 @@ msgstr ""
"userinput> (не забудьте «-» в конце команды)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr ""
"Соедините с компьютером ваш диск USB (не монтируйте его, т.е. не открывайте "
@@ -3891,17 +3858,17 @@ msgstr ""
"файлами)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr "Введите команду <userinput>fdisk -l</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command <code>dmesg</"
"code>: at end, you see the device name starting with <emphasis>sd</"
@@ -3912,7 +3879,7 @@ msgstr ""
"<emphasis>sd</emphasis>, и<emphasis>sdd</emphasis> в этом случае:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3954,7 +3921,7 @@ msgstr ""
"[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example <code>/"
"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
@@ -3964,7 +3931,7 @@ msgstr ""
"ГБ, это флешка USB."
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
@@ -3973,12 +3940,12 @@ msgstr ""
"bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr "Где X=имя вашего устройства, например: /dev/sdc"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
"dev/sdb bs=1M</userinput>"
@@ -3987,12 +3954,12 @@ msgstr ""
"of=/dev/sdb bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr "Введите команду: # <userinput>sync</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr "Извлеките флешку USB. Запись завершена."
@@ -4488,35 +4455,33 @@ msgstr ""
#: en/setupBootloader.xml:36
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <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 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>"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid ""
+"Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr ""
"Не изменяйте \"Загрузочное устройство\", если на самом деле не знаете, что "
"вы делаете."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
#, fuzzy
msgid "Grub2-efi on UEFI systems"
msgstr "С системой UEFI"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
#, fuzzy
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
@@ -4526,32 +4491,27 @@ msgstr ""
"выбрать загрузчик, так как только доступен Grub2-efi."
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:58
+#: en/setupBootloader.xml:56
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:64
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </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><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
#, fuzzy
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only 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 "
+"If there are already UEFI operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer detects the existing ESP "
+"created by Windows and adds grub2-efi. Although it is possible to have "
"several ESPs, only one is advised and enough whatever the number of "
"operating systems you have."
msgstr ""
@@ -4565,29 +4525,29 @@ msgstr ""
"вас операционных систем."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr "Использование загрузчика Mageia"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
msgid ""
"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, "
@@ -4596,29 +4556,25 @@ msgid ""
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>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:100
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </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><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr "Использование уже установленного загрузчика"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
msgid ""
"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 "
@@ -4634,44 +4590,40 @@ msgstr ""
"другой операционной системы."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
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>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:129
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </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><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
@@ -4679,17 +4631,17 @@ msgid ""
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
msgid "Options"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<guilabel>Delay before booting the default image</guilabel>: This text box "
"lets you set a delay in seconds before the default operating system is "
@@ -4697,7 +4649,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: en/setupBootloader.xml:162
msgid ""
"<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 "
@@ -4705,14 +4657,14 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
msgid ""
"<guilabel>Password</guilabel>: This text box is where you actually put the "
"password"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:182
+#: en/setupBootloader.xml:173
#, fuzzy
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
@@ -4723,31 +4675,31 @@ msgstr ""
"вариантом."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
#, fuzzy
msgid "<guilabel>Advanced</guilabel>"
msgstr "<guilabel>Службы</guilabel>:"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
msgid ""
"<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)."
+"stopping unused devices, this was the method used before APM. Unchecking it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:208
+#: en/setupBootloader.xml:199
msgid ""
"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
"operating system access to the Advanced Programmable Interrupt Controller. "
@@ -4756,38 +4708,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:232
msgid ""
"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:247
+#: en/setupBootloader.xml:239
msgid ""
"<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 "
@@ -4795,7 +4747,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -5218,6 +5170,138 @@ msgstr ""
"времени, это нормально."
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
+#~ "\"mediaobject\" id=\"1\"/>"
+#~ msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
+#, 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>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Different media for architecture 32 or 64 bits."
+#~ msgstr "Различные носители для архитектур 32 или 64 бит."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, 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>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#~ msgid ""
#~ "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."
@@ -5419,19 +5503,6 @@ msgstr ""
#~ "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 ""
#~ "If you prefer different bootloader settings to those chosen automatically "
#~ "by the installer, you can change them here."
#~ msgstr ""
diff --git a/docs/installer/sk.po b/docs/installer/sk.po
index ce393b24..849baf0e 100644
--- a/docs/installer/sk.po
+++ b/docs/installer/sk.po
@@ -8,7 +8,7 @@ msgid ""
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"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
"PO-Revision-Date: 2016-07-17 11:59+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -186,7 +186,7 @@ msgstr "Spravovanie používateľa a superpoužívateľa"
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -200,12 +200,12 @@ msgstr ""
"fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr "Nastavenie správcovho (rootovho) hesla:"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -226,7 +226,7 @@ msgstr ""
"prvom políčku."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
@@ -235,16 +235,16 @@ msgstr ""
"kombináciu písmen (veľkých a malých), čísel a ostatných znakov."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr "Pridať používateľa"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
"Tu pridajte používateľa. Používateľ má menej oprávnení než superpoužívateľ "
"(root), ale dostatok pre surfovanie po internete, používanie kancelárskych "
@@ -252,29 +252,29 @@ msgstr ""
"so svojím počítačom."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr ""
"<guibutton>Ikona</guibutton>: ak kliknete na toto tlačidlo, zmení sa ikona "
"používateľa."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr ""
"<guilabel>Reálne meno</guilabel>: Do tohto textového políčka vložte reálne "
"používateľovo meno."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
"<guilabel>Prihlasovacie meno</guilabel>: Sem môžete zadať používateľovo "
"prihlasovacie meno alebo to prenecháte inštalačnému programu drakx, aby "
@@ -282,7 +282,7 @@ msgstr ""
"citlivé na veľkosť písmen.</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -293,7 +293,7 @@ msgstr ""
"silu heslu. (Pozrite aj <xref linkend=\"givePassword\"/>)"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -304,7 +304,7 @@ msgstr ""
"textových políčok pre používateľské heslo."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
#, fuzzy
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
@@ -314,7 +314,7 @@ msgstr ""
"čitateľný domovský adresár (ale ochránený proti zápisu)."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
#, fuzzy
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - Summary</"
@@ -327,17 +327,17 @@ msgstr ""
"používateľov</emphasis>."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr "Prístupové oprávnenia možno meniť aj po inštalácii."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr "Rozšírená správa používateľov"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
@@ -347,12 +347,12 @@ msgstr ""
"pridávate."
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr "Na dôvažok môžete zakázať alebo povoliť hosťovský účet."
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -363,7 +363,7 @@ msgstr ""
"odhlási. Hosť by si mal uložiť svoje dôležité súbory na USB kľúč."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -374,7 +374,7 @@ msgstr ""
"používať ho, ale má viacej obmedzený prístup než normálni používatelia."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -385,7 +385,7 @@ msgstr ""
"predošlej obrazovke, možnosťami sú Bash, Dash a Sh."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -396,7 +396,7 @@ msgstr ""
"Ponechajte ho prázdne, pokiaľ neviete, čo robíte."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -1463,29 +1463,23 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </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><note><para>
-#: en/diskdrake.xml:56
-#, fuzzy
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
#, fuzzy
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
@@ -1495,16 +1489,17 @@ msgstr ""
"Partícia) je prítomná a správne pripojená na /boot/EFI (viď vyššie)"
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
#, 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>"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.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>"
#. type: Content of: <section><info><title>
#: en/doPartitionDisks.xml:9
@@ -1535,29 +1530,22 @@ msgstr ""
#: en/doPartitionDisks.xml:22
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr "Použiť existujúce partície"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
@@ -1566,12 +1554,12 @@ msgstr ""
"kompatibilné partície a môžu byť použité pre inštaláciu."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr "Použiť voľné miesto"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
@@ -1580,12 +1568,12 @@ msgstr ""
"využije pre vašu novú inštaláciu Mageie."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr "Použiť voľné miesto na Windowsovej partícii"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
@@ -1594,7 +1582,7 @@ msgstr ""
"môže ponúknuť jeho použitie."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"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 "
@@ -1605,7 +1593,7 @@ msgstr ""
"zazálohované všetky dôležité súbory!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1621,7 +1609,7 @@ msgstr ""
"použitá. Vysoko sa odporúča zazálohovať si vaše osobné súbory."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1635,43 +1623,37 @@ msgstr ""
"nižšie."
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
+#: en/doPartitionDisks.xml:77
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr "Vymazať a použiť Celý Disk."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr "Táto možnosť použije celé diskové zariadenie pre Mageiu."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr ""
"Upozornenie! Toto vymaže VŠETKY dáta na vybranom pevnom disku. Teda buďte "
"opatrní!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"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 "
@@ -1681,12 +1663,12 @@ msgstr ""
"disku, ktoré nie ste pripravení stratiť, potom nepoužívajte túto voľbu."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr "Vlastný výber"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
@@ -1695,19 +1677,19 @@ msgstr ""
"disku (resp. diskoch)."
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
msgstr "Inštalátor rozdelí dostupné miesto podľa nasledovných pravidiel:"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
@@ -1716,31 +1698,31 @@ msgstr ""
"partícia pre /, nebude tu žiadna samostatná partícia pre /home."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are created"
msgstr ""
"Ak je celkové dostupné miesto nad 50 GB, potom sa vytvoria tri partície"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid ""
"6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr ""
"6/19 z celkového dostupného miesta je pridelených pre / ,nanajvýš však 50 GB"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr "1/19 je pridelená pre swap , nanajvýš však 4 GB"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr "zvyšok (prinajmenšom 12/19) je pridelený pre /home"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1749,7 +1731,7 @@ msgstr ""
"tri partície: 50 GB pre /, 4 GB pre swap a zvyšok pre adresár /home."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on /"
@@ -1762,7 +1744,7 @@ msgstr ""
"bolo správne vykonané"
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"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 "
@@ -1772,29 +1754,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><note><mediaobject>
#: en/doPartitionDisks.xml:175
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
-#, fuzzy
-msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
@@ -1802,7 +1777,7 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
@@ -1822,17 +1797,17 @@ msgstr ""
"nastavenia:"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr "\"Zarovnať na\" \"MiB\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr "\"Uvádzajúce voľné miesto (MiB)\" \"2\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid ""
"Also make sure all partitions are created with an even number of megabytes."
msgstr ""
@@ -2131,11 +2106,6 @@ msgstr ""
"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -3142,7 +3112,7 @@ msgid "Reboot"
msgstr "Reštart"
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
#, fuzzy
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
@@ -3156,18 +3126,18 @@ msgstr ""
"médiá sú sťahované (viď Správu softvéru)."
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
#, fuzzy
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr ""
"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
#, fuzzy
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
"Keď bol zavádzač nainštalovaný, budete vyzvaní pozastaviť váš počítača, "
@@ -3176,7 +3146,7 @@ msgstr ""
"médiá sú sťahované (viď Správu softvéru)."
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
@@ -3245,17 +3215,17 @@ msgstr ""
"časti <guilabel>Bezpečnosť</guilabel> Ovládacieho Centra Mageie."
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr "Vyberte a používajte ISO"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr "Úvod"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
@@ -3264,12 +3234,12 @@ msgstr ""
"ktorý obraz vyhovuje vašim potrebám."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr "Sú tu dve rodiny nosičov:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target system. "
@@ -3282,7 +3252,7 @@ msgstr ""
"možnosti výberu, ktoré Prostredie Pracovnej Plochy si nainštalujete."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -3293,22 +3263,22 @@ msgstr ""
"jednoduchší, ale dostanete menej možností výberu."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr "Podrobnosti sú uvedené v ďalších častiach."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr "Dátové nosiče"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr "Definícia"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
@@ -3319,7 +3289,7 @@ msgstr ""
"ktorú je ISO súbor skopírovaný."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
"\">here</link>."
@@ -3328,40 +3298,42 @@ msgstr ""
"link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr "Klasické inštalačné nosiče"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78
+#: en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr "Bežné vlastnosti"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr "Tieto ISO súbory používajú tradičný inštalátor nazvaný drakx."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid ""
"They are able to make a clean install or an update from previous releases."
msgstr ""
"Dokážu spraviť čistú inštaláciu alebo aktualizovať z predošlých vydaní."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr "DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
-msgstr "Rozličné nosiče pre 32 alebo 64 bitovú architektúru"
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
+msgstr "Rôzne nosiče pre 32 alebo 64 bitové architektúry."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
@@ -3370,24 +3342,24 @@ msgstr ""
"Pamäťový test, Nástroj na detekciu hardvéru."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr ""
"Každé DVD obsahuje mnohé dostupné prostredia pracovnej plochy a jazyky."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid ""
"You'll be given the choice during the installation to add non free software."
msgstr "Počas inštalácie vám bude daná voľba pridať si neslobodný softvér."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr "Živé nosiče"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
@@ -3396,21 +3368,14 @@ msgstr ""
"disk i na voliteľné nainštalovanie Mageie na váš pevný disk."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
#, fuzzy
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr ""
"Každé ISO obsahuje len jedno prostredie pracovnej plochy (KDE alebo GNOME)."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr "Rôzne nosiče pre 32 alebo 64 bitové architektúry."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous releases.</"
@@ -3421,57 +3386,57 @@ msgstr ""
"emphasis>"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr "Obsahujú neslobodný softvér."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
#, fuzzy
msgid "Live DVD Plasma"
msgstr "Živé DVD KDE"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
#, fuzzy
msgid "Plasma desktop environment only."
msgstr "iba KDE prostredie pracovnej plochy."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
-#: en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122
+#: en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr "Všetky jazyky sú prítomné."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr "Živé DVD GNOME"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr "ibe GNOME prostredie pracovnej plochy."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
#, fuzzy
msgid "Live DVD Xfce"
msgstr "Živé DVD KDE"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
#, fuzzy
msgid "Xfce desktop environment only."
msgstr "iba KDE prostredie pracovnej plochy."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr "Iba bootovacie CD nosiče"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -3485,7 +3450,7 @@ msgstr ""
"na lokálnej sieti alebo na internete."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -3496,18 +3461,18 @@ msgstr ""
"keď PC nedokáže naštartovať z USB kľúča."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr "iba anglický jazyk."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
#, fuzzy
msgid "netinstall.iso"
msgstr "Spustiť inštaláciu"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
@@ -3516,13 +3481,13 @@ msgstr ""
"neslobodný softvér."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
#, fuzzy
msgid "netinstall-nonfree.iso"
msgstr "boot-nonfree.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
@@ -3531,17 +3496,17 @@ msgstr ""
"potrebujú."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr "Sťahovanie a skontrolovanie nosiča"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr "Sťahovanie"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -3554,12 +3519,12 @@ msgstr ""
"nízka. Ak je vybrané http, môžete uvidieť i čosi takéto"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
@@ -3570,28 +3535,30 @@ msgstr ""
"link>. Potom sa objaví toto okno:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr "Zaškrtnite prepínacie tlačidlo Uložiť Súbor."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr "Kontrolovanie neporušenosti stiahnutého nosiča"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
"Obe kontrolné súčty sú hexadecimálne čísla vypočítané algoritmom zo súboru, "
"ktorý má byť stiahnutý. Keď požiadate tieto algoritmy na znovuprepočítanie "
@@ -3601,12 +3568,12 @@ msgstr ""
"znova."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr "Otvorte konzolu, netreba byť rootom, a:"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
"file.iso</userinput>."
@@ -3615,7 +3582,7 @@ msgstr ""
"obrazovemu/suboru.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
"image/file.iso</userinput>."
@@ -3624,7 +3591,7 @@ msgstr ""
"ku/obrazovemu/suboru.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
@@ -3633,32 +3600,32 @@ msgstr ""
"počkať) s číslom daným Mageiou. Napríklad:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr "Vypálenie alebo vpísanie ISO súboru"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a boot-able medium."
+"These operations are not a simple copy and aim to make a bootable medium."
msgstr ""
"Skontrolované ISO môže byť teraz napálené na CD alebo DVD alebo vpísané na "
"USB kľúč. Tieto operácie nie sú obyčajným kopírovaním a cielia k vytvoreniu "
"zavediteľného nosiča."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr "Napálenie ISO súboru na CD/DVD"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -3672,12 +3639,12 @@ msgstr ""
"Writing_CD_and_DVD_images\">Mageia wiki</link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr "Vpísať ISO na USB kľúčenku"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
@@ -3686,9 +3653,9 @@ msgstr ""
"USB kľúč a potom ho použiť na zavedenie a inštaláciu systému."
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
@@ -3697,7 +3664,7 @@ msgstr ""
"bude zmenšená na veľkosť obrazu."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
@@ -3706,12 +3673,12 @@ msgstr ""
"naformátovať ho."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr "Použitím grafického nástroja v Mageii"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3720,17 +3687,17 @@ msgstr ""
"org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr "Použitím grafického nástroja vo Windows"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr "Môžete vyskúšať:"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
@@ -3739,7 +3706,7 @@ msgstr ""
"použijúc možnosť \"ISO obraz\";"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
@@ -3748,12 +3715,12 @@ msgstr ""
"Disk Imager</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr "Použijúc Príkazový riadok v systéme GNU/Linux"
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
@@ -3762,17 +3729,17 @@ msgstr ""
"diskovú partíciu, zadáte nesprávne ID zariadenia."
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr "Tiež môžete použiť dd nástroj v konzole:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr "Otvorte konzolu"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
@@ -3781,14 +3748,14 @@ msgstr ""
"na koncovú pomlčku '-')"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr ""
"Vsuňte váš USB kľúč (nepripájajte ho mountom, čo tiež znamená, neotvárajte "
@@ -3796,17 +3763,17 @@ msgstr ""
"z neho čítať)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr "Vložte príkaz <userinput>fdisk -l</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command <code>dmesg</"
"code>: at end, you see the device name starting with <emphasis>sd</"
@@ -3817,7 +3784,7 @@ msgstr ""
"<emphasis>sdd</emphasis> v tomto prípade:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3859,7 +3826,7 @@ msgstr ""
"[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example <code>/"
"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
@@ -3868,7 +3835,7 @@ msgstr ""
"<code>/dev/sdb</code> na obrázku vyššie, je to 8GB USB kľúč."
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
@@ -3877,12 +3844,12 @@ msgstr ""
"userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr "kde X=názov vášho zariadenia, napr. /dev/sdc"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
"dev/sdb bs=1M</userinput>"
@@ -3891,12 +3858,12 @@ msgstr ""
"iso of=/dev/sdb bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr "Vložte príkaz: # <userinput>sync</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr "Odpojte váš USB kľúč, je to hotovo."
@@ -4384,35 +4351,32 @@ msgstr ""
#: en/setupBootloader.xml:36
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
"setupBootloader.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<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>"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid ""
+"Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr ""
"Neupravujte \"Zavádzacie Zariadenie\" pokiaľ naozaj neviete, čo robíte."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
#, fuzzy
msgid "Grub2-efi on UEFI systems"
msgstr "So systémom UEFI"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
#, fuzzy
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
@@ -4422,33 +4386,27 @@ msgstr ""
"nemôžete zvoliť zavádzač systému, keďže je dostupný len Grub2-efi."
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:58
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:64
+#: en/setupBootloader.xml:56
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"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><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
#, fuzzy
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only 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 "
+"If there are already UEFI operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer detects the existing ESP "
+"created by Windows and adds grub2-efi. Although it is possible to have "
"several ESPs, only one is advised and enough whatever the number of "
"operating systems you have."
msgstr ""
@@ -4461,29 +4419,29 @@ msgstr ""
"ktoré máte v počítači."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr "Použitie zavádzača Mageie"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
msgid ""
"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, "
@@ -4492,32 +4450,25 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:105
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:100
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"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><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr "Použitie už existujúceho zavádzača"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
msgid ""
"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 "
@@ -4532,47 +4483,40 @@ msgstr ""
"systém."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:136
+#: en/setupBootloader.xml:129
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"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><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
@@ -4582,17 +4526,17 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
msgid "Options"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<guilabel>Delay before booting the default image</guilabel>: This text box "
"lets you set a delay in seconds before the default operating system is "
@@ -4600,7 +4544,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: en/setupBootloader.xml:162
msgid ""
"<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 "
@@ -4608,14 +4552,14 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
msgid ""
"<guilabel>Password</guilabel>: This text box is where you actually put the "
"password"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:182
+#: en/setupBootloader.xml:173
#, fuzzy
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
@@ -4626,31 +4570,31 @@ msgstr ""
"textových políčok pre používateľské heslo."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
#, fuzzy
msgid "<guilabel>Advanced</guilabel>"
msgstr "<guilabel>Služby</guilabel>:"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
msgid ""
"<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)."
+"stopping unused devices, this was the method used before APM. Unchecking it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:208
+#: en/setupBootloader.xml:199
msgid ""
"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
"operating system access to the Advanced Programmable Interrupt Controller. "
@@ -4659,38 +4603,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:232
msgid ""
"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:247
+#: en/setupBootloader.xml:239
msgid ""
"<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 "
@@ -4698,7 +4642,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -5112,6 +5056,146 @@ msgstr ""
"minút. Na konci dostanete na určitý čas prázdnu obrazovku, to je normálne."
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
+#~ "\"mediaobject\" id=\"1\"/>"
+#~ msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
+#, 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>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Different media for architecture 32 or 64 bits."
+#~ msgstr "Rozličné nosiče pre 32 alebo 64 bitovú architektúru"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+#~ "setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
#~ "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."
@@ -5305,19 +5389,6 @@ msgstr ""
#~ "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 ""
#~ "If you prefer different bootloader settings to those chosen automatically "
#~ "by the installer, you can change them here."
#~ msgstr ""
diff --git a/docs/installer/sl.po b/docs/installer/sl.po
index 4617c12c..3c762128 100644
--- a/docs/installer/sl.po
+++ b/docs/installer/sl.po
@@ -11,7 +11,7 @@ msgid ""
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"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
"PO-Revision-Date: 2017-02-21 23:44+0000\n"
"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
"Language-Team: Slovenian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -170,7 +170,7 @@ msgstr "Upravljanje z naprednimi in navadnimi uporabniki"
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -183,12 +183,12 @@ msgstr ""
"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr "Nastavite geslo skrbnika (uporabnika root):"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -201,49 +201,49 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr "Dodajte uporabnika"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -251,7 +251,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -259,14 +259,14 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
"protected home directory (umask=0027)."
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - Summary</"
"emphasis> step during the install. Choose <emphasis>User management</"
@@ -274,29 +274,29 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr "Dovoljenje dostopa lahko spremenite tudi po namestitvi"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr "Napredno upravljanje z uporabniki"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr "Dodatno lahko onemogočite ali omogočite prijavo gosta."
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -304,7 +304,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -312,7 +312,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -320,7 +320,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -328,7 +328,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -1196,42 +1196,40 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
-msgid ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </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><note><para>
-#: en/diskdrake.xml:56
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
-msgstr ""
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
"partition is present with a correct type"
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
-"> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
-"> </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><info><title>
#: en/doPartitionDisks.xml:9
@@ -1255,60 +1253,55 @@ msgstr ""
#. type: Content of: <section><mediaobject>
#: en/doPartitionDisks.xml:22
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr "Uporabi obstoječe razdelke"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr "Uporabi razpoložljivi prostor"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr "Uporabi razpoložljivi prostor v razdelku za Windows"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"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 "
@@ -1316,7 +1309,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1327,7 +1320,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1336,40 +1329,35 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:77
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr "Zbriši in uporabi celoten disk."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr "Ta možnost bo uporabila celoten pogon za Magejo."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr "Pozor! To bo pobrisalo VSE podatke na izbrani napravi. Pazljivo!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"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 "
@@ -1377,12 +1365,12 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr "Po meri"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
@@ -1390,19 +1378,19 @@ msgstr ""
"S tem imate popoln nadzor nad namestitvijo na (enem ali več) vaših diskov."
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr "<emphasis role=\"bold\">Velikost razdelkov:</emphasis>"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
msgstr "Namestitev bo razdelila razpoložljiv prostor po naslednjih pravilih:"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
@@ -1412,7 +1400,7 @@ msgstr ""
"home."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are created"
msgstr ""
@@ -1420,23 +1408,23 @@ msgstr ""
"trije razdelki"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid ""
"6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr "6/19 prostora na voljo bo namenjeno korenskemu: /, a ne več kot 50 GB"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr "1/19 bo rezervirana izmenjalnemu razdelku: swap, a največ 4 GB"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr "ostalih (vsaj 12/19) bo uporabljenih za domači razdelek: /home"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1446,7 +1434,7 @@ msgstr ""
"preostalo za domačo mapo: /home."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on /"
@@ -1455,7 +1443,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"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 "
@@ -1465,26 +1453,21 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"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><note><mediaobject>
#: en/doPartitionDisks.xml:175
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
-msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
@@ -1492,7 +1475,7 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
@@ -1504,17 +1487,17 @@ msgid ""
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr "»Poravnaj z ang.: Align to« »MiB«"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid ""
"Also make sure all partitions are created with an even number of megabytes."
msgstr ""
@@ -1774,11 +1757,6 @@ msgstr ""
"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -2614,7 +2592,7 @@ msgid "Reboot"
msgstr "Ponovni zagon"
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
"computer, remove the live CD and restart the computer, click on <emphasis "
@@ -2623,20 +2601,20 @@ msgid ""
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -2698,29 +2676,29 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr "Izbor in uporaba odtisa diska: ISO"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr "Predstavitev"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target system. "
@@ -2729,7 +2707,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -2737,22 +2715,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr "Vir"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr "Definicija"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
@@ -2760,7 +2738,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
"\">here</link>."
@@ -2769,81 +2747,76 @@ msgstr ""
"link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr "Mediji za klasično namestitev"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78
+#: en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr "Skupne značilnosti"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid ""
"They are able to make a clean install or an update from previous releases."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr "DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid ""
"You'll be given the choice during the installation to add non free software."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous releases.</"
@@ -2851,53 +2824,53 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr "Vsebuje lastniško programsko opremo."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
msgid "Live DVD Plasma"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
msgid "Plasma desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
-#: en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122
+#: en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr "Prisotni so vsi jeziki."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
msgid "Live DVD Xfce"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
msgid "Xfce desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -2906,7 +2879,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -2914,46 +2887,46 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr "samo angleščina."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
msgid "netinstall.iso"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
msgid "netinstall-nonfree.iso"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr "Prejemanje"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -2962,12 +2935,12 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
@@ -2975,80 +2948,81 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
"file.iso</userinput>."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
"image/file.iso</userinput>."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a boot-able medium."
+"These operations are not a simple copy and aim to make a bootable medium."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -3057,21 +3031,21 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr "Odlaganje odtisa nosilca za namestitev na ključek USB"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
msgstr ""
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
@@ -3080,19 +3054,19 @@ msgstr ""
"Izgubili boste vse podatke na njem."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3102,17 +3076,17 @@ msgstr ""
"link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr "Lahko poskusite:"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
@@ -3121,7 +3095,7 @@ msgstr ""
"možnosti \"ISO image\" \"ISO slika\" ;"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
@@ -3130,58 +3104,58 @@ msgstr ""
"Disk Imager</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr ""
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr "Odprite konzolo"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command <code>dmesg</"
"code>: at end, you see the device name starting with <emphasis>sd</"
@@ -3189,7 +3163,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3231,38 +3205,38 @@ msgstr ""
"[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example <code>/"
"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
"dev/sdb bs=1M</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr ""
@@ -3647,91 +3621,84 @@ 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=\"dx2-setupBootloader.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
"setupBootloader.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
-"setupBootloader.png\"/> </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><section><section><para>
-#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid ""
+"Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
msgid "Grub2-efi on UEFI systems"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
"choose between with or without graphical menu"
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:58
+#: en/setupBootloader.xml:56
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:64
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"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><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only 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 "
+"If there are already UEFI operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer detects the existing ESP "
+"created by Windows and adds grub2-efi. Although it is possible to have "
"several ESPs, only one is advised and enough whatever the number of "
"operating systems you have."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
msgid ""
"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, "
@@ -3740,30 +3707,25 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:100
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"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><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
msgid ""
"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 "
@@ -3773,45 +3735,40 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:136
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:129
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"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><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
"imageobject>"
@@ -3820,17 +3777,17 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
msgid "Options"
msgstr "Možnosti"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<guilabel>Delay before booting the default image</guilabel>: This text box "
"lets you set a delay in seconds before the default operating system is "
@@ -3838,7 +3795,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: en/setupBootloader.xml:162
msgid ""
"<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 "
@@ -3846,44 +3803,44 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
msgid ""
"<guilabel>Password</guilabel>: This text box is where you actually put the "
"password"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:182
+#: en/setupBootloader.xml:173
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
"check that it matches with the one set above."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
msgid "<guilabel>Advanced</guilabel>"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
msgid ""
"<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)."
+"stopping unused devices, this was the method used before APM. Unchecking it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:208
+#: en/setupBootloader.xml:199
msgid ""
"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
"operating system access to the Advanced Programmable Interrupt Controller. "
@@ -3892,38 +3849,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:232
msgid ""
"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:247
+#: en/setupBootloader.xml:239
msgid ""
"<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 "
@@ -3931,7 +3888,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -4274,3 +4231,120 @@ 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-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png"
+#~ "\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png"
+#~ "\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+#~ "setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+#~ "setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
diff --git a/docs/installer/sq.po b/docs/installer/sq.po
index dfd8e1f7..66e20ed2 100644
--- a/docs/installer/sq.po
+++ b/docs/installer/sq.po
@@ -10,7 +10,7 @@ msgid ""
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"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
"PO-Revision-Date: 2017-01-27 01:30+0000\n"
"Last-Translator: Ardit Dani <ardit.dani@gmail.com>\n"
"Language-Team: Albanian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -186,7 +186,7 @@ msgstr "Menaxher për Përdorues dhe Super-përdoruesin "
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -200,12 +200,12 @@ msgstr ""
"fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr "Vendos Fjalëkalim administratori (root):"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -227,7 +227,7 @@ msgstr ""
"shtypur keq pyetjen fjalëkalimin e parë duke i krahasuar ato."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
@@ -237,16 +237,16 @@ msgstr ""
"në një fjalëkalim."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr "Fut një përdorues"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
"Shto një përdorues këtu. Një përdorues ka më pak të drejta se super-"
"përdoruesit (root), por të mjaftueshme për të shfletuar në internet, "
@@ -254,36 +254,36 @@ msgstr ""
"përdoruesi mesatar bën me kompjuterin e tij"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr ""
"<guibutton>Ikonë</guibutton>: nëse klikoni në këtë buton do të ndryshojë "
"ikonën e përdoruesve."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr ""
"<guilabel>Emri Vërtetë</guilabel>: Vendos emrin e vërtetë të përdoruesit në "
"këtë kuti teksti."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
"<guilabel>Emri Hyrës</guilabel>: Këtu ju shkruani emrin e përdoruesit hyrës "
"ose le draky përdorimin e një versioni të emrin e vërtetë përdoruesit. "
"<emphasis>Emri hyrës është rast i ndjeshme.</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -295,7 +295,7 @@ msgstr ""
"\"jepFjalëkalim\"/>)"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -306,7 +306,7 @@ msgstr ""
"njëjtin fjalëkalim në secilën nga kutitë e tekstit përdorues fjalëkalim."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
#, fuzzy
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
@@ -316,7 +316,7 @@ msgstr ""
"lexueshëm (por shkrim i mbrojtur) skedari shtëpi."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
#, fuzzy
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - Summary</"
@@ -329,17 +329,17 @@ msgstr ""
"Zgjidh <emphasis>Menaxhimi Përdoruesit</emphasis>."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr "Lejet hyrëse gjithashtu mund të ndryshohet pas instalimit."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr "Menaxhim Përdoruesi Avancuar"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
@@ -349,12 +349,12 @@ msgstr ""
"shtuar."
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr "Përveç kësaj, ju mund të çaktivizoni ose aktivizo një llogari mysafir."
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -365,7 +365,7 @@ msgstr ""
"Mysafiri duhet të ruaj skedarët të tij të rëndësishme në një çelës USB."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -377,7 +377,7 @@ msgstr ""
"përdoruesit normal."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -388,7 +388,7 @@ msgstr ""
"Bash, Dash dhe Sh"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -399,7 +399,7 @@ msgstr ""
"Lëre bosh nëse nuk e dini se çfarë ju po bëni."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -1432,45 +1432,40 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </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><note><para>
-#: en/diskdrake.xml:56
-#, fuzzy
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
"partition is present with a correct type"
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
#, 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>"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.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>"
#. type: Content of: <section><info><title>
#: en/doPartitionDisks.xml:9
@@ -1498,29 +1493,22 @@ msgstr ""
#: en/doPartitionDisks.xml:22
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr "Përdor ndarjet ekzistuese"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
@@ -1529,12 +1517,12 @@ msgstr ""
"përputhje janë gjetur dhe mund të përdoren për instalimin."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr "Përdor Hapësirën e Lirë"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
@@ -1543,12 +1531,12 @@ msgstr ""
"të përdorë atë për instalimin tuaj të ri Mageia."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr "Përdore Hapësirën e Lirë në Ndarjen Windows"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
@@ -1557,7 +1545,7 @@ msgstr ""
"instaluesi mund të ofrojë ta përdorni atë."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"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 "
@@ -1568,7 +1556,7 @@ msgstr ""
"jeni të sigurte që ju keni ruajtur rezervë gjitha dosjet e rëndësishme!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1585,7 +1573,7 @@ msgstr ""
"e rekomanduar për të ruajtur dosjet tuaja personale rezervë."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1594,43 +1582,37 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
+#: en/doPartitionDisks.xml:77
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr "Fshi dhe të përdor të Gjithë Diskun."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr "Ky opsion do të përdorin të gjithë diskun për Mageia."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr ""
"Shënim! Kjo do të fshijë të gjitha të dhënat në hard diskun e zgjedhur. "
"Kujdes!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"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 "
@@ -1641,12 +1623,12 @@ msgstr ""
"atëherë mos e përdorni këtë opsion."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr "Personalizuar"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
@@ -1655,12 +1637,12 @@ msgstr ""
"tuaja."
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr "<emphasis role=\"bold\">Përmasa ndarëseve:</emphasis>"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
@@ -1669,7 +1651,7 @@ msgstr ""
"mëposhtme:"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
@@ -1678,7 +1660,7 @@ msgstr ""
"ndarje është krijuar për /, nuk ka ndarje të veçantë për /shtëpi."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are created"
msgstr ""
@@ -1686,7 +1668,7 @@ msgstr ""
"krijuar"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid ""
"6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr ""
@@ -1694,17 +1676,17 @@ msgstr ""
"prej 50 GB"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr "1/19 është ndarë për swap me një maksimum prej 4GB"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr "pjesa tjetër (të paktën 12/19) është e ndarë për /shtëpi"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1714,7 +1696,7 @@ msgstr ""
"shtëpi."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on /"
@@ -1727,7 +1709,7 @@ msgstr ""
"kontrolluar se është bërë në mënyrë korrekte"
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"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 "
@@ -1737,29 +1719,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><note><mediaobject>
#: en/doPartitionDisks.xml:175
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
-#, fuzzy
-msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
@@ -1767,7 +1742,7 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
@@ -1779,17 +1754,17 @@ msgid ""
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr "\"Radhit në\" \"MiB\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr "\"Liro hapësirën mësipër (MiB)\" \"2\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid ""
"Also make sure all partitions are created with an even number of megabytes."
msgstr ""
@@ -2086,11 +2061,6 @@ msgstr ""
"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -2997,7 +2967,7 @@ msgid "Reboot"
msgstr "Rinise (riboot)"
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
"computer, remove the live CD and restart the computer, click on <emphasis "
@@ -3006,22 +2976,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
#, fuzzy
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr ""
"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
@@ -3082,29 +3052,29 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr "Zgjidh dhe përdorë ISOs"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr "Paraqitje"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target system. "
@@ -3113,7 +3083,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -3121,22 +3091,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr "Media"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr "Përcaktim"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
@@ -3144,7 +3114,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
"\">here</link>."
@@ -3153,23 +3123,23 @@ msgstr ""
"\">këtu</link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78
+#: en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid ""
"They are able to make a clean install or an update from previous releases."
msgstr ""
@@ -3177,60 +3147,55 @@ msgstr ""
"lëshimet e mëparshme."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr "DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid ""
"You'll be given the choice during the installation to add non free software."
msgstr ""
"Ju do ju jepet zgjedhja gjatë instalimit të shtoni programe jo të lirë."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous releases.</"
@@ -3238,53 +3203,53 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
msgid "Live DVD Plasma"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
msgid "Plasma desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
-#: en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122
+#: en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr "Të gjitha gjuhët janë të pranishëme."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
msgid "Live DVD Xfce"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
msgid "Xfce desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -3293,7 +3258,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -3301,46 +3266,46 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr "Vetëm gjuha angleze."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
msgid "netinstall.iso"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
msgid "netinstall-nonfree.iso"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr "Shkarkim"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -3354,12 +3319,12 @@ msgstr ""
"të shihni diçka si"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
@@ -3367,80 +3332,81 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
"file.iso</userinput>."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
"image/file.iso</userinput>."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a boot-able medium."
+"These operations are not a simple copy and aim to make a bootable medium."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -3449,92 +3415,92 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
msgstr ""
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr "Ju mund të provoni:"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr ""
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr "Hap panel komandimi"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
@@ -3543,29 +3509,29 @@ msgstr ""
"fund )"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr "Shkruani komandën <userinput>fdisk -l</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command <code>dmesg</"
"code>: at end, you see the device name starting with <emphasis>sd</"
@@ -3573,7 +3539,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3597,14 +3563,14 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example <code>/"
"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
@@ -3613,12 +3579,12 @@ msgstr ""
"bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
"dev/sdb bs=1M</userinput>"
@@ -3627,12 +3593,12 @@ msgstr ""
"of=/dev/sdb bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr "Shkruani komandën: # <userinput>sync</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr ""
@@ -4029,90 +3995,84 @@ msgstr ""
#: en/setupBootloader.xml:36
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <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 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>"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid ""
+"Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
msgid "Grub2-efi on UEFI systems"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
"choose between with or without graphical menu"
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:58
+#: en/setupBootloader.xml:56
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.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=\"Download.png\"/> </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><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only 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 "
+"If there are already UEFI operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer detects the existing ESP "
+"created by Windows and adds grub2-efi. Although it is possible to have "
"several ESPs, only one is advised and enough whatever the number of "
"operating systems you have."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
msgid ""
"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, "
@@ -4121,28 +4081,25 @@ msgid ""
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>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:100
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.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>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
msgid ""
"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 "
@@ -4152,43 +4109,40 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:136
+#: en/setupBootloader.xml:129
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.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=\"Download.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.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>"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
@@ -4196,17 +4150,17 @@ msgid ""
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
msgid "Options"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<guilabel>Delay before booting the default image</guilabel>: This text box "
"lets you set a delay in seconds before the default operating system is "
@@ -4214,7 +4168,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: en/setupBootloader.xml:162
msgid ""
"<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 "
@@ -4222,14 +4176,14 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
msgid ""
"<guilabel>Password</guilabel>: This text box is where you actually put the "
"password"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:182
+#: en/setupBootloader.xml:173
#, fuzzy
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
@@ -4240,31 +4194,31 @@ msgstr ""
"njëjtin fjalëkalim në secilën nga kutitë e tekstit përdorues fjalëkalim."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
#, fuzzy
msgid "<guilabel>Advanced</guilabel>"
msgstr "<guilabel>Shërbimet</guilabel>:"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
msgid ""
"<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)."
+"stopping unused devices, this was the method used before APM. Unchecking it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:208
+#: en/setupBootloader.xml:199
msgid ""
"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
"operating system access to the Advanced Programmable Interrupt Controller. "
@@ -4273,38 +4227,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:232
msgid ""
"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:247
+#: en/setupBootloader.xml:239
msgid ""
"<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 "
@@ -4312,7 +4266,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -4659,6 +4613,132 @@ msgid ""
msgstr ""
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
+#~ "\"mediaobject\" id=\"1\"/>"
+#~ msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
+#, 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>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, 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>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#~ msgid ""
#~ "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."
@@ -4746,16 +4826,3 @@ msgstr ""
#~ "condition=\"live\"> <imagedata format=\"PNG\" xml:id="
#~ "\"bootloaderConfiguration-im1\" fileref=\"live-bootloaderConfiguration.png"
#~ "\" align=\"center\" revision=\"1\"/> </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>"
diff --git a/docs/installer/sv.po b/docs/installer/sv.po
index 54d87ceb..f819f40a 100644
--- a/docs/installer/sv.po
+++ b/docs/installer/sv.po
@@ -12,7 +12,7 @@ msgid ""
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"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
"PO-Revision-Date: 2017-02-23 09:57+0000\n"
"Last-Translator: Michael Eklund <willard@null.net>\n"
"Language-Team: Swedish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -188,7 +188,7 @@ msgstr "Hantering av användare och administratör"
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -201,12 +201,12 @@ msgstr ""
"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr "Ställ in ett administratörs (root) -lösenord:"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -226,7 +226,7 @@ msgstr ""
"jämföra dem så att du inte har skrivit fel."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
@@ -236,16 +236,16 @@ msgstr ""
"lösenord."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr "Lägg till en användare"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
"Lägg till en användare här. En användare har färre rättigheter än en "
"administratör (root), men tillräckligt för att surfa på nätet, använda "
@@ -253,29 +253,29 @@ msgstr ""
"med sin dator."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr ""
"<guibutton>Ikon</guibutton>: om du klickar på den här knappen så kommer "
"användarens ikon att ändras."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr ""
"<guilabel>Verkligt namn</guilabel>: Skriv in användarens verkliga namn i det "
"här fältet."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
"<guilabel>Inloggningsnamn</guilabel>: Här kan du skriva in användarens "
"inloggningsnamn eller låta drakx använda en version av användarens riktiga "
@@ -283,7 +283,7 @@ msgstr ""
"emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -294,7 +294,7 @@ msgstr ""
"lösenordets styrka. (Se även <xref linkend=\"givePassword\"/>)"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -305,7 +305,7 @@ msgstr ""
"båda fälten."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
"protected home directory (umask=0027)."
@@ -314,7 +314,7 @@ msgstr ""
"hemkatalog med läs och skrivrättigheter (umask=0027)."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - Summary</"
"emphasis> step during the install. Choose <emphasis>User management</"
@@ -324,17 +324,17 @@ msgstr ""
"emphasis> under installationen. Välj <emphasis>Användarhantering</emphasis>."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr "Rättigheterna för åtkomst kan också ändras efter installationen."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr "Avancerad hantering av användare"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
@@ -343,12 +343,12 @@ msgstr ""
"inställningar för den användare du lägger till."
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr "Du kan även aktivera eller inaktivera ett gästkonto."
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -359,7 +359,7 @@ msgstr ""
"spara sina viktiga filer till ett USB-minne"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -370,7 +370,7 @@ msgstr ""
"använda datorn, men har en mer begränsad tillgång än vanliga användare."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -381,7 +381,7 @@ msgstr ""
"eller Sh"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -392,7 +392,7 @@ msgstr ""
"du gör."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -1444,29 +1444,23 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
-msgid ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </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><note><para>
-#: en/diskdrake.xml:56
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
-msgstr ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
"partition is present with a correct type"
@@ -1475,15 +1469,17 @@ msgstr ""
"finns en BIOS boot-partition av korrekt typ."
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
-"> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
-"> </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><info><title>
#: en/doPartitionDisks.xml:9
@@ -1512,29 +1508,24 @@ msgstr ""
#. type: Content of: <section><mediaobject>
#: en/doPartitionDisks.xml:22
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr "Använd existerande partitioner"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
@@ -1543,12 +1534,12 @@ msgstr ""
"hittats och kan användas för installation."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr "Använd ledigt utrymme"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
@@ -1557,12 +1548,12 @@ msgstr ""
"använda det för att installera Mageia."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr "Använd ledigt utrymme på en Windows-partition"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
@@ -1571,7 +1562,7 @@ msgstr ""
"dig möjlighet att använda det."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"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 "
@@ -1582,7 +1573,7 @@ msgstr ""
"har säkerhetskopierat alla viktiga filer!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1598,7 +1589,7 @@ msgstr ""
"användas. Du rekommenderas starkt att säkerhetskopiera dina personliga filer."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1612,42 +1603,37 @@ msgstr ""
"nedan."
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
+#: en/doPartitionDisks.xml:77
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr "Radera och använd hela hårddisken."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr "Det här alternativet kommer att använda hela disken för Mageia."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr ""
"Tänk på att detta kommer att ta radera ALL data på den valda hårddisken. Var "
"försiktig!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"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 "
@@ -1658,12 +1644,12 @@ msgstr ""
"ska du inte använda detta alternativ."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr "Anpassad"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
@@ -1672,12 +1658,12 @@ msgstr ""
"a disk/ar."
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr "<emphasis role=\"bold\">Partitionsstorlek:</emphasis>"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
@@ -1686,7 +1672,7 @@ msgstr ""
"följande regler:"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
@@ -1695,31 +1681,31 @@ msgstr ""
"att skapas för /. Det finns ingen separat partition för /home."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are created"
msgstr ""
"Om det totala utrymmet är mer än 50GB så kommer tre partitioner att skapas"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid ""
"6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr ""
"6/19 av det totala lediga utrymmet fördelas till / med ett maximum av 50GB"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr "1/19 är allokerat till swap med en gräns på 4 GB"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr "resten (minst 12/19) förledas till /home"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1729,7 +1715,7 @@ msgstr ""
"och resten till /home."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on /"
@@ -1742,7 +1728,7 @@ msgstr ""
"utförts korrekt"
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"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 "
@@ -1757,26 +1743,21 @@ msgstr ""
"som med vilken annan partition. Välj BIOS boot- partition som filsystem."
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"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><note><mediaobject>
#: en/doPartitionDisks.xml:175
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
-msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
@@ -1784,7 +1765,7 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
@@ -1803,17 +1784,17 @@ msgstr ""
"följande inställningar:"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr "\"Rikta mot\" \"MiB\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr "\"Ledigt utrymme före (MiB)\" \"2\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid ""
"Also make sure all partitions are created with an even number of megabytes."
msgstr ""
@@ -2109,11 +2090,6 @@ msgstr ""
"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -3111,7 +3087,7 @@ msgid "Reboot"
msgstr "Starta om"
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
"computer, remove the live CD and restart the computer, click on <emphasis "
@@ -3124,20 +3100,20 @@ msgstr ""
"den ordningen.</emphasis>"
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -3206,17 +3182,17 @@ msgstr ""
"kontrollcentral."
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr "Välj och använd ISO-filer"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr "Presentation"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
@@ -3225,12 +3201,12 @@ msgstr ""
"att välja den avbild som passar dina behov bäst."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr "Det finns två media-familjer:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target system. "
@@ -3244,7 +3220,7 @@ msgstr ""
"du vill installera."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -3255,22 +3231,22 @@ msgstr ""
"är sedan lättare men du har färre val."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr "Detaljer följer i nästkommande avsnitt."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr "Media"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr "Definition"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
@@ -3281,7 +3257,7 @@ msgstr ""
"filen kopieras till."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
"\">here</link>."
@@ -3290,40 +3266,42 @@ msgstr ""
"link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr "Klassiska installtionsmedier"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78
+#: en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr "Vanliga funktioner"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr "De här ISO-filerna använder den traditionella installeraren, drakx."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid ""
"They are able to make a clean install or an update from previous releases."
msgstr ""
"De kan utföra en ren installation eller uppgradera från en tidigare version."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr "DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
-msgstr "Olika media för 32 eller 64-bitars arkitektur."
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
+msgstr "Olika media för 32 eller 64-bitars arkitekturer."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
@@ -3332,12 +3310,12 @@ msgstr ""
"minnestest och identifiering av hårdvara."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr "Varje DVD innehåller många skrivbordsmiljöer och språk."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid ""
"You'll be given the choice during the installation to add non free software."
msgstr ""
@@ -3345,12 +3323,12 @@ msgstr ""
"programvara."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr "Live media"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
@@ -3359,19 +3337,12 @@ msgstr ""
"på en hårddisk, och eventuellt installera den."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr "Varje ISO innehåller endast en skrivbordsmiljö (KDE, GOME eller Xfce)."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr "Olika media för 32 eller 64-bitars arkitekturer."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous releases.</"
@@ -3382,53 +3353,53 @@ msgstr ""
"version.</emphasis>"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr "De innehåller icke-fri mjukvara."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
msgid "Live DVD Plasma"
msgstr "Live DVD Plasma"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
msgid "Plasma desktop environment only."
msgstr "Endast skrivbordsmiljön Plasma."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
-#: en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122
+#: en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr "Alla språk finns med."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr "Live DVD GNOME"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr "Endast skrivbordsmiljön GNOME."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
msgid "Live DVD Xfce"
msgstr "Live DVD Xfce"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
msgid "Xfce desktop environment only."
msgstr "Endast skrivbordsmiljön Xfce."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr "Endast bootbar CD-media"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -3441,7 +3412,7 @@ msgstr ""
"kan ligga på datorns hårddisk, på ett nätverk eller Internet."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -3452,17 +3423,17 @@ msgstr ""
"eller en PC som inte kan starta från ett USB-minne."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr "Endast på engelska."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
msgid "netinstall.iso"
msgstr "netinstall.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
@@ -3470,12 +3441,12 @@ msgstr ""
"Innehåller endast gratis mjukvara, för de som inte vill använda icke-fri."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
msgid "netinstall-nonfree.iso"
msgstr "netinstall-nonfree.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
@@ -3484,17 +3455,17 @@ msgstr ""
"som behöver det."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr "Laddar ner och kontrollerar media"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr "Hämtar"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -3507,12 +3478,12 @@ msgstr ""
"så kan du även se något som "
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
@@ -3523,28 +3494,30 @@ msgstr ""
"framtida användning</link>. Sedan ser du det här fönstret:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr "Markera knappen Spara fil."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr "Kontrollerar integritet av hämtat media"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
"Båda kontrollsummorna är i hexadecimal och räknas ut av en algoritm från "
"filen som ska laddas ner. När du sedan ber om en omräkning av den hämtade "
@@ -3553,12 +3526,12 @@ msgstr ""
"bör du ladda ner den igen."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr "Öppna en konsol, behöver inte vara root, och:"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
"file.iso</userinput>."
@@ -3567,7 +3540,7 @@ msgstr ""
"till/avbilden/fil.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
"image/file.iso</userinput>."
@@ -3576,7 +3549,7 @@ msgstr ""
"till/avbilden/fil.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
@@ -3585,32 +3558,32 @@ msgstr ""
"med det nummer som Mageia har försett. Exempel:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr "Bränn eller dumpa ISO-filen."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a boot-able medium."
+"These operations are not a simple copy and aim to make a bootable medium."
msgstr ""
"Den kontrollerade ISOn kan nu brännas på en CD eller DVD, eller dumpas på "
"ett USB-minne. Det är inte en vanlig kopiering utan ämnar att skapa ett "
"startbart media."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr "Att bränna ISO-filen till en CD/DVD"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -3623,12 +3596,12 @@ msgstr ""
"org/en/Writing_CD_and_DVD_images\">Mageias wiki</link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr "Dumpa ISOn till ett USB-minne"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
@@ -3637,9 +3610,9 @@ msgstr ""
"minne och sedan använda det för att starta och installera systemet."
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
@@ -3648,7 +3621,7 @@ msgstr ""
"reducerad till avbildens storlek."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
@@ -3657,12 +3630,12 @@ msgstr ""
"formatera om USB-enheten."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr "Använda ett grafiskt verktyg i Mageia"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3671,17 +3644,17 @@ msgstr ""
"mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr "Använda ett grafiskt verktyg i Windows"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr "Du kan prova:"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
@@ -3690,7 +3663,7 @@ msgstr ""
"användning av \"ISO image\"-alternativet;"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
@@ -3699,12 +3672,12 @@ msgstr ""
"Disk Imager</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr "Använda kommandoraden i ett GNU/Linux-system"
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
@@ -3713,17 +3686,17 @@ msgstr ""
"över en hårddiskpartition om du anger fel enhets-ID."
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr "Du kan även använda verktyget dd i en konsol:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr "Öppna en konsol"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
@@ -3732,31 +3705,31 @@ msgstr ""
"slutet)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr ""
"Anslut ditt USB-minne (montera inte det, dvs. öppna inget program eller "
"filhanterare som kan läsa det)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr "Skriv kommandot <userinput>fdisk -l</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command <code>dmesg</"
"code>: at end, you see the device name starting with <emphasis>sd</"
@@ -3767,7 +3740,7 @@ msgstr ""
"<emphasis>sdd</emphasis>. I det här fallet:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3809,7 +3782,7 @@ msgstr ""
"[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example <code>/"
"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
@@ -3818,7 +3791,7 @@ msgstr ""
"dev/sdb</code> i skärmdumpen ovan är ett USB-minne på 8GB."
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
@@ -3827,12 +3800,12 @@ msgstr ""
"userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr "Där X=din enhets namn t. ex. /dev/sdc"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
"dev/sdb bs=1M</userinput>"
@@ -3841,12 +3814,12 @@ msgstr ""
"dev/sdb bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr "Skriv kommandot: # <userinput>sync</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr "Koppla från ditt USB-minne och sedan är allt klart."
@@ -4309,32 +4282,30 @@ msgstr "Grub2 för ett Legacy/MBR eller Legacy/GPT-system."
#. type: Content of: <section><section><section><mediaobject>
#: en/setupBootloader.xml:36
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
"setupBootloader.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
-"setupBootloader.png\"/> </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><section><section><para>
-#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid ""
+"Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr "Ändra inte din \"startenhet\" om du inte verkligen vet vad du gör."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
msgid "Grub2-efi on UEFI systems"
msgstr "Grub2-efi för ett UEFI-system."
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
"choose between with or without graphical menu"
@@ -4343,47 +4314,42 @@ msgstr ""
"kan välja mellan text eller grafisk meny."
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:58
+#: en/setupBootloader.xml:56
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:64
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"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><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only 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 "
+"If there are already UEFI operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer detects the existing ESP "
+"created by Windows and adds grub2-efi. Although it is possible to have "
"several ESPs, only one is advised and enough whatever the number of "
"operating systems you have."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr "Använder en startshanterare från Mageia"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr "Som standard baserat på ditt system så kommer Mageia att skriva en ny:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
@@ -4392,12 +4358,12 @@ msgstr ""
"hårddisk, eller på BIOS boot-partitionen."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr "En Grub2-efi starthanterare på ESP"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
msgid ""
"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, "
@@ -4406,30 +4372,25 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:100
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"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><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr "Använder en befintlig startshanterare"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
msgid ""
"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 "
@@ -4443,45 +4404,40 @@ msgstr ""
"till det automatiskt. Se dokumentationen för operativsystemet i fråga."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:136
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:129
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"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><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
"imageobject>"
@@ -4490,17 +4446,17 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
msgid "Options"
msgstr "Alternativ"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr "Första sidan"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<guilabel>Delay before booting the default image</guilabel>: This text box "
"lets you set a delay in seconds before the default operating system is "
@@ -4508,7 +4464,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: en/setupBootloader.xml:162
msgid ""
"<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 "
@@ -4516,44 +4472,44 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
msgid ""
"<guilabel>Password</guilabel>: This text box is where you actually put the "
"password"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:182
+#: en/setupBootloader.xml:173
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
"check that it matches with the one set above."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
msgid "<guilabel>Advanced</guilabel>"
msgstr "<guilabel>Avancerat</guilabel>"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
msgid ""
"<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)."
+"stopping unused devices, this was the method used before APM. Unchecking it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:208
+#: en/setupBootloader.xml:199
msgid ""
"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
"operating system access to the Advanced Programmable Interrupt Controller. "
@@ -4562,38 +4518,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr "Nästa sida"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:232
msgid ""
"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:247
+#: en/setupBootloader.xml:239
msgid ""
"<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 "
@@ -4601,7 +4557,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -5007,3 +4963,130 @@ msgid ""
msgstr ""
"I nästa steg kopieras filerna till hårddisken. Det kan ta lite tid och du "
"kommer att få en blank skärm i slutet vilket är normalt."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
+#~ "\"mediaobject\" id=\"1\"/>"
+#~ msgstr ""
+#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
+#~ "\"mediaobject\" id=\"1\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png"
+#~ "\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png"
+#~ "\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Different media for architecture 32 or 64 bits."
+#~ msgstr "Olika media för 32 eller 64-bitars arkitektur."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+#~ "setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+#~ "setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
diff --git a/docs/installer/tr.po b/docs/installer/tr.po
index 39826b38..4927abaa 100644
--- a/docs/installer/tr.po
+++ b/docs/installer/tr.po
@@ -9,7 +9,7 @@ msgid ""
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"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
"PO-Revision-Date: 2016-07-17 12:01+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -183,7 +183,7 @@ msgstr "Kullanıcı ve Süper Kullanıcı Yönetimi"
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -197,12 +197,12 @@ msgstr ""
"fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr "Yönetici (kök) Parolasını Ayarlayın:"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -223,7 +223,7 @@ msgstr ""
"yazılmadığı denetlenir."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
@@ -233,16 +233,16 @@ msgstr ""
"en iyisidir."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr "Bir kullanıcı girin"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
"Buraya bir kullanıcı ekleyin. Bir kullanıcı, süper kullanıcıdan (kök) daha "
"az yetkiye sahiptir; ancak internette gezinmeye, ofis uygulamalarını "
@@ -250,29 +250,29 @@ msgstr ""
"bilgisayarında yaptığı diğer her şeyi yapmaya yetkisi olur"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr ""
"<guibutton>Simge</guibutton>: bu düğmeye tıklarsanız kullanıcının simgesini "
"değiştirebilirsiniz."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr ""
"<guilabel>Gerçek Ad</guilabel>: Kullanıcının gerçek adını bu metin kutusuna "
"girin."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
"<guilabel>Giriş Adı</guilabel>: Burada kullanıcının giriş adını "
"belirleyebilir veya drakx' in kullanıcının gerçek adının bir benzerini "
@@ -280,7 +280,7 @@ msgstr ""
"duyarlıdır.</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -291,7 +291,7 @@ msgstr ""
"bkz: <xref linkend=\"givePassword\"/>)"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -302,7 +302,7 @@ msgstr ""
"aynı parolanın bulunduğunu denetleyebilsin."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
#, fuzzy
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
@@ -312,7 +312,7 @@ msgstr ""
"okunabilen (ancak yazılamayan) bir ev dizini oluşturulur."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
#, fuzzy
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - Summary</"
@@ -324,17 +324,17 @@ msgstr ""
"adımında ekleyebilirsiniz. <emphasis>Kullanıcı yönetimi</emphasis>ni seçin."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr "Erişim izinleri kurulumdan sonra da değiştirilebilir."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr "Gelişmiş Kullanıcı Yönetimi"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
@@ -343,14 +343,14 @@ msgstr ""
"kullanıcı için ayarları değiştirebilmenizi sağlayan bir ekran önerilir."
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr ""
"Ek olarak, bir konuk hesabını etkinleştirebilir veya devre dışı "
"bırakabilirsiniz."
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -361,7 +361,7 @@ msgstr ""
"Konuk önemli dosyalarını bir USB belleğe kaydetmelidir."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -373,7 +373,7 @@ msgstr ""
"normal kullanıcılardan çok daha sınırlı erişim verir."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -384,7 +384,7 @@ msgstr ""
"dir."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -395,7 +395,7 @@ msgstr ""
"rakamdır. Ne yaptığınızı bilmiyorsanız boş bırakın."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -1464,29 +1464,23 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </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><note><para>
-#: en/diskdrake.xml:56
-#, fuzzy
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
#, fuzzy
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
@@ -1497,16 +1491,17 @@ msgstr ""
"olun (yukarıya bakın)"
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
#, 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>"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.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>"
#. type: Content of: <section><info><title>
#: en/doPartitionDisks.xml:9
@@ -1537,29 +1532,22 @@ msgstr ""
#: en/doPartitionDisks.xml:22
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr "Mevcut Disk Bölümü Kullanılsın"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
@@ -1568,12 +1556,12 @@ msgstr ""
"bölümleri bulunmuştur ve yükleme için kullanılabilir."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr "Boş Alan Kullanılsın"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
@@ -1582,12 +1570,12 @@ msgstr ""
"bu seçenek o alanı kullanacaktır."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr "Windows Bölümündeki Boş Alan Kullanılsın"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
@@ -1596,7 +1584,7 @@ msgstr ""
"kullanmayı önerebilir."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"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 "
@@ -1606,7 +1594,7 @@ msgstr ""
"riskli bir işlem olduğundan önemli tüm dosyalarınızı yedeklemelisiniz!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1622,7 +1610,7 @@ msgstr ""
"Kişisel dosyalarınızı yedeklemeniz önerilir."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1636,43 +1624,37 @@ msgstr ""
"görüntüsüne bakın."
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
+#: en/doPartitionDisks.xml:77
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr "Tüm Diski Sil ve Kullan"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr "Bu seçenek tüm sabit diski Mageia için kullanacaktır."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr ""
"Önemli! Bu işlem seçilen sabit diskteki BÜTÜN veriyi silecektir. Dikkatli "
"olun!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"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 "
@@ -1683,12 +1665,12 @@ msgstr ""
"seçeneği kullanmayın."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr "Özel"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
@@ -1696,19 +1678,19 @@ msgstr ""
"Bu seçenek, sistemi sabit disklerinize kurarken size tam denetim sağlar.."
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr "<emphasis role=\"bold\">Disk bölümleri boyutlandırma:</emphasis>"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
msgstr "Aşağıdaki kurallara göre kurulum aracı erişilebilir alanı paylaşır:"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
@@ -1717,14 +1699,14 @@ msgstr ""
"oluşturulur ve /home için ayrı bir disk bölümü oluşturulmaz."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are created"
msgstr ""
"Erişilebilir toplam boş alan 50 GB üzerindeyse, üç disk bölümü oluşturulur"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid ""
"6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr ""
@@ -1732,17 +1714,17 @@ msgstr ""
"ayarlanır"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr "1/19 kadarı en fazla 4 GB olacak şekilde takas olarak ayarlanır"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr "kalanı (en az 12/19) ise /home olarak ayarlanır"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1752,7 +1734,7 @@ msgstr ""
"home için arta kalan alan."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on /"
@@ -1765,7 +1747,7 @@ msgstr ""
"sağlayan tek seçenektir."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"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 "
@@ -1775,29 +1757,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"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><note><mediaobject>
#: en/doPartitionDisks.xml:175
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
-#, fuzzy
-msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
@@ -1805,7 +1780,7 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
@@ -1824,17 +1799,17 @@ msgstr ""
"öneririz. Şu ayarları kullanın: "
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr "\"MIB\" \"için Hizala\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr "\"Önündeki boş alan (MiB):\" \"2\""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid ""
"Also make sure all partitions are created with an even number of megabytes."
msgstr ""
@@ -2134,11 +2109,6 @@ msgstr ""
"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -3142,7 +3112,7 @@ msgid "Reboot"
msgstr "Yeniden Başlat"
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
#, fuzzy
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
@@ -3157,18 +3127,18 @@ msgstr ""
"bölümüne bakınız ) gösterir."
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
#, fuzzy
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr ""
"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
#, fuzzy
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
"Önyükleyici kurulduğunda; bilgisayarınızı durdurmanız, çalışan CD' yi "
@@ -3178,7 +3148,7 @@ msgstr ""
"bölümüne bakınız ) gösterir."
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
@@ -3247,17 +3217,17 @@ msgstr ""
"Merkezi'ndeki <guilabel>Güvenlik</guilabel> bölümünden yapabilirsiniz."
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr "ISO'ları seçin ve kullanın"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr "Giriş"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
@@ -3266,12 +3236,12 @@ msgstr ""
"doğrultusunda hangi kalıp dosyasını seçeceğinize yardımcı olacaktır."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr "İki tür kurulum ortamı mevcuttur:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target system. "
@@ -3284,7 +3254,7 @@ msgstr ""
"Masaüstü Ortamını kuracağınız hususunda en fazla esnekliği sağlar."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -3296,22 +3266,22 @@ msgstr ""
"seçeneğiz mevcuttur."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr "Ayrıntılar ilerleyen bölümlerde verilmiştir."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr "Ortam"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr "Açıklama"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
@@ -3322,7 +3292,7 @@ msgstr ""
"olarak kopyalanan ISO dosyasıdır."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
"\">here</link>."
@@ -3331,39 +3301,41 @@ msgstr ""
"link> bulabilirsiniz."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr "Klasik kurulum ortamı"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78
+#: en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr "Ortak özellikler"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr "Bu ISO'lar drakx denilen geleneksel yükleyiciyi kullanırlar."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid ""
"They are able to make a clean install or an update from previous releases."
msgstr "Önceki sürümden yükseltme veya temiz bir kurulum yapabilirler."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr "DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
-msgstr "32 veya 64 bit mimari için faklı ortamlar. "
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
+msgstr "32 veya 64 bit mimari için farklı ortamlar."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
@@ -3372,24 +3344,24 @@ msgstr ""
"araçları mevcuttur."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr "Her bir DVD birçok masaüstü ortamı ve dil içermektedir."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid ""
"You'll be given the choice during the installation to add non free software."
msgstr ""
"Size, kurulum sırasında özgür olmayan yazılım eklemek için seçenek sunulacak."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr "Canlı Ortam"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
@@ -3398,20 +3370,13 @@ msgstr ""
"üzerine Mageia kurulur."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
#, fuzzy
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr "Her bir ISO yalnız bir masaüstü ortamı içerir (KDE veya Gnome)."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr "32 veya 64 bit mimari için farklı ortamlar."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous releases.</"
@@ -3422,57 +3387,57 @@ msgstr ""
"emphasis>"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr "Özgür olmayan yazılım içerirler."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
#, fuzzy
msgid "Live DVD Plasma"
msgstr "Canlı DVD KDE"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
#, fuzzy
msgid "Plasma desktop environment only."
msgstr "Yalnız KDE masaüstü ortamı."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
-#: en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122
+#: en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr "Tüm diller mevcuttur."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr "Canlı DVD GNOME"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr "Yalnız GNOME masaüstü ortamı."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
#, fuzzy
msgid "Live DVD Xfce"
msgstr "Canlı DVD KDE"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
#, fuzzy
msgid "Xfce desktop environment only."
msgstr "Yalnız KDE masaüstü ortamı."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr "Boot-only CD ortamı"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -3484,7 +3449,7 @@ msgstr ""
"içermeyen küçük bir imajdır."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -3495,18 +3460,18 @@ msgstr ""
"aralığınız çok düşükse uygundur."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr "Yalnız İngilizce."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
#, fuzzy
msgid "netinstall.iso"
msgstr "Kurulumu başlatmak"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
@@ -3515,13 +3480,13 @@ msgstr ""
"içerir."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
#, fuzzy
msgid "netinstall-nonfree.iso"
msgstr "boot-nonfree.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
@@ -3530,17 +3495,17 @@ msgstr ""
"içerir."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr "Ortamları indirme ve kontrol etme"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr "İndirme"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -3553,12 +3518,12 @@ msgstr ""
"imkanı sağlamak gibi. Eğer http seçildiyse şöyle bir şey görebilirsiniz"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
@@ -3570,28 +3535,30 @@ msgstr ""
"şu pencere görüntülenir:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr "Sabit diske kaydet seçeneğini işaretleyin."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr "İndirilen ortamın bütünlüğünü kontrol etme"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
"Onaltılık sayılar indirilecek dosyadan bir algoritma tarafından hesaplanır. "
"İndirdiğiniz dosyadan bu numarayı hesaplamak için algoritmayı "
@@ -3600,14 +3567,14 @@ msgstr ""
"yanlıştır. Sonuç yanlışsa dosyayı tekrar indirmeniz gerekmektedir."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr ""
"Konsolu açın -root olmanıza gerek yok- ve aşağıdaki komutlardan birini "
"kullanın:"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
"file.iso</userinput>."
@@ -3616,7 +3583,7 @@ msgstr ""
"bulunduğu/yol/dosyaadı.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
"image/file.iso</userinput>."
@@ -3625,7 +3592,7 @@ msgstr ""
"bulunduğu/yol/dosyaadı.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
@@ -3634,32 +3601,32 @@ msgstr ""
"(Bir süre beklemek durumunda olabilirsiniz) karşılaştırın. Örneğin:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr "ISO yakma veya atma"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a boot-able medium."
+"These operations are not a simple copy and aim to make a bootable medium."
msgstr ""
"Kontrol edilen ISO artık bir CD, DVD üzerine yakılabilir veya USB bellek "
"üzerine aktarılabilir. Bu işlemler basit bir kopya değildir amaç "
"çalıştırılabilir bir ortam yapmaktır."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr "Bir CD/DVD üzerine ISO yakma"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -3673,12 +3640,12 @@ msgstr ""
"\">buradaki Mageia wiki sayfasına</link> bakınız."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr "Bir USB bellek üzerine ISO atmak"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
@@ -3687,9 +3654,9 @@ msgstr ""
"sistemi önyükleme ve kurulum için kullanabilirsiniz."
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
@@ -3698,7 +3665,7 @@ msgstr ""
"imaj boyutuna indirgenir."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
@@ -3707,12 +3674,12 @@ msgstr ""
"yeniden biçimlendirmelisiniz."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr "Mageia üzerinde bir grafiksel araç kullanarak"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3722,17 +3689,17 @@ msgstr ""
"bir araç kullanabilirsiniz."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr "Windows üzerinde bir grafiksel araç kullanarak"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr "Deneyebilecekleriniz:"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
@@ -3741,7 +3708,7 @@ msgstr ""
"imajı\" seçeneğini kullanarak;"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
@@ -3750,12 +3717,12 @@ msgstr ""
"Disk Imager</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr "Bir GNU/Linux sistem üzerinde komut satırını kullanarak"
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
@@ -3764,17 +3731,17 @@ msgstr ""
"girerseniz bir disk bölümünün üzerin yazmanız ihtimali vardır."
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr "Ayrıca konsolda dd aracını da kullanabilirsiniz:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr "Konsolu açın"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
@@ -3783,14 +3750,14 @@ msgstr ""
"unutmayın)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr ""
"USB belleği takın (bağlamayın, bu aynı zamanda herhangi bir uygulama veya "
@@ -3798,17 +3765,17 @@ msgstr ""
"gelmektedir)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr "<userinput>fdisk -l</userinput> komutunu girin"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command <code>dmesg</"
"code>: at end, you see the device name starting with <emphasis>sd</"
@@ -3819,7 +3786,7 @@ msgstr ""
"başlayan aygıt adını görürsünüz:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3861,7 +3828,7 @@ msgstr ""
"[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example <code>/"
"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
@@ -3871,7 +3838,7 @@ msgstr ""
"görünüyor."
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
@@ -3880,12 +3847,12 @@ msgstr ""
"userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr "X= aygıtınızın adıdır. örn: /dev/sdc"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
"dev/sdb bs=1M</userinput>"
@@ -3894,12 +3861,12 @@ msgstr ""
"iso of=/dev/sdb bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr "Şu komutu girin: # <userinput>sync</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr "USB belleğinizi çıkartıp işlemi tamamlayın"
@@ -4388,36 +4355,33 @@ msgstr ""
#: en/setupBootloader.xml:36
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
"setupBootloader.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<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>"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid ""
+"Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr ""
"Ne yaptığınızı gerçekten bilmediğiniz sürece \"Önyükleme Aygıtı\"nı "
"değiştirmeyin."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
#, fuzzy
msgid "Grub2-efi on UEFI systems"
msgstr "Bir UEFI sistem ile"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
#, fuzzy
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
@@ -4427,33 +4391,27 @@ msgstr ""
"mevcut olduğundan önyükleyici seçemezsiniz."
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:58
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:64
+#: en/setupBootloader.xml:56
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"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><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
#, fuzzy
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only 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 "
+"If there are already UEFI operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer detects the existing ESP "
+"created by Windows and adds grub2-efi. Although it is possible to have "
"several ESPs, only one is advised and enough whatever the number of "
"operating systems you have."
msgstr ""
@@ -4466,29 +4424,29 @@ msgstr ""
"işletim sistemi kurulu olursa olsun biri yeterlidir."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr "Bir Mageia önyükleyicisi kullanmak"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
msgid ""
"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, "
@@ -4497,32 +4455,25 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:105
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:100
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"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><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr "Mevcut bir önyükleyiciyi kullanmak"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
msgid ""
"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 "
@@ -4537,47 +4488,40 @@ msgstr ""
"bakın."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:136
+#: en/setupBootloader.xml:129
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"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><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
@@ -4587,17 +4531,17 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
msgid "Options"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<guilabel>Delay before booting the default image</guilabel>: This text box "
"lets you set a delay in seconds before the default operating system is "
@@ -4605,7 +4549,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: en/setupBootloader.xml:162
msgid ""
"<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 "
@@ -4613,14 +4557,14 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
msgid ""
"<guilabel>Password</guilabel>: This text box is where you actually put the "
"password"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:182
+#: en/setupBootloader.xml:173
#, fuzzy
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
@@ -4631,31 +4575,31 @@ msgstr ""
"aynı parolanın bulunduğunu denetleyebilsin."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
#, fuzzy
msgid "<guilabel>Advanced</guilabel>"
msgstr "<guilabel>Hizmetler</guilabel>:"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
msgid ""
"<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)."
+"stopping unused devices, this was the method used before APM. Unchecking it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:208
+#: en/setupBootloader.xml:199
msgid ""
"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
"operating system access to the Advanced Programmable Interrupt Controller. "
@@ -4664,38 +4608,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:232
msgid ""
"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:247
+#: en/setupBootloader.xml:239
msgid ""
"<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 "
@@ -4703,7 +4647,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -5118,6 +5062,146 @@ msgstr ""
"karşılaşabilirsiniz fakat bu durum gayet olağandır."
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
+#~ "\"mediaobject\" id=\"1\"/>"
+#~ msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
+#, 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>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Different media for architecture 32 or 64 bits."
+#~ msgstr "32 veya 64 bit mimari için faklı ortamlar. "
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+#~ "setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
#~ "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."
@@ -5313,19 +5397,6 @@ msgstr ""
#~ "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 ""
#~ "If you prefer different bootloader settings to those chosen automatically "
#~ "by the installer, you can change them here."
#~ msgstr ""
diff --git a/docs/installer/uk.po b/docs/installer/uk.po
index 4ef76574..5366bb24 100644
--- a/docs/installer/uk.po
+++ b/docs/installer/uk.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-02-10 19:18+0200\n"
-"PO-Revision-Date: 2017-02-10 19:46+0200\n"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
+"PO-Revision-Date: 2017-03-14 21:37+0200\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
"Language: uk\n"
@@ -186,7 +186,7 @@ msgstr "Керування обліковими записами користу
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -199,12 +199,12 @@ msgstr ""
"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr "Встановлення пароля адміністратора (root):"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -224,7 +224,7 @@ msgstr ""
"розташованому нижче, щоб упевнитися, що пароль було вказано без помилок."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
@@ -233,16 +233,16 @@ msgstr ""
"паролі суміш літер (великих і малих), цифр та інших символів."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr "Введіть користувача"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
"За допомогою цієї панелі ви можете додати користувачів. Кожен користувач має "
"вужчі права доступу, ніж суперкористувач (root), але достатньо прав для "
@@ -250,36 +250,36 @@ msgstr ""
"яких інших завдань, які виконуються звичайним користувачем за комп’ютером."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr ""
"<guibutton>Піктограма</guibutton>: за допомогою цієї кнопки можна змінити "
"піктограму користувача."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr ""
"<guilabel>Справжнє ім’я</guilabel>: у цьому полі для введення тексту слід "
"вказати справжнє ім’я користувача."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
"<guilabel>Ім’я користувача, що реєструється</guilabel>: тут ви можете ввести "
"реєстраційне ім’я користувача або надати змогу drakx використовувати певну "
"версію справжнього імені користувача."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -290,7 +290,7 @@ msgstr ""
"пароля (див. також <xref linkend=\"givePassword\"/>)"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -301,7 +301,7 @@ msgstr ""
"з його початковим варіантом."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
"protected home directory (umask=0027)."
@@ -310,7 +310,7 @@ msgstr ""
"час встановлення Mageia, буде захищено від читання і запису (umask=0027)."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - Summary</"
"emphasis> step during the install. Choose <emphasis>User management</"
@@ -322,19 +322,19 @@ msgstr ""
"користувачами</emphasis>."
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr ""
"Права доступу до домашніх каталогів, звичайно ж, можна змінити і після "
"завершення встановлення системи."
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr "Додаткові можливості керування записами користувачів"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
@@ -344,14 +344,14 @@ msgstr ""
"запису, який ви додаєте."
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr ""
"Крім того, за допомогою цього діалогового вікна можна вимкнути або увімкнути "
"гостьовий обліковий запис."
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -363,7 +363,7 @@ msgstr ""
"потурбуватися про збереження важливих файлів на портативний носій даних."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -376,7 +376,7 @@ msgstr ""
"звичайними користувачами."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -388,7 +388,7 @@ msgstr ""
"Можливі такі варіанти: Bash, Dash та Sh."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -400,7 +400,7 @@ msgstr ""
"поле, якщо вам невідомі наслідки ваших дій."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -1503,28 +1503,21 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
-msgid ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:56
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
-msgstr ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
"partition is present with a correct type"
@@ -1533,15 +1526,17 @@ msgstr ""
"існує розділ BIOS належного типу."
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
-"> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
-"> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
+"\"center\"/> </imageobject>"
#. type: Content of: <section><info><title>
#: en/doPartitionDisks.xml:9
@@ -1571,28 +1566,23 @@ msgstr ""
#. type: Content of: <section><mediaobject>
#: en/doPartitionDisks.xml:22
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr "Користуватися існуючими розділами"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
@@ -1601,12 +1591,12 @@ msgstr ""
"Linux розділи, якими можна скористатися для встановлення системи."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr "Використовувати вільний простір"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
@@ -1615,12 +1605,12 @@ msgstr ""
"достатнє для встановлення нової системи Mageia."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr "Використовувати вільний простір на розділі Microsoft Windows®"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
@@ -1630,7 +1620,7 @@ msgstr ""
"системи."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"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 "
@@ -1641,7 +1631,7 @@ msgstr ""
"створити резервні копії важливих для вас файлів!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1659,7 +1649,7 @@ msgstr ""
"вас файлів."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1673,43 +1663,38 @@ msgstr ""
"нижче знімок екрана."
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:77
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr "Стерти і використати весь диск"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr ""
"У разі використання цього варіанта для встановлення Mageia буде використано "
"весь об’єм на диску."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr ""
"Зауваження: всіх дані на диску буде у такому разі витерто. Будьте обережні!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"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 "
@@ -1719,12 +1704,12 @@ msgstr ""
"не диску вже зберігаються якісь важливі дані, не користуйтеся цим варіантом."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr "Спеціальний"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
@@ -1733,12 +1718,12 @@ msgstr ""
"розташування розділів на вашому диску відповідно до ваших уподобань."
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr "<emphasis role=\"bold\">Розміри розділів диска:</emphasis>"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
@@ -1746,7 +1731,7 @@ msgstr ""
"Засіб встановлення розподілити наявне місце відповідно до таких правил:"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
@@ -1755,32 +1740,32 @@ msgstr ""
"кореневий розділ, /, окремого розділу для /home створено не буде."
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are created"
msgstr "Якщо загалом доступного місця понад 50 ГБ, буде створено три розділи"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid ""
"6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr ""
"6/19 від доступного місця, але не більше за 50 ГБ, буде віддано розділу /"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr ""
"1/19, але не більше за 4 ГБ, буде віддано розділу резервної пам’яті на диску "
"(swap)"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr "решту (принаймні 12/19) буде віддано розділу /home"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1790,7 +1775,7 @@ msgstr ""
"пам’яті на диску. Решту місця буде віддано під /home."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on /"
@@ -1803,7 +1788,7 @@ msgstr ""
"UEFI було виконано належним чином."
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"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 "
@@ -1820,26 +1805,21 @@ msgstr ""
"вибрати тип файлової системи «Розділ завантаження BIOS»."
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
#. type: Content of: <section><note><mediaobject>
#: en/doPartitionDisks.xml:175
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
-msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
@@ -1847,7 +1827,7 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
@@ -1867,17 +1847,17 @@ msgstr ""
"таких значень параметрів:"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr "«Вирівняти до» «МіБ»"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr "«Вільне місце перед (МіБ)» «2»"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid ""
"Also make sure all partitions are created with an even number of megabytes."
msgstr ""
@@ -2176,11 +2156,6 @@ msgstr ""
"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -3224,7 +3199,7 @@ msgid "Reboot"
msgstr "Перезавантажити"
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
"computer, remove the live CD and restart the computer, click on <emphasis "
@@ -3238,15 +3213,15 @@ msgstr ""
"<emphasis role=\"bold\">у вказаному порядку</emphasis>."
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
"Після перезавантаження ви побачите інформацію щодо отримання даних на "
@@ -3254,7 +3229,7 @@ msgstr ""
"із програмним забезпеченням (див. «Керування програмним забезпеченням»)."
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -3325,17 +3300,17 @@ msgstr ""
"модуля <guilabel>Безпека</guilabel> Центру керування Mageia."
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr "Вибір і використання образів ISO"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr "Вступ"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
@@ -3345,12 +3320,12 @@ msgstr ""
"потребам."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr "Існує два сімейства носіїв дистрибутива:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target system. "
@@ -3364,7 +3339,7 @@ msgstr ""
"вибрати стільничне середовище, яким би ви хотіли користуватися."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -3376,22 +3351,22 @@ msgstr ""
"варіантів є вужчим."
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr "Подробиці наведено у наступних розділах."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr "Носій"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr "Визначення"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
@@ -3402,7 +3377,7 @@ msgstr ""
"зберігаються дані файла ISO."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
"\">here</link>."
@@ -3411,42 +3386,44 @@ msgstr ""
"\">тут</link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr "Класичний носій для встановлення"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78
+#: en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr "Типові можливості"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr ""
"На цих образах ISO використовується традиційний засіб встановлення під "
"назвою drakx."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid ""
"They are able to make a clean install or an update from previous releases."
msgstr ""
"Вони придатні для встановлення «з нуля» або оновлення попередніх випусків."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr "DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
msgstr "Різні носії для 32-бітової та 64-бітової архітектур."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
@@ -3455,14 +3432,14 @@ msgstr ""
"відновлення, тест пам’яті, інструмент виявлення обладнання."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr ""
"На кожному з DVD міститься багато стільничних середовищ та переклади різними "
"мовами."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid ""
"You'll be given the choice during the installation to add non free software."
msgstr ""
@@ -3470,12 +3447,12 @@ msgstr ""
"програмного забезпечення."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr "Портативний носій"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
@@ -3485,20 +3462,13 @@ msgstr ""
"встановити Mageia на вашому комп’ютері."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr ""
"Кожен ISO містить лише одне стільничне середовище (KDE, GNOME або Xfce)."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr "Різні носії для 32-бітової та 64-бітової архітектур."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous releases.</"
@@ -3509,53 +3479,53 @@ msgstr ""
"системи з попередніх випусків.</emphasis>"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr "Містять невільне програмне забезпечення."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
msgid "Live DVD Plasma"
msgstr "Портативний DVD з Плазмою"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
msgid "Plasma desktop environment only."
msgstr "Лише стільничне середовище Плазми."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
-#: en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122
+#: en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr "Містить переклади усіма мовами."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr "Портативний DVD із GNOME"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr "Лише стільничне середовище GNOME."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
msgid "Live DVD Xfce"
msgstr "Портативний DVD з Xfce"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
msgid "Xfce desktop environment only."
msgstr "Лише стільничне середовище Xfce."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr "Носії CD лише для завантаження"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -3569,7 +3539,7 @@ msgstr ""
"локальній мережі або у інтернеті."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -3581,17 +3551,17 @@ msgstr ""
"можуть завантажувати систему із флеш-диска USB."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr "Лише англійська мова."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
msgid "netinstall.iso"
msgstr "netinstall.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
@@ -3600,12 +3570,12 @@ msgstr ""
"не бажають користуватися невільними пакунками."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
msgid "netinstall-nonfree.iso"
msgstr "netinstall-nonfree.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
@@ -3614,17 +3584,17 @@ msgstr ""
"Призначено для тих, хто потребує цих компонентів системи."
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr "Отримання та перевірка носіїв даних"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr "Отримання"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -3638,12 +3608,12 @@ msgstr ""
"вибрано http, ви побачите щось таке:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
@@ -3655,44 +3625,46 @@ msgstr ""
"них. Далі, буде показано таке вікно:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr "Позначте пункт «Зберегти файл»."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr "Перевірка цілісності отриманих даних"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
"Обидва шістнадцяткових числа обчислено за допомогою певного алгоритму на "
"основі файла, який має бути отримано. Якщо ви попросите відповідну програму "
"знову обчислити шістнадцяткове число на основі отриманого файла, буде "
"отримано те саме число (це означатиму що дані було отримано належним чином) "
"або інше число (отже, дані було отримано з помилками). Розбіжність чисел "
-"означає, що вам слід повторити отримання образу."
+"означає, що вам слід повторити отримання образу або спробувати відновити "
+"його за допомогою BitTorrent."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr ""
"Відкрийте консоль (від імені звичайного користувача) і віддайте таку команду:"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
"file.iso</userinput>."
@@ -3701,7 +3673,7 @@ msgstr ""
"файла/образу.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
"image/file.iso</userinput>."
@@ -3710,7 +3682,7 @@ msgstr ""
"образу.iso</userinput>."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
@@ -3719,32 +3691,32 @@ msgstr ""
"певний час) з числом, вказаним на сторінці Mageia. Приклад:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr "Запис образу ISO"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a boot-able medium."
+"These operations are not a simple copy and aim to make a bootable medium."
msgstr ""
"Перевірений образ ISO можна записати на компакт-диск, DVD або флешку USB. "
"Дія із запису не є простим копіюванням, — її призначено для створення "
"придатного до завантаження системи носія даних."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr "Запис образу ISO на компакт-диск або DVD"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -3758,12 +3730,12 @@ msgstr ""
"Mageia</link>."
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr "Запис образу ISO на флешку USB"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
@@ -3772,9 +3744,9 @@ msgstr ""
"USB і користуватися нею для завантаження або встановлення системи."
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
@@ -3783,7 +3755,7 @@ msgstr ""
"втрачено. Розмір диска буде зменшено на розмір образу."
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
@@ -3792,12 +3764,12 @@ msgstr ""
"повторно створити на ньому розділи і виконати форматування."
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr "Використання інструмента із графічним інтерфейсом у Mageia"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3807,17 +3779,17 @@ msgstr ""
"IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr "Використання інструмента із графічним інтерфейсом у Windows"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr "Ви можете спробувати такі засоби:"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
@@ -3826,7 +3798,7 @@ msgstr ""
"допомогою пункту «ISO image» («образ ISO»);"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
@@ -3835,12 +3807,12 @@ msgstr ""
"Disk Imager</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr "За допомогою інструментів командного рядка у системі GNU/Linux"
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
@@ -3849,17 +3821,17 @@ msgstr ""
"вкажете помилковий ідентифікатор пристрою."
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr "Ви також можете скористатися консольною програмою dd:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr "Відкрийте вікно консолі"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
@@ -3868,14 +3840,14 @@ msgstr ""
"userinput> (не забудьте «-» наприкінці команди)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr ""
"З’єднайте з комп’ютером ваш диск USB (не монтуйте його, тобто не відкривайте "
@@ -3883,17 +3855,17 @@ msgstr ""
"яка може отримати доступ до даних або читати дані)."
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr "Віддайте команду <userinput>fdisk -l</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command <code>dmesg</"
"code>: at end, you see the device name starting with <emphasis>sd</"
@@ -3905,7 +3877,7 @@ msgstr ""
"<emphasis>sdd</emphasis> у нашому випадку:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3947,7 +3919,7 @@ msgstr ""
"[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example <code>/"
"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
@@ -3956,7 +3928,7 @@ msgstr ""
"знімку <code>/dev/sdb</code> це пристрій місткістю 8 ГБ, тобто флешка USB."
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
@@ -3965,12 +3937,12 @@ msgstr ""
"bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr "де X — назва потрібного вам пристрою. Приклад: /dev/sdc"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
"dev/sdb bs=1M</userinput>"
@@ -3979,12 +3951,12 @@ msgstr ""
"iso of=/dev/sdb bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr "Віддайте таку команду: # <userinput>sync</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr "Витягніть флешку USB. Запис завершено."
@@ -4471,33 +4443,31 @@ msgstr "Grub2 для застарілих систем із MBR та GPT"
#. type: Content of: <section><section><section><mediaobject>
#: en/setupBootloader.xml:36
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
"setupBootloader.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <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
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid ""
+"Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr ""
"Не змінюйте значення параметри «Пристрій завантаження», якщо у цьому немає "
"нагальної потреби."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
msgid "Grub2-efi on UEFI systems"
msgstr "Grub2-efi у системах UEFI"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
"choose between with or without graphical menu"
@@ -4507,35 +4477,30 @@ msgstr ""
"графічним меню і без нього."
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:58
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:64
+#: en/setupBootloader.xml:56
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only 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 "
+"If there are already UEFI operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer detects the existing ESP "
+"created by Windows and adds grub2-efi. Although it is possible to have "
"several ESPs, only one is advised and enough whatever the number of "
"operating systems you have."
msgstr ""
-"Якщо Mageia є першою операційною системою, яку встановлено на вашому "
+"Якщо Mageia є єдиною операційною системою, яку встановлено на вашому "
"комп’ютері, засіб встановлення створить ESP (системний розділ EFI) для "
"зберігання завантажувача (Grub2-efi). Якщо ж на комп’ютері вже було "
"встановлено операційні системи з UEFI (наприклад Windows 8), засіб "
@@ -4545,17 +4510,17 @@ msgstr ""
"кількості встановлених вами операційних систем."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr "Користування завантажувачем Mageia"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr "Типово, залежно від вашої системи, Mageia записує новий:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
@@ -4564,12 +4529,12 @@ msgstr ""
"до завантажувального розділу BIOS."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr "завантажувач Grub2-efi до ESP;"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
msgid ""
"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, "
@@ -4582,30 +4547,25 @@ msgstr ""
"позначку з пункту <guilabel>Зондування сторонньої ОС</guilabel>."
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:105
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:100
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr "Користування вже встановленим завантажувачем"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
msgid ""
"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 "
@@ -4621,14 +4581,14 @@ msgstr ""
"до іншої операційної системи."
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr "Використання ланцюгового завантаження"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
msgstr ""
@@ -4639,34 +4599,29 @@ msgstr ""
"або MBR</guilabel>."
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:136
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:129
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
msgstr ""
"Програма попередить вас про те, що у системі не буде завантажувача. "
"Проігноруйте попередження і натисніть кнопку <guibutton>Гаразд</guibutton>."
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
"imageobject>"
@@ -4675,17 +4630,17 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
msgid "Options"
msgstr "Параметри"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr "Перша сторінка"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<guilabel>Delay before booting the default image</guilabel>: This text box "
"lets you set a delay in seconds before the default operating system is "
@@ -4696,7 +4651,7 @@ msgstr ""
"завантаженням типової операційної системи."
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: en/setupBootloader.xml:162
msgid ""
"<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 "
@@ -4708,7 +4663,7 @@ msgstr ""
"змінити параметри під час завантаження."
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
msgid ""
"<guilabel>Password</guilabel>: This text box is where you actually put the "
"password"
@@ -4717,7 +4672,7 @@ msgstr ""
"можете вказати пароль."
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:182
+#: en/setupBootloader.xml:173
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
"check that it matches with the one set above."
@@ -4727,19 +4682,19 @@ msgstr ""
"з його початковим варіантом."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
msgid "<guilabel>Advanced</guilabel>"
msgstr "<guilabel>Додатково</guilabel>"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
msgid ""
"<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)."
+"stopping unused devices, this was the method used before APM. Unchecking it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
msgstr ""
"<guilabel>Увімкнути ACPI:</guilabel> ACPI (Advanced Configuration and Power "
"Interface) є стандартом керування живленням комп’ютера. За його допомогою "
@@ -4751,7 +4706,7 @@ msgstr ""
"або «замерзання» системи)."
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
@@ -4761,7 +4716,7 @@ msgstr ""
"комп’ютері встановлено багатоядерний процесор."
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:208
+#: en/setupBootloader.xml:199
msgid ""
"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
"operating system access to the Advanced Programmable Interrupt Controller. "
@@ -4775,29 +4730,29 @@ msgstr ""
"керування розширеними IRQ (запитами щодо переривань)."
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
"<guilabel>Увімкнути локальний APIC</guilabel>: за допомогою цього пункту ви "
"можете увімкнути локальний APIC, тобто керування усіма зовнішніми "
"перериваннями для певних процесорів у багатопроцесорних системах."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr "Наступна сторінка"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr ""
"<guilabel>Типовий:</guilabel> типовий варіант операційної системи для "
"завантаження."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
@@ -4807,7 +4762,7 @@ msgstr ""
"вам більше інформації під час завантаження системи."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:232
msgid ""
"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
@@ -4816,7 +4771,7 @@ msgstr ""
"linkend=\"setupMageiaBootloader\">використання завантажувача Mageia</link>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:247
+#: en/setupBootloader.xml:239
msgid ""
"<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 "
@@ -4829,7 +4784,7 @@ msgstr ""
"якими можна скористатися."
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -5259,6 +5214,133 @@ msgstr ""
"бачитимете порожній екран. Це нормально."
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
+#~ "\"mediaobject\" id=\"1\"/>"
+#~ msgstr ""
+#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
+#~ "\"mediaobject\" id=\"1\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png"
+#~ "\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png"
+#~ "\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Different media for architecture 32 or 64 bits."
+#~ msgstr "Різні носії для 32-бітової та 64-бітової архітектур."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+#~ "setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+#~ "setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
#~ "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."
@@ -5457,19 +5539,6 @@ msgstr ""
#~ "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 ""
#~ "If you prefer different bootloader settings to those chosen automatically "
#~ "by the installer, you can change them here."
#~ msgstr ""
diff --git a/docs/installer/uk/SelectAndUseISOs2.xml b/docs/installer/uk/SelectAndUseISOs2.xml
index 5991842c..d8417990 100644
--- a/docs/installer/uk/SelectAndUseISOs2.xml
+++ b/docs/installer/uk/SelectAndUseISOs2.xml
@@ -1,22 +1,17 @@
-<?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="uk" xml:id="Select-and-use-ISOs">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="uk" xml:id="Select-and-use-ISOs">
-
<info>
<!-- Made by Lebarhon 2014 03 26
Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
<title xml:id="Select-and-use-ISOs-ti1">Вибір і використання образів ISO</title>
</info>
-
<section>
<title>Вступ</title>
-
<para>Розповсюдження Mageia відбувається за допомогою образів ISO. За допомогою
цієї сторінки довідки ви зможете вибрати образ, який відповідає вашим
потребам.</para>
-
<para>Існує два сімейства носіїв дистрибутива:</para>
-
<itemizedlist>
<listitem>
<para>Класичний засіб встановлення: після завантаження з носія системи буде
@@ -25,7 +20,6 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
вам максимальні можливості щодо гнучкості налаштувань, зокрема ви зможете
вибрати стільничне середовище, яким би ви хотіли користуватися.</para>
</listitem>
-
<listitem>
<para>Портативні носії (LIVE): систему на такому носії можна завантажити як
звичайну систему Mageia без встановлення для ознайомлення із тим, як усе
@@ -33,60 +27,46 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
варіантів є вужчим.</para>
</listitem>
</itemizedlist>
-
<para>Подробиці наведено у наступних розділах.</para>
</section>
-
<section>
<title>Носій</title>
-
<section>
<title>Визначення</title>
-
<para>Тут ми називаємо носієм даних файл образу ISO, за допомогою якого можна
встановити і/або оновити Mageia, а також будь-який фізичний носій, де
зберігаються дані файла ISO.</para>
-
<para>Знайти носії даних можна <link
ns4:href="http://www.mageia.org/uk/downloads/">тут</link>.</para>
</section>
-
<section>
<title>Класичний носій для встановлення</title>
-
<section>
<title>Типові можливості</title>
-
<itemizedlist>
<listitem>
<para>На цих образах ISO використовується традиційний засіб встановлення під
назвою drakx.</para>
</listitem>
-
<listitem>
<para>Вони придатні для встановлення «з нуля» або оновлення попередніх випусків.</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>DVD</title>
-
<itemizedlist>
<listitem>
<para>Різні носії для 32-бітової та 64-бітової архітектур.</para>
</listitem>
-
<listitem>
<para>Доступ до деяких з інструментів можна отримати з екран вітання: система
відновлення, тест пам’яті, інструмент виявлення обладнання.</para>
</listitem>
-
<listitem>
<para>На кожному з DVD міститься багато стільничних середовищ та переклади різними
мовами.</para>
</listitem>
-
<listitem>
<para>Під час встановлення вам буде надано можливість додати джерела невільного
програмного забезпечення.</para>
@@ -94,101 +74,79 @@ ns4:href="http://www.mageia.org/uk/downloads/">тут</link>.</para>
</itemizedlist>
</section>
</section>
-
<section>
<title>Портативний носій</title>
-
<section>
<title>Типові можливості</title>
-
<itemizedlist>
<listitem>
<para>Можна скористатися для ознайомлення із дистрибутивом без встановлення його
на жорсткий диск. Втім, якщо хочеться, за допомогою цього носія можна
встановити Mageia на вашому комп’ютері.</para>
</listitem>
-
<listitem>
<para>Кожен ISO містить лише одне стільничне середовище (KDE, GNOME або Xfce).</para>
</listitem>
-
<listitem>
<para>Різні носії для 32-бітової та 64-бітової архітектур.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Образами ISO портативних систем можна скористатися
лише для встановлення системи «з нуля». Вони непридатні для оновлення
системи з попередніх випусків.</emphasis></para>
</listitem>
-
<listitem>
<para>Містять невільне програмне забезпечення.</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>Портативний DVD з Плазмою</title>
-
<itemizedlist>
<listitem>
<para>Лише стільничне середовище Плазми.</para>
</listitem>
-
<listitem>
<para>Містить переклади усіма мовами.</para>
</listitem>
-
<listitem>
<para>Різні носії для 32-бітової та 64-бітової архітектур.</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>Портативний DVD із GNOME</title>
-
<itemizedlist>
<listitem>
<para>Лише стільничне середовище GNOME.</para>
</listitem>
-
<listitem>
<para>Містить переклади усіма мовами.</para>
</listitem>
-
<listitem>
<para>Різні носії для 32-бітової та 64-бітової архітектур.</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>Портативний DVD з Xfce</title>
-
<itemizedlist>
<listitem>
<para>Лише стільничне середовище Xfce.</para>
</listitem>
-
<listitem>
<para>Містить переклади усіма мовами.</para>
</listitem>
-
<listitem>
<para>Різні носії для 32-бітової та 64-бітової архітектур.</para>
</listitem>
</itemizedlist>
</section>
</section>
-
<section>
<title>Носії CD лише для завантаження</title>
-
<section>
<title>Типові можливості</title>
-
<itemizedlist>
<listitem>
<para>Кожен з таких малих образів містить лише дані, потрібні для запуску засобу
@@ -197,27 +155,22 @@ ns4:href="http://www.mageia.org/uk/downloads/">тут</link>.</para>
можуть зберігатися на жорсткому диску комп’ютера, локальному диску, у
локальній мережі або у інтернеті.</para>
</listitem>
-
<listitem>
<para>Такі носії є дуже малими (менше за 100 МБ). Ними зручно користуватися, якщо
канал зв’язку у мережі є надто вузьким для отримання повноцінного образу
DVD, на комп’ютерах без пристрою для читання DVD або на комп’ютерах, які не
можуть завантажувати систему із флеш-диска USB.</para>
</listitem>
-
<listitem>
<para>Різні носії для 32-бітової та 64-бітової архітектур.</para>
</listitem>
-
<listitem>
<para>Лише англійська мова.</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>netinstall.iso</title>
-
<itemizedlist>
<listitem>
<para>Містить лише вільне програмне забезпечення. Призначено для користувачів, які
@@ -225,10 +178,8 @@ DVD, на комп’ютерах без пристрою для читання
</listitem>
</itemizedlist>
</section>
-
<section>
<title>netinstall-nonfree.iso</title>
-
<itemizedlist>
<listitem>
<para>Містить невільне програмне забезпечення (здебільшого драйвери, кодеки
@@ -238,154 +189,115 @@ DVD, на комп’ютерах без пристрою для читання
</section>
</section>
</section>
-
<section>
<title>Отримання та перевірка носіїв даних</title>
-
<section>
<title>Отримання</title>
-
<para>Щойно вами буде вибрано потрібний вам файл ISO, ви можете отримати його або
за допомогою протоколу http, або за допомогою BitTorrent. У обох випадках у
вікні буде показано певну інформацію щодо джерела даних та надано можливість
змінити його, якщо швидкість отримання даних є надто малою. Якщо буде
вибрано http, ви побачите щось таке:</para>
-
<mediaobject>
<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
-
<para>md5sum і sha1sum — програми для перевірки цілісності даних у образах
ISO. Для виконання перевірки достатньо встановити лише одну з цих
програм. Для <link linkend="integrity">подальшого використання</link>
встановіть одну з них. Далі, буде показано таке вікно:</para>
-
<mediaobject>
<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
-
<para>Позначте пункт «Зберегти файл».</para>
</section>
-
<section>
<title xml:id="integrity">Перевірка цілісності отриманих даних</title>
-
<para>Обидва шістнадцяткових числа обчислено за допомогою певного алгоритму на
основі файла, який має бути отримано. Якщо ви попросите відповідну програму
знову обчислити шістнадцяткове число на основі отриманого файла, буде
отримано те саме число (це означатиму що дані було отримано належним чином)
або інше число (отже, дані було отримано з помилками). Розбіжність чисел
-означає, що вам слід повторити отримання образу.</para>
-
+означає, що вам слід повторити отримання образу або спробувати відновити
+його за допомогою BitTorrent.</para>
<para>Відкрийте консоль (від імені звичайного користувача) і віддайте таку
команду:</para>
-
<para>- Якщо використовується md5sum: [sam@localhost]$ <userinput>md5sum
шлях/до/файла/образу.iso</userinput>.</para>
-
<para>- Якщо використовується sha1sum: [sam@localhost]$ <userinput>sha1sum
шлях/до/образу.iso</userinput>.</para>
-
<para>і порівняйте отримане числове значення (для його отримання знадобиться
певний час) з числом, вказаним на сторінці Mageia. Приклад:</para>
-
<mediaobject>
<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
-
<para/>
</section>
</section>
-
<section>
<title>Запис образу ISO</title>
-
<para>Перевірений образ ISO можна записати на компакт-диск, DVD або флешку
USB. Дія із запису не є простим копіюванням, — її призначено для створення
придатного до завантаження системи носія даних.</para>
-
<section>
<title>Запис образу ISO на компакт-диск або DVD</title>
-
<para>Скористайтеся будь-яким пристроєм для записування, але його має бути
налаштовано на <emphasis role="bold">запис образу</emphasis>. Просто
записати дані або файли недостатньо. Докладніше про це можна дізнатися з
<link ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">вікі
Mageia</link>.</para>
</section>
-
<section>
<title>Запис образу ISO на флешку USB</title>
-
<para>Усі образи ISO Mageia є гібридними, тобто ви можете записувати їх на флешку
USB і користуватися нею для завантаження або встановлення системи.</para>
-
<warning>
<para>У результаті «запису» образу на диск USB (флешку) усі дані файлової системи
на ній буде знищено. Доступ до усіх даних, які не буде знищено, буде
втрачено. Розмір диска буде зменшено на розмір образу.</para>
</warning>
-
<para>Для відновлення початкової місткості диска USB вам згодом доведеться
повторно створити на ньому розділи і виконати форматування.</para>
-
<section>
<title>Використання інструмента із графічним інтерфейсом у Mageia</title>
-
<para>Ви можете скористатися інструментом із графічним інтерфейсом, наприклад
<link
ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks">IsoDumper</link></para>
</section>
-
<section>
<title>Використання інструмента із графічним інтерфейсом у Windows</title>
-
<para>Ви можете спробувати такі засоби:</para>
-
<para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> за
допомогою пункту «ISO image» («образ ISO»);</para>
-
<para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
Disk Imager</link></para>
</section>
-
<section>
<title>За допомогою інструментів командного рядка у системі GNU/Linux</title>
-
<warning>
<para>Цей шлях є потенційно небезпечним. Ви можете пошкодити розділ на диску, якщо
вкажете помилковий ідентифікатор пристрою.</para>
</warning>
-
<para>Ви також можете скористатися консольною програмою dd:</para>
-
<orderedlist>
<listitem>
<para>Відкрийте вікно консолі</para>
</listitem>
-
<listitem>
<para>Отримайте права користувача root за допомогою команди <userinput>su
-</userinput> (не забудьте «-» наприкінці команди)</para>
-
<mediaobject>
<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
</listitem>
-
<listitem>
<para>З’єднайте з комп’ютером ваш диск USB (не монтуйте його, тобто не відкривайте
вміст диска у будь-якій програмі, зокрема у програмі для керування файлами,
яка може отримати доступ до даних або читати дані).</para>
</listitem>
-
<listitem>
<para>Віддайте команду <userinput>fdisk -l</userinput></para>
-
<mediaobject>
<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
-
<para>Крім того, визначити назву пристрою можна за допомогою команди
<code>dmesg</code>: наприкінці виведених нею даних буде вказано назву
пристрою, що починатиметься з <emphasis>sd</emphasis> з наступним фрагментом
<emphasis>sdd</emphasis> у нашому випадку:</para>
-
<screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
@@ -405,27 +317,21 @@ Disk Imager</link></para>
[72595.967251] <emphasis>sdd</emphasis>: sdd1
[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen>
</listitem>
-
<listitem>
<para>Назву пристрою можна визначити за розміром. Наприклад, на наведеному вище
знімку <code>/dev/sdb</code> це пристрій місткістю 8 ГБ, тобто флешка USB.</para>
</listitem>
-
<listitem>
<para>Віддайте таку команду: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX
bs=1M</userinput></para>
-
<para>де X — назва потрібного вам пристрою. Приклад: /dev/sdc</para>
-
<para>Приклад команди: # <userinput>dd
if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/dev/sdb
bs=1M</userinput></para>
</listitem>
-
<listitem>
<para>Віддайте таку команду: # <userinput>sync</userinput></para>
</listitem>
-
<listitem>
<para>Витягніть флешку USB. Запис завершено.</para>
</listitem>
diff --git a/docs/installer/uk/addUser.xml b/docs/installer/uk/addUser.xml
index b0fa821a..dbbe7b1d 100644
--- a/docs/installer/uk/addUser.xml
+++ b/docs/installer/uk/addUser.xml
@@ -1,22 +1,18 @@
-<?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="uk" xml:id="addUser">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="uk" xml:id="addUser">
<info>
<title xml:id="addUser-ti1">Керування обліковими записами користувача і адміністратора</title>
</info>
-
-
<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>
<title xml:id="root-password-ti2">Встановлення пароля адміністратора (root):</title>
</info>
-
<para>У кожній встановленій системі <application>Mageia</application> варто
визначити пароль суперкористувача або адміністратора. Такий пароль у Linux
зазвичай має назву <emphasis>пароль root</emphasis>. Під час введення пароля
@@ -24,87 +20,71 @@ format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
зелений, залежно від складності пароля. Зелений колір відповідає достатньо
складним паролям. Вам також слід повторити введення пароля у полі
розташованому нижче, щоб упевнитися, що пароль було вказано без помилок.</para>
-
<note xml:id="givePassword">
<para>Всі паролі слід вказувати з врахуванням регістру. Краще використовувати у
паролі суміш літер (великих і малих), цифр та інших символів.</para>
</note>
</section>
-
<section xml:id="enterUser">
<info>
<title xml:id="enterUser-ti3">Введіть користувача</title>
</info>
-
<para>За допомогою цієї панелі ви можете додати користувачів. Кожен користувач має
вужчі права доступу, ніж суперкористувач (root), але достатньо прав для
перегляду сторінок інтернету, користування офісними програмами, ігор та
будь-яких інших завдань, які виконуються звичайним користувачем за
комп’ютером.</para>
-
<itemizedlist>
<listitem>
<para><guibutton>Піктограма</guibutton>: за допомогою цієї кнопки можна змінити
піктограму користувача.</para>
</listitem>
-
<listitem>
<para><guilabel>Справжнє ім’я</guilabel>: у цьому полі для введення тексту слід
вказати справжнє ім’я користувача.</para>
</listitem>
-
<listitem>
<para><guilabel>Ім’я користувача, що реєструється</guilabel>: тут ви можете ввести
реєстраційне ім’я користувача або надати змогу drakx використовувати певну
версію справжнього імені користувача.</para>
</listitem>
-
<listitem>
<para><guilabel>Пароль</guilabel>: у цьому полі вам слід вказати пароль
користувача. Колір позначки щита поряд з цим полем відповідає складності
пароля (див. також <xref linkend="givePassword"/>)</para>
</listitem>
-
<listitem>
<para><guilabel>Пароль (ще раз)</guilabel>: повторіть введення пароля користувача
у цьому полі. drakx перевірить, чи збігається введений вами повторно пароль
з його початковим варіантом.</para>
</listitem>
</itemizedlist>
-
<note>
<para>Вміст домашніх каталогів всіх користувачів, записи яких буде створено під
час встановлення Mageia, буде захищено від читання і запису (umask=0027).</para>
-
<para>Ви можете додати всі записи майбутніх користувачів системи на кроці
<emphasis>Налаштування - Резюме</emphasis> під час встановлення системи. Для
керування записами користувачів виберіть пункт <emphasis>Керування
користувачами</emphasis>.</para>
-
<para>Права доступу до домашніх каталогів, звичайно ж, можна змінити і після
завершення встановлення системи.</para>
</note>
</section>
-
<section xml:id="addUserAdvanced" condition="classical">
<info>
<title xml:id="addUserAdvanced-ti3">Додаткові можливості керування записами користувачів</title>
</info>
-
<para>Якщо ви натиснете кнопку <guibutton>Додатково</guibutton>, програма відкриє
діалогове вікно, за допомогою якого ви зможете змінити параметри облікового
запису, який ви додаєте.</para>
-
<para condition="classical">Крім того, за допомогою цього діалогового вікна можна вимкнути або увімкнути
гостьовий обліковий запис.</para>
-
<warning condition="classical">
<para>Будь-які дані, які буде записано з гостьового облікового запису
<emphasis>rbash</emphasis> до відповідного каталогу у /home, буде витерто
під час виходу з системи. Користувачеві гостьового облікового запису слід
потурбуватися про збереження важливих файлів на портативний носій даних.</para>
</warning>
-
<itemizedlist>
<listitem condition="classical">
<para><guilabel>Увімкнути гостьовий запис</guilabel>: за допомогою цього пункту
@@ -113,21 +93,18 @@ format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
комп’ютером, але матиме обмежені права доступу навіть порівняно зі
звичайними користувачами.</para>
</listitem>
-
<listitem>
<para><guilabel>Командна оболонка</guilabel>: за допомогою цього спадного списку
ви можете змінити командну оболонку, яка використовуватиметься для роботи
користувача, обліковий запис якого створено за допомогою попереднього
вікна. Можливі такі варіанти: Bash, Dash та Sh.</para>
</listitem>
-
<listitem>
<para><guilabel>Код користувача</guilabel>: тут ви можете встановити код
(ідентифікатор) користувача, обліковий запис якого було додано за допомогою
попереднього вікна. Слід вказати номер облікового запису. Не заповнюйте це
поле, якщо вам невідомі наслідки ваших дій.</para>
</listitem>
-
<listitem>
<para><guilabel>Код групи</guilabel>: тут ви можете встановити код (ідентифікатор)
групи користувача, обліковий запис якого було додано за допомогою
diff --git a/docs/installer/uk/diskdrake.xml b/docs/installer/uk/diskdrake.xml
index 4c8a402d..aa4cdeb5 100644
--- a/docs/installer/uk/diskdrake.xml
+++ b/docs/installer/uk/diskdrake.xml
@@ -47,8 +47,9 @@ fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
(EFI System Partition) і що її змонтовано до /boot/EFI (див. нижче).</para>
<para><mediaobject>
-<imageobject> <imagedata fileref="dx2-diskdrake2.png"/> </imageobject></mediaobject><mediaobject>
-<imageobject> <imagedata fileref="live-diskdrake2.png"/> </imageobject></mediaobject></para>
+<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake2.png"
+align="center"/> </imageobject> <imageobject condition="live"> <imagedata
+fileref="live-diskdrake2.png" align="center"/> </imageobject></mediaobject></para>
</note>
<note>
@@ -56,8 +57,9 @@ fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
існує розділ BIOS належного типу.</para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks3.png"/>
-</imageobject> <imageobject> <imagedata
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-doPartitionDisks3.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-doPartitionDisks3.png" align="center"/> </imageobject></mediaobject>
</note>
</section> \ No newline at end of file
diff --git a/docs/installer/uk/doPartitionDisks.xml b/docs/installer/uk/doPartitionDisks.xml
index f4320e90..d9f54c81 100644
--- a/docs/installer/uk/doPartitionDisks.xml
+++ b/docs/installer/uk/doPartitionDisks.xml
@@ -19,12 +19,10 @@ lebarhon 20170209 added SC-->
комп’ютера та вмісту дисків.</para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks.png" align="center"/>
-</imageobject></mediaobject>
-
- <mediaobject>
-<imageobject> <imagedata fileref="live-doPartitionDisks.png"/>
-</imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
<para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist>
<listitem>
@@ -67,12 +65,10 @@ Windows блакитним кольором, а майбутній розділ
миші. Див. наведений нижче знімок екрана.</para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks2.png"/>
-</imageobject></mediaobject>
-
- <mediaobject>
-<imageobject> <imagedata fileref="live-doPartitionDisks2.png"/>
-</imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-doPartitionDisks2.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-doPartitionDisks2.png" align="center"/> </imageobject></mediaobject>
</listitem>
</itemizedlist> <itemizedlist>
<listitem>
@@ -146,12 +142,10 @@ GPT, вам доведеться створити розділ для заван
але треба вибрати тип файлової системи «Розділ завантаження BIOS».</para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
-
- <mediaobject>
-<imageobject> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-doPartitionDisks3.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
<mediaobject>
<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
diff --git a/docs/installer/uk/reboot.xml b/docs/installer/uk/reboot.xml
index b8a250e8..49d895d3 100644
--- a/docs/installer/uk/reboot.xml
+++ b/docs/installer/uk/reboot.xml
@@ -1,25 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/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="uk" xml:id="reboot">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="uk" xml:id="reboot">
<!--Lebarhon 20170210 updated for Mageia6-->
<info>
<title xml:id="reboot-ti1">Перезавантажити</title>
</info>
-
-
-
-
+
<para>Після встановлення завантажувача програма попросить вас перервати роботу
системи, вийняти з лотка компакт-диск, від’єднати від комп’ютера флешку і
перезавантажити комп’ютер. Натисніть кнопку <emphasis
role="bold"><guibutton>Завершити</guibutton></emphasis> і виконайте саме ці
дії <emphasis role="bold">у вказаному порядку</emphasis>.</para>
-
<mediaobject>
<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
-
<para>Після перезавантаження ви побачите інформацію щодо отримання даних на
смужках поступу. Дані цих смужок відповідають процесу отримання даних сховищ
із програмним забезпеченням (див. «Керування програмним забезпеченням»).</para>
-
<mediaobject condition="live">
<imageobject> <imagedata format="PNG" xml:id="reboot-im1"
fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/installer/uk/setupBootloader.xml b/docs/installer/uk/setupBootloader.xml
index 17a2a331..4c321064 100644
--- a/docs/installer/uk/setupBootloader.xml
+++ b/docs/installer/uk/setupBootloader.xml
@@ -34,10 +34,9 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<title>Grub2 для застарілих систем із MBR та GPT</title>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader.png"/> </imageobject></mediaobject>
-
- <mediaobject>
-<imageobject> <imagedata xml:id="setupBootloader-im1"
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<para>Не змінюйте значення параметри «Пристрій завантаження», якщо у цьому немає
@@ -52,13 +51,12 @@ fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
графічним меню і без нього.</para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader2.png"/> </imageobject></mediaobject>
-
- <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader2.png"/>
-</imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader2.png"/> </imageobject></mediaobject>
- <para>Якщо Mageia є першою операційною системою, яку встановлено на вашому
+ <para>Якщо Mageia є єдиною операційною системою, яку встановлено на вашому
комп’ютері, засіб встановлення створить ESP (системний розділ EFI) для
зберігання завантажувача (Grub2-efi). Якщо ж на комп’ютері вже було
встановлено операційні системи з UEFI (наприклад Windows 8), засіб
@@ -94,11 +92,10 @@ grub2-efi. Хоча теоретично у системі може бути д
позначку з пункту <guilabel>Зондування сторонньої ОС</guilabel>.</para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader3.png"/> </imageobject></mediaobject>
-
- <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader3.png"/>
-</imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader3.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader3.png" align="center"/> </imageobject></mediaobject>
</section>
<section>
@@ -122,11 +119,10 @@ grub2-efi. Хоча теоретично у системі може бути д
або MBR</guilabel>.</para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader4.png"/> </imageobject></mediaobject>
-
- <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader4.png"/>
-</imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
<para>Програма попередить вас про те, що у системі не буде
завантажувача. Проігноруйте попередження і натисніть кнопку
diff --git a/docs/installer/zh_CN.po b/docs/installer/zh_CN.po
index e356bb24..49a781ec 100644
--- a/docs/installer/zh_CN.po
+++ b/docs/installer/zh_CN.po
@@ -1,29 +1,24 @@
-# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Mageia
# This file is distributed under the same license as the Mageia Installer Help package.
#
# Translators:
-# 吴善俊 <sjwuny@126.com>, 2013
-# Xiaobo Zhou <zhouxiaobo.500@gmail.com>, 2014
-# xiao wenming <xwm-citcc5@hotmail.com>, 2015
-# Yuri Chornoivan <yurchor@ukr.net>, 2016
-# zwpwjwtz <zwpwjwtz@126.com>, 2016-2017
-# 吴善俊 <sjwuny@126.com>, 2013
-# Xiaobo Zhou <zhouxiaobo.500@gmail.com>, 2014
+# 吴善俊 <sjwuny@126.com>, 2013.
+# Xiaobo Zhou <zhouxiaobo.500@gmail.com>, 2014.
+# xiao wenming <xwm-citcc5@hotmail.com>, 2015.
+# zwpwjwtz <zwpwjwtz@126.com>, 2016-2017.
msgid ""
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: 2017-03-05 13:47+0000\n"
-"Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/"
-"language/zh_CN/)\n"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
+"PO-Revision-Date: 2017-03-14 21:42+0200\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Lokalize 1.5\n"
#. type: Content of: <section><info><title>
#: en/acceptLicense.xml:25
@@ -112,9 +107,9 @@ msgstr "zh_CN"
msgid "Media Selection (Configure Supplemental Installation Media)"
msgstr "介质选择 (设置增补的安装介质)"
-#. papoteur 2013-04-13 - created
-#. marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection
-#. marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell
+#. papoteur 2013-04-13 - created
+#. marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection
+#. marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell
#. type: Content of: <section><mediaobject>
#: en/add_supplemental_media.xml:18
msgid ""
@@ -181,7 +176,7 @@ msgstr "用户和管理员管理"
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -194,12 +189,12 @@ msgstr ""
"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr "设置管理员(root 账户)密码:"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -216,7 +211,7 @@ msgstr ""
"较高。你需要在下方输入框中再次输入相同的密码,以确保你之前的密码没有输错。"
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
@@ -225,46 +220,46 @@ msgstr ""
"符。"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr "输入用户名"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
"在这里添加一个用户。一个用户拥有比超级管理员更少的权限,但是网上冲浪,使用办"
"公软件或者玩游戏等是足够的。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr "<guibutton>图标</guibutton>:若点击此按钮,则会改变用户图标。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr "<guilabel>真实姓名</guilabel>:在文本框中输入用户的真名。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
"<guilabel>登录名</guilabel>:输入用户的登录名,或让 drakx 根据真实姓名自动设"
"置。<emphasis>登录名区分大小写。</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -274,7 +269,7 @@ msgstr ""
"码强度。(参见 <xref linkend=\"givePassword\"/>)"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -284,15 +279,14 @@ msgstr ""
"的密码是否一致。"
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
"protected home directory (umask=0027)."
-msgstr ""
-"在安装 Mageia 期间添加的任何用户都将拥有读/写保护的主目录(即 umask=0027)。"
+msgstr "在安装 Mageia 期间添加的任何用户都将拥有读/写保护的主目录(即 umask=0027)。"
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - Summary</"
"emphasis> step during the install. Choose <emphasis>User management</"
@@ -302,17 +296,17 @@ msgstr ""
"<emphasis>用户管理</emphasis>即可。"
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr "也可以在安装完成后改变访问权限。"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr "高级用户管理"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
@@ -321,12 +315,12 @@ msgstr ""
"设置。"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr "此外,您还可以禁用或启用来宾账户。"
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -336,7 +330,7 @@ msgstr ""
"应当将他/她的临时文件存储于 U 盘等设备中。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -346,7 +340,7 @@ msgstr ""
"来宾登录并使用电脑,但对其使用更严格的访问权限控制。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -356,7 +350,7 @@ msgstr ""
"中添加),可能的选项有 Bash、Dash 和 Sh。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -366,7 +360,7 @@ msgstr ""
"您不确定如何设置,请将其留空。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -380,17 +374,17 @@ msgstr ""
msgid "Choose the mount points"
msgstr "选择挂载点"
-#. Made by marja on 2012 03 28
-#. NEEDS TO BE REVIEWED!
-#. SimonNZG 2012-04-03 has taken a look but needs to come back
-#. removed para xml:id's, marja, 20120409
+#. Made by marja on 2012 03 28
+#. NEEDS TO BE REVIEWED!
+#. SimonNZG 2012-04-03 has taken a look but needs to come back
+#. removed para xml:id's, marja, 20120409
#. barjac 14/04/2012 Minor edit to improve grammar and replaced "at least ONE"
-#. with "a", as I can't imagine having more than one root partition ;)
-#. Lebarhon : I put [] where it seems having mistakes
+#. with "a", as I can't imagine having more than one root partition ;)
+#. Lebarhon : I put [] where it seems having mistakes
#. Marja: you're right, in English English it is "its type", however, the Americans
#. write "it's type". And you're right about the redundant part, too, I removed it
-#. And JohnR says the Americans are WRONG! :-))
-#. 2012-04-19 Language proofreading done
+#. And JohnR says the Americans are WRONG! :-))
+#. 2012-04-19 Language proofreading done
#. type: Content of: <section><mediaobject>
#: en/ask_mntpoint_s.xml:27
msgid ""
@@ -423,8 +417,7 @@ msgstr ""
msgid ""
"If you change anything, make sure you still have a <literal>/</literal> "
"(root) partition."
-msgstr ""
-"如果进行了更改,请确保你仍然具有访问 <literal>/</literal> (根)分区的权限。"
+msgstr "如果进行了更改,请确保你仍然具有访问 <literal>/</literal> (根)分区的权限。"
#. type: Content of: <section><itemizedlist><listitem><para>
#: en/ask_mntpoint_s.xml:48
@@ -854,8 +847,8 @@ msgstr ""
msgid "Configure your Services"
msgstr "配置服务"
-#. 2012-12-25 marja - moved this section out of misc-params.xml
-#. 2013-05-05 marja - added screenshot
+#. 2012-12-25 marja - moved this section out of misc-params.xml
+#. 2013-05-05 marja - added screenshot
#. type: Content of: <section><mediaobject>
#: en/configureServices.xml:21
msgid ""
@@ -902,8 +895,8 @@ msgstr "只有在您完全了解您的行为的风险后再作出改动。"
msgid "Configure your Timezone"
msgstr "配置时区"
-#. 2012-12-25 marja - moved this part out of misc-params.xml
-#. 2013-05-05 marja - added screenshot
+#. 2012-12-25 marja - moved this part out of misc-params.xml
+#. 2013-05-05 marja - added screenshot
#. type: Content of: <section><mediaobject>
#: en/configureTimezoneUTC.xml:11
msgid ""
@@ -938,8 +931,7 @@ msgstr "在下一个窗口中,您可以将硬件时钟设置为本地时间或
msgid ""
"If you have more than one operating system on your computer, make sure they "
"are all set to local time, or all to UTC/GMT."
-msgstr ""
-"若您安装了多个操作系统,请确保硬件时钟均被设为本地时间,或均为 UTC/GMT。"
+msgstr "若您安装了多个操作系统,请确保硬件时钟均被设为本地时间,或均为 UTC/GMT。"
#. type: Content of: <section><info><title>
#: en/configureX_card_list.xml:11
@@ -1011,8 +1003,7 @@ msgstr ""
msgid ""
"Be aware that if you select an incompatible driver you may only have access "
"to the Commandline Interface."
-msgstr ""
-"请注意,若选择了不兼容的驱动,您可能无法使用图形化界面(但仍可使用命令行)。"
+msgstr "请注意,若选择了不兼容的驱动,您可能无法使用图形化界面(但仍可使用命令行)。"
#. type: Content of: <section><para>
#: en/configureX_card_list.xml:51
@@ -1330,28 +1321,21 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
-msgid ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:56
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
-msgstr ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
-"\" id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
"partition is present with a correct type"
@@ -1360,15 +1344,17 @@ msgstr ""
"正确的分区标志"
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
-"> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
-"> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
+"\"center\"/> </imageobject>"
#. type: Content of: <section><info><title>
#: en/doPartitionDisks.xml:9
@@ -1395,28 +1381,23 @@ msgstr "根据特定硬盘布局和内容的不同,下列选项可能会有所
#. type: Content of: <section><mediaobject>
#: en/doPartitionDisks.xml:22
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"/> </imageobject>"
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr "使用现存的分区"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
@@ -1425,31 +1406,31 @@ msgstr ""
"安装。"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr "使用空闲空间"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
msgstr "若硬盘上有未使用的区域,此选项将会把 Mageia 安装到该区域中。"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr "使用 Windows 分区中的空闲空间"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
msgstr "若现存 Windows 分区中有空闲空间,安装程序将把 Mageia 安装在此处。"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"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 "
@@ -1459,7 +1440,7 @@ msgstr ""
"所有重要文件!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1473,7 +1454,7 @@ msgstr ""
"移出待使用区域。我们推荐您对个人文件进行备份后再进行此操作。"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1485,40 +1466,35 @@ msgstr ""
"图)。"
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:77
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr "擦除磁盘,并使用整个磁盘。"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr "此选项将会把整个硬盘空间用于安装 Mageia。"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr "注意!将会删除所选驱动器上的所有数据!请谨慎操作!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"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 "
@@ -1528,60 +1504,60 @@ msgstr ""
"要使用此选项。"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr "自定义"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
msgstr "允许您完全控制系统在硬盘上的安装方式。"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr "<emphasis role=\"bold\">分区大小:</emphasis>"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
msgstr "安装程序将会根据下列规则使用可用空间:"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
msgstr "若可用空间小于 50GB,则只创建 / 分区,不创建单独的 /home 分区。"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are created"
msgstr "若总可用空间大于 50GB,则创建三个分区。"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid ""
"6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr "其中 6/19 被分配给 / 分区,最大不超过 50GB"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr "1/19 被分配给交换分区,最大不超过 4GB"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr "剩余部分(至少 12/19)被分配给 /home 分区"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1590,7 +1566,7 @@ msgstr ""
"及 106GB 的 /home 分区。"
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on /"
@@ -1601,7 +1577,7 @@ msgstr ""
"boot/EFI。“自定义”选项仅用于检测该操作的结果是否正确"
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"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 "
@@ -1614,26 +1590,21 @@ msgstr ""
"磁盘分区”,然后手动创建一个 BIOS 引导分区。"
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
#. type: Content of: <section><note><mediaobject>
#: en/doPartitionDisks.xml:175
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
-msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
@@ -1641,7 +1612,7 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"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 "
@@ -1656,17 +1627,17 @@ msgstr ""
"议您使用其他的分区工具(如gparted)预先进行分区操作:"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr "“对齐到”“MiB”"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr "“前面的自由空间(MiB)”“2”"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid ""
"Also make sure all partitions are created with an even number of megabytes."
msgstr "确保所有创建的分区的大小均为偶数倍 MB。"
@@ -1829,10 +1800,10 @@ msgstr "若您有任何疑问,或希望帮助完善 Mageia,请访问 www.mag
msgid "Formatting"
msgstr "格式化"
-#. Made by marja on 2012 03 29
-#. NEEDS TO BE REVIEWED!
-#. marja 2012-04-24 added screenshot
-#. marja 2012-04-24 added emphasis tags in formatPartitions-pa1
+#. Made by marja on 2012 03 29
+#. NEEDS TO BE REVIEWED!
+#. marja 2012-04-24 added screenshot
+#. marja 2012-04-24 added emphasis tags in formatPartitions-pa1
#. type: Content of: <section><mediaobject>
#: en/formatPartitions.xml:18
msgid ""
@@ -1941,11 +1912,6 @@ msgstr ""
"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -1966,8 +1932,7 @@ msgstr "在此页中,可以进行自定义设置:"
msgid ""
"The language (for the installation only, may be different that the chosen "
"language for the system) by pressing the key F2 (Legacy mode only)"
-msgstr ""
-"按 F2 选择语言(仅用于安装,可能与系统所选语言有出入)(仅用于传统模式)。"
+msgstr "按 F2 选择语言(仅用于安装,可能与系统所选语言有出入)(仅用于传统模式)。"
#. type: Content of: <section><itemizedlist><listitem><mediaobject>
#: en/installer.xml:66
@@ -2215,8 +2180,7 @@ msgstr ""
msgid ""
"Most screens have <guibutton>Help</guibutton> buttons which give further "
"explanations about the current step."
-msgstr ""
-"多数窗口中有<guibutton>帮助</guibutton>按钮,可以提供当前操作的有关说明。"
+msgstr "多数窗口中有<guibutton>帮助</guibutton>按钮,可以提供当前操作的有关说明。"
#. type: Content of: <section><section><note><para>
#: en/installer.xml:214
@@ -2327,10 +2291,10 @@ msgstr ""
msgid "Updates"
msgstr "更新"
-#. Made by marja on 2012 03 30
-#. NEEDS TO BE REVIEWED!
+#. Made by marja on 2012 03 30
+#. NEEDS TO BE REVIEWED!
#. marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
-#. marja, 2012-04-24 added screenshot
+#. marja, 2012-04-24 added screenshot
#. type: Content of: <section><mediaobject>
#: en/installUpdates.xml:13
msgid ""
@@ -2414,9 +2378,9 @@ msgstr ""
msgid "Media Selection (Nonfree)"
msgstr "介质选择 (Nonfree)"
-#. papoteur 2013-04-11 - created
+#. papoteur 2013-04-11 - created
#. marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)
-#. marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell
+#. marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell
#. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
#. type: Content of: <section><mediaobject>
#: en/media_selection.xml:12
@@ -2673,8 +2637,7 @@ msgstr "<guilabel>服务</guilabel>:"
msgid ""
"System services refer to those small programs which run the background "
"(daemons). This tool allows you to enable or disable certain tasks."
-msgstr ""
-"系统服务指在后台运行的小程序(守护进程)。此工具允许您启用或禁用特定任务。"
+msgstr "系统服务指在后台运行的小程序(守护进程)。此工具允许您启用或禁用特定任务。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
#: en/misc-params.xml:89
@@ -2870,7 +2833,7 @@ msgid "Reboot"
msgstr "重新启动"
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
"computer, remove the live CD and restart the computer, click on <emphasis "
@@ -2878,26 +2841,26 @@ msgid ""
"asked<emphasis role=\"bold\"> in this order!</emphasis>"
msgstr ""
"一旦安装了引导器,安装程序将会提示您重启电脑,此时请移除 Live CD 并重启。请点"
-"击<emphasis role=\"bold\"><guibutton>完成</guibutton></emphasis>并<emphasis role=\"bold\">根据提示的"
-"步骤</emphasis>进行操作。"
+"击<emphasis role=\"bold\"><guibutton>完成</guibutton></emphasis>并<emphasis "
+"role=\"bold\">根据提示的步骤</emphasis>进行操作。"
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
"重启后,您将会看到一系列下载进度条,它将提示您正在下载的软件媒体(参见“软件管"
"理”)。"
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -2930,8 +2893,8 @@ msgstr ""
msgid "Security Level"
msgstr "安全级别"
-#. 2012-12-25 marja - moved this part out of misc-params.xml"
-#. 2013-05-05 marja - added screenshot
+#. 2012-12-25 marja - moved this part out of misc-params.xml"
+#. 2013-05-05 marja - added screenshot
#. type: Content of: <section><mediaobject>
#: en/securityLevel.xml:19
msgid ""
@@ -2964,29 +2927,29 @@ msgstr ""
"调整安全设置。"
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr "选择和使用 ISO"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr "简介"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
msgstr "Mageia 通过 ISO 镜像进行分发。此页将帮助您选择所需的镜像。"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr "有两种类型的媒介:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target system. "
@@ -2997,7 +2960,7 @@ msgstr ""
"装类型可以给予您最大限度的灵活性,尤其是选择所需安装的桌面环境。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -3007,31 +2970,30 @@ msgstr ""
"样。这种安装的过程更加简单,但您可做的选择也相应减少。"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr "下一节中将涉及有关细节。"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr "介质"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr "定义"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
"file is copied to."
-msgstr ""
-"媒介:是一类承载 ISO 文件、可以用于安装和/或更新 Mageia 的任意物理介质。"
+msgstr "媒介:是一类承载 ISO 文件、可以用于安装和/或更新 Mageia 的任意物理介质。"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
"\">here</link>."
@@ -3040,82 +3002,76 @@ msgstr ""
"到它们。"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr "传统安装媒介"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78
+#: en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr "通用特性"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr "这些 ISO 使用传统的安装器(drakx)。"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid ""
"They are able to make a clean install or an update from previous releases."
msgstr "它们可以用于全新安装,或更新之前的版本。"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr "DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
msgstr "媒介有 32 位和 64 位两种架构之分。"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
msgstr "欢迎屏幕中列出了一些可用的工具,如:救援系统、内存测试、硬件检测工具。"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr "每个 DVD 中包含多种桌面环境和语言支持。"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid ""
"You'll be given the choice during the installation to add non free software."
msgstr "您可以在安装时添加非自由软件。"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr "Live 媒介"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
-msgstr ""
-"可以用于预览该发行版,而无需将其安装到硬盘上。也可以用于安装 Mageia 至硬盘。"
+msgstr "可以用于预览该发行版,而无需将其安装到硬盘上。也可以用于安装 Mageia 至硬盘。"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr "每个 ISO 仅包含一种桌面环境(KDE、GNOME 或 Xfce)。"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr "媒介有 32 位和 64 位两种架构之分。"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous releases.</"
@@ -3125,53 +3081,53 @@ msgstr ""
"级。</emphasis>"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr "其中包含非自由软件。"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
msgid "Live DVD Plasma"
msgstr "Live DVD KDE"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
msgid "Plasma desktop environment only."
msgstr "仅包含 KDE(Plasma)桌面环境。"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
-#: en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122
+#: en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr "包含所有语言支持。"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr "Live DVD GNOME"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr "仅包含 GNOME 桌面环境。"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
msgid "Live DVD Xfce"
msgstr "Live DVD Xfce"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
msgid "Xfce desktop environment only."
msgstr "仅包含 Xfce 桌面环境。"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr "仅用于引导的 CD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -3183,7 +3139,7 @@ msgstr ""
"络或互联网。"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -3193,46 +3149,46 @@ msgstr ""
"或不支持 USB 引导的电脑。"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr "仅包含英语支持。"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
msgid "netinstall.iso"
msgstr "netinstall.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
msgstr "仅包含自由软件,适用于不希望使用非自由软件的人。"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
msgid "netinstall-nonfree.iso"
msgstr "netinstall-nonfree.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
msgstr "包含部分用户所需的非自由软件(主要为驱动、编码器)。"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr "下载和检查媒介"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr "下载中"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -3244,12 +3200,12 @@ msgstr ""
"载,您可能会看到类似下列情形"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
@@ -3259,40 +3215,42 @@ msgstr ""
"保留它们以便<link linkend=\"integrity\">后续使用</link>。之后,窗口将会显示:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr "点击“保存文件”选项。"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr "检查下载文件的完整性"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
"这两种校验和均由特定算法计算文件内容产生,且均为十六进制数字。若您重新计算得"
"到的校验和与 Mageia 提供的校验和一致,说明您下载的文件内容正确;否则,说明您"
"下载失败(文件可能不完整或已损坏),您应当重新下载。"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr "打开一个终端(无需以 root 身份操作),然后:"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
"file.iso</userinput>."
@@ -3301,7 +3259,7 @@ msgstr ""
"image/file.iso</userinput>。"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
"image/file.iso</userinput>."
@@ -3310,39 +3268,38 @@ msgstr ""
"image/file.iso</userinput>。"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
-msgstr ""
-"然后比较执行结果(可能需要等待一段时间)和 Mageia 网上提供的数值。例如:"
+msgstr "然后比较执行结果(可能需要等待一段时间)和 Mageia 网上提供的数值。例如:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr "刻录或转储 ISO"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a boot-able medium."
+"These operations are not a simple copy and aim to make a bootable medium."
msgstr ""
"经过检查后的 ISO 即可被刻录至 CD/DVD,或写入到 U 盘。这些操作不同于简单的复"
"制,其目的是创建一个可引导的媒体。"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr "将ISO文件刻录到CD或DVD"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -3354,12 +3311,12 @@ msgstr ""
"\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images\">Mageia wiki</link>。"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr "写入 ISO 到 U 盘"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
@@ -3368,9 +3325,9 @@ msgstr ""
"U 盘来引导和安装系统。"
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
@@ -3378,19 +3335,19 @@ msgstr ""
"容量将会(暂时)缩减为镜像大小。"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
msgstr "若要恢复原始容量,您必须重新进行分区和格式化操作。"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr "使用 Mageia 的图形化工具"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3400,17 +3357,17 @@ msgstr ""
"具来操作。"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr "使用 Windows 下的图形化工具"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr "您可以尝试:"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
@@ -3419,7 +3376,7 @@ msgstr ""
"的“ISO 镜像”选项;"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
@@ -3428,12 +3385,12 @@ msgstr ""
"Disk Imager</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr "使用 GNU/Linux 系统中的命令行程序"
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
@@ -3442,47 +3399,46 @@ msgstr ""
"据。"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr "您也可以在终端中使用 dd 工具:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr "打开一个终端"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
-msgstr ""
-"使用命令 <userinput>su -</userinput> 获取 root 权限(不要漏掉末尾的“-”)"
+msgstr "使用命令 <userinput>su -</userinput> 获取 root 权限(不要漏掉末尾的“-”)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr "插入您的 U 盘(无需挂载,并且不要用任何应用程序或文件管理器访问它)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr "输入命令 <userinput>fdisk -l</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command <code>dmesg</"
"code>: at end, you see the device name starting with <emphasis>sd</"
@@ -3492,21 +3448,26 @@ msgstr ""
"以 <emphasis>sd</emphasis> 开头的设备名,如 <emphasis>sdd</emphasis>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
"[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000\n"
-"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3\n"
+"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, "
+"SerialNumber=3\n"
"[72594.770536] usb 1-1: Product: Mass Storage Device\n"
"[72594.770537] usb 1-1: Manufacturer: JetFlash\n"
"[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB\n"
-"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
-"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
+"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep "
+"desc says 255 microframes\n"
+"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep "
+"desc says 255 microframes\n"
"[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected\n"
"[72594.772447] scsi host8: usb-storage 1-1:1.0\n"
-"[72595.963238] scsi 8:0:0:0: Direct-Access JetFlash Transcend 2GB 1100 PQ: 0 ANSI: 4\n"
-"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)\n"
+"[72595.963238] scsi 8:0:0:0: Direct-Access JetFlash Transcend 2GB 1100 "
+"PQ: 0 ANSI: 4\n"
+"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 "
+"GB/2.00 GiB)\n"
"[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off\n"
"[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00\n"
"[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found\n"
@@ -3516,16 +3477,21 @@ msgid ""
msgstr ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
"[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000\n"
-"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3\n"
+"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, "
+"SerialNumber=3\n"
"[72594.770536] usb 1-1: Product: Mass Storage Device\n"
"[72594.770537] usb 1-1: Manufacturer: JetFlash\n"
"[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB\n"
-"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
-"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
+"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep "
+"desc says 255 microframes\n"
+"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep "
+"desc says 255 microframes\n"
"[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected\n"
"[72594.772447] scsi host8: usb-storage 1-1:1.0\n"
-"[72595.963238] scsi 8:0:0:0: Direct-Access JetFlash Transcend 2GB 1100 PQ: 0 ANSI: 4\n"
-"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)\n"
+"[72595.963238] scsi 8:0:0:0: Direct-Access JetFlash Transcend 2GB 1100 "
+"PQ: 0 ANSI: 4\n"
+"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 "
+"GB/2.00 GiB)\n"
"[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off\n"
"[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00\n"
"[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found\n"
@@ -3534,7 +3500,7 @@ msgstr ""
"[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example <code>/"
"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
@@ -3543,20 +3509,19 @@ msgstr ""
"一个 8GB 的 U 盘。"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
-msgstr ""
-"输入命令:# <userinput>dd if=ISO文件的完整路径 of=/dev/sdX bs=1M</userinput>"
+msgstr "输入命令:# <userinput>dd if=ISO文件的完整路径 of=/dev/sdX bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr "其中,“X”是您的设备名(如:/dev/sdc)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
"dev/sdb bs=1M</userinput>"
@@ -3565,12 +3530,12 @@ msgstr ""
"dev/sdb bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr "输入命令:# <userinput>sync</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr "操作完成,拔下 U 盘"
@@ -3902,18 +3867,17 @@ msgstr ""
msgid ""
"You can change the language of your system after installation in the Mageia "
"Control Center -> System -> Manage localization for your system."
-msgstr ""
-"您可以在安装完成后,在 Mageia 控制中心 -> 系统 -> 管理本地化 中改变系统语言。"
+msgstr "您可以在安装完成后,在 Mageia 控制中心 -> 系统 -> 管理本地化 中改变系统语言。"
#. type: Content of: <section><info><title>
#: en/selectMouse.xml:4
msgid "Select mouse"
msgstr "选择鼠标"
-#. Made by marja on 2012 04 11
-#. NEEDS TO BE REVIEWED!
+#. Made by marja on 2012 04 11
+#. NEEDS TO BE REVIEWED!
#. adding some "real" text now that we know the page shows up in the right place
-#. marja 2012-04-24 adding screenshot
+#. marja 2012-04-24 adding screenshot
#. type: Content of: <section><mediaobject>
#: en/selectMouse.xml:16
msgid ""
@@ -4011,63 +3975,55 @@ msgstr "GRUB2,当使用传统硬件 + MBR/GPT 格式分区时"
#. type: Content of: <section><section><section><mediaobject>
#: en/setupBootloader.xml:36
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
"setupBootloader.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <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
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid ""
+"Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr "若您不确定如何操作,请不要修改“引导设备”。"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
msgid "Grub2-efi on UEFI systems"
msgstr "GRUB2-efi,当使用 UEFI 硬件时"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
"choose between with or without graphical menu"
-msgstr ""
-"对于 UEFI,用户界面会稍有不同,您将无法选择引导器(因为只能使用 Grub2-efi)。"
+msgstr "对于 UEFI,用户界面会稍有不同,您将无法选择引导器(因为只能使用 Grub2-efi)。"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:58
+#: en/setupBootloader.xml:56
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:64
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only 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 "
+"If there are already UEFI operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer detects the existing ESP "
+"created by Windows and adds grub2-efi. Although it is possible to have "
"several ESPs, only one is advised and enough whatever the number of "
"operating systems you have."
msgstr ""
@@ -4078,29 +4034,29 @@ msgstr ""
"求。"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr "使用 Mageia 提供的引导器"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr "默认情况下,根据您的硬件情况,Mageia 会将:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
msgstr "GRUB 2 引导器安装至 MBR(主引导记录)区域或第一硬盘的 BIOS 引导分区。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr "GRUB2-efi 引导器安装至 ESP"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
msgid ""
"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, "
@@ -4112,30 +4068,25 @@ msgstr ""
"<guilabel>检测其他操作系统</guilabel>"
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:100
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr "使用现存的引导器"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
msgid ""
"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 "
@@ -4148,14 +4099,14 @@ msgstr ""
"以便进一步操作。"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr "使用链式加载(chain loading)"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
msgstr ""
@@ -4164,33 +4115,27 @@ msgstr ""
"<guilabel>不要修改 ESP 或 MBR</guilabel>。"
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:136
+#: en/setupBootloader.xml:129
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
-msgstr ""
-"安装程序将会提醒您缺少引导器,请忽略它并点击<guibutton>确定</guibutton>。"
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
+msgstr "安装程序将会提醒您缺少引导器,请忽略它并点击<guibutton>确定</guibutton>。"
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
"imageobject>"
@@ -4199,17 +4144,17 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
msgid "Options"
msgstr "选项"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr "第一页"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<guilabel>Delay before booting the default image</guilabel>: This text box "
"lets you set a delay in seconds before the default operating system is "
@@ -4219,7 +4164,7 @@ msgstr ""
"入默认选定的操作系统。"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: en/setupBootloader.xml:162
msgid ""
"<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 "
@@ -4229,14 +4174,14 @@ msgstr ""
"式,或者修改引导参数。"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
msgid ""
"<guilabel>Password</guilabel>: This text box is where you actually put the "
"password"
msgstr "<guilabel>密码</guilabel>:此文本框用于输入密码"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:182
+#: en/setupBootloader.xml:173
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
"check that it matches with the one set above."
@@ -4245,30 +4190,30 @@ msgstr ""
"否一致。"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
msgid "<guilabel>Advanced</guilabel>"
msgstr "<guilabel>高级</guilabel>"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
msgid ""
"<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)."
+"stopping unused devices, this was the method used before APM. Unchecking it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:208
+#: en/setupBootloader.xml:199
msgid ""
"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
"operating system access to the Advanced Programmable Interrupt Controller. "
@@ -4277,32 +4222,31 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr "下一页"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr "<guilabel>默认</guilabel>:使用默认引导参数"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
-msgstr ""
-"<guilabel>追加</guilabel> :用于在默认引导选项后添加额外所需的内核参数。"
+msgstr "<guilabel>追加</guilabel> :用于在默认引导选项后添加额外所需的内核参数。"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:232
msgid ""
"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
@@ -4311,7 +4255,7 @@ msgstr ""
"\">使用 Mageia 引导器</link>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:247
+#: en/setupBootloader.xml:239
msgid ""
"<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 "
@@ -4321,7 +4265,7 @@ msgstr ""
"若要从可用的模式中进行选择,请点击下三角标记。"
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -4334,14 +4278,14 @@ msgstr ""
msgid "Setup SCSI"
msgstr "设置SCSI"
-#. Made by marja on 2012 04 02
-#. NEEDS TO BE REVIEWED!
-#. JohnR - edited 2012-03-03
-#. SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-)
-#. barjac has re-reviewed and made some minor tweaks. Revisions incremented.
-#. marja 2012-04-24 added screenshot
+#. Made by marja on 2012 04 02
+#. NEEDS TO BE REVIEWED!
+#. JohnR - edited 2012-03-03
+#. SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-)
+#. barjac has re-reviewed and made some minor tweaks. Revisions incremented.
+#. marja 2012-04-24 added screenshot
#. marja 2012-04-25 replacing John's version 1.6 because that one was based on the
-#. Mdv doc instead of on our setupSCSI file
+#. Mdv doc instead of on our setupSCSI file
#. type: Content of: <section><mediaobject>
#: en/setupSCSI.xml:26
msgid ""
@@ -4394,8 +4338,7 @@ msgid ""
"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."
-msgstr ""
-"这一界面中列出了安装程序为声卡选定的驱动,如果有默认驱动则将其作为默认配置。"
+msgstr "这一界面中列出了安装程序为声卡选定的驱动,如果有默认驱动则将其作为默认配置。"
#. type: Content of: <section><para>
#: en/soundConfig.xml:18
@@ -4449,12 +4392,12 @@ msgstr ""
msgid "Confirm hard disk to be formatted"
msgstr "确定要格式化的硬盘"
-#. Made by marja on 2012 04 03
-#. test comment - johnr
+#. Made by marja on 2012 04 03
+#. test comment - johnr
#. 2012-04-24 marja - replaced "if you are not sure you selected the correct
#. hard disk." with "if you are not sure about your choice", because I'm sure I
-#. saw this help screen when I had only one HD
-#. 2013-05-05 marja added screenshot
+#. saw this help screen when I had only one HD
+#. 2013-05-05 marja added screenshot
#. type: Content of: <section><mediaobject>
#: en/takeOverHdConfirm.xml:19
msgid ""
@@ -4706,3 +4649,130 @@ msgid ""
msgstr ""
"下一步是复制文件到硬盘。这需要花费几分钟的时间。之后,您的屏幕会变黑一段时"
"间,这是正常现象。"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
+#~ "\"mediaobject\" id=\"1\"/>"
+#~ msgstr ""
+#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
+#~ "\"mediaobject\" id=\"1\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png"
+#~ "\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png"
+#~ "\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Different media for architecture 32 or 64 bits."
+#~ msgstr "媒介有 32 位和 64 位两种架构之分。"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+#~ "setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+#~ "setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+#~ "imageobject>"