Update Installer translations

1 files changed, 3437 insertions, 2203 deletions

diff --git a/docs/docs/stable/installer/ru.po b/docs/docs/stable/installer/ru.po
index ab416cbf..f59e8959 100644
--- a/docs/docs/stable/installer/ru.po
+++ b/docs/docs/stable/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: 2018-04-19 16:32+0300\n"
+"POT-Creation-Date: 2019-01-06 12:43+0200\n"
 "PO-Revision-Date: 2018-09-04 04:47+0000\n"
 "Last-Translator: AlexL <loginov.alex.valer@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -31,12 +31,12 @@ msgstr ""
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #. type: Content of: <section><info><title>
-#: en/acceptLicense.xml:25
+#: en/acceptLicense.xml:31
 msgid "License and Release Notes"
 msgstr "Условия лицензирования и заметки о выпуске"
 
 #. type: Content of: <section><mediaobject>
-#: en/acceptLicense.xml:29
+#: en/acceptLicense.xml:35
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
@@ -51,81 +51,89 @@ msgstr ""
 "\"center\" condition=\"live\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:40
+#: en/acceptLicense.xml:46
 msgid "License Agreement"
 msgstr "Лицензионное соглашение"
 
-#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:43
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/acceptLicense.xml:51
+#, fuzzy
 msgid ""
-"Before installing <application>Mageia</application>, please read the license "
-"terms and conditions carefully."
+"Before installing Mageia, please read the license terms and conditions "
+"carefully."
 msgstr ""
 "Перед установкой <application>Mageia</application> ознакомьтесь с условиями "
 "лицензирования."
 
-#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:46
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/acceptLicense.xml:56
+#, fuzzy
 msgid ""
-"These terms and conditions apply to the entire <application>Mageia</"
-"application> distribution and must be accepted before you can continue."
+"These terms and conditions apply to the entire Mageia distribution and must "
+"be accepted before you can continue."
 msgstr ""
 "Эти условия лицензирования касаются всего дистрибутива <application>Mageia</"
 "application>. Вам следует принять эти условия, иначе установка будет "
 "невозможна."
 
-#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:50
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/acceptLicense.xml:61
+#, fuzzy
 msgid ""
-"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
-"<guibutton>Next</guibutton>."
+"To proceed, simply select <emphasis>Accept</emphasis> and then click on "
+"<emphasis>Next</emphasis>"
 msgstr ""
 "Чтобы согласиться с условиями, отметьте пункт <guilabel>Принять</guilabel>, "
 "а затем нажмите кнопку <guibutton>Далее</guibutton>."
 
 #. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:53
+#: en/acceptLicense.xml:66
+#, fuzzy
 msgid ""
-"If you decide not to accept these conditions, then we thank you for looking. "
-"Clicking <guibutton>Quit</guibutton> will reboot your computer."
+"If you decide not to accept these conditions, then we thank you for your "
+"interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your "
+"computer."
 msgstr ""
 "Если вы не согласны с условиями лицензионного соглашения, мы будем "
 "благодарны за то, что вы обратили внимание на наш дистрибутив. После нажатия "
 "кнопки <guibutton>Выйти</guibutton> ваш компьютер будет перезагружен."
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:63
+#: en/acceptLicense.xml:76
 msgid "Release Notes"
 msgstr "Заметки о выпуске"
 
 #. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:70
+#: en/acceptLicense.xml:83
+#, fuzzy
 msgid ""
-"Important information about this release of <application>Mageia</"
-"application> can be viewed by clicking on the <guibutton>Release Notes</"
-"guibutton> button."
+"Important information about this particular Mageia release can be viewed by "
+"clicking on the <emphasis>Release Notes</emphasis> button."
 msgstr ""
 "Чтобы ознакомиться с важной информацией о текущем выпуска "
 "<application>Mageia</application>, нажмите кнопку <guibutton>Заметки о "
 "выпуске</guibutton>."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:2
+#: en/DrakX-cover.xml:3 en/DrakX.xml:3 en/media_selection.xml:2
 msgid "en"
 msgstr "ru"
 
 #. type: Content of: <section><info><title>
 #: en/add_supplemental_media.xml:3
-msgid "Media Selection (Configure Supplemental Installation Media)"
+#, fuzzy
+msgid "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 
+#. 2018/02/10 apb: Text and typgraphy.
+#. 2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:14
+#: en/add_supplemental_media.xml:18
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
 "png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
@@ -136,12 +144,13 @@ msgstr ""
 "\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:19
+#: en/add_supplemental_media.xml:23
+#, fuzzy
 msgid ""
-"This screen shows you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source.  "
+"This screen shows you the list of already recognised repositories. You can "
+"add other sources for packages, like an optical-disc or a remote source.  "
 "The source selection determines which packages will be available during the "
-"next steps."
+"subsequent steps."
 msgstr ""
 "На этой странице будет приведён список определённых хранилищ пакетов. Вы "
 "сможете добавить другие источники пакетов, в частности оптический носитель "
@@ -149,25 +158,26 @@ msgstr ""
 "какие из пакетов будут доступны для выбора на следующих шагах."
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:28
 msgid "For a network source, there are two steps to follow:"
 msgstr ""
 "Чтобы добавить сетевой источник, необходимо выполнить два следующих шага:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:28
-msgid "Choosing and activation of the network, if not already up."
+#: en/add_supplemental_media.xml:32
+#, fuzzy
+msgid "Choosing and activating the network, if not already up."
 msgstr "Выбор и включение сети, если она еще не была включена."
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:32
+#: en/add_supplemental_media.xml:36
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
-"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
-"\">Updates</emphasis>. With the URL, you can designate a specific repository "
-"or your own NFS installation."
+"Mageia, like the <emphasis>Nonfree</emphasis>, the <emphasis>Tainted</"
+"emphasis> repositories and the <emphasis>Updates</emphasis>. With the URL, "
+"you can designate a specific repository or your own NFS installation."
 msgstr ""
 "Выбор зеркала или определения адреса (первая запись). После выбора зеркала "
 "вы получите доступ к выбору хранилищ, которые используются в Mageia, в "
@@ -178,14 +188,15 @@ msgstr ""
 "определённое хранилище пакетов или развернутую вами с помощью NFS систему."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:42
+#: en/add_supplemental_media.xml:46
+#, fuzzy
 msgid ""
-"If you are updating a 64 bit installation which may contain some 32 bit "
+"If you are updating a 64-bit installation which may contain some 32-bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
-"64-bit and noarch packages, it will not be able to update the 32-bit "
-"packages. However, after adding an online mirror, the installer will find "
-"the needed 32-bit packages there."
+"selecting one of the Network protocols here. The 64-bit DVD ISO only "
+"contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be "
+"able to update the 32-bit packages. However, after adding an online mirror, "
+"the installer will find the needed 32-bit packages there."
 msgstr ""
 "Если вы обновляете 64-битную версию системы, где могут содержаться какие-то "
 "32-битные пакеты, то вам стоит воспользоваться этой страницей для добавления "
@@ -196,18 +207,25 @@ msgstr ""
 "для обновления 32-битные пакеты."
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
-msgid "User and Superuser Management"
-msgstr "Управление учётными записями пользователя и администратора"
+#: en/addUser.xml:9
+#, fuzzy
+msgid "User Management"
+msgstr "Дополнительные возможности управления учетными записями пользователей"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
+#. 2018/02/12 apb: Text and Typography.
+#. 2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.
+#. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+#.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
+#. 2018/02/24 apb: Changed list style.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata fileref="
+"\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -215,20 +233,21 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:36
 msgid "Set Administrator (root)  Password:"
 msgstr "Восстановление пароля администратора (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:40
+#, fuzzy
 msgid ""
-"It is advisable for all <application>Mageia</application> installations to "
-"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
-"usually called the <emphasis>root password</emphasis> in Linux. As you type "
-"a password into the top box a shield will change from red to yellow to green "
-"depending on the strength of the password. A green shield shows you are "
-"using a strong password. You need to repeat the same password in the box "
-"underneath, to check that the first entry was not mistyped."
+"It is advisable for all Mageia installations to set a <literal>superuser</"
+"literal> (Administrator) password, usually called the <emphasis>root </"
+"emphasis>password in Linux. As you type a password into the top box a shield "
+"will change from red-to-yellow-to-green depending on the strength of the "
+"password. A green shield shows you are using a strong password. You need to "
+"repeat the same password in the box underneath, to check that the first "
+"entry was not mistyped."
 msgstr ""
 "В каждой установлённой системе <application>Mageia</application> следует "
 "определить пароль <emphasis role=\"bold\">суперпользователя</emphasis> или "
@@ -240,26 +259,28 @@ msgstr ""
 "ошибок."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:49
+#, fuzzy
 msgid ""
-"All passwords are case sensitive. It is best to use a mixture of letters "
+"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:57
 msgid "Enter a user"
 msgstr "Введите пользователя"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:60
+#, fuzzy
 msgid ""
-"Add a user here. A regular user has fewer privileges than the <emphasis role="
-"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
-"applications or play games and anything else the average user might use "
-"their computer for."
+"Add a User here. A regular user has fewer privileges than the "
+"<literal>superuser</literal> (root), but enough to use the Internet, office "
+"applications or play games and anything else the average user might use a "
+"computer for."
 msgstr ""
 "С помощью этой панели можно добавить пользователей. Каждый пользователь "
 "имеет более узкие права доступа, чем <emphasis role=\"bold"
@@ -268,67 +289,92 @@ msgstr ""
 "которые выполняются обычным пользователем за компьютером."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
-msgid ""
-"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"user's icon."
+#: en/addUser.xml:67
+#, fuzzy
+msgid "<emphasis role=\"bold\">Icon</emphasis>"
+msgstr "<emphasis role=\"bold\">Дополнительно</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:69
+#, fuzzy
+msgid "Click on this button if you want to change the user's icon"
 msgstr ""
 "<guibutton>Иконка</guibutton>: с помощью этой кнопки можно изменить значок "
 "пользователя."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
-msgid ""
-"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
-"box."
+#: en/addUser.xml:74
+#, fuzzy
+msgid "<emphasis role=\"bold\">Real Name</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:76
+#, fuzzy
+msgid "Insert the user's real name into this text box"
 msgstr ""
 "<guilabel>Имя</guilabel>: в этом поле следует указать настоящее имя "
 "пользователя."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:62
+#: en/addUser.xml:80
+#, fuzzy
+msgid "<emphasis role=\"bold\">Login Name</emphasis>"
+msgstr "<emphasis role=\"bold\">Дополнительно</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:82
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
-"a version of the user's real name. <emphasis role=\"bold\">The login name is "
-"case sensitive.</emphasis>"
+"Enter the user login name or let DrakX use a version of the user's real "
+"name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
 msgstr ""
 "<guilabel>Имя пользователя, которое регистрируется</guilabel>: здесь вы "
 "можете ввести регистрационное имя пользователя или предоставить возможность "
 "drakx использовать определённую версию настоящего имени пользователя."
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:88 en/setupBootloader.xml:87
+#, fuzzy
+msgid "<emphasis role=\"bold\">Password</emphasis>"
+msgstr "<emphasis role=\"bold\">Дополнительно</emphasis>"
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:90
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: 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\"/>)"
+"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\"/>)"
 msgstr ""
 "<guilabel>Пароль</guilabel>: в этом поле вы должны указать пароль. Цвет "
 "отметки щита рядом с этим полем соответствует сложности пароля (см. также "
 "<xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:94
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
-"check that you have not mistyped the password."
+"<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
+"password. DrakX will check that you have not mistyped the password."
 msgstr ""
 "<guilabel>Пароль (ещё раз)</guilabel>: повторите ввод пароля пользователя в "
 "этом поле. DrakX проверит, совпадает ли введённый повторно пароль с его "
 "первоначальным вариантом."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:101
+#, fuzzy
 msgid ""
-"Any users you added while installing Mageia, will have a home directory that "
-"is both read and write protected (umask=0027)."
+"Any users added while installing Mageia, will have a home directory that is "
+"both read and write protected (umask=0027)"
 msgstr ""
 "Содержание домашних каталогов всех пользователей, записи которых будут "
 "созданы при установке Mageia, будут защищены от чтения и записи (umask = "
 "0027)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:82
+#: en/addUser.xml:104
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -339,34 +385,36 @@ msgstr ""
 "управления записями выберите <emphasis>Управление пользователями</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:86
+#: en/addUser.xml:108
 msgid "The access permissions can also be changed after the install."
 msgstr ""
 "Права доступа к домашним каталогам, конечно же, можно изменить и после "
 "завершения установки системы."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:93
-msgid "Advanced User Management"
+#: en/addUser.xml:115
+#, fuzzy
+msgid "User Management (advanced)"
 msgstr "Дополнительные возможности управления учетными записями пользователей"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:96
+#: en/addUser.xml:118
+#, fuzzy
 msgid ""
-"The <guibutton>Advanced</guibutton> option allows you to edit further "
-"settings for the user you are adding."
+"The <emphasis>Advanced</emphasis> option allows you to edit further settings "
+"for the user you are adding."
 msgstr ""
 "Если вы нажмёте кнопку <guibutton>Дополнительно</guibutton>, программа "
 "откроет диалоговое окно, с помощью которого вы сможете изменить параметры "
 "учётной записи, которую вы добавляете."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:123
+#, fuzzy
 msgid ""
-"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
-"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
-"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
+"<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal>"
 msgstr ""
 "<guilabel>Командная оболочка</guilabel>: с помощью этого раскрывающегося "
 "списка вы можете изменить командную оболочку, которая будет использоваться "
@@ -376,11 +424,12 @@ msgstr ""
 "emphasis>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:107
+#: en/addUser.xml:130
+#, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
-"\">user ID</emphasis> for any user you added in the previous screen. If you "
-"are unsure what the purpose of this is, then leave it blank."
+"<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
+"added in the previous screen. If you are unsure what the purpose of this is, "
+"then leave it blank."
 msgstr ""
 "<guilabel>Код пользователя</guilabel>: здесь вы можете установить <emphasis "
 "role=\"bold\">код (идентификатор) пользователя</emphasis>, аккаунт которого "
@@ -389,17 +438,18 @@ msgstr ""
 "действий."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:113
+#: en/addUser.xml:136
+#, fuzzy
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
-"\">group ID</emphasis>. Again, if unsure, leave it blank."
+"<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
+"unsure, leave it blank."
 msgstr ""
 "<guilabel>Ид. группы</guilabel>: предоставляет вам возможность установить "
 "<emphasis role=\"bold\">идентификатор группы</emphasis>. Опять же, если не "
 "уверены, оставьте это поле."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:3
+#: en/ask_mntpoint_s.xml:10
 msgid "Choose the mount points"
 msgstr "Выберете точки монтированния"
 
@@ -414,15 +464,17 @@ msgstr "Выберете точки монтированния"
 #.        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 
+#. 2018/02/12 apb: Text and typography.
+#. 2019/01/04 apb: Typo & minor reword on custom mount-points.
 #. type: Content of: <section><mediaobject>
-#: en/ask_mntpoint_s.xml:27
+#: en/ask_mntpoint_s.xml:38
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
-"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
-"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-chooseMountpoints.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"chooseMountPoints-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-chooseMountpoints.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"live-chooseMountPoints-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
@@ -432,58 +484,37 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:36
+#: en/ask_mntpoint_s.xml:49
+#, fuzzy
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
-"you don't agree with the <application>DrakX</application> suggestions, you "
-"can change the mount points."
+"you don't agree with the DrakX suggestions, you can change the mount points "
+"yourself."
 msgstr ""
 "С помощью этой страницы вы можете просмотреть список разделов Linux на вашем "
 "компьютере. Если вы не согласны с предложениями <application>DrakX</"
 "application>, вы можете заменить точки монтирования."
 
-#. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:41
-msgid ""
-"If you change anything, make sure you still have a <emphasis role=\"bold"
-"\"><literal>/</literal></emphasis> (root) partition."
-msgstr ""
-"В случае внесения изменений не забудьте, что среди разделов обязательно "
-"должен быть раздел <emphasis role=\"bold\"><literal>/</literal></emphasis>."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:46
-msgid ""
-"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
-"(capacity, mount point, type).</emphasis>"
-msgstr ""
-"Для каждого из разделов будут показаны следующие данные: <emphasis role="
-"\"bold\">Устройство («Ёмкость», «Точка монтирования», «Тип»).</emphasis>"
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:50
+#: en/ask_mntpoint_s.xml:55
 msgid ""
-"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
-"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
-"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
-"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
+"To the left of the drop-down menus is a list of available partitions. For "
+"example: <filename>sda</filename> is a hard drive - and <filename>5</"
+"filename> is a <emphasis>partition number</emphasis>, followed by "
+"the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the "
+"partition."
 msgstr ""
-"<emphasis role=\"bold\">Устройство</emphasis> состоит из следующих частей: "
-"<emphasis role=\"bold\">жёсткий диск</emphasis>, [<emphasis role=\"bold"
-"\">название жёсткого диска</emphasis> (буква)], <emphasis role=\"bold"
-"\">номер раздела</emphasis> (пример: <emphasis role=\"bold\">sda5</"
-"emphasis>)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:56
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"If you have several partitions, you can choose various different mount "
-"points from the drop down menu, such as <emphasis role=\"bold\">/</"
-"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
-"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
-"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
-"emphasis> for a partition where you want to store your films, or <emphasis "
-"role=\"bold\">/Data</emphasis> (or some other name) for your data."
+"If you have several partitions, you can choose various different "
+"<emphasis>mount points</emphasis> from the drop down menu, such as "
+"<filename>/</filename>, <filename>/home</filename> and <filename>/var</"
+"filename>. You can even make your own mount points, for instance <filename>/"
+"video</filename> for a partition where you want to store your films, or "
+"perhaps <filename>/Data</filename> for all your data files."
 msgstr ""
 "Если в вашей системе много разделов, в выпадающем меню вы сможете выбрать "
 "для них различные точки монтирования, в частности такие: <literal>/</"
@@ -494,7 +525,7 @@ msgstr ""
 "emphasis> (или любое другое название) для раздела с данными."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:63
+#: en/ask_mntpoint_s.xml:73
 msgid ""
 "For any partitions that you don't need to make use of, you can leave the "
 "mount point field blank."
@@ -503,11 +534,22 @@ msgstr ""
 "осуществляться, вы можете не указывать точку монтирования."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:79
+#, fuzzy
 msgid ""
-"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
-"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
-"guilabel>, where, you can click on a partition to see its type and size."
+"If you make any changes here, ensure you still have a <filename>/</filename> "
+"(root) partition."
+msgstr ""
+"В случае внесения изменений не забудьте, что среди разделов обязательно "
+"должен быть раздел <emphasis role=\"bold\"><literal>/</literal></emphasis>."
+
+#. type: Content of: <section><tip><para>
+#: en/ask_mntpoint_s.xml:84
+#, fuzzy
+msgid ""
+"If you are not sure what to choose, click <emphasis>Previous</emphasis> to "
+"go back and then tick <emphasis>Custom disk partitioning</emphasis>, where "
+"you can click on a partition to see its type and size."
 msgstr ""
 "Нажмите кнопку <guibutton>Назад</guibutton>, если вы не уверены в выборе. "
 "Затем нажмите кнопку <guilabel>Специальное разделение диска</guilabel>. В "
@@ -515,11 +557,12 @@ msgstr ""
 "проверить данные по типу и размеру раздела."
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:74
+#: en/ask_mntpoint_s.xml:90
+#, fuzzy
 msgid ""
-"If you are sure the mount points are correct, click on <guibutton>Next</"
-"guibutton>, and choose whether you only want to format the partition(s) "
-"DrakX suggests, or more."
+"If you are sure the mount points are correct, click on <emphasis>Next</"
+"emphasis>, and choose whether you only want to format the partition "
+"suggested by DrakX, or more."
 msgstr ""
 "Если вы уверены, что точки монтирования определены правильно, нажмите кнопку "
 "<guibutton>Далее</guibutton> и определитесь с тем, следует ли только "
@@ -527,180 +570,232 @@ msgstr ""
 "дополнительные действия."
 
 #. type: Content of: <section><info><title>
-#: en/bestTime.xml:10
-msgid "Clock settings"
+#: en/bestTime.xml:5
+#, fuzzy
+msgid "Clock Settings"
 msgstr "Настройки часов"
 
 #. type: Content of: <section><mediaobject>
-#: en/bestTime.xml:14
+#: en/bestTime.xml:8
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"live-"
+"bestTime.png\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
 "format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/bestTime.xml:20
+#: en/bestTime.xml:12
+#, fuzzy
 msgid ""
-"In this step, you have to select on which time your internal clock is set, "
-"either local time or UTC time."
+"Here, you can select whether your computer internal clock is set to local "
+"time or UTC time."
 msgstr ""
 "На этом шаге вы должны выбрать, на какое время устанавливаются ваши "
 "внутренние часы, либо местное время, либо время UTC."
 
 #. type: Content of: <section><para>
-#: en/bestTime.xml:23
-msgid "In advanced tab, you will find more options about clock settings."
+#: en/bestTime.xml:14
+msgid ""
+"In the <emphasis>Advanced</emphasis> tab, you can enable automatic time "
+"synchronization and specify an NTP server."
 msgstr ""
-"На вкладке Дополнительно, вы найдёте больше вариантов о настройках часов."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:6
 msgid "Boot Mageia as Live system"
 msgstr "Загрузка Mageia как Live системы"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:10
 msgid "Booting the medium"
 msgstr "Загрузка носителя"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:1
-msgid "From a disc"
-msgstr "С диска"
-
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:1
-msgid ""
-"You can boot directly from the media you used to burn your image (CD-ROM, "
-"DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the "
-"bootloader to launch the installation automatically after rebooting the "
-"computer. If that does not happen you may need to reconfigure your BIOS or "
-"press one key that will offer you to choose the peripheral from which the "
-"computer will boot."
-msgstr ""
-"Вы можете загрузиться непосредственно с носителя, который вы использовали, "
-"чтобы прожечь ваш образ (CD-ROM, DVD-ROM...). Вам, как правило, нужно просто "
-"вставить его в CD/DVD привод для загрузчика, чтобы автоматически запустить "
-"установку после перезагрузки компьютера. Если этого не произойдёт, то вам "
-"возможно потребуется изменить настройки BIOS или нажать определённую "
-"клавишу, которая предложит вам выбрать периферийное устройство, с которого "
-"компьютер будет загружаться."
+#. type: Content of: <section><section><para>
+#: en/bootLive.xml:12
+msgid ""
+"You can boot directly from a Live DVD or USB. Usually, you just need to plug "
+"the USB device in or place the DVD in the drive and restart the computer."
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:6
+#. type: Content of: <section><section><para>
+#: en/bootLive.xml:15
 msgid ""
-"According to which hardware you have, and how it is configured, you get "
-"either one or another of the two screens below."
+"If the computer does not automatically boot from the USB or DVD you may need "
+"to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
+"accessing the boot device menu to select a device from which the computer "
+"will boot."
 msgstr ""
-"В соответствии аппаратными средствами, которые вы имеете, и как они "
-"настроены, вы получаете либо один, либо другой из двух экранов ниже."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:7
-msgid "From a USB device"
-msgstr "С USB устройства"
+#. type: Content of: <section><section><tip><para>
+#: en/bootLive.xml:20
+msgid ""
+"To access the BIOS or boot menu when the computer is starting, you can try "
+"pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
+"keycap> for the BIOS, or <keycap>Esc</keycap>, <keycap>F8</keycap>, "
+"<keycap>F10</keycap> or <keycap>F11</keycap> for the boot device menu. These "
+"(fairly common) keys are just a selection of possible options though."
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:7
+#. type: Content of: <section><section><note><para>
+#: en/bootLive.xml:28
 msgid ""
-"You can boot from the USB device on which you dumped your image ISO. "
-"According to your BIOS settings, the computer boots perhaps directly on the "
-"USB device already plugged in a port. If that does not happen you may need "
-"to reconfigure your BIOS or press one key that will offer you to choose the "
-"peripheral from which the computer will boot."
+"The actual screen that you will first see when booting from the Live media "
+"will depend on whether your computer motherboard is of the Legacy (BIOS) or "
+"UEFI type."
 msgstr ""
-"Вы можете загрузиться с устройства USB, на которое вы сбрасывали свой образ "
-"ISO. В соответствии с вашими настройками BIOS компьютер возможно загружается "
-"непосредственно с устройства USB, которое уже подключено к порту. Если это "
-"не произойдёт, вам возможно потребуется изменить настройки BIOS или нажать "
-"определённую клавишу, которая предложит вам выбрать периферийное устройство, "
-"с которого компьютер будет загружаться."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:35
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "В режиме BIOS/CSM/Legacy"
 
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/bootLive.xml:38
+msgid "Main Menu"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:40 en/bootLive.xml:152
+#, fuzzy
+msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
+msgstr "<emphasis role=\"bold\">Рабочая станция</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:41
+msgid ""
+"This option will boot the Mageia Live system from the connected DVD/USB "
+"media (expect a very slow system compared to an installed OS)."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:42
+#, fuzzy
+msgid "Once the boot is done, you can proceed to the installation."
+msgstr ""
+"Параметры конфигурации, которые вы здесь сделали, сохраняются для установки."
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:45 en/bootLive.xml:57
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
+"emphasis>"
+msgstr ""
+"<emphasis role=\"bold\">Пожалуйста, выберите уровень безопасности</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:47
+msgid "Boot the Mageia Live system using non-free video drivers"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:53 en/bootLive.xml:156 en/installer.xml:65
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
+msgstr "<emphasis role=\"bold\">Рабочая станция</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:54 en/bootLive.xml:157
+#, fuzzy
+msgid "This option will install Mageia to a hard disk."
+msgstr ""
+"Установить Mageia: Этот выбор приведёт к непосредственной установке Mageia "
+"на жёсткий диск."
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:59
+msgid "Install Mageia using non-free video drivers"
+msgstr ""
+
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:12
-msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+#: en/bootLive.xml:65
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:69
 msgid "First screen while booting in BIOS mode"
 msgstr "Первый экран при загрузке в режиме BIOS"
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:12
-msgid "In the middle menu, you have the choice between three actions:"
-msgstr "В среднем меню у вас есть выбор между тремя действиями:"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/bootLive.xml:73
+msgid "Function Keys"
+msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:13
-msgid ""
-"Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD "
-"or USB stick) without writing anything on the disk, so expect a very slow "
-"system. Once the boot is done, you can proceed to the installation on a hard "
-"disk."
-msgstr ""
-"Загрузить Mageia: Это означает, что Mageia 5 запустится с подключенного "
-"носителя (CD/DVD или USB флэш диска) без записи на диск, поэтому стоит "
-"ожидать очень медленную систему. После завершения загрузки вы можете "
-"приступить к установке на жёсткий диск."
+#: en/bootLive.xml:75
+#, fuzzy
+msgid "<keycap>F1</keycap> <emphasis role=\"bold\">Help</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:76
+#, fuzzy
 msgid ""
-"Install Mageia: This choice will directly install Mageia on a hard disk."
+"Within any of the <keycap>F2</keycap> to <keycap>F6</keycap> options, you "
+"can view relevant help by pressing <keycap>F1</keycap>."
 msgstr ""
-"Установить Mageia: Этот выбор приведёт к непосредственной установке Mageia "
-"на жёсткий диск."
+"Справку по каждому из пунктов, от <emphasis role=\"bold\">F2</emphasis> до "
+"<emphasis role=\"bold\">F6</emphasis>, можно просмотреть, нажав клавишу "
+"<emphasis role=\"bold\">F1</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:81
+#, fuzzy
+msgid "<keycap>F2</keycap> <emphasis role=\"bold\">Language</emphasis>"
+msgstr "<emphasis role=\"bold\">Дополнительно</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:17
+#: en/bootLive.xml:82
 msgid ""
-"Boot from hard disk: This choice allows to boot from hard disk, as usual, "
-"when no media (CD/DVD or USB stick) is connected. (not working with Mageia "
-"5)."
+"Press <keycap>F2</keycap> to have the installer use a specific language "
+"during the installation. Use the arrow keys to select the language then "
+"press <keycap>Enter</keycap>."
 msgstr ""
-"Загрузка с жёсткого диска: Этот выбор позволяет загружаться с жёсткого диска "
-"как обычно, когда никакие носители информации (CD/DVD или USB флэш диски) не "
-"подключены. (не работает с Mageia 5)."
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:19
-msgid "In the bottom menu, are the Boot Options:"
-msgstr "В нижнем меню находятся параметры загрузки:"
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:87
+#, fuzzy
+msgid "<keycap>F3</keycap> <emphasis role=\"bold\">Video Mode</emphasis>"
+msgstr "<emphasis role=\"bold\">Дополнительно</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:19
+#: en/bootLive.xml:89
+#, fuzzy
 msgid ""
-"F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
-msgstr "F1 - Справка. Объясняются опции \"splash\", \"apm\", \"acpi\" и\"Ide\""
+"If needed, change the screen resolution by pressing <keycap>F3</keycap>. "
+"Options are: 640x480, 800x600, 1024x768."
+msgstr ""
+"Изменить разрешение экрана можно с помощью нажатия клавиши <emphasis role="
+"\"bold\">F3</emphasis> (только в устаревшем режиме)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:20
-msgid "F2 - Language. Choose the display language of the screens."
-msgstr "F2 - Язык. Выбирается отображаемый на экранах язык."
+#: en/bootLive.xml:93
+#, fuzzy
+msgid "<keycap>F4</keycap> <emphasis role=\"bold\">Source</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:21
-msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
+#: en/bootLive.xml:94
+msgid ""
+"Normally, the installation is performed from the inserted installation "
+"medium. Here, you may select other sources, like FTP or NFS servers."
 msgstr ""
-"F3 - Разрешение экрана. Выбирается между текстом, 640x400, 800x600, 1024x728"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:22
+#: en/bootLive.xml:95
+#, fuzzy
 msgid ""
-"F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
-"the inserted installation medium. Here, select other sources, like FTP or "
-"NFS servers. If the installation is carried out in a network with an SLP "
-"server, select one of the installation sources available on the server with "
-"this option."
+"If the installation is carried out in a network with an SLP server, then "
+"select one of the installation sources available on the server with this "
+"option."
 msgstr ""
 "F4 - CD-Rom. CD-Rom или другой. Как правило, установка производится с "
 "вставленного установочного носителя. Здесь выбираются другие источники, "
@@ -709,119 +804,178 @@ msgstr ""
 "доступный на сервере."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:26
+#: en/bootLive.xml:98
+#, fuzzy
+msgid "<keycap>F5</keycap> <emphasis role=\"bold\">Driver</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:99
 msgid ""
-"F5 - Driver. Yes or No. The system is aware about the presence of an "
-"optional disk with a driver update and will require its insertion during "
-"installation process."
+"If you have a driver update that you wish to use, select this option and "
+"then answer <emphasis>Yes</emphasis>. You will be prompted to insert the "
+"update disc at the appropriate time."
 msgstr ""
-"F5 - Драйвер. Да или Нет. Система знает о наличии оптического диска с "
-"обновлением драйверов и потребует его вставки во время процесса установки."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:104
+#, fuzzy
+msgid "<keycap>F6</keycap> <emphasis role=\"bold\">Kernel Options</emphasis>"
+msgstr "<emphasis role=\"bold\">Рабочая станция</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:106
+#, fuzzy
+msgid ""
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis>Kernel Option</emphasis> menu:"
+msgstr ""
+"Если у вас возникают проблемы с установкой, вы можете попробовать изменить "
+"типовые параметры, воспользовавшись пунктом <emphasis role=\"bold\">F6</"
+"emphasis> <emphasis role=\"bold\">Kernel Options (Опции ядра)</emphasis> (в "
+"системах с UEFI следует вместо этого нажать клавишу <emphasis role=\"bold"
+"\">E</emphasis>)."
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:111
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Default:</emphasis> splash quiet noiswmd resume "
+"audit=0"
+msgstr "<emphasis role=\"bold\">Выровнять до</emphasis> = Мб"
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:114
+msgid ""
+"<emphasis role=\"bold\">Safe Settings:</emphasis> <literal>apm=off acpi=off "
+"mce=off barrier=off ide=nodma idewait=50 i8042.nomux psmouse.proto=bare "
+"irqpoll pci=nommconf</literal>"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:120
+#, fuzzy
 msgid ""
-"F6 - Kernel options. This is a way to specify options according to your "
-"hardware and the drivers to use."
+"<emphasis role=\"bold\">No ACPI:</emphasis> (Advanced Configuration and "
+"Power Interface): Power management features are not used."
+msgstr ""
+"No ACPI (без расширенного интерфейса настройки и управления питанием): не "
+"учитывать параметры управления питанием."
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:125
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">No Local APIC:</emphasis> (Local Advanced "
+"Programmable Interrupt Controller): CPU interrupt. Select this option if you "
+"experience system misbehaviour like a kernel panic in relation to APIC."
+msgstr ""
+"No Local APIC (без локального расширенного контроллера прерываний с "
+"возможностью программирования): этот вариант связан с прерываниями работы "
+"центрального процессора, выберите, если есть соответствующие установки."
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:131
+msgid ""
+"If you open any of the above <keycap>F6</keycap> menu items, and then click "
+"on <keycap>F1</keycap>, an info window will open to show more details for "
+"that particular item:"
 msgstr ""
-"F6 - Параметры ядра. Это способ указать параметры в соответствии с вашим "
-"оборудованием и драйверами для использования."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:139
 msgid "In UEFI mode"
 msgstr "В режиме UEFI"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:142
+#, fuzzy
 msgid ""
-"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
-"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"live-bootUEFI.png\" align="
+"\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:29
-msgid "First screen while booting on UEFI system from disk"
-msgstr "Первый экран при загрузке с диска для системы с UEFI"
+#: en/bootLive.xml:146
+#, fuzzy
+msgid "First screen while booting in UEFI mode"
+msgstr "Первый экран при загрузке в режиме BIOS"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:29
-msgid ""
-"You have only the choice to run Mageia in Live mode (first choice)  or to "
-"process the installation (second choice)."
+#: en/bootLive.xml:149
+msgid "In UEFI mode, you have just the two menu options to choose from:"
 msgstr ""
-"У вас есть только выбор для запуска Mageia в Live режиме (первый вариант) "
-"или инициировать установку (второй вариант)."
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:30
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:153
+#, fuzzy
 msgid ""
-"If you booted from a USB stick, you get two supplemental lines which are a "
-"duplicata of the previous lines suffixed with \"USB\". You have to choose "
-"them."
+"This option will boot the Mageia Live system from the connected Dvd/USB "
+"media (expect a very slow system compared to an installed OS). Once the boot "
+"is done, you can proceed to the installation"
 msgstr ""
-"Если вы загрузились с USB флешки, вы получите две дополнительные строки, "
-"которые являются дубликатами предыдущих строк с суффиксом \"USB\". Вы должны "
-"выбрать их."
+"Загрузить Mageia: Это означает, что Mageia 5 запустится с подключенного "
+"носителя (CD/DVD или USB флэш диска) без записи на диск, поэтому стоит "
+"ожидать очень медленную систему. После завершения загрузки вы можете "
+"приступить к установке на жёсткий диск."
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:32
+#. type: Content of: <section><section><note><para>
+#: en/bootLive.xml:161
 msgid ""
-"In each case, the first steps will be the same to choose language, timezone "
-"and keyboard, then the processes differ, with <link linkend=\"testing"
-"\">additional steps in Live mode</link>."
+"If you booted from a USB stick, you will see the above menu options "
+"duplicated, and in this case, you should choose from the menu pair that will "
+"be suffixed with \"USB\"."
 msgstr ""
-"В каждом случае первые шаги будут такими же, чтобы выбрать язык, часовой "
-"пояс и клавиатуру, а затем процессы будут различаться на <link linkend="
-"\"testing\">дополнительные шаги в Live режиме</link>."
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:3
+#: en/chooseDesktop.xml:16
 msgid "Desktop Selection"
 msgstr "Выбор рабочего стола"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:8
-msgid ""
-"Depending on your selection here, you may be offered further screens to fine-"
-"tune your choice."
+#: en/chooseDesktop.xml:23
+msgid "Some choices made here will open other screens with related options."
 msgstr ""
-"В зависимости от выбранного вами с помощью этой страницы варианта установки, "
-"программа может предложить на последующих страницах дополнительные "
-"возможности окончательной настройки вашей системы."
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:26
+#, fuzzy
 msgid ""
-"After the selection step(s), you will see a slide-show during package "
-"installation. The slide show can be disabled by pressing the "
-"<guilabel>Details</guilabel> button"
+"After the selection step(s), you will see a slideshow during the "
+"installation of required packages. The slideshow can be disabled by pressing "
+"the <emphasis>Details</emphasis> button."
 msgstr ""
 "После выполнения шагов выбора, вы увидите слайд-шоу. Отключить показ слайдов "
 "можно нажатием кнопки <guilabel>Подробности</guilabel>."
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:16
+#: en/chooseDesktop.xml:31
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
-"align=\"center\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-chooseDesktop.png\" "
+"format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
 "align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><para>
-#: en/chooseDesktop.xml:21
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/chooseDesktop.xml:38
+msgid ""
+"Choose whether you prefer to use the KDE Plasma or GNOME desktop "
+"environment. Both come with a full set of useful applications and tools."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/chooseDesktop.xml:44
+#, fuzzy
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> "
-"<emphasis role=\"bold\">Plasma</emphasis> or <application>GNOME</"
-"application> desktop environment. Both come with a full set of useful "
-"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
-"neither (or even use both), or if you want to modify the default software "
-"choices for these desktop environments. The <application>LXDE</application> "
-"desktop, for instance, is lighter than the previous two, sporting less eye "
-"candy and fewer packages installed by default."
+"Select <emphasis>Custom</emphasis> if you do not wish to use either (or, "
+"actually use both) of these, or if you want to modify the default software "
+"choices for these desktop environments. The LXDE desktop, for instance, is "
+"lighter than the previous two, sporting less eye candy and having fewer "
+"packages installed by default."
 msgstr ""
 "Выберите желаемую для вас графическую среду, <emphasis role=\"bold\">Плазму</"
 "emphasis> <application>KDE</application> или <application>GNOME</"
@@ -839,8 +993,9 @@ msgid "Package Group Selection"
 msgstr "Выбор групп пакетов"
 
 #. Lebarhon 20170209 Updated SC
+#. 2018/02/25 apb: add xreflabel to this section.
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:9
+#: en/choosePackageGroups.xml:11
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
 "\" align=\"center\"/> </imageobject>"
@@ -849,7 +1004,7 @@ msgstr ""
 "\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:14
+#: en/choosePackageGroups.xml:16
 msgid ""
 "Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -862,22 +1017,22 @@ msgstr ""
 "указателя мыши на пункт группы в списке."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:21
+#: en/choosePackageGroups.xml:23
 msgid "<emphasis role=\"bold\">Workstation</emphasis>"
 msgstr "<emphasis role=\"bold\">Рабочая станция</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:25
+#: en/choosePackageGroups.xml:27
 msgid "<emphasis role=\"bold\">Server</emphasis>"
 msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:29
+#: en/choosePackageGroups.xml:31
 msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
 msgstr "<emphasis role=\"bold\">Графическая среда</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:33
+#: en/choosePackageGroups.xml:35
 msgid ""
 "<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can use "
 "this option to manually add or remove packages"
@@ -886,7 +1041,7 @@ msgstr ""
 "вариантом можно воспользоваться для добавления или удаления пакетов вручную."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:38
+#: en/choosePackageGroups.xml:40
 msgid ""
 "See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
@@ -901,8 +1056,10 @@ msgid "Choose Individual Packages"
 msgstr "Выбор индивидуальных пакетов"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. 2018/02/15 apb: Text and typography.
+#. 2018/02/25 apb: add xreflabel to this section.
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:9
+#: en/choosePackagesTree.xml:13
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
 "\" align=\"center\"/> </imageobject>"
@@ -911,7 +1068,7 @@ msgstr ""
 "\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:14
+#: en/choosePackagesTree.xml:18
 msgid ""
 "Here you can add or remove any extra packages to customize your installation."
 msgstr ""
@@ -920,13 +1077,14 @@ msgstr ""
 "частью типового набора."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:21
+#, fuzzy
 msgid ""
-"After having made your choice, you can click on the <guibutton>floppy icon</"
-"guibutton> at the bottom of the page to save your choice of packages (saving "
-"to a USB key works, too). You can then use this file to install the same "
-"packages on another system, by pressing the same button during install and "
-"choosing to load it."
+"After having made your choice, you can click on the <emphasis>floppy</"
+"emphasis> icon at the bottom of the page to save your choice of packages "
+"(saving to a USB key works, too). You can then use this file to install the "
+"same packages on another system, by pressing the same button during install "
+"and choosing to load it."
 msgstr ""
 "Как только выбор будет сделан, вы сможете нажать <guibutton>значок дискеты</"
 "guibutton> в нижней части страницы, чтобы сохранить список пакетов (данные "
@@ -941,8 +1099,10 @@ msgstr "Настройка ваших служб"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
+#.  2018/02/16 apb: Minor text adjustment.
+#. 2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:11
+#: en/configureServices.xml:15
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
 "\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
@@ -953,27 +1113,25 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:16
+#: en/configureServices.xml:20
 msgid ""
 "Here you can choose which services should start when you boot your system."
 msgstr ""
 "С помощью этой страницы вы можете определить, какие службы будут "
 "запускаться, а какие нет, во время загрузки вашей системы."
 
-#. type: Content of: <section><para>
-#: en/configureServices.xml:19
-msgid "Click on a triangle to expand a group to all the relevant services."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureServices.xml:25
+#, fuzzy
+msgid ""
+"Click on a triangle to expand a group to all the relevant services. The "
+"settings DrakX chose are usually good."
 msgstr ""
 "Нажмите треугольник, чтобы развернуть группу в список всех соответствующих "
 "служб."
 
-#. type: Content of: <section><para>
-#: en/configureServices.xml:22
-msgid "The settings DrakX chose are usually good."
-msgstr "Обычно, потребности в изменении настроек, выбранных DrakX, нет."
-
-#. type: Content of: <section><para>
-#: en/configureServices.xml:25
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureServices.xml:31
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
@@ -982,7 +1140,7 @@ msgstr ""
 "службе на панели под списком."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:28
+#: en/configureServices.xml:37
 msgid "Only change things when you know very well what you are doing."
 msgstr ""
 "Вносите изменения только если вам хорошо известны последствия ваших действий."
@@ -994,14 +1152,17 @@ msgstr "Настройка часового пояса"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
+#. 2018/02/13 apb: Minor text adjustment.
+#. 2018/02/25 apb: Added xreflabel to this section.
 #. type: Content of: <section><mediaobject>
-#: en/configureTimezoneUTC.xml:11
+#: en/configureTimezoneUTC.xml:15
+#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
-"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
-"</imageobject>"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata format=\"png\" fileref=\"live-timeZone.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
@@ -1009,18 +1170,19 @@ msgstr ""
 "<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:20
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureTimezoneUTC.xml:26
+#, fuzzy
 msgid ""
-"Choose your time-zone by choosing your country or a city close to you in the "
-"same time-zone."
+"Choose your timezone by choosing your country, or a city close to you in the "
+"same timezone."
 msgstr ""
 "Выберите ваш часовой пояс. Для этого достаточно выбрать вашу страну или "
 "какой-то город рядом с вашим пребыванием так, чтобы этот город был "
 "расположен в том же часовом поясе."
 
 #. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:24
+#: en/configureTimezoneUTC.xml:32
 msgid ""
 "In the next screen you can choose to set your hardware clock to local time "
 "or to GMT, also known as UTC."
@@ -1030,7 +1192,7 @@ msgstr ""
 "известного как Всемирное время."
 
 #. type: Content of: <section><note><para>
-#: en/configureTimezoneUTC.xml:29
+#: en/configureTimezoneUTC.xml:37
 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."
@@ -1040,23 +1202,23 @@ msgstr ""
 "GMT)."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:13
+#: en/configureX_card_list.xml:24
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Выбор графического сервера (настройки вашей графической карты)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:18
+#: en/configureX_card_list.xml:29
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_card_list-im1\" "
-"align=\"center\" fileref=\"dx2-configureX_card_list.png\" revision=\"1\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_card_list-im1\" "
-"align=\"center\" fileref=\"dx2-configureX_card_list.png\" revision=\"1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:23
+#: en/configureX_card_list.xml:35
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1065,7 +1227,7 @@ msgstr ""
 "программа может правильно определить ваш видеоадаптер."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:26
+#: en/configureX_card_list.xml:38
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1074,30 +1236,34 @@ msgstr ""
 "карту, и вам известно название этой карты, вы можете выбрать ее из "
 "иерархического списка по следующим критериям:"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
-msgid "vendor"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#, fuzzy
+msgid "Vendor"
 msgstr "разработчик"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:33
-msgid "then the name of your card"
+#: en/configureX_card_list.xml:45
+#, fuzzy
+msgid "then the make of your card"
 msgstr "название вашей карты"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:37
-msgid "and the type of card"
+#: en/configureX_card_list.xml:49
+#, fuzzy
+msgid "and the model of card"
 msgstr "тип вашей карты"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:41
+#: en/configureX_card_list.xml:53
+#, fuzzy
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
-"40 generic and open source video card drivers. If you still can't find a "
-"specific driver for your card there is the option of using the <emphasis "
-"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
+"<emphasis>Xorg</emphasis> category, which provides more than 40 generic and "
+"open source video card drivers. If you still can't find a specific driver "
+"for your card there is the option of using the VESA driver which provides "
+"basic capabilities."
 msgstr ""
 "Если вы не можете найти вашу карту в списке производителей (так как её ещё "
 "нет в базе данных или вы имеете дело с устаревшей картой), то вы можете "
@@ -1107,67 +1273,64 @@ msgstr ""
 "названию, вы можете воспользоваться драйвером <emphasis role=\"bold\">vesa</"
 "emphasis>. Этот драйвер обеспечивает базовые возможности по показу видео."
 
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:47
+#. type: Content of: <section><caution><para>
+#: en/configureX_card_list.xml:61
+#, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
+"to the <emphasis>Command Line Interface</emphasis>"
 msgstr ""
 "Будьте внимательны: если драйвер будет выбран по ошибке, вы сможете получить "
 "доступ только к интерфейсу <emphasis role=\"bold\">командной строки</"
 "emphasis>."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:51
+#: en/configureX_card_list.xml:65
+#, fuzzy
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
-"repository and in some cases only from the card manufacturers' websites."
+"may only be available in the <emphasis>Nonfree</emphasis> repository and in "
+"some cases only from the card manufacturers' websites. The "
+"<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to "
+"access them. If you didn't enable it previously, you should do this after "
+"your first reboot."
 msgstr ""
 "Некоторые производители видеокарт сами создают проприетарные (закрытые) "
 "драйверы для Linux. Доступ к таким драйверам можно получить только с помощью "
 "хранилищ пакетов <emphasis role=\"bold\">Nonfree</emphasis> или сайтов "
 "производителей карточек."
 
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:56
-msgid ""
-"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
-"explicitly enabled to access them. If you didn't enable it previously, you "
-"should do this after your first reboot."
-msgstr ""
-"Вам следует явным образом включить хранилища <emphasis role=\"bold"
-"\">Nonfree</emphasis>, чтобы иметь к ним доступ. Сделать это следует после "
-"первой перезагрузки системы."
-
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:3
+#: en/configureX_chooser.xml:11
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Настройки графической карты и монитора"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
+#. 2018/02/15 apb: Some text and typography.
+#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
+#. 2018/02/23 apb: Typo.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:10
+#: en/configureX_chooser.xml:24
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
-"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
-"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:15
+#: en/configureX_chooser.xml:30
+#, fuzzy
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
-"you chose for this install of <application>Mageia</application>, they are "
-"all based on a graphical user interface system called <acronym>X Window "
-"System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
-"acronym> or any other graphical environment to work well, the following "
-"<acronym>X</acronym> settings need to be correct. Choose the correct "
-"settings if none are shown, or if you think the details are incorrect."
+"you chose for this install of Mageia, they are all based on a graphical user "
+"interface system called <literal>X Window System</literal>, or simply "
+"<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other "
+"graphical environment to work well, the following <quote>X</quote> settings "
+"need to be correct. Choose the appropriate settings - if none are shown, or "
+"if you think the details are incorrect."
 msgstr ""
 "Неважно, какая графическая среда (или рабочая среда) была выбрана при "
 "установке <application>Mageia</application>, все эти среды основаны на "
@@ -1180,22 +1343,33 @@ msgstr ""
 "или если вам кажется, что этот выбор является ошибочным."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:27
+#: en/configureX_chooser.xml:41
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+msgstr "<emphasis role=\"bold\">Графическая среда</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:44
 msgid ""
-"<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
-"from the list if needed."
+"If you need to, you can select a specific card from this expandable list. "
+"See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
-"<emphasis><guibutton>Графическая карта</guibutton></emphasis>: если нужно, "
-"выберите установленную на компьютере графическую карту из списка."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:33
+#: en/configureX_chooser.xml:49
+#, fuzzy
+msgid "<emphasis role=\"bold\">Monitor</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:52
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
-"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
-"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
-"vertical refresh rates of your monitor."
+"You can choose Plug'n Play, if applicable, or choose your monitor from the "
+"<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> list. Choose "
+"<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor. See <xref linkend="
+"\"configureX_monitor\"/>."
 msgstr ""
 "<emphasis><guibutton>Монитор</guibutton></emphasis>: вы можете выбрать "
 "<guilabel>Plug'n Play</guilabel>, если считаете, что это правильно, или "
@@ -1204,32 +1378,37 @@ msgstr ""
 "если хотите вручную указать частоту обновления изображения по вертикали и "
 "горизонтали для вашего монитора."
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:41
-msgid "Incorrect refresh rates may damage your monitor"
-msgstr ""
-"Ошибочно указанные частоты обновления изображения могут привести к "
-"повреждению монитора."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:60
+#, fuzzy
+msgid "<emphasis role=\"bold\">Resolution</emphasis>"
+msgstr "<emphasis role=\"bold\">Рабочая станция</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
-msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
-"color depth of your monitor can be set here."
+#: en/configureX_chooser.xml:63
+#, fuzzy
+msgid "The resolution and color depth of your monitor can be set here"
 msgstr ""
 "<emphasis><guibutton>Разрешение</guibutton></emphasis>: с помощью этого "
 "пункта можно выбрать желаемое разрешение и глубину цветов на вашем мониторе."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:68
+#, fuzzy
+msgid "<emphasis role=\"bold\">Test</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:71
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the option is there, and you test your "
-"settings, you should be ask whether your settings are correct. If you answer "
-"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
-"don't see anything, you'll return to the configuration screen and be able to "
-"reconfigure everything until the test result is satisfactory. If the test "
-"option is not available, then make sure your settings are on the safe side."
+"The test button does not always appear during install. If the option is "
+"there, and you test your settings, you should be asked whether your settings "
+"are correct. If you answer <emphasis>Yes</emphasis>, the settings will be "
+"kept. If you don't see anything, you'll return to the configuration screen "
+"and be able to reconfigure everything until the test result is satisfactory. "
+"If the test option is not available, then make sure your settings are on the "
+"safe side."
 msgstr ""
 "<emphasis><guibutton>Проверить</guibutton></emphasis>: кнопка проверки во "
 "время установки может быть недоступной. Если кнопка доступна, с помощью её "
@@ -1243,21 +1422,35 @@ msgstr ""
 "безопасными."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
-msgid ""
-"<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
-"enable or disable various options."
+#: en/configureX_chooser.xml:81
+#, fuzzy
+msgid "<emphasis role=\"bold\">Options</emphasis>"
+msgstr "<emphasis role=\"bold\">Рабочая станция</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:84
+#, fuzzy
+msgid "Here you can choose to enable or disable various options"
 msgstr ""
 "<emphasis><guibutton>Параметры</guibutton></emphasis>: с помощью этого "
 "пункта вы можете включить или отключить различные параметры."
 
+#. type: Content of: <section><warning><para>
+#: en/configureX_chooser.xml:89
+msgid ""
+"There is a risk of damaging a monitor if you choose refresh rates that are "
+"outside the frequency range of that monitor. This applies to older CRT "
+"displays: modern monitors will reject an unsupported frequency and normally "
+"enter standby mode."
+msgstr ""
+
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:11
+#: en/configureX_monitor.xml:22
 msgid "Choosing your Monitor"
 msgstr "Выбор монитора"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:14
+#: en/configureX_monitor.xml:25
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1266,7 +1459,7 @@ msgstr ""
 "может правильно определить ваш монитор."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:19
+#: en/configureX_monitor.xml:30
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1279,25 +1472,26 @@ msgstr ""
 "есть определённые сомнения, обратитесь к документации по вашему монитору."
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:38
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
-"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
-"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:31
-msgid "<emphasis>Custom</emphasis>"
-msgstr "<emphasis>Дополнительно</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:46
+msgid "Custom"
+msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:33
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:49
+#, fuzzy
 msgid ""
-"This option allows you to set two critical parameters, the vertical refresh "
+"This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
 "screen is refreshed and horizontal sync is the rate at which scan lines are "
 "displayed."
@@ -1308,8 +1502,8 @@ msgstr ""
 "изображение на экране, а частота синхронизации является частотой, с которой "
 "будут показаны линии изображения."
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:38
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:55
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1321,27 +1515,23 @@ msgstr ""
 "Если сомневаетесь, выберите минимальные параметры и внимательно ознакомьтесь "
 "с документацией к вашему монитору."
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
-msgid "<emphasis>Plug 'n Play</emphasis>"
-msgstr "<emphasis>Plug 'n Play</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:64
+msgid "Plug'n Play"
+msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:47
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:67
+#, fuzzy
 msgid ""
-"This is the default option and tries to determine the monitor type from the "
-"monitor database."
+"This is the default option and automatically tries to determine the monitor "
+"type from the monitor database."
 msgstr ""
 "Это дефолтный вариант: программа пытается определить тип вашего монитора по "
 "базе данных мониторов."
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:51
-msgid "<emphasis>Vendor</emphasis>"
-msgstr "<emphasis>Производитель</emphasis>"
-
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:53
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:77
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
@@ -1350,30 +1540,30 @@ msgstr ""
 "известно название этого монитора, вы можете выбрать его из иерархического "
 "списка по следующим критериям:"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:61
-msgid "the monitor manufacturers name"
-msgstr "название фирмы-производителя монитора"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_monitor.xml:86
+msgid "Manufacturer"
+msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:65
-msgid "the monitor description"
-msgstr "описание монитора"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_monitor.xml:90
+msgid "Monitor model"
+msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:69
-msgid "<emphasis>Generic</emphasis>"
-msgstr "<emphasis>Общий</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:96
+msgid "Generic"
+msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:71
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:99
+#, fuzzy
 msgid ""
-"selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the <emphasis role="
-"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
-"determined automatically. Once again it may be wise to be conservative in "
-"your selections."
+"Selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the VESA card driver "
+"when your video hardware cannot be determined automatically.  Once again it "
+"may be wise to be conservative in your selections."
 msgstr ""
 "если вы выберете эту группу, будет открыт список из около 30 типовых "
 "настроек дисплеев, подобных 1024x768 @ 60 Гц, в который включены параметры "
@@ -1384,77 +1574,57 @@ msgstr ""
 "осторожно."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
-msgid "Custom disk partitioning with DiskDrake"
+#: en/diskdrake.xml:22
+#, fuzzy
+msgid "Custom Disk Partitioning with DiskDrake"
 msgstr "Ручное разделение диска на разделы с помощью DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake.png\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
-
-#. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
-msgid ""
-"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
-"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
-"boot</emphasis> partition. The encryption option for the <emphasis role="
-"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
-"will be unbootable."
-msgstr ""
-"Если на вашем разделе с <emphasis role=\"bold\">/</emphasis> вы хотите "
-"использовать шифрование, каталог <emphasis role=\"bold\">/boot</emphasis> "
-"следует хранить на отдельном разделе. Не следует шифровать каталог <emphasis "
-"role=\"bold\">/boot</emphasis>, иначе загрузка системы станет невозможной."
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:38
+#, fuzzy
 msgid ""
-"Modify the layout of your disk(s)  here. You can remove or create "
-"partitions, change the filesystem of a partition or change its size and even "
-"view their details before you start."
+"Modify the layout of your disk(s) here. You can remove or create partitions, "
+"change the filesystem or size of a partition and even view their details "
+"before you start."
 msgstr ""
 "С помощью этой страницы можно определить компоновки разделов в вашей "
 "системе. С её помощью можно изымать и создавать разделы, менять файловые "
 "системы на разделах или размеры разделов и даже просматривать содержимое "
 "разделов до внесения изменений."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:45
+#, fuzzy
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device like a USB key). In the screen-shot above there are two available "
-"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
-"\">sdb</emphasis>."
+"device, like a USB key). In the screenshot above there are two available "
+"devices: <filename>sda </filename>and <filename>sdb</filename>."
 msgstr ""
 "Вверху для каждого обнаруженного жёсткого диска (или другого устройства "
 "хранения данных, в частности флешек USB) будет отведена вкладка. На "
 "приведенном выше снимке окна показаны два доступных устройства: <emphasis "
 "role=\"bold\">sda</emphasis> и <emphasis role=\"bold\">sdb</emphasis>."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:39
-msgid ""
-"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
-"you are sure you want to wipe all partitions on the selected storage device."
-msgstr ""
-"Будьте осторожны с пунктом <guibutton>Очистить все</guibutton>, пользуйтесь "
-"им, только если вы действительно хотите, чтобы все разделы на выбранном "
-"носителе данных были изъяты."
-
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:43
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:52
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Expert mode</guibutton> provides more options such as a label "
-"(give a name to) a partition, or to choose a partition type."
+"<emphasis>Expert mode</emphasis> provides more options such as to label "
+"(name) a partition, or to choose a partition type."
 msgstr ""
 "Чтобы выполнить любое другое действие, сначала обозначьте область "
 "соответствующего раздела. Затем посмотрите данные по разделу, измените его "
@@ -1463,56 +1633,92 @@ msgstr ""
 "получить доступ к дополнительным возможностям, в том числе добавление метки "
 "или выбора типа раздела."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:49
-msgid "Continue until you have adjusted everything to your satisfaction."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:60
+#, fuzzy
+msgid ""
+"Continue until you have adjusted everything to your satisfaction, then click "
+"<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 "Повторяйте эти действия для всех соответствующих разделов, пока всё не "
 "приобретёт нужных вам очертаний."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:52
-msgid "Click <guibutton>Done</guibutton> when you're ready."
+#. type: Content of: <section><warning><orderedlist><listitem><para>
+#: en/diskdrake.xml:69
+#, fuzzy
+msgid ""
+"Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
+"are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
-"Нажмите кнопку <guibutton>Выполнено</guibutton>, когда настройки будут "
-"завершены."
+"Будьте осторожны с пунктом <guibutton>Очистить все</guibutton>, пользуйтесь "
+"им, только если вы действительно хотите, чтобы все разделы на выбранном "
+"носителе данных были изъяты."
 
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:56
+#. type: Content of: <section><warning><orderedlist><listitem><para>
+#: en/diskdrake.xml:75
+#, fuzzy
+msgid ""
+"If you wish to use encryption on your <filename>/</filename> partition you "
+"must ensure that you have a separate <filename>/boot</filename> partition. "
+"The encryption option for the <filename>/boot</filename> partition must NOT "
+"be set, otherwise your system will be unbootable."
+msgstr ""
+"Если на вашем разделе с <emphasis role=\"bold\">/</emphasis> вы хотите "
+"использовать шифрование, каталог <emphasis role=\"bold\">/boot</emphasis> "
+"следует хранить на отдельном разделе. Не следует шифровать каталог <emphasis "
+"role=\"bold\">/boot</emphasis>, иначе загрузка системы станет невозможной."
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:87
+#, fuzzy
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
-"Partition) is present and correctly mounted on /boot/EFI (see below)"
+"Partition) is present and correctly mounted on <filename>/boot/EFI</"
+"filename>. See Figure 1 below."
 msgstr ""
 "Если вы устанавливаете Mageia в системе с UEFI, убедитесь, что существует "
 "ESP (EFI System Partition) и он смонтирован в /boot/EFI (см. ниже)."
 
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:93
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present and of the correct type. See Figure 2 below."
+msgstr ""
+"Если вы устанавливаете Mageia на устаревшей системе с GPT, убедитесь, что "
+"существует раздел BIOS надлежащего типа."
+
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:101
+#, fuzzy
+msgid "EFI System Partition"
+msgstr "Использовать существующие разделы"
+
+#. type: Content of: <section><figure><mediaobject>
+#: en/diskdrake.xml:104
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:60
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:103 en/diskdrake.xml:117
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:72
-msgid ""
-"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present and of the correct type"
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:115
+msgid "BIOS boot partition"
 msgstr ""
-"Если вы устанавливаете Mageia на устаревшей системе с GPT, убедитесь, что "
-"существует раздел BIOS надлежащего типа."
 
-#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:76
+#. type: Content of: <section><mediaobject>
+#: en/diskdrake.xml:118 en/doPartitionDisks.xml:200
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1525,50 +1731,60 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
-msgid "Partitioning"
+#: en/doPartitionDisks.xml:25
+#, fuzzy
+msgid "Suggested Partitioning"
 msgstr "Разбиение на разделы"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:28
+#, fuzzy
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
-"DrakX partitioning proposals for where to install <application>Mageia</"
-"application>."
+"DrakX partitioning proposals for where to install Mageia."
 msgstr ""
 "С помощью этой страницы вы сможете просмотреть содержимое всех дисков "
 "компьютера и ознакомиться с предложениями мастера разделения на разделы "
 "DrakX о месте установки <application>Mageia</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:16
+#: en/doPartitionDisks.xml:32
+#, fuzzy
 msgid ""
-"The options available from those shown below will vary according to the "
-"layout and content of your particular hard drive(s)."
+"The actual options available from those shown below will vary according to "
+"the layout and content of your particular hard drive(s)."
 msgstr ""
 "Перечень пунктов в приведенном ниже списке будет зависеть от комплектации "
 "компьютера и содержания дисков."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:21
+#: en/doPartitionDisks.xml:37
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
-msgid "Use Existing Partitions"
-msgstr "Использовать существующие разделы"
+#. type: Content of: <section><itemizedlist><title>
+#: en/doPartitionDisks.xml:47
+#, fuzzy
+msgid "Main Options"
+msgstr "Параметры"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:50
+#, fuzzy
+msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
+msgstr "<emphasis role = \"bold\">Размер раздела:</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:53
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1577,13 +1793,14 @@ msgstr ""
 "совместимые с Linux разделы, которыми можно воспользоваться для установки "
 "системы."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
-msgid "Use Free Space"
-msgstr "Использовать свободное место"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:43
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:62
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1591,57 +1808,35 @@ msgstr ""
 "Этим вариантом можно будет воспользоваться, если на вашем диске есть "
 "свободное место, достаточное для установки новой системы Mageia."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:49
-msgid "Use Free Space on a Windows Partition"
-msgstr "Использовать свободное место на разделе Microsoft Windows®"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:68
+#, fuzzy
 msgid ""
-"If you have unused space on an existing Windows partition, the installer may "
-"offer to use it."
-msgstr ""
-"Этим вариантом можно будет воспользоваться, если на уже созданных разделах "
-"Windows достаточно свободного места для установки новой операционной системы."
+"<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
+msgstr "<emphasis role=\"bold\">Рабочая станция</emphasis>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:71
+#, fuzzy
 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 "
-"important files!"
+"If you have unused space on an existing Windows partition, the installer may "
+"offer to use it. This can be a useful way of making room for your new Mageia "
+"installation, but is a risky operation so you should make sure you have "
+"backed up all important files!"
 msgstr ""
 "Этот вариант получения места для установки Mageia может быть полезным, но в "
 "случае его использования вы рискуете потерей данных, поэтому вам следует "
 "предварительно создать резервные копии важных для вас файлов!"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
-msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
-"correctly the last time it was used. It must also have been defragmented, "
-"although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
-msgstr ""
-"Заметьте, что размер раздела Windows будет уменьшен. Раздел должен быть "
-"«очищен», то есть работа Windows должна быть завершена в штатном режиме во "
-"время последнего сеанса, когда вы пользовались этой операционной системой. "
-"Кроме того, раздел должен быть дефрагментирован, хотя дефрагментация и не "
-"гарантирует полного передвижения файлов с одного места на другое на диске, "
-"который будет использован для Mageia. Мы настоятельно рекомендуем вам "
-"создать резервные копии важных для вас файлов."
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:69
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:77
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
-"clicking and dragging the gap between both partitions. See the following "
-"screen-shot."
+"clicking and dragging the gap between both partitions.  See the following "
+"screenshot:"
 msgstr ""
 "Если будет выбран этот вариант, средство установки покажет остальные разделы "
 "Windows голубым цветом, а будущий раздел с Mageia - тёмно-синим. Размеры "
@@ -1649,56 +1844,58 @@ msgstr ""
 "перетаскиванием риски между ними с помощью указателя мыши. См. приведенный "
 "ниже снимок экрана."
 
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:76
-msgid ""
-"<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 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:87
-msgid "Erase and use Entire Disk."
-msgstr "Стереть и использовать весь диск"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
+msgstr "<emphasis role=\"bold\">Графическая среда</emphasis>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
-msgid "This option will allocate the entire drive for Mageia."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:88
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia"
 msgstr ""
 "При использовании этого варианта для установки Mageia будет использовано всё "
 "место на диске."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:93
-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:96
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:92
+#, fuzzy
 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 "
-"this option."
+"This will erase ALL data on the selected hard drive. Take care! If you "
+"intend to use part of the disk for something else, or you already have data "
+"on the drive that you are not prepared to lose, then do not use this option."
 msgstr ""
 "Если часть диска будет впоследствии использована для хранения каких-то "
 "данных или на диске уже хранятся какие-то важные данные, не пользуйтесь этим "
 "вариантом."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:103
-msgid "Custom disk partitioning"
-msgstr "Ручная разметка диска"
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:99
+msgid ""
+"Note that this involves shrinking the size of the Windows partition. The "
+"partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used. It is highly recommended to "
+"back up your personal files."
+msgstr ""
+"Заметьте, что размер раздела Windows будет уменьшен. Раздел должен быть "
+"«очищен», то есть работа Windows должна быть завершена в штатном режиме во "
+"время последнего сеанса, когда вы пользовались этой операционной системой. "
+"Кроме того, раздел должен быть дефрагментирован, хотя дефрагментация и не "
+"гарантирует полного передвижения файлов с одного места на другое на диске, "
+"который будет использован для Mageia. Мы настоятельно рекомендуем вам "
+"создать резервные копии важных для вас файлов."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:110
+#, fuzzy
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr "<emphasis role = \"bold\">Размер раздела:</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:113
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1706,85 +1903,108 @@ msgstr ""
 "С помощью этого варианта вы можете получить полный доступ к расположению "
 "разделов на вашем диске в соответствии с вашими предпочтениями."
 
-#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
-msgstr "<emphasis role = \"bold\">Размер раздела:</emphasis>"
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:120
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:129
+#, fuzzy
 msgid ""
-"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
-"emphasis> option, the installer will allocate the available space according "
-"to the following rules:"
+"If you are not using the <emphasis>Custom disk partitioning</emphasis> "
+"option, then the installer will allocate the available space according to "
+"the following rules:"
 msgstr ""
 "Если вы не воспользовались пунктом <emphasis role=\"bold\">Нетипичное "
 "разделение диска</emphasis>, средство установки распределит доступное место "
 "по следующим правилам:"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:120
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:135
+#, fuzzy
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
-"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
-"partition."
+"created. This will be the <filename>/</filename> (root)  partition."
 msgstr ""
 "Если в целом доступного места меньше 50 ГБ, будет создан только один "
 "корневой раздел, <emphasis role=\"bold\">/</emphasis>, отдельного раздела "
 "для /home создано не будет."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:141
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 "Если в целом доступного места более 50 ГБ, то будет создано три раздела"
 
-#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:146
+#, fuzzy
 msgid ""
-"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
-"emphasis> with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <filename>/</filename> "
+"with a maximum of 50 GB"
 msgstr ""
 "6/19 от доступного места, но не более 50 ГБ, будет отдано разделу <emphasis "
 "role=\"bold\">/</emphasis>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
-msgid "1/19 is allocated to swap with a maximum of 4 GB"
+#. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:151
+#, fuzzy
+msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr "1/19 выделяется под своп с максимумом 4 Гб"
 
-#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:138
+#. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:156
+#, fuzzy
 msgid ""
-"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
-"emphasis>"
+"the rest (at least 12/19) is allocated to <emphasis>/</"
+"emphasis><filename>home</filename><emphasis role=\"bold\">.</emphasis>"
 msgstr ""
 "остальное (по крайней мере 12/19) будет отдано разделу <emphasis role=\"bold"
 "\">/home.</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:144
+#: en/doPartitionDisks.xml:164
 msgid ""
-"That means that from 160 GB or greater available space, the installer will "
-"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
-"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
-"<emphasis role=\"bold\">/home</emphasis>."
+"This means that from 160 GB or greater available space, the installer will "
+"create three partitions:"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:169
+msgid "50 GB for <filename>/</filename>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:173
+msgid "4 GB for <filename>swap</filename>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:177
+msgid "and the remainder for <filename>/home</filename>."
 msgstr ""
-"Это означает, что если на диске 160 ГБ или более свободного места, средством "
-"установки будет создано три раздела: 50 ГБ для <emphasis role=\"bold\">/</"
-"emphasis>, 4 ГБ для <emphasis role=\"bold\">свопа</emphasis> на диске. "
-"Остальные места будут отданы под <emphasis role=\"bold\">/home</emphasis>."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:182
+#, fuzzy
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected - or created if it does not exist yet, and mounted "
-"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"automatically detected - or created if it does not exist yet - and mounted "
+"on <filename>/boot/EFI</filename>. The <emphasis>Custom disk partitioning</"
 "emphasis> option is the only one that allows to check it has been correctly "
-"done"
+"done."
 msgstr ""
 "Если вы пользуетесь системой с UEFI, ESP (раздел с системой EFI) будет "
 "обнаружен автоматически или создан, если его ещё не существовало, и "
@@ -1793,13 +2013,15 @@ msgstr ""
 "UEFI было выполнено должным образом."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:188
+#, fuzzy
 msgid ""
-"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
-"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
-"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
-"able to create it with the Installer like any other partition, just select "
-"BIOS boot partition as the filesystem type."
+"If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
+"disk, you need to create a BIOS boot partition if it doesn't already exist. "
+"It should be about 1 MiB with no mount point. It can be created with the "
+"Installer, under <emphasis>Custom disk partitioning</emphasis>, like any "
+"other partition. Be sure to select <quote>BIOS boot partition</quote> for "
+"filesystem type."
 msgstr ""
 "Если вы пользуетесь устаревшей системой (известной как CSM или BIOS) с "
 "диском GPT, вам придётся создать раздел для загрузки BIOS, если он ещё не "
@@ -1809,36 +2031,29 @@ msgstr ""
 "Создание раздела вроде создания любого другого раздела, но надо выбрать тип "
 "файловой системы «Раздел загрузки BIOS»."
 
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:195
+msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:210
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
+"\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
 "partitioning tool used in the installer has not been tested with such a "
-"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
-"have such a device we suggest that you partition the drive in advance, using "
-"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
-"emphasis>, and to use the following settings:"
+"drive."
 msgstr ""
 "В некоторых более новых дисках используются логические сектора в 4096 байт "
 "вместо предыдущего стандарта в 512 байтов на логический сектор. Так что у "
@@ -1850,18 +2065,39 @@ msgstr ""
 "<emphasis role=\"bold\">gparted</emphasis> с использованием таких значений "
 "параметров:"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:189
-msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:221
+#, fuzzy
+msgid ""
+"Some SSD devices now use an erase block size over 1 MB. If you have such a "
+"device we suggest that you partition the drive in advance, using an "
+"alternative partitioning tool like gparted, and to use the following "
+"settings:"
+msgstr ""
+"В некоторых более новых дисках используются логические сектора в 4096 байт "
+"вместо предыдущего стандарта в 512 байтов на логический сектор. Так что у "
+"разработчиков нет достаточного доступа к соответствующему оборудованию, "
+"надлежащее тестирование программы для разделения диска на разделы на таких "
+"дисках не выполнялось. Кроме того, в некоторых дисках SSD используется "
+"размер блока более 1 МБ. Советуем вам выполнить разделение такого диска на "
+"разделы с помощью альтернативной специализированной программы, например "
+"<emphasis role=\"bold\">gparted</emphasis> с использованием таких значений "
+"параметров:"
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:228
+#, fuzzy
+msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis role=\"bold\">Выровнять до</emphasis> = Мб"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:191
-msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:232
+#, fuzzy
+msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr "<emphasis role=\"bold\">Свободное место перед (Мб)</emphasis> = 2"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:236
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1869,38 +2105,40 @@ msgstr ""
 "мегабайтах."
 
 #. type: Content of: <article><info><title>
-#: en/DrakLive-cover.xml:4 en/DrakLive-cover.xml:30 en/DrakLive.xml:3
+#: en/DrakLive-cover.xml:15 en/DrakLive-cover.xml:54 en/DrakLive.xml:16
 msgid "Installation from LIVE medium"
 msgstr "Установка с LIVE носителя"
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
+#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:14
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakLive-cover.xml:10
-msgid "January 2015"
-msgstr "Январь 2015"
+#: en/DrakLive-cover.xml:23
+msgid "March 2016"
+msgstr ""
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakLive-cover.xml:11
+#: en/DrakLive-cover.xml:25
 msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
+#: en/DrakLive-cover.xml:30 en/DrakX-cover.xml:27
 msgid "The Official Documentation for Mageia"
 msgstr "Официальная документация для Mageia"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17
-msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+#: en/DrakLive-cover.xml:33 en/DrakX-cover.xml:30
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
-#: en/DrakX.xml:12
+#: en/DrakLive-cover.xml:38 en/DrakLive.xml:25 en/DrakX-cover.xml:35
+#: en/DrakX.xml:44
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
 "3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -1912,8 +2150,8 @@ msgstr ""
 "licenses/by-sa/3.0/</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
-#: en/DrakX.xml:15
+#: en/DrakLive-cover.xml:42 en/DrakLive.xml:29 en/DrakX-cover.xml:39
+#: en/DrakX.xml:48
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1924,8 +2162,7 @@ msgstr ""
 "neodoc.biz\">NeoDoc</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
-#: en/DrakX.xml:17
+#: en/DrakLive-cover.xml:46 en/DrakX-cover.xml:43 en/DrakX.xml:52
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1936,15 +2173,15 @@ msgstr ""
 "Documentation_team\">команды документирования</link>, Если вы хотите, помочь "
 "улучшить данное руководство."
 
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
-#: en/DrakX.xml:6
+#. type: Content of: <section><itemizedlist><listitem><para><note>
+#: en/DrakLive-cover.xml:56 en/DrakLive.xml:19 en/DrakX-cover.xml:64
+#: en/DrakX.xml:38 en/selectKeyboard.xml:49
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
-#: en/DrakX.xml:7
+#: en/DrakLive-cover.xml:57 en/DrakLive.xml:20 en/DrakX-cover.xml:65
+#: en/DrakX.xml:39
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
 "screens you will see, depends on your hardware and the choices you make "
@@ -1954,42 +2191,50 @@ msgstr ""
 "страниц, которые вы увидите, зависит от набора оборудования в системе и "
 "выбранного вами варианта установки."
 
-#. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
-#: en/DrakX.xml:10
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/DrakLive-cover.xml:60 en/DrakLive.xml:23 en/DrakX-cover.xml:68
+#: en/DrakX.xml:42 en/selectKeyboard.xml:56
 msgid "</note>"
 msgstr "</note>"
 
+#. type: Content of: <article><info><cover><para>
+#: en/DrakLive.xml:33
+#, fuzzy
+msgid ""
+"It was written by volunteers in their free time. Please contact the <link "
+"ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation "
+"Team</link>, if you would like to help improve this manual."
+msgstr ""
+"Учебник был написан доброжелателями в свободное от основной работы время. "
+"Пожалуйста, обратитесь к <link ns6:href=\"https://wiki.mageia.org/en/"
+"Documentation_team\">команды документирования</link>, Если вы хотите, помочь "
+"улучшить данное руководство."
+
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
+#: en/DrakX-cover.xml:12 en/DrakX-cover.xml:61 en/DrakX.xml:35
 msgid "Installation with DrakX"
 msgstr "Установка с помощью DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:9
+#: en/DrakX-cover.xml:20
 msgid "February 2014"
 msgstr "Февраль 2014"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:22
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
-#. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakX-cover.xml:16
-msgid ""
-"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
-
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Поздравляем"
 
 #.  Lebarhon 20170209 updated SC
+#. 2018/02/12 apb: Text and typography.
+#. 2018/02/25 apb: Added clickable link to mageia.org
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:13
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1998,27 +2243,28 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
 msgid ""
-"You have finished installing and configuring <application>Mageia</"
-"application> and it is now safe to remove the installation medium and reboot "
-"your computer."
+"You have finished installing and configuring Mageia and it is now safe to "
+"remove the installation medium and reboot your computer."
 msgstr ""
 "Теперь <application>Mageia</application> установлена и настроена, можно "
 "извлекать носитель для установки системы и перезагружать компьютер."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:22
+#, fuzzy
 msgid ""
-"After reboot, in the bootloader screen, you can choose between the operating "
-"systems (if there are more than one) on your computer."
+"After rebooting, you can use the bootloader screen to choose which operating "
+"system to start (if there are more than one on your computer)."
 msgstr ""
 "После перезагрузки с помощью экрана загрузки вы сможете выбрать одну из "
 "операционных систем, установленных на вашем компьютере (если установлено "
 "несколько систем)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:26
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -2027,26 +2273,27 @@ msgstr ""
 "запустится установленная вами операционная система Mageia."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:30
 msgid "Enjoy!"
 msgstr "Приятной работы!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:32
+#, fuzzy
 msgid ""
-"Visit www.mageia.org if you have any questions or want to contribute to "
-"Mageia"
+"Visit <link ns4:href=\"http://www.mageia.org/en/\">www.mageia.org/en/</link> "
+"if you have any questions or want to contribute to Mageia"
 msgstr ""
 "Посетите www.mageia.org, если хотите узнать больше об участии в сообществе "
 "Mageia"
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:3
+#: en/firewall.xml:7
 msgid "Firewall"
 msgstr "Файервол"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:6
+#: en/firewall.xml:10
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -2059,16 +2306,17 @@ msgstr ""
 "доступ к соответствующим службам системы из сети Интернет."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:12
+#: en/firewall.xml:16
+#, fuzzy
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
-"accessible from the network. The <emphasis role=\"bold\">Everything (no "
-"firewall)</emphasis> enables access to all services of the machine - an "
-"option that does not make much sense in the context of the installer since "
-"it would create a totally unprotected system. Its veritable use is in the "
-"context of the Mageia Control Center (which uses the same GUI layout) for "
-"temporarily disabling the entire set of firewall rules for testing and "
-"debugging purposes."
+"accessible from the network. The <emphasis>Everything (no firewall)</"
+"emphasis> option enables access to all services of the machine - an option "
+"that does not make much sense in the context of the installer since it would "
+"create a totally unprotected system. Its veritable use is in the context of "
+"the Mageia Control Center (which uses the same GUI layout)  for temporarily "
+"disabling the entire set of firewall rules for testing and debugging "
+"purposes."
 msgstr ""
 "В типичном состоянии ни один из пунктов не обозначен - ни одна из служб в "
 "системе не будет доступна из интернета. Пункт <emphasis role=\"bold\">Все "
@@ -2080,26 +2328,28 @@ msgstr ""
 "тестирования или диагностики."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:21
+#: en/firewall.xml:25
+#, fuzzy
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
-"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
-"printers on your machine to be accessible from the network."
+"enable the CUPS server if you want printers on your machine to be accessible "
+"from the network."
 msgstr ""
 "Назначение всех пунктов должно быть более-менее понятным. Например, отметьте "
 "пункт <emphasis role=\"bold\">Сервер CUPS</emphasis>, если хотите, чтобы "
 "принтеры на вашем компьютере были доступны из сети."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:29
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">Дополнительно</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:27
+#: en/firewall.xml:31
+#, fuzzy
 msgid ""
-"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
-"you can enable a series of services by typing a list of couples (blank "
+"The <emphasis>Advanced</emphasis> option opens a window where you can enable "
+"a series of services by typing a list of <quote>couples</quote> (blank "
 "separated)"
 msgstr ""
 "В списке пунктов содержатся только самые распространённые типы служб. С "
@@ -2109,12 +2359,12 @@ msgstr ""
 "записей данных (разделённых пробелами)."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:35
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>&lt;номер порта>/&lt;протокол></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:34
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -2125,7 +2375,7 @@ msgstr ""
 "RSYNC). Номер определяется по протоколу <emphasis>RFC-433</emphasis>;"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:42
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
@@ -2135,7 +2385,7 @@ msgstr ""
 "использоваться для обмена данными со службой."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:43
+#: en/firewall.xml:47
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -2144,7 +2394,7 @@ msgstr ""
 "<emphasis>873/tcp</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:46
+#: en/firewall.xml:50
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -2153,7 +2403,7 @@ msgstr ""
 "указать две пары записей для одного порта."
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:3
+#: en/formatPartitions.xml:10
 msgid "Formatting"
 msgstr "Форматирование"
 
@@ -2161,14 +2411,16 @@ msgstr "Форматирование"
 #.  NEEDS TO BE REVIEWED! 
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
+#. 2018/02/10 apb: Text and typography.
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:15
+#: en/formatPartitions.xml:24
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
-"\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata format=\"PNG\" xml:id=\"live-formatPartitions-im1\" align=\"center"
-"\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-formatPartitions.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"formatPartitions-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-formatPartitions.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"live-formatPartitions-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
@@ -2177,7 +2429,7 @@ msgstr ""
 "\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:24
+#: en/formatPartitions.xml:35
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
 "partitions <emphasis>not</emphasis> marked for formatting will be preserved."
@@ -2187,28 +2439,32 @@ msgstr ""
 "обозначены для форматирования, будут сохранены."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:28
-msgid "Usually at least the partitions DrakX selected, need to be formatted"
+#: en/formatPartitions.xml:39
+#, fuzzy
+msgid ""
+"Usually, at least the partitions that DrakX selected need to be formatted."
 msgstr ""
 "Обычно форматирование нужно по крайней мере для разделов, выбранных DrakX."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:31
+#: en/formatPartitions.xml:42
+#, fuzzy
 msgid ""
-"Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
-"check for so called <emphasis>bad blocks</emphasis>"
+"Click on <emphasis>Advanced</emphasis> to choose the partitions you want to "
+"check for so-called <emphasis>bad blocks</emphasis>"
 msgstr ""
 "Нажмите кнопку <guibutton>Дополнительно</guibutton>, чтобы выбрать разделы, "
 "которые следует проверить на так называемые <emphasis>поврежденные блоки</"
 "emphasis>."
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:36
+#: en/formatPartitions.xml:47
+#, fuzzy
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
-"<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
-"where you can choose to view details of your partitions."
+"<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and "
+"then on <emphasis>Custom</emphasis> to get back to the main screen, where "
+"you can choose to view details of your partitions."
 msgstr ""
 "Если вы не уверены в правильности своего выбора, вы можете нажать кнопку "
 "<guibutton>Назад</guibutton>, ещё раз кнопку <guibutton>Назад</guibutton>, а "
@@ -2217,21 +2473,22 @@ msgstr ""
 "параметры разделов."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:43
+#: en/formatPartitions.xml:54
+#, fuzzy
 msgid ""
-"When you are confident about the selection, click on <guibutton>Next</"
-"guibutton> to continue."
+"When you are confident about the selections, click on <emphasis>Next</"
+"emphasis> to continue."
 msgstr ""
 "Если вы уверены в своем выборе, нажмите кнопку <guibutton>Далее</guibutton>, "
 "чтобы продолжить работу с программой."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:10
+#: en/installer.xml:14
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, программа для установки Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:13
+#: en/installer.xml:16
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2241,337 +2498,241 @@ msgstr ""
 "установки Mageia разработана таким образом, чтобы  установка или обновление "
 "системы прошло как можно проще для вас."
 
-#. type: Content of: <section><para>
-#: en/installer.xml:17
-msgid ""
-"The initial menu screen has various options, however the default one will "
-"start the installer, which will normally be all that you will need."
-msgstr ""
-"На начальном окне меню установки вы увидите пункты вариантов действий. "
-"Типичным будет пункт запуска программы для установки системы. Обычно, это "
-"именно тот пункт, который вам нужен."
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:22
-msgid "Installation Welcome Screen"
-msgstr "Приветственное окно программы установки"
-
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:25
-msgid "Using a Mageia DVD"
-msgstr "С помощью DVD Mageia"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:27
-msgid ""
-"Here are the default welcome screens when using a Mageia DVD, The first one "
-"is what you will see if you have a UEFI system, the second one is for a "
-"Legacy system:"
-msgstr ""
-"Ниже приведены типичные окна приветствия DVD Mageia. Первое из них "
-"соответствует системе с UEFI, второе - системе с устаревшей системой "
-"загрузки:"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:32
-msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+#: en/installer.xml:20
+msgid "The installation steps"
+msgstr "Шаги установки"
 
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:23
+#, fuzzy
 msgid ""
-"From this screen, you have access to options by pressing \"<emphasis role="
-"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
-"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
-"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
-"role=\"bold\">F10</emphasis> to quit with saving."
+"The install process is divided into a number of steps - the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
-"С этой страницы вы можете получить доступ к параметрам, нажав клавишу "
-"<emphasis role=\"bold\">E</emphasis> для входа в режим редактирования. Чтобы "
-"вернуться из этого режима, нажмите или клавишу <emphasis role=\"bold\">Esc</"
-"emphasis>, если изменения не следует хранить, или комбинацию клавиш "
-"<emphasis role=\"bold\">Ctrl</emphasis> и <emphasis role=\"bold\">F10</"
-"emphasis>, чтобы сохранить изменения и выйти из режима редактирования."
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:45
-msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+"Процедура установки разделена на последовательность шагов, перечень которых "
+"будет показан на левой боковой панели экрана."
 
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:50
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:28
+#, fuzzy
 msgid ""
-"From this screen, it is possible to set some preferences (note that the "
-"options <emphasis role=\"bold\">F1</emphasis> to <emphasis role=\"bold\">F6</"
-"emphasis> are available only on Legacy systems):"
+"Each step has one or more screens, which may also have <emphasis>Advanced</"
+"emphasis> sections with extra, less commonly required options."
 msgstr ""
-"С помощью этой страницы можно указать некоторые настройки (заметьте, что "
-"пункты от <emphasis role=\"bold\">F1</emphasis> до <emphasis role=\"bold"
-"\">F6</emphasis> доступны только на устаревших системах):"
+"На каждом шагу вам будут показаны одна или несколько страниц, на которых вы "
+"можете увидеть кнопку <guibutton>Дополнительно</guibutton>, с помощью "
+"которой осуществляется доступ к дополнительным параметрам, которыми "
+"пользуются не так часто как основными."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:33
+#, fuzzy
 msgid ""
-"Within any of the <emphasis role=\"bold\">F2</emphasis> to <emphasis role="
-"\"bold\">F6</emphasis> options, you can view relevant help by pressing "
-"<emphasis role=\"bold\">F1</emphasis>"
+"Most screens have <emphasis>Help</emphasis> buttons for further details "
+"about the particular step."
 msgstr ""
-"Справку по каждому из пунктов, от <emphasis role=\"bold\">F2</emphasis> до "
-"<emphasis role=\"bold\">F6</emphasis>, можно просмотреть, нажав клавишу "
-"<emphasis role=\"bold\">F1</emphasis>"
+"На большинстве страниц вы также увидите кнопку <guibutton>Справка</"
+"guibutton>, с помощью которой можно получить дополнительные объяснения "
+"относительно текущего шага."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:63
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:38
+#, fuzzy
 msgid ""
-"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
-"specific language for the installation."
+"If at some point during the install you decide to abort the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
+"partition has been formatted or updates have started to be installed, your "
+"computer is no longer in the same state and rebooting it could very well "
+"leave you with an unusable system."
 msgstr ""
-"Нажмите <emphasis role=\"bold\">F2</emphasis>, чтобы выбрать язык, на "
-"котором средству установки показывать сообщения."
+"Если в течение процедуры установки вы решите прекратить установку, вы можете "
+"перезагрузить компьютер. Впрочем, вам следует тщательно обдумать ваши "
+"действия. После форматирования раздела или начала процедуры установки "
+"обновлений компьютер будет находиться в промежуточном состоянии. "
+"Перезагрузка может привести к невозможности использования системы. Если, "
+"вопреки этим предупреждением, вы хотите перезагрузить систему, перейдите в "
+"текстовый терминал нажатием комбинации этих трёх клавиш: <guibutton>Alt Ctrl "
+"F2</guibutton> одновременно. После этого, нажмите комбинацию клавиш "
+"<guibutton>Alt Ctrl Delete</guibutton> одновременно, чтобы перезагрузить "
+"компьютер."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:67
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:43
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"If, in spite of this, you are very sure rebooting is what you want, go to a "
+"text terminal by pressing the keys <keycombo><keycap>Ctrl</"
+"keycap><keycap>Alt</keycap><keycap>F2</keycap></keycombo> together. After "
+"that, press <keycombo><keycap>Ctrl</keycap><keycap>Alt</"
+"keycap><keycap>Delete</keycap></keycombo> together to reboot."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
-msgid ""
-"Use the arrow keys to select the language then press <emphasis role=\"bold"
-"\">Enter</emphasis>."
-msgstr ""
-"Используйте клавиши со стрелками, чтобы выбрать нужный вам пункт в списке и "
-"нажмите клавишу <emphasis role=\"bold\">Enter</emphasis>."
+#. type: Content of: <section><section><title>
+#: en/installer.xml:48
+msgid "Installation Welcome Screen"
+msgstr "Приветственное окно программы установки"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:77
+#. type: Content of: <section><section><para>
+#: en/installer.xml:49
 msgid ""
-"If needed, change the screen resolution by pressing <emphasis role=\"bold"
-"\">F3</emphasis> (Legacy mode only)."
+"The particular screen that you will first see when booting from the "
+"Installation media will depend on whether your computer motherboard is of "
+"the Legacy (BIOS) or UEFI type."
 msgstr ""
-"Изменить разрешение экрана можно с помощью нажатия клавиши <emphasis role="
-"\"bold\">F3</emphasis> (только в устаревшем режиме)."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:81
+#. type: Content of: <section><section><para>
+#: en/installer.xml:52
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+"The welcome menu screen has various options, however the default option will "
+"start the installer, and is normally all that you will need."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+"На начальном окне меню установки вы увидите пункты вариантов действий. "
+"Типичным будет пункт запуска программы для установки системы. Обычно, это "
+"именно тот пункт, который вам нужен."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:88
-msgid ""
-"If you experience problems with the installation, you could try modifying "
-"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
-"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
-"<emphasis role=\"bold\">e</emphasis> instead)."
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:56
+msgid "Legacy (BIOS) Systems"
 msgstr ""
-"Если у вас возникают проблемы с установкой, вы можете попробовать изменить "
-"типовые параметры, воспользовавшись пунктом <emphasis role=\"bold\">F6</"
-"emphasis> <emphasis role=\"bold\">Kernel Options (Опции ядра)</emphasis> (в "
-"системах с UEFI следует вместо этого нажать клавишу <emphasis role=\"bold"
-"\">E</emphasis>)."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:96
-msgid "Default: It doesn't alter anything in the default options."
-msgstr "Default (по-умолчанию): не менять ничего в типичных параметрах."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:101
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
 msgid ""
-"Safe Settings: Priority is given to the safer options at the price of a "
-"performance detriment."
+"<imageobject> <imagedata fileref=\"dx-welcome.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
-"Safe Settings (безопасные параметры): преимущество безопасности параметров "
-"над быстродействием."
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:106
-msgid ""
-"No ACPI: (Advanced Configuration and Power Interface): Power management "
-"features are not used."
+#. type: Content of: <section><section><section><itemizedlist><title>
+#: en/installer.xml:63
+msgid "Menu"
 msgstr ""
-"No ACPI (без расширенного интерфейса настройки и управления питанием): не "
-"учитывать параметры управления питанием."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:113
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:66
 msgid ""
-"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
-"interrupt. Select this option if you experience system misbehaviour like a "
-"kernel panic in relation to APIC."
+"Install Mageia to a hard disk. This is the default option, and will "
+"automatically start after a short while unless another option is selected."
 msgstr ""
-"No Local APIC (без локального расширенного контроллера прерываний с "
-"возможностью программирования): этот вариант связан с прерываниями работы "
-"центрального процессора, выберите, если есть соответствующие установки."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:120
-msgid ""
-"When you select one of these entries, it modifies the default options "
-"displayed in the <guilabel>Boot Options</guilabel> line."
-msgstr ""
-"Выбор одного из пунктов приводит к внесению изменений в параметры по "
-"умолчанию, показанные в строке <guilabel>Параметры загрузки</guilabel>."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:69
+#, fuzzy
+msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:125
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:70
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with "
-"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
-"Options</guilabel> line, despite this, they will in fact be applied."
+"This option allows you to either re-install the bootloader for an existing "
+"Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
-"В некоторых выпусках Mageia параметры, выбранные с помощью <emphasis role="
-"\"bold\">F6</emphasis>, не появятся в строке <guilabel>Параметры загрузки</"
-"guilabel>. Впрочем, эти параметры будут учтены при загрузке системы."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:132
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:75
+#, fuzzy
+msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:139
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:76
 msgid ""
-"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
-"various boot options. Select an item with the arrow keys and press <emphasis "
-"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
-"\"bold\">Esc</emphasis> to go back to the welcome screen."
+"Test the installed RAM by performing multiple read and write operations. "
+"Reboot to end the test."
 msgstr ""
-"Нажатие клавиши <emphasis role=\"bold\">F1</emphasis> открывает новое окно "
-"со списком пунктов. Выберите один из пунктов с помощью клавиш со стрелками и "
-"нажмите клавишу <emphasis role=\"bold\">Enter</emphasis>, чтобы получить "
-"подробную справку, или нажмите клавишу <emphasis role=\"bold\">Esc</"
-"emphasis>, чтобы вернуться к окну приветствия."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:146
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:80
+#, fuzzy
+msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
+msgstr "<emphasis role=\"bold\">Дополнительно</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:151
-msgid ""
-"The detailed view about the splash option. Press <emphasis role=\"bold"
-"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
-"go back to the options list. These options can be added by hand in the "
-"<guilabel>Boot Options</guilabel> line."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:81
+msgid "Press F2 for alternative languages."
 msgstr ""
-"Ниже приведён снимок окна с подробным описанием параметров окна приветствия "
-"системы. Нажмите клавишу <emphasis role=\"bold\">Esc</emphasis> или выберите "
-"пункт <guilabel>Return to Boot Options (Вернуться к параметрам загрузки)</"
-"guilabel>, чтобы вернуться в список параметров. Описанные в окне параметры "
-"можно добавить вручную в строку <guilabel>Параметры загрузки</guilabel>."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:158
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:86
+msgid "UEFI Systems"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:164
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:87
+#, fuzzy
 msgid ""
-"The help is translated in the chosen language with <emphasis role=\"bold"
-"\">F2</emphasis>."
+"From this screen, you can access options by pressing <keycap>e</keycap> to "
+"enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
+"to quit without saving or press <keycap>F10</keycap> to save and quit."
 msgstr ""
-"Посмотреть перевод справки на выбранном языке можно с помощью нажатия "
-"клавиши <emphasis role=\"bold\">F2</emphasis>."
+"С этой страницы вы можете получить доступ к параметрам, нажав клавишу "
+"<emphasis role=\"bold\">E</emphasis> для входа в режим редактирования. Чтобы "
+"вернуться из этого режима, нажмите или клавишу <emphasis role=\"bold\">Esc</"
+"emphasis>, если изменения не следует хранить, или комбинацию клавиш "
+"<emphasis role=\"bold\">Ctrl</emphasis> и <emphasis role=\"bold\">F10</"
+"emphasis>, чтобы сохранить изменения и выйти из режима редактирования."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:168
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:92
+#, fuzzy
 msgid ""
-"For more information about kernel options on legacy and UEFI systems, see: "
-"<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
-"\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
-"Подробное описание параметров ядра в устаревших системах и системах с UEFI "
-"можно найти  <link ns2:href=\"https://wiki.mageia.org/en/"
-"How_to_set_up_kernel_options\">здесь</link>."
-
-#. type: Content of: <section><section><title>
-#: en/installer.xml:177
-msgid "The installation steps"
-msgstr "Шаги установки"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:179
-msgid ""
-"The install process is divided into a number of steps, the status of which "
-"is indicated in a panel to the left of the screen."
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:96
+msgid "In UEFI mode you have only two menu options to choose from:"
 msgstr ""
-"Процедура установки разделена на последовательность шагов, перечень которых "
-"будет показан на левой боковой панели экрана."
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:182
-msgid ""
-"Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> sections with extra, less commonly required, options."
-msgstr ""
-"На каждом шагу вам будут показаны одна или несколько страниц, на которых вы "
-"можете увидеть кнопку <guibutton>Дополнительно</guibutton>, с помощью "
-"которой осуществляется доступ к дополнительным параметрам, которыми "
-"пользуются не так часто как основными."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:99
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
+msgstr "<emphasis role=\"bold\">Выровнять до</emphasis> = Мб"
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:186
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons for further details "
-"about the particular step."
+"<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
+"re-install the bootloader for an existing Mageia installation or you can use "
+"it to restore a Windows bootloader."
 msgstr ""
-"На большинстве страниц вы также увидите кнопку <guibutton>Справка</"
-"guibutton>, с помощью которой можно получить дополнительные объяснения "
-"относительно текущего шага."
 
-#. type: Content of: <section><section><note><para>
-#: en/installer.xml:190
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:109
+#, fuzzy
 msgid ""
-"If at some points during the install you decide to stop the installation, it "
-"is possible to reboot, but please think twice before you do this. Once a "
-"partition has been formatted or updates have started to be installed, your "
-"computer is no longer in the same state and rebooting it could very well "
-"leave you with an unusable system. If in spite of this you are very sure "
-"rebooting is what you want, go to a text terminal by pressing the three keys "
-"<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press "
-"<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
+"If you booted from a USB stick, you will see the above options duplicated, "
+"and in this case, you should use the set that will be suffixed with \"USB\"."
 msgstr ""
-"Если в течение процедуры установки вы решите прекратить установку, вы можете "
-"перезагрузить компьютер. Впрочем, вам следует тщательно обдумать ваши "
-"действия. После форматирования раздела или начала процедуры установки "
-"обновлений компьютер будет находиться в промежуточном состоянии. "
-"Перезагрузка может привести к невозможности использования системы. Если, "
-"вопреки этим предупреждением, вы хотите перезагрузить систему, перейдите в "
-"текстовый терминал нажатием комбинации этих трёх клавиш: <guibutton>Alt Ctrl "
-"F2</guibutton> одновременно. После этого, нажмите комбинацию клавиш "
-"<guibutton>Alt Ctrl Delete</guibutton> одновременно, чтобы перезагрузить "
-"компьютер."
+"Если вы загрузились с USB флешки, вы получите две дополнительные строки, "
+"которые являются дубликатами предыдущих строк с суффиксом \"USB\". Вы должны "
+"выбрать их."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:203
+#: en/installer.xml:115
 msgid "Installation Problems and Possible Solutions"
 msgstr "Проблемы с установкой и возможные пути их решения"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:206
+#: en/installer.xml:117
 msgid "No Graphical Interface"
 msgstr "Нет графического интерфейса"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:210
+#: en/installer.xml:120
+#, fuzzy
 msgid ""
-"After the initial screen you did not reach the language selection screen. "
-"This can happen with some graphic cards and older systems. Try using low "
-"resolution by typing <code>vgalo</code> at the prompt."
+"After the initial screen you did not progress to the <emphasis>Language "
+"Selection</emphasis> screen. This can happen with some graphic cards and "
+"older systems. Try using low resolution by typing <command>vgalo</command> "
+"at the prompt."
 msgstr ""
 "После начальной страницы не открывается страница выбора языка. Такое может "
 "случиться в системах с некоторыми графическими картами и в устаревших "
@@ -2579,15 +2740,15 @@ msgstr ""
 "впишите <code>vgalo</code> в строку запроса."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:217
+#: en/installer.xml:126
+#, fuzzy
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this press "
-"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
-"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
-"with a black screen with the word \"boot:\". Type \"text\" and press "
-"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
-"in text mode."
+"In this case it is worth trying a text-mode installation. To use this press "
+"<keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen and confirm "
+"with <keycap>ENTER</keycap>. You will be presented with a black screen with "
+"a <prompt>boot:</prompt> prompt. Type <command>text</command> and press "
+"<keycap>ENTER</keycap> to continue with the installation in text mode."
 msgstr ""
 "Если компьютер является очень устаревшим, установка в графическом режиме "
 "может быть просто невозможной. В таком случае стоит воспользоваться "
@@ -2598,18 +2759,19 @@ msgstr ""
 "<code>Enter</code>. Установка будет продолжена в текстовом режиме."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:230
+#: en/installer.xml:138
 msgid "The Install Freezes"
 msgstr "Остановка установки"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:232
+#: en/installer.xml:139
+#, fuzzy
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
-"problem with hardware detection. In this case the automatic detection of "
-"hardware may be bypassed and dealt with later. To try this, type "
-"<code>noauto</code> at the prompt. This option may also be combined with "
-"other options as necessary."
+"problem with hardware detection. In this case the automatic hardware "
+"detection may be bypassed and dealt with later. To try this, type "
+"<command>noauto</command> at the prompt. This option may also be combined "
+"with other parameters as necessary."
 msgstr ""
 "Если при установке система перестает отвечать на ваши запросы, вероятно, "
 "возникла проблема с определением характеристик оборудования. В таком случае "
@@ -2619,17 +2781,19 @@ msgstr ""
 "При необходимости эту команду можно совместить с вышеуказанными командами."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:240
+#: en/installer.xml:146
 msgid "RAM problem"
 msgstr "Проблемы с RAM (оперативной памятью)"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:242
+#: en/installer.xml:147
+#, fuzzy
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
-"<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
-"g. <code>mem=256M</code> would specify 256MB of RAM."
+"<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where "
+"<replaceable>xxx</replaceable> is the correct amount of RAM. e.g. "
+"<literal>mem=256M</literal> would specify 256MB of RAM."
 msgstr ""
 "Потребность в определении параметров ядра возникает нечасто, но в "
 "определённых случаях компьютер может сообщать средству установки ложные "
@@ -2639,19 +2803,20 @@ msgstr ""
 "соответствует 256 МБ оперативной памяти."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:249
+#: en/installer.xml:154
 msgid "Dynamic partitions"
 msgstr "Динамические разделы"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:251
+#: en/installer.xml:155
+#, fuzzy
 msgid ""
-"If you converted your hard disk from <emphasis role=\"bold\">basic</"
-"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
-"Microsoft Windows, then it is not possible to install Mageia on this disc. "
-"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
-"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
-"microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <literal>Basic</literal> format to "
+"<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
+"possible to install Mageia on this disc. To revert to a <literal>Basic</"
+"literal> disk, see the Microsoft documentation: <link ns2:href=\"http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx\">http://msdn.microsoft.com/en-us/"
+"library/cc776315.aspx</link>."
 msgstr ""
 "Если вами был преобразован ваш жёсткий диск с формата <emphasis role=\"bold"
 "\">basic</emphasis> в формат <emphasis role=\"bold\">dynamic</emphasis> в "
@@ -2661,18 +2826,15 @@ msgstr ""
 "cc776315.aspx\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
 
 #. type: Content of: <section><info><title>
-#: en/installUpdates.xml:3
+#: en/installUpdates.xml:16
 msgid "Updates"
 msgstr "Обновления"
 
-#.  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 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:15
+#: en/installUpdates.xml:20
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"<imageobject> <imagedata format=\"png\" fileref=\"dx2-installUpdates.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
@@ -2681,62 +2843,76 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:20
+#: en/installUpdates.xml:25
+#, fuzzy
 msgid ""
-"Since this version of <application>Mageia</application> was released, some "
-"packages will have been updated or improved."
+"Since this version of Mageia was released, some packages will have been "
+"updated or improved."
 msgstr ""
 "Со времени выпуска этой версии <application>Mageia</application> некоторые "
 "пакеты могли быть обновлены или улучшены."
 
-#. type: Content of: <section><para>
-#: en/installUpdates.xml:24
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:30
 msgid ""
-"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
-"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
+"Select <emphasis>Yes</emphasis> if you wish to download and install them"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:35
+#, fuzzy
+msgid ""
+"Select <emphasis>No</emphasis> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "Нажмите кнопку <guilabel>Да</guilabel>, если вы хотите загрузить и "
 "установить эти пакеты, или выберите <guilabel>Нет</guilabel>, если вы не "
 "хотите делать этого сейчас, или ваш компьютер не подключен к интернету."
 
-#. type: Content of: <section><para>
-#: en/installUpdates.xml:29
-msgid "Press <guibutton>Next</guibutton> to continue"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:40
+#, fuzzy
+msgid "Press <emphasis>Next</emphasis> to continue"
 msgstr ""
 "Как только выбор будет сделан, нажмите кнопку <guibutton>Далее</guibutton>, "
 "чтобы продолжить работу с программой."
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:1
-msgid "Login screen"
+#: en/login.xml:4
+#, fuzzy
+msgid "Login Screen"
 msgstr "Окно логина"
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:1
+#: en/login.xml:7
+#, fuzzy
 msgid ""
-"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
-"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:1
-msgid "KDM login screen"
+#: en/login.xml:11
+#, fuzzy
+msgid "SDDM login screen"
 msgstr "Окно логина KDM"
 
 #. type: Content of: <section><para>
-#: en/login.xml:1
-msgid "Finally, you will come to the login screen."
+#: en/login.xml:14
+#, fuzzy
+msgid "Finally, you will come to the desktop login screen."
 msgstr "И, наконец, вы попадёте на экран логина."
 
 #. type: Content of: <section><para>
-#: en/login.xml:1
+#: en/login.xml:15
+#, fuzzy
 msgid ""
 "Enter your user name and user password, and in a few seconds you will find "
-"yourself with a loaded KDE or GNOME desktop, depending on which live medium "
-"you used. You can now start using your Mageia installation."
+"yourself with a loaded KDE Plasma or GNOME desktop, depending on which live "
+"medium you used. You can now start using and enjoying your Mageia "
+"installation."
 msgstr ""
 "Введите имя пользователя и пароль пользователя, и через несколько секунд вы "
 "окажетесь с загруженным рабочим столом KDE или GNOME, в зависимости от того, "
@@ -2744,36 +2920,38 @@ msgstr ""
 "вашу установку Mageia."
 
 #. type: Content of: <section><para>
-#: en/login.xml:3
+#: en/login.xml:16
+#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find further documentation in <link xmlns:ns0=\"http://www.w3."
+"org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 "Ещё больше информации доступно в <link ns4:href=\"https://wiki.mageia.org/en/"
 "Category:Documentation\">вики Mageia</link>."
 
 #. type: Content of: <section><info><title>
-#: en/media_selection.xml:3
-msgid "Media Selection (Nonfree)"
-msgstr "Выбор источника (Nonfree)"
+#: en/media_selection.xml:10
+msgid "Nonfree Media"
+msgstr ""
 
 #.  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-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
+#. 2019.01.05 apb: Changed Ati to AMD in Nonfree para.
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:15
+#: en/media_selection.xml:24
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
-"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
-"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:20
+#: en/media_selection.xml:30
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2786,7 +2964,7 @@ msgstr ""
 "пакетов будут доступны для выбора на последующих шагах."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:27
+#: en/media_selection.xml:37
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
@@ -2795,12 +2973,13 @@ msgstr ""
 "содержатся основные пакеты дистрибутива."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:32
+#: en/media_selection.xml:42
+#, fuzzy
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
 "software (hence the name - Nonfree). For example this repository includes "
-"nVidia and ATI graphics card proprietary drivers, firmware for various WiFi "
+"nVidia and AMD graphics card proprietary drivers, firmware for various WiFi "
 "cards, etc."
 msgstr ""
 "В репозиторий <emphasis>Nonfree</emphasis> включены пакеты, которые являются "
@@ -2810,7 +2989,7 @@ msgstr ""
 "графическим картам nVidia и ATI, прошивки для различных карт WiFi и т. п."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:40
+#: en/media_selection.xml:50
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
@@ -2833,32 +3012,14 @@ msgid "Minimal Install"
 msgstr "Минимальная установка"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:11
-msgid ""
-"You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
-msgstr ""
-"Вы можете выбрать «Минимальная установка» снятием отметок со всех пунктов в "
-"списке выбора групп пакетов см. <xref linkend=\"choosePackageGroups\"/>."
-
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:14
-msgid ""
-"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
-"package selection</emphasis> option in the same screen."
-msgstr ""
-"Если нужно, вы можете дополнительно обозначить пункт <emphasis role=\"bold"
-"\">Индивидуальный выбор пакетов</emphasis> на той же странице."
-
-#. type: Content of: <section><para>
 #: en/minimal-install.xml:17
+#, fuzzy
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"<application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the <emphasis "
-"role=\"bold\">Individual package selection</emphasis> option mentioned "
-"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
-"\"/>."
+"Mageia, such as a server or a specialised workstation. You will probably use "
+"this option combined with the <emphasis>Individual package selection</"
+"emphasis> option to fine-tune your installation. See <xref linkend="
+"\"choosePackagesTree\"/>."
 msgstr ""
 "Минимальный режим предназначен для тех, кто намерен использовать "
 "<application>Mageia</application> с какой-то узкоспециализированной целью, в "
@@ -2868,20 +3029,44 @@ msgstr ""
 "точной настройки списка установленных пакетов см. <xref linkend="
 "\"choosePackagesTree\"/>."
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:24
+#, fuzzy
 msgid ""
-"If you choose this installation method, then the relevant screen will offer "
-"you a few useful extras to install, such as documentation and X."
+"You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting "
+"everything in the <emphasis>Package Group Selection</emphasis> screen, see "
+"<xref linkend=\"choosePackageGroups\"/>."
+msgstr ""
+"Вы можете выбрать «Минимальная установка» снятием отметок со всех пунктов в "
+"списке выбора групп пакетов см. <xref linkend=\"choosePackageGroups\"/>."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:28
+#, fuzzy
+msgid ""
+"If desired, you can additionally tick the <emphasis>Individual package "
+"selection</emphasis> option in the same screen."
+msgstr ""
+"Если нужно, вы можете дополнительно обозначить пункт <emphasis role=\"bold"
+"\">Индивидуальный выбор пакетов</emphasis> на той же странице."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:33
+#, fuzzy
+msgid ""
+"If you choose this installation method, then the relevant screen (see "
+"screenshot below) will offer you a few useful extras to install, such as "
+"documentation and <quote>X</quote>."
 msgstr ""
 "Если вы выберете этот вариант установки, то на следующей странице программы "
 "вам будет предложено установить полезные дополнения системы, в частности "
 "документацию и графический сервер."
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:26
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:37
+#, fuzzy
 msgid ""
-"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"If the <emphasis>With X</emphasis> option is selected, then IceWM (a "
 "lightweight desktop environment) will also be included."
 msgstr ""
 "Если выбрать <emphasis role=\"bold\">Вместе с X</emphasis>, то к "
@@ -2889,13 +3074,14 @@ msgstr ""
 "среда)."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:42
+#, fuzzy
 msgid ""
-"The basic documentation is provided in the form of man and info pages.  It "
-"contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
-"manpages/man.html\">Linux Documentation Project</link> and the <link xlink:"
-"href=\"http://www.gnu.org/software/coreutils/manual/\">GNU coreutils</link> "
-"info pages."
+"The basic documentation is provided in the form of <quote>man</quote> and "
+"<quote>info</quote> pages. It contains the man pages from the <link xlink:"
+"href=\"http://www.tldp.org/manpages/man.html\">Linux Documentation Project</"
+"link> and the <link xlink:href=\"http://www.gnu.org/software/coreutils/"
+"manual/\">GNU coreutils</link> info pages."
 msgstr ""
 "Базовая документация предоставляется в формате страниц man и info. В ней "
 "содержатся страницы man с <link xlink:href=\"http://www.tldp.org/manpages/"
@@ -2904,7 +3090,7 @@ msgstr ""
 "link>."
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:35
+#: en/minimal-install.xml:48
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
 "\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
@@ -2916,24 +3102,33 @@ msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
-msgid "Summary of miscellaneous parameters"
-msgstr "Резюме относительно других параметров"
+#, fuzzy
+msgid "Configuration Summary"
+msgstr "Настройка звука"
 
 #.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
+#. 2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.
+#. 2018/02/22 apb: Changed list styles.
+#. 2018/02/23 apb: Updated dx2-summaryBottom.png
+#. 2018/02/24 apb: Changed list style
+#. 2018/02/24 apb: Centre-align dx2-summaryTop.png
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:10
+#: en/misc-params.xml:19
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:15
+#: en/misc-params.xml:24
+#, fuzzy
 msgid ""
 "DrakX presents a proposal for the configuration of your system depending on "
 "the choices you made and on the hardware detected. You can check the "
-"settings here and change them if you want by pressing <guibutton>Configure</"
-"guibutton>."
+"settings here and change them if you want by pressing <emphasis>Configure</"
+"emphasis>."
 msgstr ""
 "DrakX пытается правильно определить настройки вашей системы в соответствии "
 "со сделанным вами выбором и обнаруженным DrakX оборудованием. Вы можете "
@@ -2941,7 +3136,7 @@ msgstr ""
 "достаточно нажать кнопку <guibutton>Настроить</guibutton>."
 
 #. type: Content of: <section><note><para>
-#: en/misc-params.xml:21
+#: en/misc-params.xml:30
 msgid ""
 "As a general rule, it is recommended that you accept the default settings "
 "unless:"
@@ -2950,37 +3145,39 @@ msgstr ""
 "можете ничего не менять, кроме таких исключений:"
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
-#: en/misc-params.xml:24
+#: en/misc-params.xml:33
 msgid "there are known issues with a default setting"
 msgstr "известны определённые недостатки в параметрах по умолчанию;"
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
-#: en/misc-params.xml:28
+#: en/misc-params.xml:37
 msgid "the default setting has already been tried and it fails"
 msgstr "вы попытались с параметрами по умолчанию, и ничего не вышло;"
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
-#: en/misc-params.xml:32
-msgid ""
-"some other factor mentionned in the detailed sections below is an issue."
+#: en/misc-params.xml:41
+#, fuzzy
+msgid "some other factor mentioned in the detailed sections below is an issue"
 msgstr ""
 "в разделах с подробной информацией, приведённых ниже, утверждается, что "
 "следует выбрать нетипичные параметры."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:40
+#: en/misc-params.xml:49
 msgid "System parameters"
 msgstr "Параметры системы"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:45
-msgid "<guilabel>Timezone</guilabel>"
-msgstr "<guilabel>Часовой пояс</guilabel>"
+#: en/misc-params.xml:54
+#, fuzzy
+msgid "<emphasis role=\"bold\">Timezone</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:47
+#: en/misc-params.xml:56
+#, fuzzy
 msgid ""
-"DrakX selects a time zone for you, depending on your preferred language. You "
+"DrakX selects a timezone for you, depending on your preferred language. You "
 "can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 "DrakX выбирает часовой пояс на основе указанного вами желаемой языка. Если "
@@ -2988,12 +3185,13 @@ msgstr ""
 "\"configureTimezoneUTC\"/>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:53
-msgid "<guilabel>Country / Region</guilabel>"
-msgstr "<guilabel>Страна / Регион</guilabel>"
+#: en/misc-params.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Country / Region</emphasis>"
+msgstr "<emphasis role=\"bold\">Рабочая станция</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:56
+#: en/misc-params.xml:64
 msgid ""
 "If the selected country is wrong, it is very important that you correct the "
 "setting.  See <xref linkend=\"selectCountry\"/>"
@@ -3003,48 +3201,50 @@ msgstr ""
 "\"selectCountry\"/>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:62
-msgid "<guilabel>Bootloader</guilabel>"
-msgstr "<guilabel>Загрузчик</guilabel>"
+#: en/misc-params.xml:70
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:64
-msgid "DrakX has made good choices for the bootloader setting."
+#: en/misc-params.xml:72
+#, fuzzy
+msgid "DrakX proposal for the bootloader setting"
 msgstr "DrakX автоматически выбирает соответствующие параметры загрузчика."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
-msgid "Do not change anything, unless you know how to configure GRUB2"
+#: en/misc-params.xml:75
+#, fuzzy
+msgid ""
+"Do not change anything, unless you know how to configure GRUB2. For more "
+"information, see <xref linkend=\"setupBootloader\"/>"
 msgstr ""
 "Не вносите никаких изменений, если вы не являетесь знатоком с настройки GRUB2"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:70
-msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
-msgstr ""
-"Чтобы узнать больше, обратитесь к разделу <xref linkend=\"setupBootloader\"/>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
-msgid "<guilabel>User management</guilabel>"
-msgstr "<guilabel>Управление учетными записями</guilabel>"
+#: en/misc-params.xml:83
+#, fuzzy
+msgid "<emphasis role=\"bold\">User management</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:78
+#: en/misc-params.xml:85
+#, fuzzy
 msgid ""
-"You can add extra users here. They will each get their own <literal>/home</"
-"literal> directories."
+"You can add extra users here. They will each be allocated their own "
+"<filename>/home</filename> directories."
 msgstr ""
 "С помощью этой страницы вы можете добавить учетные записи пользователей. У "
 "каждого пользователя будет свой ​​каталог <literal>/home</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:84
-msgid "<guilabel>Services</guilabel>:"
-msgstr "<guilabel>Службы</guilabel>:"
+#: en/misc-params.xml:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Services</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:86
+#: en/misc-params.xml:93
 msgid ""
 "System services refer to those small programs which run in the background "
 "(daemons).  This tool allows you to enable or disable certain processes."
@@ -3054,33 +3254,29 @@ msgstr ""
 "включить или выключить некоторые из этих служб."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:90
+#: en/misc-params.xml:97
+#, fuzzy
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
-"prevent your computer from operating correctly."
+"prevent your computer from operating correctly. For more information, see "
+"<xref linkend=\"configureServices\"/>"
 msgstr ""
 "Вам следует быть осторожными в выборе: ошибки могут привести к ухудшению "
 "работы компьютера."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:94
-msgid "For more information, see <xref linkend=\"configureServices\"/>"
-msgstr ""
-"Чтобы узнать больше, обратитесь к разделу <xref linkend=\"configureServices"
-"\"/>."
-
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:101
+#: en/misc-params.xml:106
 msgid "Hardware parameters"
 msgstr "Параметры оборудования"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:106
-msgid "<guilabel>Keyboard</guilabel>:"
-msgstr "<guilabel>Клавиатура</guilabel>:"
+#: en/misc-params.xml:111
+#, fuzzy
+msgid "<emphasis role=\"bold\">Keyboard</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:108
+#: en/misc-params.xml:113
 msgid ""
 "Configure your keyboard layout according to your location, language and type "
 "of keyboard."
@@ -3090,7 +3286,7 @@ msgstr ""
 "языка и типа клавиатуры."
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:118
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
@@ -3100,12 +3296,13 @@ msgstr ""
 "текст вашего пароля."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
-msgid "<guilabel>Mouse</guilabel>:"
-msgstr "<guilabel>Мышь</guilabel>:"
+#: en/misc-params.xml:124
+#, fuzzy
+msgid "<emphasis role=\"bold\">Mouse</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:126
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -3114,43 +3311,43 @@ msgstr ""
 "шаровые манипуляторы и т.д."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
-msgid "<guilabel>Sound card</guilabel>:"
-msgstr "<guilabel>Звуковая плата</guilabel>:"
+#: en/misc-params.xml:131
+#, fuzzy
+msgid "<emphasis role=\"bold\">Sound card</emphasis>"
+msgstr "<emphasis role=\"bold\">Дополнительно</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:133
+msgid "The installer will use the default driver if one is available."
+msgstr ""
+
+#. type: Content of: <section><section><para>
+#: en/misc-params.xml:136 en/soundConfig.xml:46
 msgid ""
-"The installer uses the default driver - if there is a default one. The "
-"option to select a different driver is only given when there is more than "
-"one driver for your card, but where none of them is the default one."
+"If there is no actual default driver for your sound card, there may be other "
+"possible alternative drivers available to choose from. If this is the case, "
+"but you think the installer has not made the most appropriate choice, you "
+"can click on <emphasis>Advanced</emphasis> to manually specify a driver."
 msgstr ""
-"Средством установки будет использован типичный драйвер, если такой типичный "
-"драйвер предусмотрен. Возможность выбора другого драйвера будет "
-"предоставлена, только если для карточки предусмотрено несколько драйверов, "
-"но ни один из них не является типичным."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:137
-msgid "<guilabel>Graphical interface</guilabel>:"
-msgstr "<guilabel>Графический интерфейс</guilabel>:"
+#: en/misc-params.xml:144
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical interface</emphasis>"
+msgstr "<emphasis role=\"bold\">Графическая среда</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:140
-msgid "This section allows you to configure your graphic card(s) and displays."
+#: en/misc-params.xml:146
+#, fuzzy
+msgid ""
+"This section allows you to configure your graphics card(s) and displays. For "
+"more information, see <xref linkend=\"configureX_chooser\"/>"
 msgstr ""
 "С помощью этого раздела вы можете настроить параметры работы ваших "
 "графических карт и дисплеев."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:143
-msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
-msgstr ""
-"Чтобы узнать больше, обратитесь к разделу <xref linkend=\"configureX_chooser"
-"\"/>."
-
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:149
+#: en/misc-params.xml:155
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -3159,21 +3356,23 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:157
+#: en/misc-params.xml:163
 msgid "Network and Internet parameters"
 msgstr "Параметры сети и Интернета"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
-msgid "<guilabel>Network</guilabel>:"
-msgstr "<guilabel>Сеть</guilabel>:"
+#: en/misc-params.xml:169
+#, fuzzy
+msgid "<emphasis role=\"bold\">Network</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:165
+#: en/misc-params.xml:171
+#, fuzzy
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, using the <application>Mageia "
-"Control Center</application>, if you have not yet enabled the Nonfree media "
+"drivers it is better to do that after reboot, using the Mageia Control "
+"Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media "
 "repositories."
 msgstr ""
 "Этот раздел предоставит вам возможность настроить сеть. Впрочем, если вы "
@@ -3183,7 +3382,7 @@ msgstr ""
 "пакетов."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:172
+#: en/misc-params.xml:178
 msgid ""
 "When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
@@ -3192,15 +3391,17 @@ msgstr ""
 "(сетевой экран), который будет следить за соответствующим интерфейсом."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
-msgid "<guilabel>Proxies</guilabel>:"
-msgstr "<guilabel>Прокси</guilabel>:"
+#: en/misc-params.xml:185
+#, fuzzy
+msgid "<emphasis role=\"bold\">Proxies</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:181
+#: en/misc-params.xml:187
+#, fuzzy
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
-"internet.  This section allows you to configure your computer to utilize a "
+"Internet.  This section allows you to configure your computer to utilize a "
 "proxy service."
 msgstr ""
 "Прокси-сервер является промежуточным звеном между компьютером и интернетом. "
@@ -3208,71 +3409,76 @@ msgstr ""
 "прокси-сервера."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:186
+#: en/misc-params.xml:192
+#, fuzzy
 msgid ""
-"You may need to consult your systems administrator to get the parameters you "
-"need to enter here."
+"You may need to consult your systems administrator to obtain the parameters "
+"you need to enter here."
 msgstr ""
 "Вам стоит посоветоваться с вашим системным администратором, чтобы узнать "
 "больше о значении параметров, которые следует указать в этом разделе."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:195
+#: en/misc-params.xml:201
 msgid "Security"
 msgstr "Безопасность"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:200
-msgid "<guilabel>Security Level</guilabel>:"
-msgstr "<guilabel>Уровень безопасности</guilabel>:"
+#: en/misc-params.xml:206
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Level</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:203
+#: en/misc-params.xml:208
+#, fuzzy
 msgid ""
-"Here you set the Security level for your computer, in most cases the default "
-"setting (Standard) is adequate for general use."
+"The Security level for your computer, in most cases the default setting "
+"(Standard)  is adequate for general use. Select the option which best suits "
+"your usage."
 msgstr ""
 "С помощью этого раздела вы можете определить уровень защиты вашего "
 "компьютера. В основном, дефолтный вариант (Стандартный) предоставит вашему "
 "компьютеру достаточную защиту."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:207
-msgid "Check the option which best suits your usage."
-msgstr ""
-"Выберите тот из вариантов, который лучше всего соответствует вашему образу "
-"использования системы."
+#: en/misc-params.xml:215
+#, fuzzy
+msgid "<emphasis role=\"bold\">Firewall</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
-msgid "<guilabel>Firewall</guilabel>:"
-msgstr "<guilabel>Файервол</guilabel>:"
+#: en/misc-params.xml:217
+msgid ""
+"The firewall allows you to manage which network connections are allowed on "
+"your computer. The safe and secure default is to allow ZERO inbound "
+"connections. This does not stop you connecting outbound and using your "
+"computer normally."
+msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:214
+#: en/misc-params.xml:223
 msgid ""
-"A firewall is intended to be a barrier between your important data and the "
-"rascals out there on the internet who would compromise or steal it."
+"Please be aware that the Internet is a high risk network where there are "
+"continuous attempts to probe and attack systems. Even seemingly <quote>safe</"
+"quote> connections such as ICMP (for ping) have been used as covert data "
+"channels for exfiltrating data by malicious persons."
 msgstr ""
-"Файервол или сетевой экран является барьером, который защищает важные данные "
-"от доступа к ним мошенников из интернета, пытающихся похитить и "
-"воспользоваться этими данными."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:218
-msgid ""
-"Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for. For more "
-"information, see <xref linkend=\"firewall\"/>."
+#: en/misc-params.xml:229
+#, fuzzy
+msgid "For more information, see <xref linkend=\"firewall\"/>."
 msgstr ""
-"Выберите службы, каким должен быть разрешён доступ к вашей системе. Выбор "
-"служб будет зависеть от назначения компьютера, на котором работает "
-"операционная система. Подробнее об этом в разделе <xref linkend=\"firewall\"/"
-">."
+"Чтобы узнать больше, обратитесь к разделу <xref linkend=\"configureX_chooser"
+"\"/>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:224
-msgid "Bear in mind that allowing everything (no firewall) may be very risky."
+#: en/misc-params.xml:232
+#, fuzzy
+msgid ""
+"Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may "
+"be very risky."
 msgstr ""
 "Помните, что включение доступа без ограничений (выключение файервола) может "
 "значительно снизить уровень защиты вашей системы."
@@ -3283,12 +3489,11 @@ msgid "Reboot"
 msgstr "Перезагрузка"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:6
+#: en/reboot.xml:7
+#, fuzzy
 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>"
+"computer, remove the live DVD/USB stick and restart the computer."
 msgstr ""
 "После установки загрузчика программа попросит вас прервать работу системы, "
 "вынуть из лотка компакт-диск, отсоединить от компьютера флешку и "
@@ -3296,17 +3501,33 @@ msgstr ""
 "\"><guibutton>Завершить</guibutton></emphasis> и выполните именно эти "
 "действия <emphasis role=\"bold\"> в указанном порядке </emphasis>."
 
+#. type: Content of: <section><important><simpara>
+#: en/reboot.xml:9
+msgid ""
+"Ensure that you follow these shut-down and restart instruction steps in the "
+"<emphasis role=\"bold\">same</emphasis> order."
+msgstr ""
+
 #. type: Content of: <section><mediaobject>
-#: en/reboot.xml:11
-msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+#: en/reboot.xml:12
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot2.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
 
-#. type: Content of: <section><para>
-#: en/reboot.xml:15
+#. type: Content of: <section><simpara>
+#: en/reboot.xml:16
+msgid "When you are ready, press <emphasis>Finish</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><simpara>
+#: en/reboot.xml:17
+#, fuzzy
 msgid ""
 "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)."
+"indicate that the software media lists are being downloaded (see "
+"<emphasis>Software Management</emphasis>)."
 msgstr ""
 "После перезагрузки вы увидите информацию о получении данных на полосе "
 "прогресса. Данные этих полос соответствуют процессу получения данных "
@@ -3314,7 +3535,7 @@ msgstr ""
 "обеспечением»)."
 
 #. type: Content of: <section><mediaobject>
-#: en/reboot.xml:17
+#: en/reboot.xml:19
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
 "reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -3344,35 +3565,43 @@ msgstr ""
 "<application>Mageia</application>."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:3
+#: en/securityLevel.xml:10
 msgid "Security Level"
 msgstr "Уровень безопасности"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml" 
 #.  2013-05-05 marja - added screenshot 
+#. 2018/02/12 apb: Minor wording.
 #. type: Content of: <section><mediaobject>
-#: en/securityLevel.xml:11
+#: en/securityLevel.xml:20
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
-"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-securityLevel.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"securityLevel-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
-"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:16
+#: en/securityLevel.xml:26
 msgid ""
 "<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Пожалуйста, выберите уровень безопасности</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:19
+#: en/securityLevel.xml:29
 msgid ""
-"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
-"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
-"setting will create a highly protected system - for instance if the system "
-"is to be used as a public server."
+"<emphasis>Standard</emphasis> is the default, and recommended setting for "
+"the average user."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:32
+#, fuzzy
+msgid ""
+"<emphasis>Secure</emphasis> will create a highly protected system - for "
+"instance if the system is to be used as a public server."
 msgstr ""
 "<emphasis role=\"bold\">Standard (Стандартный)</emphasis> - типичный "
 "уровень, который мы рекомендуем рядовому пользователю. С помощью варианта "
@@ -3381,12 +3610,12 @@ msgstr ""
 "сервера."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:24
+#: en/securityLevel.xml:36
 msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
 msgstr "<emphasis role=\"bold\">Администратор безопасности</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:26
+#: en/securityLevel.xml:38
 msgid ""
 "This item allows you to configure an email address to which the system will "
 "send <emphasis>security alert messages</emphasis> when it detects situations "
@@ -3397,17 +3626,18 @@ msgstr ""
 "emphasis>, если обнаружит проблемы, требующие уведомления администратора."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:31
+#: en/securityLevel.xml:43
+#, fuzzy
 msgid ""
-"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
-"where &lt;user> is the login name of the user to receive these messages."
+"A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost - "
+"where &lt;user&gt; is the login name of the user to receive these messages."
 msgstr ""
 "Неплохим, простым в реализации вариантом является введение строки &lt;"
 "пользователь>@localhost, где &lt;пользователь> - название учётной записи "
 "пользователя, который будет получать эти сообщения."
 
 #. type: Content of: <section><note><para>
-#: en/securityLevel.xml:36
+#: en/securityLevel.xml:48
 msgid ""
 "The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
 "messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
@@ -3418,26 +3648,27 @@ msgstr ""
 "пользователя следует должным образом настроить для получения таких сообщений!"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:41
+#: en/securityLevel.xml:53
+#, fuzzy
 msgid ""
-"After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
+"It will always be possible to adjust your security settings post-install in "
+"the <emphasis>Security</emphasis> section of the Mageia Control Center."
 msgstr ""
 "После установки вы всегда сможете изменить параметры защиты с помощью модуля "
 "<guilabel>Безопасность</guilabel> Центра управления Mageia."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:6
+#: en/SelectAndUseISOs2.xml:15
 msgid "Select and use ISOs"
 msgstr "Выбор и использование образов ISO"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:18
 msgid "Introduction"
 msgstr "Введение"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:10
+#: en/SelectAndUseISOs2.xml:19
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image best suits your needs."
@@ -3447,16 +3678,19 @@ msgstr ""
 "потребностям."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:12
-msgid "There are two families of media:"
+#: en/SelectAndUseISOs2.xml:21
+#, fuzzy
+msgid "There are three types of installation media:"
 msgstr "Существует два семейства носителей дистрибутива:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:15
+#: en/SelectAndUseISOs2.xml:24
+#, fuzzy
 msgid ""
-"Classical installer: Booting with this media provides you with the maximum "
-"flexibility when choosing what to install, and for configuring your system. "
-"In particular, you have a choice of which Desktop environment to install"
+"<emphasis role=\"bold\">Classical installer:</emphasis> Booting with this "
+"media provides you with the maximum flexibility when choosing what to "
+"install, and for configuring your system. In particular, you have a choice "
+"of which Desktop environment to install."
 msgstr ""
 "Классический способ установки: после загрузки с носителя системы, будет "
 "начата процедура, в ходе которой вы сможете выбрать компоненты для установки "
@@ -3465,12 +3699,14 @@ msgstr ""
 "рабочую среду, какой бы вы хотели пользоваться."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:21
+#: en/SelectAndUseISOs2.xml:31
+#, fuzzy
 msgid ""
-"LIVE media: This option allows you to try out Mageia without having to "
-"actually install it, or make any changes to your computer.  If the "
-"installation is decided, the process is simpler, but you get fewer choices "
-"than offered by the Classical installer"
+"<emphasis role=\"bold\">LIVE media:</emphasis> This option allows you to try "
+"out Mageia without having to actually install it, or make any changes to "
+"your computer. However, the Live media also includes an Installer, which can "
+"be started when booting the media, or after booting into the Live operating "
+"system itself."
 msgstr ""
 "Носитель портативной LIVE системы: этот вариант даст вам возможность "
 "попробовать Mageia без установки на диск и внесения изменений в систему "
@@ -3478,34 +3714,82 @@ msgstr ""
 "носителя, процесс установки будет проще, но у вас будет узкий выбор, по "
 "сравнению с классическим носителем."
 
+#. type: Content of: <section><section><itemizedlist><listitem><note><para>
+#: en/SelectAndUseISOs2.xml:37
+msgid ""
+"The Live Installer is simpler compared to the Classical Installer - but you "
+"have fewer configuration options."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><important><para>
+#: en/SelectAndUseISOs2.xml:41
+#, fuzzy
+msgid ""
+"Live ISOs can only be used to create <quote>clean</quote> installations, "
+"they cannot be used to upgrade previously installed Mageia releases."
+msgstr ""
+"<emphasis role=\"bold\">Образами ISO портативных систем можно "
+"воспользоваться только для установки системы «с нуля». Они непригодны для "
+"обновления системы из предыдущих выпусков.</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:47
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Net Install</emphasis>: These are minimal ISO's "
+"containing no more than that which is needed to start the DrakX installer "
+"and find <literal>DrakX-installer-stage2</literal> and other packages that "
+"are needed to continue and complete the install. These packages may be on "
+"the PC hard disk, on a local drive, on a local network or on the Internet."
+msgstr ""
+"Каждый из таких малых образов содержит данные, необходимые для запуска "
+"средства установки drakx и поиска drakx-installer-stage2 и других пакетов, с "
+"помощью которых можно продолжить и завершить установку. Такие пакеты могут "
+"храниться на жёстком диске компьютера, локальном диске, в локальной сети или "
+"в интернете."
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:53
+msgid ""
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
+msgstr ""
+"Такие носители очень маленькие (менее 100 МБ). Ими удобно пользоваться, если "
+"канал связи в сети слишком узкий для получения полноценного образа DVD, на "
+"компьютерах без устройства для чтения DVD или на компьютерах, которые не "
+"могут загружать систему с флэш-диска USB."
+
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:27
-msgid "Details are given in the next sections."
+#: en/SelectAndUseISOs2.xml:58
+#, fuzzy
+msgid "More details are given in the next sections."
 msgstr "Подробности приведены в следующих разделах."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:30
+#: en/SelectAndUseISOs2.xml:61
 msgid "Media"
 msgstr "Носитель"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:32
+#: en/SelectAndUseISOs2.xml:63
 msgid "Definition"
 msgstr "Определение"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:64
+#, fuzzy
 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 (DVD, USB "
-"stick, ...) the ISO file is copied to."
+"install and/or update Mageia and, by extension, any physical medium (DVD, "
+"USB stick, ...) the ISO file is copied to."
 msgstr ""
 "Здесь мы называем носителем данных файл образа ISO, с помощью которого можно "
 "установить и/или обновить Mageia, а также любой физический носитель, где "
 "хранятся данные файла ISO."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:36
+#: en/SelectAndUseISOs2.xml:67
 msgid ""
 "You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
 "downloads/\">here</link>."
@@ -3514,228 +3798,210 @@ msgstr ""
 "downloads/\">здесь</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:70
 msgid "Classical installation media"
 msgstr "Классический носитель для установки"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
-#: en/SelectAndUseISOs2.xml:141
+#: en/SelectAndUseISOs2.xml:72 en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:171
 msgid "Common features"
 msgstr "Типичные возможности"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:44
-msgid "These ISOs use the Classical installer called drakx."
+#: en/SelectAndUseISOs2.xml:75
+#, fuzzy
+msgid "These ISOs use the Classical installer called DrakX"
 msgstr ""
 "На этих образах ISO используется традиционное средство установки под "
 "названием drakx."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:47
+#: en/SelectAndUseISOs2.xml:78
+#, fuzzy
 msgid ""
 "They are used for performing clean installs or to upgrade a previously "
-"installed version of Mageia."
+"installed version of Mageia"
 msgstr ""
 "Они пригодны для установки «с нуля» или обновления предыдущих выпусков "
 "Mageia."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
-#: en/SelectAndUseISOs2.xml:158
-msgid "Different media for 32 and 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:82 en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:174
+#, fuzzy
+msgid "Different media for 32 and 64-bit architectures"
 msgstr "Различные носители для 32-битной и 64-битной архитектур."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:54
+#: en/SelectAndUseISOs2.xml:85
+#, fuzzy
 msgid ""
-"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
-"Hardware Detection Tool."
+"Some tools are available in the Installer <quote>Welcome</quote> screen: "
+"<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware "
+"Detection Tool</emphasis>"
 msgstr ""
 "Доступ к некоторым из инструментов можно получить в экране приветствия: "
 "система восстановления, тест памяти, инструмент обнаружения оборудования."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:58
-msgid "Each DVD contains many available desktop environments and languages."
+#: en/SelectAndUseISOs2.xml:91
+#, fuzzy
+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:62
+#: en/SelectAndUseISOs2.xml:95
+#, fuzzy
 msgid ""
-"You'll be given the choice during the installation to add non free software."
+"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:69
+#: en/SelectAndUseISOs2.xml:102
 msgid "Live media"
 msgstr "Live носитель"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:74
+#: en/SelectAndUseISOs2.xml:107
+#, fuzzy
 msgid ""
 "Can be used to preview the Mageia operating system without having to install "
-"it. Can also be used to install Mageia if you wish."
+"it"
 msgstr ""
 "Можно воспользоваться для ознакомления с дистрибутивом без установки его на "
 "жёсткий диск. Впрочем, если хочется, с помощью этого носителя можно "
 "установить Mageia на ваш компьютер."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
-msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
-msgstr "Каждый ISO содержит лишь одну рабочую среду (Plasma, GNOME или Xfce)."
+#: en/SelectAndUseISOs2.xml:111
+msgid "The Live media also includes an Installer."
+msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:86
-msgid ""
-"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade previously installed Mageia "
-"releases.</emphasis>"
-msgstr ""
-"<emphasis role=\"bold\">Образами ISO портативных систем можно "
-"воспользоваться только для установки системы «с нуля». Они непригодны для "
-"обновления системы из предыдущих выпусков.</emphasis>"
+#: en/SelectAndUseISOs2.xml:114
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)"
+msgstr "Каждый ISO содержит лишь одну рабочую среду (Plasma, GNOME или Xfce)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:91
-msgid "They contain non free software."
+#: en/SelectAndUseISOs2.xml:121
+#, fuzzy
+msgid "They contain non-free software"
 msgstr "Они содержат несвободное программное обеспечение."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:96
+#: en/SelectAndUseISOs2.xml:126
 msgid "Live DVD Plasma"
 msgstr "Live DVD Plasma"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:99
-msgid "Plasma desktop environment only."
+#: en/SelectAndUseISOs2.xml:129
+#, fuzzy
+msgid "Plasma desktop environment only"
 msgstr "Только рабочая среда Plasma."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
-#: en/SelectAndUseISOs2.xml:130
-msgid "All available languages are present."
+#: en/SelectAndUseISOs2.xml:132 en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:160
+#, fuzzy
+msgid "All available languages are present"
 msgstr "Содержит переводы на всех языках."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:105
-msgid "64 bit architecture only."
-msgstr "Только для 64-битной архитектуры."
+#: en/SelectAndUseISOs2.xml:135 en/SelectAndUseISOs2.xml:149
+#, fuzzy
+msgid "64-bit architecture only"
+msgstr "Только для 64-битной архитектуры"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:110
+#: en/SelectAndUseISOs2.xml:140
 msgid "Live DVD GNOME"
 msgstr "Live DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:113
-msgid "GNOME desktop environment only."
+#: en/SelectAndUseISOs2.xml:143
+#, fuzzy
+msgid "GNOME desktop environment only"
 msgstr "Только рабочая среда GNOME."
 
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:119
-msgid "64 bit architecture only"
-msgstr "Только для 64-битной архитектуры"
-
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:154
 msgid "Live DVD Xfce"
 msgstr "Live DVD Xfce"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:127
-msgid "Xfce desktop environment only."
+#: en/SelectAndUseISOs2.xml:157
+#, fuzzy
+msgid "Xfce desktop environment only"
 msgstr "Только рабочая среда Xfce."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:133
-msgid "32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:163
+#, fuzzy
+msgid "32 or 64-bit architectures"
 msgstr "32-битная и 64-битная архитектуры."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:139
+#: en/SelectAndUseISOs2.xml:169
 msgid "Net install media"
 msgstr "Носитель для установки по сети"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:144
-msgid ""
-"These are minimal ISO's containing no more than that which is needed to "
-"start the drakx installer and find drakx-installer-stage2 and other packages "
-"that are needed to continue and complete the install. These packages may be "
-"on the PC hard disk, on a local drive, on a local network or on the Internet."
-msgstr ""
-"Каждый из таких малых образов содержит данные, необходимые для запуска "
-"средства установки drakx и поиска drakx-installer-stage2 и других пакетов, с "
-"помощью которых можно продолжить и завершить установку. Такие пакеты могут "
-"храниться на жёстком диске компьютера, локальном диске, в локальной сети или "
-"в интернете."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
-msgid ""
-"These media are very light (less than 100 MB) and are convenient if "
-"bandwidth is too low to download a full DVD, or if you have a PC without a "
-"DVD drive or is unable to boot from a USB stick."
-msgstr ""
-"Такие носители очень маленькие (менее 100 МБ). Ими удобно пользоваться, если "
-"канал связи в сети слишком узкий для получения полноценного образа DVD, на "
-"компьютерах без устройства для чтения DVD или на компьютерах, которые не "
-"могут загружать систему с флэш-диска USB."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:161
-msgid "First steps are English language only."
+#: en/SelectAndUseISOs2.xml:177
+#, fuzzy
+msgid "First steps are English language only"
 msgstr "Первые шаги только на английском языке."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:182
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:169
+#: en/SelectAndUseISOs2.xml:185
+#, fuzzy
 msgid ""
-"Contains only free software, for those people who prefer not to use non-free "
-"software."
+"Contains only free software, for those who prefer to not use non-free "
+"software"
 msgstr ""
 "Содержит только свободное программное обеспечение. Предназначено для "
 "пользователей, которые не хотят пользоваться несвободными пакетами."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:175
+#: en/SelectAndUseISOs2.xml:191
 msgid "netinstall-nonfree.iso"
 msgstr "netinstall-nonfree.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:194
+#, fuzzy
 msgid ""
-"Contains non-free software (mostly drivers, codecs...) for people who need "
-"it."
+"Contains non-free software (mostly drivers, codecs...) for those who need it"
 msgstr ""
 "Содержит несвободное ПО (в основном драйверы, кодеки и т.д.). Предназначен "
 "для тех, кто нуждается в этих компонентах системы."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:186
+#: en/SelectAndUseISOs2.xml:202
 msgid "Downloading and Checking Media"
 msgstr "Загрузка и проверка носителя данных"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:204
 msgid "Downloading"
 msgstr "Загрузка"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:189
+#: en/SelectAndUseISOs2.xml:205
+#, fuzzy
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
 "BitTorrent. In both cases, you are provided with some information, such as "
-"the mirror in use and an option to switch if the bandwidth is too low. If "
-"http is chosen, you will also see something regarding checksums."
+"the mirror in use and an option to switch to an alternative if the bandwidth "
+"is too low."
 msgstr ""
 "Как только вами будет выбран нужный вам файл ISO, вы можете скачать его или "
 "с помощью протокола http, или с помощью BitTorrent. В обоих случаях в окне "
@@ -3743,47 +4009,63 @@ msgstr ""
 "предоставлена возможность изменить его, если скорость получения данных "
 "слишком мала. Если будет выбрано http, вы увидите что-то такое:"
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:209
+msgid ""
+"If http is chosen you will also see some information regarding checksums."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:212
+msgid ""
+"<literal>md5sum</literal>, <literal>sha1sum</literal> and "
+"<literal>sha512sum</literal> (the most secure) are tools to check the ISO "
+"integrity. Copy one of the checksums (string of alphanumeric characters) for "
+"use in the next section."
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:191
-msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:217
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Checking.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:195
-msgid ""
-"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
-"other, and copy the checksum <link linkend=\"integrity\">for later use</"
-"link>. Then a window similar to this one appears:"
+#: en/SelectAndUseISOs2.xml:222
+msgid "In the meantime, a window to download the actual ISO will open:"
 msgstr ""
-"md5sum и sha1sum - программы для проверки целостности данных в образах ISO. "
-"Для выполнения проверки достаточно установить только одну из этих программ. "
-"Для дальнейшего использования установите одну из них. Далее, будет показано "
-"такое окно:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:199
-msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:225
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Download.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:203
-msgid "Select the Save File option, then, click OK."
-msgstr "Выберите пункт «Сохранить файл», затем нажмите кнопку «OK»."
+#: en/SelectAndUseISOs2.xml:229
+msgid ""
+"Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>."
+msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
+#: en/SelectAndUseISOs2.xml:233
 msgid "Checking the integrity of the downloaded media"
 msgstr "Проверка целостности полученных данных образа"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:208
+#: en/SelectAndUseISOs2.xml:235
+#, fuzzy
 msgid ""
 "The checksums referred to earlier, are digital fingerprints generated by an "
 "algorithm from the file to be downloaded. You may compare the checksum of "
 "your downloaded ISO against that of the original source ISO. If the "
 "checksums do not match, it means that the actual data on the ISO's do not "
-"match, and if it is the case, then you should retry the download or attempt "
-"a repair using BitTorrent."
+"match, and if that is the case, then you should retry the download or "
+"attempt a repair using BitTorrent."
 msgstr ""
 "Оба шестнадцатеричных числа вычислены с помощью определённого алгоритма на "
 "основе файла, который должен быть получен. Если вы попросите соответствующую "
@@ -3794,7 +4076,7 @@ msgstr ""
 "загрузку образа или попытаться восстановить его с помощью BitTorrent."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#: en/SelectAndUseISOs2.xml:241
 msgid ""
 "To generate the checksum for your downloaded ISO, open a console, (no need "
 "to be root), and:"
@@ -3803,67 +4085,81 @@ msgstr ""
 "(от имени обычного пользователя) и выполните следующую команду:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:245
+#, fuzzy
 msgid ""
-"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
-"userinput>."
+"To use the md5sum, type: <command>md5sum path/to/the/image/file.iso</command>"
 msgstr "Если используется md5sum: md5sum путь/к/файлу/образу.iso."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:249
+#, fuzzy
 msgid ""
-"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
-"userinput>"
+"To use the sha1sum, type: <command>sha1sum path/to/the/image/file.iso</"
+"command>"
+msgstr "Если используется sha1sum: sha1sum путь/к/файлу/образу.iso."
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:254
+#, fuzzy
+msgid ""
+"To use the sha512sum, type: <command>sha512sum path/to/the/image/file.iso</"
+"command>"
 msgstr "Если используется sha1sum: sha1sum путь/к/файлу/образу.iso."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:226
+#: en/SelectAndUseISOs2.xml:258
 msgid "Example:"
 msgstr "Например:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:228
-msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:260
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Md5sum.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:265
+#, fuzzy
 msgid ""
-"and compare the result (you may have to wait for a while) with the checksum "
-"provided by Mageia."
+"then compare the result (you may have to wait for a while) with the ISO "
+"checksum provided by Mageia."
 msgstr ""
 "и сравните полученное числовое значение (для его получения понадобится "
 "определённое время) с числом, указанным на странице Mageia."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:237
+#: en/SelectAndUseISOs2.xml:270
 msgid "Burn or dump the ISO"
 msgstr "Запись образа ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:238
+#: en/SelectAndUseISOs2.xml:271
+#, fuzzy
 msgid ""
-"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
-"This is not a standard copy operation as a bootable medium will actually be "
-"created."
+"The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a "
+"USB stick. This is not a standard copy operation, as a bootable medium will "
+"actually be created."
 msgstr ""
 "Проверенный образ ISO можно записать на компакт-диск, DVD или флешку USB. "
 "Действие по записи не является простым копированием, - оно предназначено для "
 "создания загрузочной системы носителя данных."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:275
 msgid "Burning the ISO to a CD/DVD"
 msgstr "Записать ISO на CD/DVD"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:243
+#: en/SelectAndUseISOs2.xml:276
+#, fuzzy
 msgid ""
-"Whichever software you use, ensure that the option to burn an <emphasis role="
-"\"bold\">image</emphasis> is used, burn <emphasis role=\"bold\">data</"
-"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. See "
-"<link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images\">the "
-"Mageia wiki</link> for more information."
+"Whichever software you use, ensure that the option to burn an<emphasis> "
+"image</emphasis> is used. Burn <emphasis>data</emphasis> or <emphasis>files</"
+"emphasis> is NOT correct. See the <link ns4:href=\"https://wiki.mageia.org/"
+"en/Writing_CD_and_DVD_images\">the Mageia wiki</link> for more information."
 msgstr ""
 "Воспользуйтесь любым устройством для записи, но его необходимо настроить на "
 "<emphasis role=\"bold\">запись образа</emphasis>. Просто записать данные или "
@@ -3871,46 +4167,54 @@ msgstr ""
 "\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images\">вики Mageia</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:282
 msgid "Dump the ISO to a USB stick"
 msgstr "Запись образа ISO на USB флешку"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:283
+#, fuzzy
 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."
+"All Mageia ISOs are hybrids, which means you can dump them to a USB stick "
+"and then use that to boot and install the system."
 msgstr ""
 "Все образы ISO Mageia являются гибридными, т.е. вы можете записывать их на "
 "USB флешку и пользоваться ею для загрузки и установки системы."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:286
+#, fuzzy
 msgid ""
-"\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any existing data will be lost and the partition capacity "
-"will be reduced to the image size."
+"Dumping an image onto a flash device destroys any previous file-system on "
+"the device and all existing data will be lost."
 msgstr ""
 "В результате «записи» образа на диск USB (флешку) все данные файловой "
 "системы на ней будут уничтожены. Доступ ко всем данным, которые не будут "
 "уничтожены, будет потерян. Размер диска будет уменьшен на размер образа."
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:256
+#. type: Content of: <section><section><section><note><para>
+#: en/SelectAndUseISOs2.xml:290
 msgid ""
-"To recover the original capacity, you must redo partitioning and re-format "
-"the USB stick."
+"Also, the only partition on the flash device will then just be the Mageia "
+"ISO partition."
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/SelectAndUseISOs2.xml:292
+msgid ""
+"So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will "
+"then only show up as 4GB. This is because the remaining 4GB is no longer "
+"formatted - hence not currently available for use. To recover the original "
+"capacity, you must reformat and repartition the USB stick."
 msgstr ""
-"Для восстановления первоначальной ёмкости диска USB вам впоследствии "
-"придётся его форматировать."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:299
 msgid "Using a graphical tool within Mageia"
 msgstr "Использование графического инструмента внутри Mageia"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#: en/SelectAndUseISOs2.xml:300
 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>"
@@ -3920,26 +4224,27 @@ msgstr ""
 "IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:263
+#: en/SelectAndUseISOs2.xml:303
 msgid "Using a graphical tool within Windows"
 msgstr "Использование графического инструмента внутри Windows"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:304
 msgid "You could try:"
 msgstr "Вы можете попробовать:"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:267
+#: en/SelectAndUseISOs2.xml:307
+#, fuzzy
 msgid ""
 "<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
-"\"ISO image\" option;"
+"\"ISO image\" option"
 msgstr ""
 "<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> с помощью "
 "пункта «ISO image» («ISO-образ»);"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:271
+#: en/SelectAndUseISOs2.xml:311
 msgid ""
 "<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
@@ -3948,12 +4253,13 @@ msgstr ""
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:277
-msgid "Using Command line within a GNU/Linux system"
+#: en/SelectAndUseISOs2.xml:317
+#, fuzzy
+msgid "Using the Command line within a GNU/Linux system"
 msgstr "Использование командной строки внутри системы GNU/Linux"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:279
+#: en/SelectAndUseISOs2.xml:319
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk overwriting "
 "potentially valuable existing data if you specify the wrong target device."
@@ -3962,61 +4268,72 @@ msgstr ""
 "диске, если укажете ложный идентификатор устройства."
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:325
 msgid "Open a console"
 msgstr "Откройте окно консоли"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:328
+#, fuzzy
 msgid ""
-"Become a root (Administrator) user with the command <userinput>su -</"
-"userinput> (don't forget the final '-' )"
+"Become a <emphasis>root</emphasis> (Administrator) user with the command "
+"<command>su -</command> (don't forget the <command>-</command> )"
 msgstr ""
 "Получите права пользователя root (администратора) с помощью команды "
 "<userinput>su -</userinput> (не забудьте \"-\" в конце команды)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
-msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:332
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Root.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:297
+#: en/SelectAndUseISOs2.xml:338
+#, fuzzy
 msgid ""
-"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)"
+"Plug in your USB stick - but do not mount it (this also means do not open "
+"any application or file manager that could access or read it)"
 msgstr ""
 "Соедините с компьютером ваш диск USB (не монтируйте его, т.е. не открывайте "
 "содержимое диска в любой программе, в частности в программе для управления "
 "файлами)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:302
-msgid "Enter the command <userinput>fdisk -l</userinput>"
+#: en/SelectAndUseISOs2.xml:343
+#, fuzzy
+msgid "Enter the command <command>fdisk -l</command>"
 msgstr "Введите команду <userinput>fdisk -l</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
-msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:345
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Fdisk.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:310
+#: en/SelectAndUseISOs2.xml:351
+#, fuzzy
 msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is an 8GB USB stick."
+"Find the device name for your USB stick (by its size), for example "
+"<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick."
 msgstr ""
 "Название устройства можно определить по размеру. Например, на приведённом "
 "выше снимке <code>/dev/sdb</code> - это устройство ёмкостью 8 ГБ, то есть "
 "флешка USB."
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:354
+#, fuzzy
 msgid ""
-"Alternatively, you can find the device name with the command <code>dmesg</"
-"code>: towards the end of this example, you can see the device name starting "
-"with <emphasis>sd</emphasis>, and in this case, <emphasis>sdd</emphasis> is "
-"the actual device. You can also see that its size is 2GB:"
+"Alternatively, you can find the device name with the command <command>dmesg</"
+"command>. Towards the end of the following example, you can see the device "
+"name starting with <filename>sd</filename>, and in this case, <filename>sdd</"
+"filename> is the actual device. You can also see that its size is 2GB:"
 msgstr ""
 "Кроме того, определить название устройства можно с помощью команды "
 "<code>dmesg</code>: в конце выведенных ею данных будет указано название "
@@ -4025,7 +4342,7 @@ msgstr ""
 "что его размер составляет 2 ГБ:"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
-#: en/SelectAndUseISOs2.xml:317
+#: en/SelectAndUseISOs2.xml:360
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -4067,40 +4384,47 @@ 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:317
+#: en/SelectAndUseISOs2.xml:360
 msgid "<placeholder type=\"screen\" id=\"0\"/>"
 msgstr "<placeholder type=\"screen\" id=\"0\"/>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:337
+#: en/SelectAndUseISOs2.xml:380
+#, fuzzy
 msgid ""
-"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
-"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
+"Enter the command: <command>dd if=path/to/the/ISO/file of=/dev/"
+"sd<replaceable>X</replaceable> bs=1M</command>"
 msgstr ""
 "Введите следующую команду: <userinput># <userinput>dd if=/путь/к/файлу/ISO "
 "of=/dev/sdX bs=1M</userinput></userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:340
-msgid "Where X=your device name eg: /dev/sdd"
+#: en/SelectAndUseISOs2.xml:382
+#, fuzzy
+msgid ""
+"Where <replaceable>X</replaceable>=your device name eg: <filename>/dev/sdd</"
+"filename>"
 msgstr "где X - название нужного вам устройства. Пример: /dev/sdd"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:341
+#: en/SelectAndUseISOs2.xml:384
+#, fuzzy
 msgid ""
-"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
-"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
+"Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/"
+"sdd bs=1M</literal>"
 msgstr ""
 "Пример:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
 "Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:388
+#, fuzzy
 msgid ""
-"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
-"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
-"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
-"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
+"It might be helpful to know that <emphasis role=\"bold\">if</emphasis> "
+"stands for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold"
+"\">f</emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for "
+"<emphasis role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</"
+"emphasis>ile"
 msgstr ""
 "Возможно, полезным будет знать, что <emphasis role=\"bold\">if</emphasis> "
 "означает <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
@@ -4109,12 +4433,13 @@ msgstr ""
 "\">f</emphasis>ile (выходной файл)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:349
-msgid "Enter the command: # <userinput>sync</userinput>"
+#: en/SelectAndUseISOs2.xml:392
+#, fuzzy
+msgid "Enter the command: <command>sync</command>"
 msgstr "Введите команду: # <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:395
 msgid "This is the end of the process, and you may now unplug your USB stick."
 msgstr "Это конец процедуры. Теперь вы можете отключать вашу флешку USB."
 
@@ -4124,8 +4449,10 @@ msgid "Select your Country / Region"
 msgstr "Выбор страны и региона"
 
 #.  Lebarhon 2016 12 16 updated for Mageia 6
+#. 2018/02/13 apb: Minor wording + typography.
+#. 2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:9
+#: en/selectCountry.xml:13
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
@@ -4133,34 +4460,36 @@ msgstr ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 
-#. type: Content of: <section><para>
-#: en/selectCountry.xml:14
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectCountry.xml:20
+#, fuzzy
 msgid ""
-"Select your country or region.  This is important for all kinds of settings, "
+"Select your country or region. This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
-"can lead to not being able to use a Wireless network."
+"can lead to being unable to use a Wireless network."
 msgstr ""
 "Выберите страну или регион. Ваш выбор будет важным для всех типов параметров "
 "локализации системы, в частности выбора валюты и домена управления "
 "беспроводной связью. Ошибочный выбор может привести к невозможности "
 "использования беспроводной связи."
 
-#. type: Content of: <section><para>
-#: en/selectCountry.xml:19
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectCountry.xml:27
+#, fuzzy
 msgid ""
-"If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> option and choose your country / region there."
+"If your country isn't in the list, click the <emphasis>Other Countries</"
+"emphasis> option and choose your country / region there."
 msgstr ""
 "Если вашей страны нет в списке, нажмите кнопку <guilabel>Другие страны</"
 "guilabel> и выберите страну или регион с помощью окна, которое будет открыто."
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:24
+#: en/selectCountry.xml:34
+#, fuzzy
 msgid ""
-"If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
-"first list was chosen. Please ignore this, as DrakX will apply your actual "
-"choice."
+"If your country is only in the <emphasis>Other Countries</emphasis> list, "
+"after clicking <emphasis>OK</emphasis> it may seem that a country from the "
+"main list was chosen. Despite this, DrakX will actually apply your choice."
 msgstr ""
 "Если пункт вашей страны есть только в списке <guilabel>Другие страны</"
 "guilabel>, после нажатия <guibutton>ОК</guibutton> может показаться, что "
@@ -4168,14 +4497,15 @@ msgstr ""
 "учёл ваш правильный выбор."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:33
+#: en/selectCountry.xml:42
 msgid "Input method"
 msgstr "Способ ввода"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:36
+#: en/selectCountry.xml:45
+#, fuzzy
 msgid ""
-"In the <guilabel>Other Countries</guilabel> screen you can also select an "
+"In the <emphasis>Other Countries</emphasis> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
@@ -4193,12 +4523,13 @@ msgstr ""
 "FTP."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:45
+#: en/selectCountry.xml:54
+#, fuzzy
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via <emphasis role=\"bold\">Configure "
-"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
-"running localedrake as root."
+"post-install via <menuchoice> <guimenu>Configure your Computer</guimenu> "
+"<guimenuitem>System</guimenuitem> </menuchoice>, or by running "
+"<command>localedrake</command> as <emphasis>root</emphasis>."
 msgstr ""
 "Если способ ввода нужен вам после установки системы, вы можете получить "
 "доступ к нему после загрузки установленной системы с помощью пункта меню "
@@ -4207,57 +4538,64 @@ msgstr ""
 "root."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:14
+#: en/selectInstallClass.xml:29
 msgid "Install or Upgrade"
 msgstr "Установка или обновление"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:18
+#: en/selectInstallClass.xml:33
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
-"selectInstallClass.png\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectInstallClass."
+"png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
 "selectInstallClass.png\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:25
-msgid "Install"
-msgstr "Установка"
+#: en/selectInstallClass.xml:41
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install</emphasis>"
+msgstr "<emphasis role=\"bold\">Рабочая станция</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:27
+#: en/selectInstallClass.xml:43
+#, fuzzy
 msgid ""
-"Use this option to perform a fresh installation of <application>Mageia</"
-"application>. This will format the root partition (/), but can preserve a "
-"separated /home partition."
+"Use this option to perform a fresh installation of Mageia. This will format "
+"the <literal>root</literal> partition (<filename>/</filename>), but can "
+"preserve a pre-existing <filename>/home</filename> partition (a dedicated /"
+"home partition, rather than being incorporated within the root (/) partition "
+"itself)."
 msgstr ""
 "Воспользуйтесь этим пунктом, чтобы выполнить установку <application>Mageia</"
 "application> с нуля. Во время такой установки будет отформатирован корневой "
 "раздел (/), но можно сохранить отдельный раздел /home."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:33
-msgid "Upgrade"
-msgstr "Обновление"
+#: en/selectInstallClass.xml:50
+#, fuzzy
+msgid "<emphasis role=\"bold\">Upgrade</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:35
-msgid ""
-"This can be used to upgrade an existing installation of <application>Mageia</"
-"application>."
+#: en/selectInstallClass.xml:52
+#, fuzzy
+msgid "Use this option to upgrade an existing installation of Mageia."
 msgstr ""
 "Выберите жёсткий диск, который следует форматировать для установки "
 "<application>Mageia</application>."
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:39
+#. type: Content of: <section><important><para>
+#: en/selectInstallClass.xml:58
+#, fuzzy
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
-"supported</emphasis> when this installer's version was released, has been "
+"supported</emphasis> when this Installer's version was released, has been "
 "thoroughly tested. If you want to upgrade a Mageia version that has reached "
-"its End Of Life, then it is better to do a clean install instead while "
-"preserving your <literal>/home</literal> partition."
+"its <quote>End Of Life</quote> then it is better to do a <quote>clean</"
+"quote> install instead, while preserving your <filename>/home</filename> "
+"partition."
 msgstr ""
 "Командой по обеспечению качества дистрибутива выполнено надлежащее "
 "тестирование только обновления с предыдущей версии Mageia, поддержка которой "
@@ -4266,37 +4604,15 @@ msgstr ""
 "процедуру установки с начала, сохранив при этом содержание раздела <literal>/"
 "home</literal>."
 
-#. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:50
-msgid ""
-"If during install you decide to stop the installation, it is possible to "
-"reboot, but please think twice before you do this. Once a partition has been "
-"formatted or updates have started to be installed, your computer isn't in "
-"the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that, and only if you are very sure "
-"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
-"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
-"Delete</guilabel> simultaneously to reboot."
-msgstr ""
-"Если в течение процедуры установки вы решите прекратить установку, вы можете "
-"перезагрузить компьютер. Впрочем, вам следует тщательно обдумать ваши "
-"действия. После форматирования раздела или начала процедуры установки "
-"обновлений компьютер будет находиться в промежуточном состоянии. "
-"Перезагрузка может привести к невозможности использования системы. Если, "
-"вопреки этим предупреждением, вы хотите перезагрузить систему, перейдите в "
-"текстовый терминал нажатием комбинации этих трёх клавиш: <guilabel>Alt Ctrl "
-"F2</guilabel> одновременно. После этого, нажмите комбинацию клавиш "
-"<guilabel>Alt Ctrl Delete</guilabel> одновременно, чтобы перезагрузить "
-"компьютер."
-
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:62
+#: en/selectInstallClass.xml:67
+#, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
-"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
-"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
-"later in the install."
+"can return from the <emphasis>Install or Upgrade</emphasis> screen to the "
+"language choice screen by pressing <keycombo> <keycap>Ctrl</keycap> "
+"<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis role="
+"\"bold\"> NOT</emphasis> do this later in the install."
 msgstr ""
 "Если вы обнаружите, что забыли установить пакеты дополнительного языка, вы "
 "можете вернуться со страницы <emphasis role=\"bold\">Установка или "
@@ -4305,39 +4621,41 @@ msgstr ""
 "делайте этого во время следующих шагов установки."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboardLive.xml:3
-msgid "Select keyboard"
+#: en/selectKeyboardLive.xml:14
+#, fuzzy
+msgid "Select Keyboard"
 msgstr "Выбор клавиатуры"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboardLive.xml:7
+#: en/selectKeyboardLive.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-selectKeyboard.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"selectKeyboardLive-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/selectKeyboardLive.xml:24
+msgid "Here you can set the keyboard layout you wish to use with Mageia​​."
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectKeyboardLive.xml:12
+#: en/selectKeyboardLive.xml:27
 msgid ""
-"You will be required to set the keyboard layout you wish to use in Mageia​​. "
-"The default one is selected according to your language and timezone "
-"previously selected."
+"A suggested keyboard layout (highlighted), has been chosen for you based "
+"upon your previously selected language and timezone choices."
 msgstr ""
-"Вам потребуется установить раскладку клавиатуры, которую вы хотите "
-"использовать в Mageia. По умолчанию она выбирается в зависимости от вашего "
-"языка и часового пояса, выбранного ранее."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:7
+#: en/selectKeyboard.xml:20
 msgid "Keyboard"
 msgstr "Клавиатура"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:10
+#: en/selectKeyboard.xml:23
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -4347,16 +4665,17 @@ msgstr ""
 "будет использована типичная американская раскладка US."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:15
+#: en/selectKeyboard.xml:28
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png\"/"
 "> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
-"> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:35
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -4375,23 +4694,25 @@ msgstr ""
 "link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:31
+#: en/selectKeyboard.xml:45
+#, fuzzy
 msgid ""
-"If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a fuller list, and select your keyboard there."
+"If your keyboard isn't in the list shown, click on <emphasis>More</emphasis> "
+"to get a fuller list, and select your keyboard there."
 msgstr ""
 "Если пункта вашей клавиатуры не будет в показанном списке, нажмите кнопку "
 "<guibutton>Ещё</guibutton> для ознакомления с полным списком, из которого вы "
 "можете выбрать модель клавиатуры."
 
-#. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:36
+#. type: Content of: <section><itemizedlist><listitem><para><note><para>
+#: en/selectKeyboard.xml:50
+#, fuzzy
 msgid ""
-"After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
-"you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this and "
-"continue the installation: the keyboard chosen from the full list will be "
-"applied."
+"After choosing a keyboard from the <emphasis>More</emphasis> dialogue, "
+"you'll return to the first keyboard choice dialogue and it will seem as "
+"though a keyboard from that screen was chosen. You can safely ignore this "
+"and continue the installation: the keyboard chosen from the full list will "
+"be applied."
 msgstr ""
 "После выбора модели клавиатуры с помощью диалогового окна <guibutton>Ещё</"
 "guibutton> вы вернётесь к первому диалоговому окну выбора клавиатуры, в "
@@ -4400,7 +4721,7 @@ msgstr ""
 "списка."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:46
+#: en/selectKeyboard.xml:60
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
 "extra dialogue screen asking how you would prefer to switch between the "
@@ -4411,37 +4732,40 @@ msgstr ""
 "со способом переключения между латинской и нелатинской раскладками."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:34
 msgid "Please choose a language to use"
 msgstr "Выберите, пожалуйста, язык"
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:39
+#, fuzzy
 msgid ""
 "Select your preferred language, by first expanding the list for your "
-"continent. <application>Mageia</application> will use this selection during "
-"the installation and for your installed system."
+"continent. Mageia will use this selection during the installation and for "
+"your installed system."
 msgstr ""
 "Выберите нужный язык интерфейса системы. Для этого сначала откройте список "
 "стран вашего континента. <application>Mageia</application> будет "
 "использовать этот выбор во время установки и в установленной системе."
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:23
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:45
+#, fuzzy
 msgid ""
-"Select your preferred language.  <application>Mageia</application> will use "
-"this selection during the installation and for your installed system."
+"Select your preferred language. Mageia will use this selection during the "
+"installation and for your installed system."
 msgstr ""
 "Выберите нужный язык интерфейса системы. <application>Mageia</application> "
 "будет использовать выбранный вами язык при установке и в уже установленной "
 "системе."
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:27
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:50
+#, fuzzy
 msgid ""
 "If it is likely that you (or others) will require several languages to be "
-"installed on your system, then you should use the <guibutton>Multiple "
-"languages</guibutton> option to add them now. It will be difficult to add "
+"installed on your system, then you should use the <emphasis>Multiple "
+"languages</emphasis> option to add them now. It will be difficult to add "
 "extra language support after installation."
 msgstr ""
 "Если в вашей системе будет использоваться несколько языков (вами или другими "
@@ -4450,50 +4774,50 @@ msgstr ""
 "сложно."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:58
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata align=\"center\" fileref=\"live-language.png"
+"\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:43
+#. type: Content of: <section><important><para>
+#: en/selectLanguage.xml:68
+#, fuzzy
 msgid ""
 "Even if you choose more than one language, you must first choose one as your "
-"preferred language in the first language screen. It will also be marked as "
-"chosen in the multiple languages screen."
+"preferred language from the main list of languages. It will also be marked "
+"as chosen in the <emphasis>Multiple languages</emphasis> screen."
 msgstr ""
 "Даже если вами было выбрано несколько языков, вам следует сначала выбрать "
 "один из них как основной язык страниц программы установки. Кроме того, этот "
 "язык будет обозначен и в окне выбора нескольких языков."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:76
+#, fuzzy
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
-"it is advisable to install the language of your keyboard as well."
+"it is advisable to install the required language for your keyboard as well"
 msgstr ""
 "Если раскладка вашей клавиатуры не совпадает с раскладкой, используемой для "
 "желаемого языка, следует также установить языковые пакеты для языка, "
 "связанные с выбранной раскладкой."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:56
-msgid "Mageia uses UTF-8 (Unicode) support by default."
-msgstr "По умолчанию Mageia использует поддержку UTF-8 (Юникод)."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:58
+#: en/selectLanguage.xml:82
+#, fuzzy
 msgid ""
-"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
-"emphasis> screen if you know that it is inappropriate for your language. "
-"Disabling UTF-8 applies to all installed languages."
+"Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the "
+"<emphasis>Multiple languages</emphasis> screen if you know that it is "
+"inappropriate for your language. Disabling UTF-8 applies to all installed "
+"languages."
 msgstr ""
 "Эту кодировку можно отключить в окне выбора <emphasis role=\"bold"
 "\">нескольких языков</emphasis>, если вам заранее известно, что Unicode "
@@ -4501,16 +4825,19 @@ msgstr ""
 "установленных языков."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:64
+#: en/selectLanguage.xml:89
+#, fuzzy
 msgid ""
-"You can change the language of your system after installation in the Mageia "
-"Control Center -> System -> Manage localization for your system."
+"You can change the language for your system post-installation in the "
+"<menuchoice> <guimenu>Mageia Control Center</guimenu> <guimenuitem>System</"
+"guimenuitem> <guimenuitem>localization for your system</guimenuitem> </"
+"menuchoice>."
 msgstr ""
 "Изменить язык интерфейса системы после установки можно с помощью Центра "
 "управления Mageia -> Система -> Настройка локализации системы."
 
 #. type: Content of: <section><info><title>
-#: en/selectMouse.xml:4
+#: en/selectMouse.xml:10
 msgid "Select mouse"
 msgstr "Выбор драйвера мыши"
 
@@ -4518,17 +4845,19 @@ msgstr "Выбор драйвера мыши"
 #.  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 
+#. 2018/02/15 apb: Text and typography.
 #. type: Content of: <section><mediaobject>
-#: en/selectMouse.xml:16
+#: en/selectMouse.xml:24
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
-"format=\"PNG\" > </imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectMouse.png\" "
+"format=\"PNG\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
-"format=\"PNG\" > </imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectMouse.xml:23
+#: en/selectMouse.xml:29
 msgid ""
 "If you are not happy with how your mouse responds, you can select a "
 "different one here."
@@ -4537,26 +4866,29 @@ msgstr ""
 "другой драйвер для мыши."
 
 #. type: Content of: <section><para>
-#: en/selectMouse.xml:25
+#: en/selectMouse.xml:32
+#, fuzzy
 msgid ""
-"Usually, <guilabel>Universal</guilabel> - <guilabel>Any PS/2 and USB mice</"
-"guilabel> is a good choice."
+"Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and "
+"USB mice</guimenuitem> </menuchoice> is a good choice."
 msgstr ""
 "Обычно, <guilabel>Универсальная</guilabel> — <guilabel>Любая мышь PS/2 или "
 "USB</guilabel> является неплохим вариантом."
 
 #. type: Content of: <section><para>
-#: en/selectMouse.xml:27
+#: en/selectMouse.xml:38
+#, fuzzy
 msgid ""
-"Select <guilabel>Universal</guilabel> - <guilabel>Force evdev</guilabel> to "
-"configure the buttons that do not work on a mouse with six or more buttons."
+"Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force edev</"
+"guimenuitem> </menuchoice> to configure the buttons that do not work on a "
+"mouse with six or more buttons."
 msgstr ""
 "Выберете пункт <guilabel>Универсальная</guilabel> — <guilabel>Задействовать "
 "evdev</guilabel>, чтобы настроить кнопки, которые не работают для мыши с "
 "шестью или более кнопками."
 
-#. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloaderAddEntry.xml:7 en/setupBootloader.xml:206
 msgid "Add or Modify a Boot Menu Entry"
 msgstr ""
 "Добавление пункта в меню загрузки или внесение изменений в такие пункты"
@@ -4583,103 +4915,68 @@ msgstr ""
 "wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Основные параметры загрузчика"
-
-#. type: Content of: <section><section><title>
 #: en/setupBootloader.xml:10
-msgid "Bootloader interface"
+#, fuzzy
+msgid "Bootloader"
 msgstr "Интерфейс загрузчика"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:11
-msgid "By default, Mageia uses exclusively:"
-msgstr "По умолчанию Mageia эксклюзивно использует:"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:14
-msgid ""
-"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:13
+msgid "Grub2"
 msgstr ""
-"GRUB2 (с графическим меню или без него) для устаревших систем с MBR или GPT"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:18
-msgid "GRUB2-efi for a UEFI system."
-msgstr "GRUB2-efi для системы UEFI."
-
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:22
-msgid "The Mageia graphical menus are nice :)"
-msgstr "Графические меню Mageia выглядят великолепно. :)"
-
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:25
-msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:15
+#, fuzzy
+msgid "Grub2 on Legacy MBR/GPT systems"
 msgstr "GRUB2 для устаревших систем с MBR и GPT"
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:27
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:17
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
-"setupBootloader.png\"/> </imageobject>"
+"GRUB2 (with or without graphical menu) will be used exclusively as the "
+"bootloader for a Legacy/MBR or Legacy/GPT system."
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
-"setupBootloader.png\"/> </imageobject>"
+"GRUB2 (с графическим меню или без него) для устаревших систем с MBR или GPT"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:21
+#, fuzzy
 msgid ""
-"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
-"really know what you are doing."
+"By default, a new bootloader will be written into either the MBR (Master "
+"Boot Record) of your first hard drive or in the BIOS boot partition."
 msgstr ""
-"Не изменяйте значение параметра <emphasis role=\"bold\">Устройство загрузки</"
-"emphasis>, если в этом нет необходимости."
+"загрузчик GRUB2 или к MBR (Master Boot Record) вашего первого диска, или к "
+"загрузочному разделу BIOS."
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:38
-msgid "GRUB2-efi on UEFI systems"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:27
+#, fuzzy
+msgid "Grub2-efi on UEFI systems"
 msgstr "GRUB2-efi в системах UEFI"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:39
-msgid ""
-"With a UEFI system, the user interface is slightly different as you cannot "
-"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
-"\"bold\">without graphical menu</emphasis> options."
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:29
+msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
 msgstr ""
-"Если вы пользуетесь системой с UEFI, интерфейс может немного отличаться, "
-"поскольку вы не сможете выбирать между загрузчиком с графическим меню и без "
-"него."
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:33
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"imageobject>"
+"By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
+"System Partition)."
 msgstr ""
-"<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:49
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:35
+#, fuzzy
 msgid ""
-"If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to house the 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 required (and advised), whatever the number of "
-"operating systems you have."
+"If there are already UEFI-based operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer will detect the existing ESP "
+"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"be created. Although it is possible to have several ESPs, only one is "
+"required, whatever the number of operating systems you have."
 msgstr ""
 "Если Mageia является единственной операционной системой, установленной на "
 "вашем компьютере, средство установки создаст ESP (системный раздел EFI) для "
@@ -4690,155 +4987,91 @@ msgstr ""
 "таким разделом, поскольку его достаточно для произвольного количества "
 "установленных вами операционных систем."
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:61
-msgid "Using a Mageia bootloader"
-msgstr "Использование загрузчика Mageia"
-
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:62
-msgid ""
-"By default, and according to your system, Mageia writes one of the following:"
-msgstr ""
-"По умолчанию в зависимости от вашей системы, Mageia записывает следующее:"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:66
-msgid ""
-"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
-"hard drive or in the BIOS boot partition."
-msgstr ""
-"загрузчик GRUB2 или к MBR (Master Boot Record) вашего первого диска, или к "
-"загрузочному разделу BIOS."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:70
-msgid "a GRUB2-efi bootloader into the ESP"
-msgstr "загрузчик GRUB2-efi к ESP;"
+#. type: Content of: <section><section><info><title>
+#: en/setupBootloader.xml:46
+#, fuzzy
+msgid "Bootloader Setup"
+msgstr "Интерфейс загрузчика"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:73
-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, "
-"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
-"\"bold\">Probe Foreign OS</emphasis> option."
-msgstr ""
-"Если на компьютере уже установлены другие операционные системы, Mageia "
-"попытается добавить эти системы к вашему новому меню загрузки Mageia. Если "
-"вам это не нужно, нажмите кнопку <guibutton>Далее</guibutton>, а затем "
-"снимите флажок с пункта <emphasis role=\"bold\">Зондирование посторонней ОС</"
-"emphasis>."
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:49
+msgid "Bootloader main options"
+msgstr "Основные параметры загрузчика"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:78
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:51
+#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
-"imageobject>"
+"\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader.png\" xml:id=\"setupBootloader-"
+"im1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
 "\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:87
-msgid "Using an existing bootloader"
-msgstr "Использование уже установленного загрузчика"
-
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:88
-msgid ""
-"The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this documentation, however in most cases it will "
-"involve running the relevant bootloader installation program which should "
-"detect and add it automatically. See the documentation for the operating "
-"system in question."
-msgstr ""
-"Полный перечень шагов добавления пункта операционной системы Mageia в меню "
-"уже установленного загрузчика не является предметом этой справочной "
-"страницы. Впрочем, в основном, эти шаги связаны с запуском соответствующей "
-"программы установки загрузчика, которая умеет выявить и добавить пункт "
-"системы в автоматическом режиме. Соответствующие пояснения должны быть "
-"приведены в документации к другой операционной системе."
-
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:95
-msgid "Using chain loading"
-msgstr "Использование цепной загрузки"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:96
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
 msgid ""
-"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 tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
+"systems will not see this option here."
 msgstr ""
-"Если вы не хотите использовать загрузчик Mageia, а вместо этого хотите "
-"воспользоваться цепной загрузкой с другой операционной системы, нажмите "
-"кнопку <guibutton>Далее</guibutton>, затем пункт <guibutton>Дополнительно</"
-"guibutton> и установите флажок <guilabel>Не трогать ESP или MBR</guilabel>."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:101
-msgid ""
-"<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-"
-"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
-"\"center\"/> </imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:67
+#, fuzzy
+msgid "<emphasis role=\"bold\">Boot device</emphasis>"
+msgstr "<emphasis role=\"bold\">Дополнительно</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:108
-msgid ""
-"You will get a warning that the bootloader is missing, ignore it by clicking "
-"<guibutton>OK</guibutton>."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing"
 msgstr ""
-"Программа предупредит вас о том, что в системе не будет загрузчика. "
-"Проигнорируйте предупреждение и нажмите кнопку <guibutton>ОК</guibutton>."
+"Вносите изменения только если вам хорошо известны последствия ваших действий."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:72
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
+"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:117
-msgid "Options"
-msgstr "Параметры"
-
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:119
-msgid "First page"
-msgstr "Первая страница"
+"<emphasis role=\"bold\">Пожалуйста, выберите уровень безопасности</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:74
+#, fuzzy
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This lets you "
-"set a delay in seconds before the default operating system is started up."
+"This text box lets you set a delay, in seconds, before the default operating "
+"system is started up."
 msgstr ""
 "<guilabel>Пауза перед загрузкой основной системы</guilabel>: с помощью этого "
 "пункта можно установить задержку в секундах перед загрузкой операционной "
 "системы по-умолчанию."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:122
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:78
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:79
+#, fuzzy
 msgid ""
-"<guilabel>Security</guilabel>: This allows you to set a password for the "
-"bootloader. This means a username and password will be required when booting "
-"to select a booting entry or change settings. The username is <emphasis role="
-"\"bold\">root</emphasis> and the password is the one chosen here-after."
+"This allows you to set a password for the bootloader. This means a username "
+"and password will be required when booting in order to select a booting "
+"entry or change settings. This is optional, and most people are not likely "
+"to have a need for it. The username is <literal>root</literal> and the "
+"password is the one chosen hereafter."
 msgstr ""
 "<guilabel>Безопасность</guilabel>: с помощью этого раздела вы можете "
 "установить пароль для доступа к загрузчику. Использование пароля будет "
@@ -4846,36 +5079,52 @@ msgstr ""
 "придётся вводить пароль. Именем будет <emphasis role=\"bold\">root</"
 "emphasis>, а пароль можно будет выбрать на следующем этапе."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:125
-msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+#, fuzzy
+msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 "<guilabel>Пароль</guilabel>: с помощью этого поля для ввода текста вы можете "
 "указать пароль для загрузчика."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
+msgstr "<emphasis role=\"bold\">Рабочая станция</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:92
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
-"check that it matches with the one above."
+"Retype the password and DrakX will check that it matches with the one set "
+"above"
 msgstr ""
 "<guilabel>Пароль (ещё раз)</guilabel>: повторите ввод пароля пользователя в "
 "этом поле. drakx проверит, совпадает ли введённый повторно пароль с его "
 "первоначальным вариантом."
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#, fuzzy
+msgid "<emphasis>Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">Дополнительно</emphasis>"
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
-msgid "<guilabel>Advanced</guilabel>"
-msgstr "<guilabel>Дополнительно</guilabel>"
+#: en/setupBootloader.xml:99
+#, fuzzy
+msgid "<emphasis>Enable ACPI</emphasis>"
+msgstr "<emphasis>Общий</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:127
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:100
+#, fuzzy
 msgid ""
-"<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for power management. It can save energy by "
-"stopping unused devices.  Deselecting 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)."
+"ACPI (Advanced Configuration and Power Interface) is a standard for power "
+"management. It can save energy by stopping unused devices. Deselecting 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) является стандартом управления питанием компьютера. С его помощью "
@@ -4886,22 +5135,36 @@ msgstr ""
 "создаёт проблемы в работе компьютера (например неожиданные перезагрузки "
 "системы или «зависания» системы)."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:133
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:108
+#, fuzzy
+msgid "<emphasis>Enable SMP</emphasis>"
+msgstr "<emphasis>Общий</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:109
+#, fuzzy
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
-"multiprocessing for multi core processors."
+"This option enables/disables symmetric multiprocessing for multi-core "
+"processors"
 msgstr ""
 "<guilabel>Включить SMP</guilabel>: с помощью этого пункта можно включить или "
 "выключить симметричное использование многих процессоров, если на компьютере "
 "установлен многоядерный процессор."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:135
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:113
+#, fuzzy
+msgid "<emphasis>Enable APIC</emphasis>"
+msgstr "<emphasis>Общий</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:114
+#, fuzzy
 msgid ""
-"<guilabel>Enable APIC</guilabel>: 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."
+"Enabling 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>: обозначение этого пункта предоставляет "
 "операционной системе доступ к расширенному программируемому контроллеру "
@@ -4909,70 +5172,220 @@ msgstr ""
 "дают возможность использовать более сложные модели с приоритетностью "
 "процессов и управления расширенными IRQ (запросами в отношении прерываний)."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:138
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:120
+#, fuzzy
+msgid "<emphasis>Enable Local APIC</emphasis>"
+msgstr "<emphasis>Общий</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:121
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
-"interrupts for a specific processor in an SMP system."
+"Here you can set Local APIC, which 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:143
-msgid "Next page"
-msgstr "Следующая страница"
+#: en/setupBootloader.xml:127
+#, fuzzy
+msgid "Bootloader Configuration"
+msgstr "Настройка звука"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:129
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-setupBootloader3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:146
-msgid "<guilabel>Default:</guilabel> Operating system started up by default"
+#: en/setupBootloader.xml:139
+#, fuzzy
+msgid "<emphasis role=\"bold\">Default</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:140
+#, fuzzy
+msgid "The operating system to started up by default"
 msgstr ""
 "<guilabel>По умолчанию:</guilabel> вариант операционной системы для загрузки "
 "по умолчанию."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:150
+#: en/setupBootloader.xml:143
+#, fuzzy
+msgid "<emphasis role=\"bold\">Append</emphasis>"
+msgstr "<emphasis role=\"bold\">Дополнительно</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:144
+#, fuzzy
 msgid ""
-"<guilabel>Append:</guilabel> This option lets you pass the kernel "
-"information or tell the kernel to give you more information as it boots."
+"This option lets you pass information to the kernel or tell the kernel to "
+"give you more information as it boots"
 msgstr ""
 "<guilabel>Присоединить:</guilabel> с помощью этого параметра вы можете "
 "передать ядру системы какие-то данные или сообщить ядру о том, что следует "
 "предоставить вам больше информации во время загрузки системы."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:155
+#: en/setupBootloader.xml:148
+#, fuzzy
+msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
+msgstr "<emphasis role=\"bold\">Сервер</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:149
+#, fuzzy
 msgid ""
-"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
-"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
+"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, "
+"then untick the Probe Foreign OS option."
 msgstr ""
-"<guilabel>Зондирование посторонней ОС</guilabel>: см. выше раздел о <link "
-"linkend=\"setupMageiaBootloader\">использование загрузчика Mageia</link>"
+"Если на компьютере уже установлены другие операционные системы, Mageia "
+"попытается добавить эти системы к вашему новому меню загрузки Mageia. Если "
+"вам это не нужно, нажмите кнопку <guibutton>Далее</guibutton>, а затем "
+"снимите флажок с пункта <emphasis role=\"bold\">Зондирование посторонней ОС</"
+"emphasis>."
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:156
+#, fuzzy
 msgid ""
-"<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"to be used by the boot menu. If you click the down triangle you will be "
-"offered other size and colour depth options."
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:166
+#, fuzzy
+msgid "<emphasis>Video mode</emphasis>"
+msgstr "<emphasis>Производитель</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:167
+#, fuzzy
+msgid ""
+"This sets the screen size and colour depth to be used by the boot menu. If "
+"you click the down-triangle you will be offered other size and colour depth "
+"options."
 msgstr ""
 "<guilabel>Режим видео:</guilabel> с помощью этого пункта можно указать "
 "разрешение экрана (в пикселях) и глубину цветов для меню загрузки. Если вы "
 "нажмёте кнопку списка с маленьким треугольником острием вниз, программа "
 "покажет варианты разрешений и глубины цветов, которыми можно воспользоваться."
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:172
+#, fuzzy
+msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
+msgstr "<emphasis>Производитель</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:173
+msgid ""
+"Select this option if you don't want a bootable Mageia, but would rather "
+"chain-load it from another OS. You will get a warning that the bootloader is "
+"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
+"implications, and wish to proceed."
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:188
+#, fuzzy
+msgid "Other Options"
+msgstr "Параметры"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:190
+msgid "Using an existing bootloader"
+msgstr "Использование уже установленного загрузчика"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:191
+#, fuzzy
 msgid ""
-"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
-"linkend=\"setupChainLoading\">Using the chain loading</link>"
+"The exact procedure for adding Mageia to an existing bootloader is beyond "
+"the scope of this documentation. However in most cases it will involve "
+"running the relevant bootloader installation program, which should detect "
+"Mageia and automatically add an entry for it in the bootloader menu. See the "
+"documentation for the relevant operating system."
 msgstr ""
-"<emphasis role=\"bold\">не трогать ESP или MBR</emphasis>: см. выше раздел о "
-"<link linkend=\"setupChainLoading\">использование цепной загрузки</link>"
+"Полный перечень шагов добавления пункта операционной системы Mageia в меню "
+"уже установленного загрузчика не является предметом этой справочной "
+"страницы. Впрочем, в основном, эти шаги связаны с запуском соответствующей "
+"программы установки загрузчика, которая умеет выявить и добавить пункт "
+"системы в автоматическом режиме. Соответствующие пояснения должны быть "
+"приведены в документации к другой операционной системе."
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:199
+#, fuzzy
+msgid "Installing Without a Bootloader"
+msgstr "Использование загрузчика Mageia"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:200
+msgid ""
+"While you can opt to install Mageia without a bootloader (see section 2.1 "
+"Advanced), this is not recommended unless you absolutely know what you are "
+"doing, as without some form of bootloader your operating system will be "
+"unable to start."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:207
+#, fuzzy
+msgid ""
+"To do this you need to manually edit <filename>/boot/grub2/custom.cfg</"
+"filename> or use the software <application>grub-customizer</application> "
+"tool instead (available in the Mageia repositories)."
+msgstr ""
+"Для этого вам придётся внести вручную изменения в /boot/grub2/custom.cfg или "
+"воспользоваться программой для настройки GRUB (например <emphasis role=\"bold"
+"\">grub-customizer</emphasis> из хранилищ Mageia)."
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:212
+#, fuzzy
+msgid ""
+"For more information, see: <link ns4:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
+msgstr ""
+"Чтобы узнать больше, ознакомьтесь с соответствующей страницей нашей вики: "
+"<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/setupSCSI.xml:3
+#: en/setupSCSI.xml:10
 msgid "Setup SCSI"
 msgstr "Настройка SCSI"
 
@@ -4984,17 +5397,20 @@ msgstr "Настройка SCSI"
 #.  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 
+#. 2018/02/15 apb: Text and typography.
+#. 2018/0217 apb: Merge 2nd/3rd paras and reword.
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:22
+#: en/setupSCSI.xml:33
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
-"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-setupSCSI.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"setupSCSI-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
-"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:27
+#: en/setupSCSI.xml:39
 msgid ""
 "DrakX will normally detect hard disks correctly. However, with some older "
 "SCSI controllers it may be unable to determine the correct drivers to use "
@@ -5005,104 +5421,60 @@ msgstr ""
 "программа не сможет установить нужных драйверов."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:44
+#, fuzzy
 msgid ""
-"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
-"you have."
+"If your device is not recognised, you will need to manually tell DrakX which "
+"SCSI drive(s) you have. DrakX should then be able to configure the drive(s) "
+"correctly."
 msgstr ""
 "Если вам встретился именно такой контроллер, вам придется вручную сообщить "
 "DrakX, с каким диском SCSI придётся иметь дело."
 
-#. type: Content of: <section><para>
-#: en/setupSCSI.xml:35
-msgid "DrakX should then be able to configure the drive(s) correctly."
-msgstr ""
-"После этого, DrakX сможет настроить систему на работу с дисками должным "
-"образом."
-
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:3
+#: en/soundConfig.xml:10
 msgid "Sound Configuration"
 msgstr "Настройка звука"
 
 #.  Lebarhon 20170209 updated SC
+#. 2018/02/13 apb: Text and typography.
+#. 2018/02/17 apb: Centre-align PNG
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:9
-msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
-"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
-"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
-
-#. type: Content of: <section><para>
-#: en/soundConfig.xml:14
+#: en/soundConfig.xml:20
+#, fuzzy
 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 one exists."
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-soundConfig.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"soundConfig-im1\"/> </imageobject>"
 msgstr ""
-"На этом экране указан драйвер, который инсталлятор выбрал для вашей звуковой "
-"карты из имеющихся и который будет драйвером по умолчанию, если такой "
-"предусмотрен для карты."
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:18
+#: en/soundConfig.xml:26
 msgid ""
-"The default driver should work without problems. However, if after install "
-"you do encounter problems, then run <command>draksound</command> or start "
-"this tool via MCC (Mageia Control Center), by choosing the "
-"<guilabel>Hardware</guilabel> tab and clicking on <guilabel>Sound "
-"Configuration</guilabel> at the top right of the screen."
+"This screen shows the details of the sound card driver chosen for you by the "
+"installer, and this driver should work without problems."
 msgstr ""
-"Драйвер по умолчанию должен работать без проблем. Однако, если после "
-"установки вы столкнётесь с проблемами, то запустите <command>draksound</"
-"command> или запустите эту утилиту из MCC (Центр Управления Mageia), выбрав "
-"вкладку <guilabel>Оборудование</guilabel> и нажав <guilabel>Настройка звука</"
-"guilabel> в верхнем правом углу окна."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:24
+#: en/soundConfig.xml:29
 msgid ""
-"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
-"\"bold\">Sound Configuration</emphasis> tool screen, click on "
-"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
-"solve the problem."
+"However, if you encounter any issues post-install, then run "
+"<command>draksound</command> or start this tool via <menuchoice> "
+"<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem> "
+"<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the "
+"<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis> "
+"screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice "
+"about how to solve the problem."
 msgstr ""
-"После этого в окне <emphasis role=\"bold\">draksound</emphasis> или "
-"инструмента <guibutton>«Настройка звука»</guibutton> нажмите кнопку "
-"<guibutton>Решение проблем</guibutton>. В ответ будут показаны достойные "
-"внимания советы по решению проблемы."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:30
+#: en/soundConfig.xml:43
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:33
-msgid ""
-"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
-"in this screen, during install, is useful if there is no default driver and "
-"there are several drivers available, but you think the installer selected "
-"the wrong one."
-msgstr ""
-"Кнопкой <emphasis role=\"bold\"><guibutton>Дополнительно</guibutton></"
-"emphasis> при установке стоит пользоваться, если для карты не предусмотрено "
-"драйвера по умолчанию, или если существует несколько драйверов, и вы "
-"уверены, что средством установки выбран ложный драйвер."
-
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:38
-msgid ""
-"In that case you can select a different driver after clicking on <emphasis "
-"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
-msgstr ""
-"В этом случае, вы можете выбрать другой драйвер после нажатия кнопки "
-"<emphasis role=\"bold\"><guibutton>Позвольте мне подобрать драйвер</"
-"guibutton></emphasis>."
-
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:3
+#: en/takeOverHdConfirm.xml:10
 msgid "Confirm hard disk to be formatted"
 msgstr "Подтверждение форматирования жесткого диска"
 
@@ -5112,76 +5484,80 @@ msgstr "Подтверждение форматирования жесткого
 #.     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 
+#. 2018/02/15 apb: Text and typography
+#. 2018/02/20 apb: Change the 2 paras to itemized listitems.
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:18
+#: en/takeOverHdConfirm.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
-"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
-"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-takeOverHdConfirm.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata align=\"center\" fileref=\"live-"
+"takeOverHdConfirm.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
-"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
-"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:27
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/takeOverHdConfirm.xml:42
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
+"Click on <emphasis>Previous</emphasis> if you are at all unsure about your "
 "choice."
 msgstr ""
 "Нажмите кнопку <guibutton>Назад</guibutton>, если вы вообще не уверены в "
 "сделанном выборе."
 
-#. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:31
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/takeOverHdConfirm.xml:48
+#, fuzzy
 msgid ""
-"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
-"ok to erase every partition, every operating system and all data that might "
-"be on that hard disk."
+"Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK "
+"to erase <emphasis role=\"bold\">every</emphasis> partition, <emphasis role="
+"\"bold\">every</emphasis> operating system and <emphasis role=\"bold\">all "
+"data</emphasis> that might be on that hard disk."
 msgstr ""
 "Нажмите кнопку <guibutton>Далее</guibutton>, чтобы продолжить, если вы "
 "уверены в том, что хотите стереть все разделы, все операционные системы на "
 "диске и все данные, хранящиеся на этом диске."
 
 #. type: Content of: <section><info><title>
-#: en/testing.xml:9
+#: en/testing.xml:3
 msgid "Testing Mageia as Live system"
 msgstr "Тестирование Mageia как Live системы"
 
 #. type: Content of: <section><section><info><title>
-#: en/testing.xml:14
+#: en/testing.xml:8
 msgid "Live mode"
 msgstr "Режим Live"
 
+#. type: Content of: <section><section><para>
+#: en/testing.xml:11
+msgid ""
+"This is the screen you will see if you selected the <emphasis role=\"bold"
+"\">Boot Mageia </emphasis>option from the Live media menu."
+msgstr ""
+
 #. type: Content of: <section><section><mediaobject>
-#: en/testing.xml:18
+#: en/testing.xml:14
 msgid "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/testing.xml:23
-msgid ""
-"You get this screen if you selected \"Boot Mageia\". If not, you get the "
-"\"<link linkend=\"doPartitionDisks\">Partitioning</link> step\""
-msgstr ""
-"Вы получите этот экран если выберите \"Загрузить Mageia\". Если нет, то вы "
-"получите шаг \"<link linkend=\"doPartitionDisks\">Разбиение на разделы</link>"
-"\""
-
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:28
+#: en/testing.xml:21
 msgid "Testing hardware"
 msgstr "Тестирование оборудования"
 
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:31
+#: en/testing.xml:24
+#, fuzzy
 msgid ""
-"One of the Live mode goals is to test if the hardware is correctly managed "
-"by Mageia. You can check if all devices have a driver in the Hardware "
-"section of the Mageia Control Center. You can test the most current devices:"
+"One of the aims of using the Live mode is to test that your hardware is "
+"correctly managed by Mageia. You can check if all devices have a driver in "
+"the Hardware section of the Mageia Control Center:"
 msgstr ""
 "Одной из целей Live режима является проверка, что аппаратное обеспечение "
 "правильно управляется Mageia. Вы можете проверить, все ли устройства имеют "
@@ -5189,84 +5565,91 @@ msgstr ""
 "можете протестировать самые современные устройства:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:38
+#: en/testing.xml:31
 msgid "network interface: configure it with net_applet"
 msgstr "сетевой интерфейс: конфигурировать его с помощью net_applet"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:42
-msgid "graphical card: if you see the previous screen, it's already OK."
+#: en/testing.xml:35
+#, fuzzy
+msgid "graphics card: if you see the previous screen, it's already OK."
 msgstr "графическая карта: если вы видите предыдущий экран, то это уже хорошо."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:47
+#: en/testing.xml:40
 msgid "webcam:"
 msgstr "веб-камера:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:51
+#: en/testing.xml:44
 msgid "sound: a jingle has already been played"
 msgstr "звук: звонок уже проиграл"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:55
-msgid "printer: configure it and print a test page"
+#: en/testing.xml:48
+#, fuzzy
+msgid "printer: configure your printer/s and print a test page"
 msgstr "принтер: настроить его и распечатать тестовую страницу"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:59
+#: en/testing.xml:52
 msgid "scanner: scan a document from ..."
 msgstr "сканер: отсканировать документ из ..."
 
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:63
+#: en/testing.xml:56
+#, fuzzy
 msgid ""
-"If all is OK for you, you can process to the installation. If not, you can "
-"leave with the quit button."
+"If everything is satisfactory, you can proceed with the installation. If "
+"not, you can use the <emphasis>Quit</emphasis> button to exit."
 msgstr ""
 "Если всё хорошо для вас, то вы можете начать установку. Если нет, то вы "
 "можете выйти кнопкой выхода."
 
-#. type: Content of: <section><section><section><remark>
-#: en/testing.xml:66
-msgid "The configuration settings you made here are kept for the installation."
+#. type: Content of: <section><section><section><note><para>
+#: en/testing.xml:61
+#, fuzzy
+msgid ""
+"The configuration settings you apply here are carried over if you decide to "
+"proceed with the installation."
 msgstr ""
 "Параметры конфигурации, которые вы здесь сделали, сохраняются для установки."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:72
+#: en/testing.xml:68
 msgid "Launch installation"
 msgstr "Запуск установки"
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/testing.xml:76
-msgid ""
-"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
-"imageobject>"
-
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:81
+#: en/testing.xml:71
+#, fuzzy
 msgid ""
-"To launch the installation of Mageia LiveCD or Live DVD to the hard disc or "
-"SSD drive, simply click on the icon \"Install on Hard Disk\". You will get "
-"this screen, and then the \"<link linkend=\"doPartitionDisks\">Partitioning</"
-"link> step\" as for the direct installation."
+"To launch the installation of the Live DVD to a hard disk or SSD drive, "
+"simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live "
+"desktop. You will then see this screen, followed by the <link linkend="
+"\"doPartitionDisks\">Partitioning</link> step."
 msgstr ""
 "Для того, чтобы запустить установку Mageia с Live CD или Live DVD на жёсткий "
 "диск или SSD-диск, просто нажмите на иконку \"Установить на жёсткий диск\". "
 "Вы получите этот экран, а затем шаг \"<link linkend=\"doPartitionDisks"
 "\">Разбиение на разделы</link>\" как для непосредственной установки."
 
+#. type: Content of: <section><section><section><mediaobject>
+#: en/testing.xml:77
+msgid ""
+"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:3
+#: en/uninstall-Mageia.xml:10
 msgid "Uninstalling Mageia"
 msgstr "Удаление Mageia"
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:18
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly - in short "
 "you want get rid of it - that is your right and Mageia also gives you the "
@@ -5278,12 +5661,13 @@ msgstr ""
 "системы. Такую возможность можно найти не в каждой операционной системе."
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:14
+#: en/uninstall-Mageia.xml:23
+#, fuzzy
 msgid ""
-"After your data backup, reboot your Mageia installation DVD and select "
-"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
-"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
-"have Windows, with no option to choose your operating system."
+"After backing up your data, reboot your Mageia installation DVD and select "
+"<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot "
+"loader</emphasis>. At the next boot, you will only have Windows, with no "
+"option to choose your Mageia operating system."
 msgstr ""
 "После создания резервной копии данных, перезагрузите систему с DVD Mageia и "
 "выберите пункт <emphasis role=\"bold\">«Rescue system/Спасение системы»</"
@@ -5292,14 +5676,18 @@ msgstr ""
 "загрузится только Windows без всяких окон выбора операционной системы."
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:19
-msgid ""
-"In Windows to recover the space used by Mageia partitions: click on "
-"<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
-"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
-"size and place on the disk. Right click on each of these partitions and "
-"select <guibutton>Delete</guibutton> to free up the space."
+#: en/uninstall-Mageia.xml:28
+#, fuzzy
+msgid ""
+"In Windows, to recover the space used by Mageia partitions: click on "
+"<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control Panel</"
+"guimenuitem> <guimenuitem>Administrative Tools</guimenuitem> "
+"<guimenuitem>Computer Management</guimenuitem> <guimenuitem>Storage</"
+"guimenuitem> <guimenuitem>Disk Management</guimenuitem> </menuchoice>. You "
+"will recognise a Mageia partition because they are labeled <literal>Unknown</"
+"literal>, and also by their size and place on the disk. Right-click on each "
+"of these partitions and select <emphasis>Delete</emphasis> to free up the "
+"space."
 msgstr ""
 "Чтобы воспользоваться местом на диске, которое когда-то было занято "
 "разделами Mageia в Windows, воспользуйтесь пунктом меню <code>Пуск -> Панель "
@@ -5312,17 +5700,18 @@ msgstr ""
 "будет освобождено."
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:46
+#, fuzzy
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
-"(FAT32 or NTFS). It will get a partition letter."
+"(FAT32 or NTFS). It will then get a partition letter."
 msgstr ""
 "Если на компьютере установлена Windows XP, вы можете создать новый раздел и "
 "выполнить его форматирование (в FAT32 или NTFS). Система предоставит ему "
 "соответствующую букву диска."
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:30
+#: en/uninstall-Mageia.xml:49
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
 "existing partition that is at the left of the freed space. There are other "
@@ -5340,34 +5729,50 @@ msgstr ""
 "резервные копии всех важных данных."
 
 #. type: Content of: <section><info><title>
-#: en/unused.xml:9
+#: en/unused.xml:3
 msgid "Keep or delete unused material"
 msgstr "Сохранить или удалить неиспользованный материал"
 
+#. 2018/03/03 apb: Adjusted text and updated SC's to Mga6.
 #. type: Content of: <section><mediaobject>
-#: en/unused.xml:13
+#: en/unused.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"unused-im1\" fileref=\"live-"
+"unused.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/unused.xml:19
+#: en/unused.xml:14
+#, fuzzy
 msgid ""
 "In this step, the installer looks for unused locales packages and unused "
-"hardware packages. Then it proposes you to delete them. It is a good idea to "
-"accept, except if you prepare an installation which has to run on different "
-"hardware."
+"hardware packages and you are then given an opportunity to delete them."
 msgstr ""
 "На этом этапе программа установки ищет неиспользуемые пакеты локалей и "
 "неиспользуемые пакеты аппаратного обеспечения. Затем она предлагает вам "
 "удалить их. Это хорошая идея, чтобы согласиться, за исключением того, если "
 "вы готовите установку, которая должна работать на другом оборудовании."
 
+#. type: Content of: <section><para>
+#: en/unused.xml:18
+msgid ""
+"If you do not foresee a case where your installation may need to run on "
+"different hardware, or that you might need additional localization files "
+"then you might wish to accept this proposal."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/unused.xml:22
+msgid ""
+"Clicking <emphasis>Advanced</emphasis> will list the unused hardware and "
+"localization files that will be removed if you proceed."
+msgstr ""
+
 #. type: Content of: <section><mediaobject>
-#: en/unused.xml:25
+#: en/unused.xml:26
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
@@ -5376,11 +5781,840 @@ msgstr ""
 "> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/unused.xml:30
+#: en/unused.xml:31
+#, fuzzy
 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."
+"The next step is the copying of files to hard disk. This process should just "
+"take a little while to complete. When it is finising you will briefly get a "
+"blank screen - this is normal."
 msgstr ""
 "Следующим шагом является копирование файлов на жёсткий диск. Это занимает "
 "несколько минут. В завершение вы получите пустой экран в течение некоторого "
 "времени, это нормально."
+
+#~ msgid "User and Superuser Management"
+#~ msgstr "Управление учётными записями пользователя и администратора"
+
+#~ msgid ""
+#~ "Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+#~ "(capacity, mount point, type).</emphasis>"
+#~ msgstr ""
+#~ "Для каждого из разделов будут показаны следующие данные: <emphasis role="
+#~ "\"bold\">Устройство («Ёмкость», «Точка монтирования», «Тип»).</emphasis>"
+
+#~ msgid ""
+#~ "<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+#~ "\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+#~ "emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+#~ "(for example, <emphasis role=\"bold\">sda5</emphasis>)."
+#~ msgstr ""
+#~ "<emphasis role=\"bold\">Устройство</emphasis> состоит из следующих "
+#~ "частей: <emphasis role=\"bold\">жёсткий диск</emphasis>, [<emphasis role="
+#~ "\"bold\">название жёсткого диска</emphasis> (буква)], <emphasis role="
+#~ "\"bold\">номер раздела</emphasis> (пример: <emphasis role=\"bold\">sda5</"
+#~ "emphasis>)."
+
+#~ msgid "In advanced tab, you will find more options about clock settings."
+#~ msgstr ""
+#~ "На вкладке Дополнительно, вы найдёте больше вариантов о настройках часов."
+
+#~ msgid "From a disc"
+#~ msgstr "С диска"
+
+#~ msgid ""
+#~ "You can boot directly from the media you used to burn your image (CD-ROM, "
+#~ "DVD-ROM...). You usually just need to insert it in your CD/DVD drive for "
+#~ "the bootloader to launch the installation automatically after rebooting "
+#~ "the computer. If that does not happen you may need to reconfigure your "
+#~ "BIOS or press one key that will offer you to choose the peripheral from "
+#~ "which the computer will boot."
+#~ msgstr ""
+#~ "Вы можете загрузиться непосредственно с носителя, который вы "
+#~ "использовали, чтобы прожечь ваш образ (CD-ROM, DVD-ROM...). Вам, как "
+#~ "правило, нужно просто вставить его в CD/DVD привод для загрузчика, чтобы "
+#~ "автоматически запустить установку после перезагрузки компьютера. Если "
+#~ "этого не произойдёт, то вам возможно потребуется изменить настройки BIOS "
+#~ "или нажать определённую клавишу, которая предложит вам выбрать "
+#~ "периферийное устройство, с которого компьютер будет загружаться."
+
+#~ msgid ""
+#~ "According to which hardware you have, and how it is configured, you get "
+#~ "either one or another of the two screens below."
+#~ msgstr ""
+#~ "В соответствии аппаратными средствами, которые вы имеете, и как они "
+#~ "настроены, вы получаете либо один, либо другой из двух экранов ниже."
+
+#~ msgid "From a USB device"
+#~ msgstr "С USB устройства"
+
+#~ msgid ""
+#~ "You can boot from the USB device on which you dumped your image ISO. "
+#~ "According to your BIOS settings, the computer boots perhaps directly on "
+#~ "the USB device already plugged in a port. If that does not happen you may "
+#~ "need to reconfigure your BIOS or press one key that will offer you to "
+#~ "choose the peripheral from which the computer will boot."
+#~ msgstr ""
+#~ "Вы можете загрузиться с устройства USB, на которое вы сбрасывали свой "
+#~ "образ ISO. В соответствии с вашими настройками BIOS компьютер возможно "
+#~ "загружается непосредственно с устройства USB, которое уже подключено к "
+#~ "порту. Если это не произойдёт, вам возможно потребуется изменить "
+#~ "настройки BIOS или нажать определённую клавишу, которая предложит вам "
+#~ "выбрать периферийное устройство, с которого компьютер будет загружаться."
+
+#~ msgid ""
+#~ "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+
+#~ msgid "In the middle menu, you have the choice between three actions:"
+#~ msgstr "В среднем меню у вас есть выбор между тремя действиями:"
+
+#~ msgid ""
+#~ "Boot from hard disk: This choice allows to boot from hard disk, as usual, "
+#~ "when no media (CD/DVD or USB stick) is connected. (not working with "
+#~ "Mageia 5)."
+#~ msgstr ""
+#~ "Загрузка с жёсткого диска: Этот выбор позволяет загружаться с жёсткого "
+#~ "диска как обычно, когда никакие носители информации (CD/DVD или USB флэш "
+#~ "диски) не подключены. (не работает с Mageia 5)."
+
+#~ msgid "In the bottom menu, are the Boot Options:"
+#~ msgstr "В нижнем меню находятся параметры загрузки:"
+
+#~ msgid ""
+#~ "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
+#~ msgstr ""
+#~ "F1 - Справка. Объясняются опции \"splash\", \"apm\", \"acpi\" и\"Ide\""
+
+#~ msgid "F2 - Language. Choose the display language of the screens."
+#~ msgstr "F2 - Язык. Выбирается отображаемый на экранах язык."
+
+#~ msgid ""
+#~ "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
+#~ msgstr ""
+#~ "F3 - Разрешение экрана. Выбирается между текстом, 640x400, 800x600, "
+#~ "1024x728"
+
+#~ msgid ""
+#~ "F5 - Driver. Yes or No. The system is aware about the presence of an "
+#~ "optional disk with a driver update and will require its insertion during "
+#~ "installation process."
+#~ msgstr ""
+#~ "F5 - Драйвер. Да или Нет. Система знает о наличии оптического диска с "
+#~ "обновлением драйверов и потребует его вставки во время процесса установки."
+
+#~ msgid ""
+#~ "F6 - Kernel options. This is a way to specify options according to your "
+#~ "hardware and the drivers to use."
+#~ msgstr ""
+#~ "F6 - Параметры ядра. Это способ указать параметры в соответствии с вашим "
+#~ "оборудованием и драйверами для использования."
+
+#~ msgid "First screen while booting on UEFI system from disk"
+#~ msgstr "Первый экран при загрузке с диска для системы с UEFI"
+
+#~ msgid ""
+#~ "You have only the choice to run Mageia in Live mode (first choice)  or to "
+#~ "process the installation (second choice)."
+#~ msgstr ""
+#~ "У вас есть только выбор для запуска Mageia в Live режиме (первый вариант) "
+#~ "или инициировать установку (второй вариант)."
+
+#~ msgid ""
+#~ "In each case, the first steps will be the same to choose language, "
+#~ "timezone and keyboard, then the processes differ, with <link linkend="
+#~ "\"testing\">additional steps in Live mode</link>."
+#~ msgstr ""
+#~ "В каждом случае первые шаги будут такими же, чтобы выбрать язык, часовой "
+#~ "пояс и клавиатуру, а затем процессы будут различаться на <link linkend="
+#~ "\"testing\">дополнительные шаги в Live режиме</link>."
+
+#~ msgid ""
+#~ "Depending on your selection here, you may be offered further screens to "
+#~ "fine-tune your choice."
+#~ msgstr ""
+#~ "В зависимости от выбранного вами с помощью этой страницы варианта "
+#~ "установки, программа может предложить на последующих страницах "
+#~ "дополнительные возможности окончательной настройки вашей системы."
+
+#~ msgid "The settings DrakX chose are usually good."
+#~ msgstr "Обычно, потребности в изменении настроек, выбранных DrakX, нет."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_card_list-"
+#~ "im1\" align=\"center\" fileref=\"dx2-configureX_card_list.png\" revision="
+#~ "\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_card_list-"
+#~ "im1\" align=\"center\" fileref=\"dx2-configureX_card_list.png\" revision="
+#~ "\"1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+#~ "explicitly enabled to access them. If you didn't enable it previously, "
+#~ "you should do this after your first reboot."
+#~ msgstr ""
+#~ "Вам следует явным образом включить хранилища <emphasis role=\"bold"
+#~ "\">Nonfree</emphasis>, чтобы иметь к ним доступ. Сделать это следует "
+#~ "после первой перезагрузки системы."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+#~ "fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+#~ "fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your "
+#~ "card from the list if needed."
+#~ msgstr ""
+#~ "<emphasis><guibutton>Графическая карта</guibutton></emphasis>: если "
+#~ "нужно, выберите установленную на компьютере графическую карту из списка."
+
+#~ msgid "Incorrect refresh rates may damage your monitor"
+#~ msgstr ""
+#~ "Ошибочно указанные частоты обновления изображения могут привести к "
+#~ "повреждению монитора."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+#~ "fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+#~ "fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> "
+#~ "</imageobject>"
+
+#~ msgid "<emphasis>Custom</emphasis>"
+#~ msgstr "<emphasis>Дополнительно</emphasis>"
+
+#~ msgid "<emphasis>Plug 'n Play</emphasis>"
+#~ msgstr "<emphasis>Plug 'n Play</emphasis>"
+
+#~ msgid "the monitor manufacturers name"
+#~ msgstr "название фирмы-производителя монитора"
+
+#~ msgid "the monitor description"
+#~ msgstr "описание монитора"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake."
+#~ "png\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake."
+#~ "png\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Click <guibutton>Done</guibutton> when you're ready."
+#~ msgstr ""
+#~ "Нажмите кнопку <guibutton>Выполнено</guibutton>, когда настройки будут "
+#~ "завершены."
+
+#~ msgid ""
+#~ "<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 fileref=\"dx2-"
+#~ "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Use Free Space"
+#~ msgstr "Использовать свободное место"
+
+#~ msgid "Use Free Space on a Windows Partition"
+#~ msgstr "Использовать свободное место на разделе Microsoft Windows®"
+
+#~ msgid ""
+#~ "If you have unused space on an existing Windows partition, the installer "
+#~ "may offer to use it."
+#~ msgstr ""
+#~ "Этим вариантом можно будет воспользоваться, если на уже созданных "
+#~ "разделах Windows достаточно свободного места для установки новой "
+#~ "операционной системы."
+
+#~ msgid ""
+#~ "<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 fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Erase and use Entire Disk."
+#~ msgstr "Стереть и использовать весь диск"
+
+#~ msgid ""
+#~ "Note! This will erase ALL data on the selected hard drive. Take care!"
+#~ msgstr ""
+#~ "Замечание: все данные на диске будут в таком случае уничтожены. Будьте "
+#~ "осторожны!"
+
+#~ msgid "Custom disk partitioning"
+#~ msgstr "Ручная разметка диска"
+
+#~ msgid ""
+#~ "That means that from 160 GB or greater available space, the installer "
+#~ "will create three partitions: 50 GB for <emphasis role=\"bold\">/</"
+#~ "emphasis>, 4 GB for <emphasis role=\"bold\">swap</emphasis> and the "
+#~ "remainder for <emphasis role=\"bold\">/home</emphasis>."
+#~ msgstr ""
+#~ "Это означает, что если на диске 160 ГБ или более свободного места, "
+#~ "средством установки будет создано три раздела: 50 ГБ для <emphasis role="
+#~ "\"bold\">/</emphasis>, 4 ГБ для <emphasis role=\"bold\">свопа</emphasis> "
+#~ "на диске. Остальные места будут отданы под <emphasis role=\"bold\">/home</"
+#~ "emphasis>."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+#~ "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition="
+#~ "\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+#~ "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition="
+#~ "\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "January 2015"
+#~ msgstr "Январь 2015"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#~ msgid "Using a Mageia DVD"
+#~ msgstr "С помощью DVD Mageia"
+
+#~ msgid ""
+#~ "Here are the default welcome screens when using a Mageia DVD, The first "
+#~ "one is what you will see if you have a UEFI system, the second one is for "
+#~ "a Legacy system:"
+#~ msgstr ""
+#~ "Ниже приведены типичные окна приветствия DVD Mageia. Первое из них "
+#~ "соответствует системе с UEFI, второе - системе с устаревшей системой "
+#~ "загрузки:"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+
+#~ msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "From this screen, it is possible to set some preferences (note that the "
+#~ "options <emphasis role=\"bold\">F1</emphasis> to <emphasis role=\"bold"
+#~ "\">F6</emphasis> are available only on Legacy systems):"
+#~ msgstr ""
+#~ "С помощью этой страницы можно указать некоторые настройки (заметьте, что "
+#~ "пункты от <emphasis role=\"bold\">F1</emphasis> до <emphasis role=\"bold"
+#~ "\">F6</emphasis> доступны только на устаревших системах):"
+
+#~ msgid ""
+#~ "Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
+#~ "specific language for the installation."
+#~ msgstr ""
+#~ "Нажмите <emphasis role=\"bold\">F2</emphasis>, чтобы выбрать язык, на "
+#~ "котором средству установки показывать сообщения."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Use the arrow keys to select the language then press <emphasis role=\"bold"
+#~ "\">Enter</emphasis>."
+#~ msgstr ""
+#~ "Используйте клавиши со стрелками, чтобы выбрать нужный вам пункт в списке "
+#~ "и нажмите клавишу <emphasis role=\"bold\">Enter</emphasis>."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+
+#~ msgid "Default: It doesn't alter anything in the default options."
+#~ msgstr "Default (по-умолчанию): не менять ничего в типичных параметрах."
+
+#~ msgid ""
+#~ "Safe Settings: Priority is given to the safer options at the price of a "
+#~ "performance detriment."
+#~ msgstr ""
+#~ "Safe Settings (безопасные параметры): преимущество безопасности "
+#~ "параметров над быстродействием."
+
+#~ msgid ""
+#~ "When you select one of these entries, it modifies the default options "
+#~ "displayed in the <guilabel>Boot Options</guilabel> line."
+#~ msgstr ""
+#~ "Выбор одного из пунктов приводит к внесению изменений в параметры по "
+#~ "умолчанию, показанные в строке <guilabel>Параметры загрузки</guilabel>."
+
+#~ msgid ""
+#~ "In some Mageia releases, it may happen that the entries selected with "
+#~ "<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+#~ "Options</guilabel> line, despite this, they will in fact be applied."
+#~ msgstr ""
+#~ "В некоторых выпусках Mageia параметры, выбранные с помощью <emphasis role="
+#~ "\"bold\">F6</emphasis>, не появятся в строке <guilabel>Параметры "
+#~ "загрузки</guilabel>. Впрочем, эти параметры будут учтены при загрузке "
+#~ "системы."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+#~ "various boot options. Select an item with the arrow keys and press "
+#~ "<emphasis role=\"bold\">Enter</emphasis> for more details or press "
+#~ "<emphasis role=\"bold\">Esc</emphasis> to go back to the welcome screen."
+#~ msgstr ""
+#~ "Нажатие клавиши <emphasis role=\"bold\">F1</emphasis> открывает новое "
+#~ "окно со списком пунктов. Выберите один из пунктов с помощью клавиш со "
+#~ "стрелками и нажмите клавишу <emphasis role=\"bold\">Enter</emphasis>, "
+#~ "чтобы получить подробную справку, или нажмите клавишу <emphasis role="
+#~ "\"bold\">Esc</emphasis>, чтобы вернуться к окну приветствия."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "The detailed view about the splash option. Press <emphasis role=\"bold"
+#~ "\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> "
+#~ "to go back to the options list. These options can be added by hand in the "
+#~ "<guilabel>Boot Options</guilabel> line."
+#~ msgstr ""
+#~ "Ниже приведён снимок окна с подробным описанием параметров окна "
+#~ "приветствия системы. Нажмите клавишу <emphasis role=\"bold\">Esc</"
+#~ "emphasis> или выберите пункт <guilabel>Return to Boot Options (Вернуться "
+#~ "к параметрам загрузки)</guilabel>, чтобы вернуться в список параметров. "
+#~ "Описанные в окне параметры можно добавить вручную в строку "
+#~ "<guilabel>Параметры загрузки</guilabel>."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "The help is translated in the chosen language with <emphasis role=\"bold"
+#~ "\">F2</emphasis>."
+#~ msgstr ""
+#~ "Посмотреть перевод справки на выбранном языке можно с помощью нажатия "
+#~ "клавиши <emphasis role=\"bold\">F2</emphasis>."
+
+#~ msgid ""
+#~ "For more information about kernel options on legacy and UEFI systems, "
+#~ "see: <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
+#~ "How_to_set_up_kernel_options</link>"
+#~ msgstr ""
+#~ "Подробное описание параметров ядра в устаревших системах и системах с "
+#~ "UEFI можно найти  <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "How_to_set_up_kernel_options\">здесь</link>."
+
+#~ msgid "Media Selection (Nonfree)"
+#~ msgstr "Выбор источника (Nonfree)"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" "
+#~ "align=\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" "
+#~ "align=\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Summary of miscellaneous parameters"
+#~ msgstr "Резюме относительно других параметров"
+
+#~ msgid "<guilabel>Timezone</guilabel>"
+#~ msgstr "<guilabel>Часовой пояс</guilabel>"
+
+#~ msgid "<guilabel>Country / Region</guilabel>"
+#~ msgstr "<guilabel>Страна / Регион</guilabel>"
+
+#~ msgid "<guilabel>Bootloader</guilabel>"
+#~ msgstr "<guilabel>Загрузчик</guilabel>"
+
+#~ msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
+#~ msgstr ""
+#~ "Чтобы узнать больше, обратитесь к разделу <xref linkend=\"setupBootloader"
+#~ "\"/>"
+
+#~ msgid "<guilabel>User management</guilabel>"
+#~ msgstr "<guilabel>Управление учетными записями</guilabel>"
+
+#~ msgid "<guilabel>Services</guilabel>:"
+#~ msgstr "<guilabel>Службы</guilabel>:"
+
+#~ msgid "For more information, see <xref linkend=\"configureServices\"/>"
+#~ msgstr ""
+#~ "Чтобы узнать больше, обратитесь к разделу <xref linkend="
+#~ "\"configureServices\"/>."
+
+#~ msgid "<guilabel>Keyboard</guilabel>:"
+#~ msgstr "<guilabel>Клавиатура</guilabel>:"
+
+#~ msgid "<guilabel>Mouse</guilabel>:"
+#~ msgstr "<guilabel>Мышь</guilabel>:"
+
+#~ msgid "<guilabel>Sound card</guilabel>:"
+#~ msgstr "<guilabel>Звуковая плата</guilabel>:"
+
+#~ msgid ""
+#~ "The installer uses the default driver - if there is a default one. The "
+#~ "option to select a different driver is only given when there is more than "
+#~ "one driver for your card, but where none of them is the default one."
+#~ msgstr ""
+#~ "Средством установки будет использован типичный драйвер, если такой "
+#~ "типичный драйвер предусмотрен. Возможность выбора другого драйвера будет "
+#~ "предоставлена, только если для карточки предусмотрено несколько "
+#~ "драйверов, но ни один из них не является типичным."
+
+#~ msgid "<guilabel>Graphical interface</guilabel>:"
+#~ msgstr "<guilabel>Графический интерфейс</guilabel>:"
+
+#~ msgid "<guilabel>Network</guilabel>:"
+#~ msgstr "<guilabel>Сеть</guilabel>:"
+
+#~ msgid "<guilabel>Proxies</guilabel>:"
+#~ msgstr "<guilabel>Прокси</guilabel>:"
+
+#~ msgid "<guilabel>Security Level</guilabel>:"
+#~ msgstr "<guilabel>Уровень безопасности</guilabel>:"
+
+#~ msgid "Check the option which best suits your usage."
+#~ msgstr ""
+#~ "Выберите тот из вариантов, который лучше всего соответствует вашему "
+#~ "образу использования системы."
+
+#~ msgid "<guilabel>Firewall</guilabel>:"
+#~ msgstr "<guilabel>Файервол</guilabel>:"
+
+#~ msgid ""
+#~ "A firewall is intended to be a barrier between your important data and "
+#~ "the rascals out there on the internet who would compromise or steal it."
+#~ msgstr ""
+#~ "Файервол или сетевой экран является барьером, который защищает важные "
+#~ "данные от доступа к ним мошенников из интернета, пытающихся похитить и "
+#~ "воспользоваться этими данными."
+
+#~ msgid ""
+#~ "Select the services that you wish to have access to your system. Your "
+#~ "selections will depend on what you use your computer for. For more "
+#~ "information, see <xref linkend=\"firewall\"/>."
+#~ msgstr ""
+#~ "Выберите службы, каким должен быть разрешён доступ к вашей системе. Выбор "
+#~ "служб будет зависеть от назначения компьютера, на котором работает "
+#~ "операционная система. Подробнее об этом в разделе <xref linkend=\"firewall"
+#~ "\"/>."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" "
+#~ "align=\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" "
+#~ "align=\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </"
+#~ "imageobject>"
+
+#~ msgid "64 bit architecture only."
+#~ msgstr "Только для 64-битной архитектуры."
+
+#~ msgid ""
+#~ "md5sum and sha1sum are tools to check the ISO integrity. Choose one or "
+#~ "the other, and copy the checksum <link linkend=\"integrity\">for later "
+#~ "use</link>. Then a window similar to this one appears:"
+#~ msgstr ""
+#~ "md5sum и sha1sum - программы для проверки целостности данных в образах "
+#~ "ISO. Для выполнения проверки достаточно установить только одну из этих "
+#~ "программ. Для дальнейшего использования установите одну из них. Далее, "
+#~ "будет показано такое окно:"
+
+#~ msgid "Select the Save File option, then, click OK."
+#~ msgstr "Выберите пункт «Сохранить файл», затем нажмите кнопку «OK»."
+
+#~ msgid ""
+#~ "To recover the original capacity, you must redo partitioning and re-"
+#~ "format the USB stick."
+#~ msgstr ""
+#~ "Для восстановления первоначальной ёмкости диска USB вам впоследствии "
+#~ "придётся его форматировать."
+
+#~ msgid "Install"
+#~ msgstr "Установка"
+
+#~ msgid "Upgrade"
+#~ msgstr "Обновление"
+
+#~ msgid ""
+#~ "If during install you decide to stop the installation, it is possible to "
+#~ "reboot, but please think twice before you do this. Once a partition has "
+#~ "been formatted or updates have started to be installed, your computer "
+#~ "isn't in the same state anymore and rebooting it could very well leave "
+#~ "you with an unusable system. If in spite of that, and only if you are "
+#~ "very sure rebooting is what you want, go to a text terminal by pressing "
+#~ "<guilabel>Alt Ctrl F2</guilabel> simultaneously. After that, press "
+#~ "<guilabel>Alt Ctrl Delete</guilabel> simultaneously to reboot."
+#~ msgstr ""
+#~ "Если в течение процедуры установки вы решите прекратить установку, вы "
+#~ "можете перезагрузить компьютер. Впрочем, вам следует тщательно обдумать "
+#~ "ваши действия. После форматирования раздела или начала процедуры "
+#~ "установки обновлений компьютер будет находиться в промежуточном "
+#~ "состоянии. Перезагрузка может привести к невозможности использования "
+#~ "системы. Если, вопреки этим предупреждением, вы хотите перезагрузить "
+#~ "систему, перейдите в текстовый терминал нажатием комбинации этих трёх "
+#~ "клавиш: <guilabel>Alt Ctrl F2</guilabel> одновременно. После этого, "
+#~ "нажмите комбинацию клавиш <guilabel>Alt Ctrl Delete</guilabel> "
+#~ "одновременно, чтобы перезагрузить компьютер."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "You will be required to set the keyboard layout you wish to use in Mageia​​"
+#~ ". The default one is selected according to your language and timezone "
+#~ "previously selected."
+#~ msgstr ""
+#~ "Вам потребуется установить раскладку клавиатуры, которую вы хотите "
+#~ "использовать в Mageia. По умолчанию она выбирается в зависимости от "
+#~ "вашего языка и часового пояса, выбранного ранее."
+
+#~ msgid "Mageia uses UTF-8 (Unicode) support by default."
+#~ msgstr "По умолчанию Mageia использует поддержку UTF-8 (Юникод)."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
+#~ "format=\"PNG\" > </imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
+#~ "format=\"PNG\" > </imagedata> </imageobject>"
+
+#~ msgid "By default, Mageia uses exclusively:"
+#~ msgstr "По умолчанию Mageia эксклюзивно использует:"
+
+#~ msgid "GRUB2-efi for a UEFI system."
+#~ msgstr "GRUB2-efi для системы UEFI."
+
+#~ msgid "The Mageia graphical menus are nice :)"
+#~ msgstr "Графические меню Mageia выглядят великолепно. :)"
+
+#~ msgid ""
+#~ "<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 fileref=\"dx2-"
+#~ "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref="
+#~ "\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless "
+#~ "you really know what you are doing."
+#~ msgstr ""
+#~ "Не изменяйте значение параметра <emphasis role=\"bold\">Устройство "
+#~ "загрузки</emphasis>, если в этом нет необходимости."
+
+#~ msgid ""
+#~ "With a UEFI system, the user interface is slightly different as you "
+#~ "cannot choose between the <emphasis role=\"bold\">with</emphasis> or "
+#~ "<emphasis role=\"bold\">without graphical menu</emphasis> options."
+#~ msgstr ""
+#~ "Если вы пользуетесь системой с UEFI, интерфейс может немного отличаться, "
+#~ "поскольку вы не сможете выбирать между загрузчиком с графическим меню и "
+#~ "без него."
+
+#~ msgid ""
+#~ "<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 fileref=\"dx2-"
+#~ "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "By default, and according to your system, Mageia writes one of the "
+#~ "following:"
+#~ msgstr ""
+#~ "По умолчанию в зависимости от вашей системы, Mageia записывает следующее:"
+
+#~ msgid "a GRUB2-efi bootloader into the ESP"
+#~ msgstr "загрузчик GRUB2-efi к ESP;"
+
+#~ msgid "Using chain loading"
+#~ msgstr "Использование цепной загрузки"
+
+#~ msgid ""
+#~ "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 tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
+#~ msgstr ""
+#~ "Если вы не хотите использовать загрузчик Mageia, а вместо этого хотите "
+#~ "воспользоваться цепной загрузкой с другой операционной системы, нажмите "
+#~ "кнопку <guibutton>Далее</guibutton>, затем пункт "
+#~ "<guibutton>Дополнительно</guibutton> и установите флажок <guilabel>Не "
+#~ "трогать ESP или MBR</guilabel>."
+
+#~ msgid ""
+#~ "<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-"
+#~ "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid ""
+#~ "You will get a warning that the bootloader is missing, ignore it by "
+#~ "clicking <guibutton>OK</guibutton>."
+#~ msgstr ""
+#~ "Программа предупредит вас о том, что в системе не будет загрузчика. "
+#~ "Проигнорируйте предупреждение и нажмите кнопку <guibutton>ОК</guibutton>."
+
+#~ msgid "First page"
+#~ msgstr "Первая страница"
+
+#~ msgid "<guilabel>Advanced</guilabel>"
+#~ msgstr "<guilabel>Дополнительно</guilabel>"
+
+#~ msgid "Next page"
+#~ msgstr "Следующая страница"
+
+#~ msgid ""
+#~ "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+#~ "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
+#~ msgstr ""
+#~ "<guilabel>Зондирование посторонней ОС</guilabel>: см. выше раздел о <link "
+#~ "linkend=\"setupMageiaBootloader\">использование загрузчика Mageia</link>"
+
+#~ 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>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" "
+#~ "align=\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" "
+#~ "align=\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
+
+#~ msgid "DrakX should then be able to configure the drive(s) correctly."
+#~ msgstr ""
+#~ "После этого, DrakX сможет настроить систему на работу с дисками должным "
+#~ "образом."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
+#~ "xml:id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
+#~ "xml:id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+
+#~ 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 one exists."
+#~ msgstr ""
+#~ "На этом экране указан драйвер, который инсталлятор выбрал для вашей "
+#~ "звуковой карты из имеющихся и который будет драйвером по умолчанию, если "
+#~ "такой предусмотрен для карты."
+
+#~ msgid ""
+#~ "The default driver should work without problems. However, if after "
+#~ "install you do encounter problems, then run <command>draksound</command> "
+#~ "or start this tool via MCC (Mageia Control Center), by choosing the "
+#~ "<guilabel>Hardware</guilabel> tab and clicking on <guilabel>Sound "
+#~ "Configuration</guilabel> at the top right of the screen."
+#~ msgstr ""
+#~ "Драйвер по умолчанию должен работать без проблем. Однако, если после "
+#~ "установки вы столкнётесь с проблемами, то запустите <command>draksound</"
+#~ "command> или запустите эту утилиту из MCC (Центр Управления Mageia), "
+#~ "выбрав вкладку <guilabel>Оборудование</guilabel> и нажав "
+#~ "<guilabel>Настройка звука</guilabel> в верхнем правом углу окна."
+
+#~ msgid ""
+#~ "Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis "
+#~ "role=\"bold\">Sound Configuration</emphasis> tool screen, click on "
+#~ "<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+#~ "solve the problem."
+#~ msgstr ""
+#~ "После этого в окне <emphasis role=\"bold\">draksound</emphasis> или "
+#~ "инструмента <guibutton>«Настройка звука»</guibutton> нажмите кнопку "
+#~ "<guibutton>Решение проблем</guibutton>. В ответ будут показаны достойные "
+#~ "внимания советы по решению проблемы."
+
+#~ msgid ""
+#~ "Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></"
+#~ "emphasis> in this screen, during install, is useful if there is no "
+#~ "default driver and there are several drivers available, but you think the "
+#~ "installer selected the wrong one."
+#~ msgstr ""
+#~ "Кнопкой <emphasis role=\"bold\"><guibutton>Дополнительно</guibutton></"
+#~ "emphasis> при установке стоит пользоваться, если для карты не "
+#~ "предусмотрено драйвера по умолчанию, или если существует несколько "
+#~ "драйверов, и вы уверены, что средством установки выбран ложный драйвер."
+
+#~ msgid ""
+#~ "In that case you can select a different driver after clicking on "
+#~ "<emphasis role=\"bold\"><guibutton>Let me pick any driver</guibutton></"
+#~ "emphasis>."
+#~ msgstr ""
+#~ "В этом случае, вы можете выбрать другой драйвер после нажатия кнопки "
+#~ "<emphasis role=\"bold\"><guibutton>Позвольте мне подобрать драйвер</"
+#~ "guibutton></emphasis>."
+
+#~ msgid ""
+#~ "<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+#~ "takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+#~ "takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+#~ "takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+#~ "takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
+
+#~ msgid ""
+#~ "You get this screen if you selected \"Boot Mageia\". If not, you get the "
+#~ "\"<link linkend=\"doPartitionDisks\">Partitioning</link> step\""
+#~ msgstr ""
+#~ "Вы получите этот экран если выберите \"Загрузить Mageia\". Если нет, то "
+#~ "вы получите шаг \"<link linkend=\"doPartitionDisks\">Разбиение на "
+#~ "разделы</link>\""