Update from Calenco

1 files changed, 496 insertions, 602 deletions

diff --git a/docs/installer/ru.po b/docs/installer/ru.po
index 20f58716..23c5eebf 100644
--- a/docs/installer/ru.po
+++ b/docs/installer/ru.po
@@ -1,23 +1,22 @@
 # Copyright (C) 2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Yuri Chornoivan <yurchor@ukr.net>, 2012, 2013.
 # Valentin Saikov <saikov.vb@gmail.com>, 2013.
-# AlexL <loginov.alex.valer@gmail.com>, 2013
+# AlexL <loginov.alex.valer@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2013-05-06 09:50+0400\n"
-"PO-Revision-Date: 2013-05-05 13:31-0000\n"
-"Last-Translator: AlexL <loginov.alex.valer@gmail.com>\n"
+"POT-Creation-Date: 2013-05-16 20:28+0400\n"
+"PO-Revision-Date: 2013-05-16 20:37+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Russian <saikov.vb@gmail.com>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. type: Content of: <section><info><title>
 #: en/acceptLicense.xml:32
@@ -27,13 +26,11 @@ msgstr "Условия лицензирования и заметки о вып�
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:36
 msgid ""
-"<imageobject> <imagedata align=\"center\" depth=\"600\" fileref=\"dx2-"
-"license.png\" format=\"PNG\" revision=\"1\" width=\"800\" xml:id="
-"\"acceptLicense-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" depth=\"600\" fileref=\"dx2-"
-"license.png\" format=\"PNG\" revision=\"1\" width=\"800\" xml:id="
-"\"acceptLicense-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
 #: en/acceptLicense.xml:45
@@ -97,29 +94,29 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Управление учётными записями пользователя и администратора"
 
-#.  Started by marja,using Led43's text, on 2012 03 27 
-#.  NEEDS TO BE REVIEWED! 
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
+#.  Started by marja,using Led43's text, on 2012 03 27
+#.  NEEDS TO BE REVIEWED!
+#.  SimonNZG 2012-04-03 has taken a look but needs to come back
 #.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing 
-#.        about guest account there, is the box you can tick or untick to enable or 
+#.        changed his text about the Advanced User Managment screen (the only thing
+#.        about guest account there, is the box you can tick or untick to enable or
 #.        disable it, the rest is about the normal user you're adding in the previous
 #.        screen), marja, 20120409
 #.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct? 
-#.  JohnR 2012-04-19 Language proofreading  
-#.  marja 2012-04-24 Added screenshot 
-#.  marja 2013-04-26 added new note 
+#.        "rbash" in the xguest warning - is that correct?
+#.  JohnR 2012-04-19 Language proofreading
+#.  marja 2012-04-24 Added screenshot
+#.  marja 2013-04-26 added new note
 #. type: Content of: <section><mediaobject>
 #: en/addUser.xml:27
 msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setRootPassword.png\" "
-"width=\"100%\" depth=\"600\" format=\"PNG\" align=\"center\" xml:id="
-"\"setRootPassword-im1\"></imagedata> </imageobject>"
+"format=\"PNG\" align=\"center\" xml:id=\"setRootPassword-im1\"></imagedata> "
+"</imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setRootPassword.png\" "
-"width=\"100%\" depth=\"600\" format=\"PNG\" align=\"center\" xml:id="
-"\"setRootPassword-im1\"></imagedata> </imageobject>"
+"format=\"PNG\" align=\"center\" xml:id=\"setRootPassword-im1\"></imagedata> "
+"</imageobject>"
 
 #. type: Content of: <section><section><info><title>
 #: en/addUser.xml:34
@@ -358,27 +355,27 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Выберете точки монтированния"
 
-#.  Made by marja on 2012 03 28 
-#.  NEEDS TO BE REVIEWED! 
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
-#.  removed para xml:id's, marja, 20120409 
+#.  Made by marja on 2012 03 28
+#.  NEEDS TO BE REVIEWED!
+#.  SimonNZG 2012-04-03 has taken a look but needs to come back
+#.  removed para xml:id's, marja, 20120409
 #.  barjac 14/04/2012 Minor edit to improve grammar and replaced "at least ONE"
-#.        with "a", as I can't imagine having more than one root partition ;) 
-#.  Lebarhon : I put [] where it seems having mistakes 
+#.        with "a", as I can't imagine having more than one root partition ;)
+#.  Lebarhon : I put [] where it seems having mistakes
 #.  Marja: you're right, in English English it is "its type", however, the Americans
 #.        write "it's type". And you're right about the redundant part, too, I removed it
-#.  And JohnR says the Americans are WRONG! :-)) 
-#.  2012-04-19  Language proofreading done 
+#.  And JohnR says the Americans are WRONG! :-))
+#.  2012-04-19  Language proofreading done
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
 msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-chooseMountpoints.png"
-"\" align=\"center\" width=\"100%\" format=\"PNG\" depth=\"600\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject>"
+"\" align=\"center\" format=\"PNG\" xml:id=\"chooseMountPoints-im1\"></"
+"imagedata> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-chooseMountpoints.png"
-"\" align=\"center\" width=\"100%\" format=\"PNG\" depth=\"600\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject>"
+"\" align=\"center\" format=\"PNG\" xml:id=\"chooseMountPoints-im1\"></"
+"imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/ask_mntpoint_s.xml:33
@@ -504,12 +501,12 @@ msgstr "Приветственное окно программы установ�
 #: en/installer.xml:39
 msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" width=\"100%\" format=\"PNG\" depth=\"600\" xml:id=\"BId-drakx-"
-"intro-im1\"> </imagedata> </imageobject>"
+"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" width=\"100%\" format=\"PNG\" depth=\"600\" xml:id=\"BId-drakx-"
-"intro-im1\"> </imagedata> </imageobject>"
+"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
+"imageobject>"
 
 #. type: Content of: <section><section><figure>
 #: en/installer.xml:34 en/installer.xml:90
@@ -622,12 +619,12 @@ msgstr "Справочное окно инсталлятора"
 #: en/installer.xml:96
 msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" width=\"100%\" format=\"PNG\" depth=\"600\" xml:id=\"installer-"
-"im2\"></imagedata> </imageobject>"
+"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" width=\"100%\" format=\"PNG\" depth=\"600\" xml:id=\"installer-"
-"im2\"></imagedata> </imageobject>"
+"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+"imageobject>"
 
 #. type: Content of: <section><section><section><info><title>
 #: en/installer.xml:105
@@ -718,9 +715,9 @@ msgstr "Установка или обновление"
 #: en/selectInstallClass.xml:27
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" width=\"100%\" format=\"PNG\"></imagedata> </imageobject>"
+"\"center\" format=\"PNG\"></imagedata> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+"<imageobject>  <imagedata fileref=\"dx2-selectInstallClass.png\" align="
 "\"center\" width=\"100%\" format=\"PNG\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
@@ -805,11 +802,11 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/selectKeyboard.xml:22
 msgid ""
-"<imageobject> <imagedata align=\"center\" depth=\"600\" fileref=\"dx2-"
-"selectKeyboard.png\" width=\"800\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" depth=\"600\" fileref=\"dx2-"
-"selectKeyboard.png\" width=\"800\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectKeyboard.xml:30
@@ -871,18 +868,18 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Настройка ваших служб"
 
-#.  2012-12-25 marja - moved this section out of misc-params.xml 
-#.  2013-05-05 marja - added screenshot 
+#.  2012-12-25 marja - moved this section out of misc-params.xml
+#.  2013-05-05 marja - added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/configureServices.xml:21
 msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" width=\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id="
-"\"configureServices-im1\"></imagedata> </imageobject>"
+"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+"imagedata> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" width=\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id="
-"\"configureServices-im1\"></imagedata> </imageobject>"
+"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+"imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/configureServices.xml:27
@@ -954,10 +951,10 @@ msgstr ""
 #: en/selectLanguage.xml:36
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-selectLanguage.png\" align=\"center\" "
-"width=\"100%\" format=\"PNG\" depth=\"600\"> </imagedata> </imageobject>"
+"format=\"PNG\" > </imagedata> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-selectLanguage.png\" align=\"center\" "
-"width=\"100%\" format=\"PNG\" depth=\"600\"> </imagedata> </imageobject>"
+"format=\"PNG\" > </imagedata> </imageobject>"
 
 #. type: Content of: <section><warning><para>
 #: en/selectLanguage.xml:44
@@ -1002,49 +999,24 @@ msgstr ""
 "управления Mageia -&gt; Система -&gt; Настройка локализации системы."
 
 #. type: Content of: <section><info><title>
-#: en/takeOverHdChoose.xml:7
-msgid "Choose hard disk to erase for <application>Mageia</application>"
-msgstr ""
-"Выбор диска для очистки с целью установки <application>Mageia</application>."
-
-#. type: Content of: <section><para>
-#: en/takeOverHdChoose.xml:11
-msgid ""
-"Select the hard disk that should be formatted to install "
-"<application>Mageia</application>."
-msgstr ""
-"Выберите жесткий диск, который следует отформатировать для установки "
-"<application>Mageia</application>."
-
-#. type: Content of: <section><warning><para>
-#: en/takeOverHdChoose.xml:15
-msgid ""
-"Be sure to select the correct hard disk. All data on the selected disk will "
-"be lost. This step can not be undone."
-msgstr ""
-"Убедитесь, что именно тот жесткий диск. Все данные на выбранном диске будут "
-"потеряны. Восстановить данные после очистки будет очень трудно (я бы сказал "
-"не реально)."
-
-#. type: Content of: <section><info><title>
 #: en/takeOverHdConfirm.xml:4
 msgid "Confirm hard disk to be formatted"
 msgstr "Подтверждение форматирования жесткого диска"
 
-#.  Made by marja on 2012 04 03 
-#.  test comment - johnr 
+#.  Made by marja on 2012 04 03
+#.  test comment - johnr
 #.  2012-04-24 marja - replaced "if you are not sure you selected the correct
 #.     hard disk." with "if you are not sure about your choice", because I'm sure I
-#.     saw this help screen when I had only one HD 
-#.  2013-05-05 marja added screenshot 
+#.     saw this help screen when I had only one HD
+#.  2013-05-05 marja added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/takeOverHdConfirm.xml:19
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-takeOverHdConfirm.png\" format=\"PNG"
-"\" align=\"center\" width=\"800\" depth=\"600\"></imagedata> </imageobject>"
+"\" align=\"center\" ></imagedata> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-takeOverHdConfirm.png\" format=\"PNG"
-"\" align=\"center\" width=\"800\" depth=\"600\"></imagedata> </imageobject>"
+"\" align=\"center\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:24
@@ -1066,12 +1038,12 @@ msgstr ""
 "хранящиеся на этом диске."
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:25
 msgid "Partitioning"
 msgstr "Разбиение на разделы"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:28
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1082,7 +1054,7 @@ msgstr ""
 "о месте установки <application>Mageia</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:33
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1091,21 +1063,21 @@ msgstr ""
 "компьютера и содержимого дисков."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:37
+#: en/doPartitionDisks.xml:38
 msgid ""
-"<imageobject> <imagedata width=\"800\" align=\"center\" fileref=\"dx2-"
-"doPartitionDisks.png\" depth=\"600\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\" /> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" width=\"800\" fileref=\"dx2-"
-"doPartitionDisks.png\" depth=\"600\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:45
 msgid "Use Existing Partitions"
 msgstr "Использовать существующие разделы"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1115,12 +1087,12 @@ msgstr ""
 "системы."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:54
 msgid "Use Free Space"
 msgstr "Использовать свободное место"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:56
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1129,12 +1101,12 @@ msgstr ""
 "свободное место, достаточное для установки новой системы Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:62
 msgid "Use Free Space on a Windows Partition"
 msgstr "Использовать свободное место на разделе Microsoft Windows®"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:65
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1143,7 +1115,7 @@ msgstr ""
 "Windows достаточно свободного места для установки новой операционной системы."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:68
+#: en/doPartitionDisks.xml:69
 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 "
@@ -1154,7 +1126,7 @@ msgstr ""
 "предварительно создать резервные копии важных для вас файлов!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:74
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1172,26 +1144,26 @@ msgstr ""
 "создать резервные копии важных для вас файлов."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:83
+#: en/doPartitionDisks.xml:84
 msgid "Erase and use Entire Disk."
 msgstr "Стереть и использовать весь диск"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:86
+#: en/doPartitionDisks.xml:87
 msgid "This option will use the complete drive for Mageia."
 msgstr ""
 "При использовании этого варианта для установки Mageia будет использован весь "
 "диск."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:89
+#: en/doPartitionDisks.xml:90
 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:92
+#: en/doPartitionDisks.xml:93
 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 "
@@ -1202,12 +1174,12 @@ msgstr ""
 "вариантом."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:99
+#: en/doPartitionDisks.xml:100
 msgid "Custom"
 msgstr "Вручную"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:102
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1216,7 +1188,7 @@ msgstr ""
 "разделов на вашем диске в соответствии с вашими предпочтениями."
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:109
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1235,19 +1207,19 @@ msgstr ""
 "программы, например gparted с такими параметрами:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:117
 msgid "\"Align to\" \"MiB\""
 msgstr "«Выровнять по» «МиБ»"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:119
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "«Свободное место до (МиБ)» «2»"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:120
+#: en/doPartitionDisks.xml:121
 msgid ""
-"Also make sure all partitions are create with an even number of megabytes."
+"Also make sure all partitions are created with an even number of megabytes."
 msgstr "Также следует создавать разделы только с чётным размером в мегабайтах."
 
 #. type: Content of: <section><info><title>
@@ -1279,10 +1251,10 @@ msgstr ""
 #: en/chooseDesktop.xml:20
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" width=\"800\" depth=\"600\"></imagedata> </imageobject>"
+"format=\"PNG\" ></imagedata> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackages.png\" align=\"center\" "
-"format=\"PNG\" width=\"800\" depth=\"600\"></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
+"format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:26
@@ -1314,12 +1286,10 @@ msgstr "Выбор групп пакетов"
 #: en/choosePackageGroups.xml:10
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" width=\"800\" depth=\"600\"></imagedata> </"
-"imageobject>"
+"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" width=\"800\" depth=\"600\"></imagedata> </"
-"imageobject>"
+"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:16
@@ -1377,12 +1347,10 @@ msgstr "Выбор индивидуальных пакетов"
 #: en/choosePackagesTree.xml:11
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" width=\"800\" depth=\"600\"></imagedata> </"
-"imageobject>"
+"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" width=\"800\" depth=\"600\"></imagedata> </"
-"imageobject>"
+"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/choosePackagesTree.xml:17
@@ -1496,20 +1464,20 @@ msgstr ""
 msgid "Congratulations"
 msgstr "Поздравляем"
 
-#.  Started by marja on 2012 03 29 
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
-#.  marja - 2012-04-24 added screenshot and text 
+#.  Started by marja on 2012 03 29
+#.  NEEDS TO BE WRITTEN AND THEN REVIEWED!
+#.  marja - 2012-04-24 added screenshot and text
 #.  same day, added "s" to "sytems"
 #. type: Content of: <section><mediaobject>
 #: en/exitInstall.xml:14
 msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"width=\"800\" depth=\"600\" format=\"PNG\" align=\"center\" xml:id="
-"\"exitInstall-im1\"> </imagedata> </imageobject>"
+"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"width=\"800\" depth=\"600\" format=\"PNG\" align=\"center\" xml:id="
-"\"exitInstall-im1\"> </imagedata> </imageobject>"
+"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/exitInstall.xml:21
@@ -1559,20 +1527,20 @@ msgstr ""
 msgid "Formatting"
 msgstr "Форматирование"
 
-#.  Made by marja on 2012 03 29 
-#.  NEEDS TO BE REVIEWED! 
-#.  marja 2012-04-24 added screenshot 
-#.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
+#.  Made by marja on 2012 03 29
+#.  NEEDS TO BE REVIEWED!
+#.  marja 2012-04-24 added screenshot
+#.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1
 #. type: Content of: <section><mediaobject>
 #: en/formatPartitions.xml:18
 msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-formatPartitions.png\" "
-"width=\"100%\" depth=\"600\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject>"
+"format=\"PNG\" align=\"center\" xml:id=\"formatPartitions-im1\"> </"
+"imagedata> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-formatPartitions.png\" "
-"width=\"100%\" depth=\"600\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject>"
+"format=\"PNG\" align=\"center\" xml:id=\"formatPartitions-im1\"> </"
+"imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/formatPartitions.xml:25
@@ -1627,20 +1595,20 @@ msgstr ""
 msgid "Updates"
 msgstr "Обновления"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
+#.  Made by marja on 2012 03 30
+#.  NEEDS TO BE REVIEWED!
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
-#.  marja, 2012-04-24 added screenshot 
+#.  marja, 2012-04-24 added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"width=\"100%\" depth=\"600\" format=\"PNG\" align=\"center\" xml:id="
-"\"installUpdates-im1\"></imagedata> </imageobject>"
+"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"width=\"100%\" depth=\"600\" format=\"PNG\" align=\"center\" xml:id="
-"\"installUpdates-im1\"></imagedata> </imageobject>"
+"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/installUpdates.xml:19
@@ -1674,29 +1642,27 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Резюме относительно других параметров"
 
-#.  Started by marja on 2012 03 31 
-#.  NEEDS TO BE WRITTEN AND REVIEWED! 
-#. marja - 2012 04 15 added some text, not much, unfortunately :( 
-#. marja 2012-04-24 added screenshots 
+#.  Started by marja on 2012 03 31
+#.  NEEDS TO BE WRITTEN AND REVIEWED!
+#. marja - 2012 04 15 added some text, not much, unfortunately :(
+#. marja 2012-04-24 added screenshots
 #. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages 
-#. marja 2012-04-24 added some text in the drakxid-configureServices and 
-#.       the drakxid-miscellaneous section 
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
+#. marja 2012-04-24 added 2 links to other help pages
+#. marja 2012-04-24 added some text in the drakxid-configureServices and
+#.       the drakxid-miscellaneous section
+#. marja 2012-04-24 corrected "Magaia" in the last paragraph
+#. marja 2012-04-24 corrected para xml:id number in the last paragraph
+#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc.
+#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader"
 #. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
 #. type: Content of: <section><mediaobject>
 #: en/misc-params.xml:33
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" width=\"800\" revision="
-"\"1\" align=\"center\" format=\"PNG\" xml:id=\"summary-im1\" depth=\"600\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" width=\"800\" revision="
-"\"1\" align=\"center\" format=\"PNG\" xml:id=\"summary-im1\" depth=\"600\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:38
@@ -1887,13 +1853,11 @@ msgstr ""
 #. type: Content of: <section><section><mediaobject>
 #: en/misc-params.xml:147
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" width=\"800\" revision="
-"\"1\" align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" "
-"depth=\"600\"/> </imageobject>"
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" width=\"800\" revision="
-"\"1\" align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" "
-"depth=\"600\"/> </imageobject>"
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
 #: en/misc-params.xml:155
@@ -2016,18 +1980,18 @@ msgstr ""
 msgid "Configure your Timezone"
 msgstr "Настройка часового пояса"
 
-#.  2012-12-25 marja - moved this part out of misc-params.xml 
-#.  2013-05-05 marja - added screenshot 
+#.  2012-12-25 marja - moved this part out of misc-params.xml
+#.  2013-05-05 marja - added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:20
 msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
-"png\" width=\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id="
-"\"configureTimezoneUTC-im1\"></imagedata> </imageobject>"
+"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
+"imagedata> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
-"png\" width=\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id="
-"\"configureTimezoneUTC-im1\"></imagedata> </imageobject>"
+"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
+"imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:26
@@ -2081,41 +2045,26 @@ msgstr ""
 "<application>Mageia</application>."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderBeginner.xml:11
-msgid "Bootloader main options (old page)"
-msgstr "Основные параметры загрузчика (устаревшая страница)"
-
-#. type: Content of: <section><warning><para>
-#: en/setupBootloaderBeginner.xml:43
-msgid ""
-"This page was moved to <xref linkend=\"setupBootloader\"></xref> because "
-"that page has the filename the help button in the '''Bootloader main "
-"options''' screen in installer links to."
-msgstr "Страница была перемещена на <xref linkend=\"setupBootloader\"></xref>."
-
-#. type: Content of: <section><info><title>
 #: en/setupSCSI.xml:11
 msgid "Setup SCSI"
 msgstr "Настройка SCSI"
 
-#.  Made by marja on 2012 04 02 
-#.  NEEDS TO BE REVIEWED! 
-#.  JohnR - edited 2012-03-03 
-#.  SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-) 
-#.  barjac has re-reviewed and made some minor tweaks. Revisions incremented. 
-#.  marja 2012-04-24 added screenshot 
+#.  Made by marja on 2012 04 02
+#.  NEEDS TO BE REVIEWED!
+#.  JohnR - edited 2012-03-03
+#.  SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-)
+#.  barjac has re-reviewed and made some minor tweaks. Revisions incremented.
+#.  marja 2012-04-24 added screenshot
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
-#.        Mdv doc instead of on our setupSCSI file 
+#.        Mdv doc instead of on our setupSCSI file
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" width="
-"\"100%\" depth=\"600\" format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
+"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" width="
-"\"100%\" depth=\"600\" format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
+"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/setupSCSI.xml:32
@@ -2145,38 +2094,22 @@ msgstr ""
 "образом."
 
 #. type: Content of: <section><info><title>
-#: en/setupX.xml:4
-msgid "Set up X, graphic card and monitor configuration (old page)"
-msgstr ""
-"Настройка графического сервера, графической карты и монитора (устаревшая "
-"страница)"
-
-#. type: Content of: <section><warning><para>
-#: en/setupX.xml:24
-msgid ""
-"This page was moved to <xref linkend=\"configureX_chooser\"></xref> because "
-"that page has the filename the help button in the '''Graphic Card and "
-"Monitor Configuration''' screen in installer links to."
-msgstr ""
-"Страница была перемещена на <xref linkend=\"configureX_chooser\"></xref>"
-
-#. type: Content of: <section><info><title>
 #: en/selectMouse.xml:4
 msgid "Select mouse"
 msgstr "Выбор драйвера мыши"
 
-#.  Made by marja on 2012 04 11 
-#.  NEEDS TO BE REVIEWED! 
+#.  Made by marja on 2012 04 11
+#.  NEEDS TO BE REVIEWED!
 #.  adding some "real" text now that we know the page shows up in the right place
-#.  marja 2012-04-24 adding screenshot 
+#.  marja 2012-04-24 adding screenshot
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
-"format=\"PNG\" width=\"100%\" depth=\"600\"> </imagedata> </imageobject>"
+"format=\"PNG\" > </imagedata> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
-"format=\"PNG\" width=\"100%\" depth=\"600\"> </imagedata> </imageobject>"
+"format=\"PNG\" > </imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/selectMouse.xml:23
@@ -2207,330 +2140,22 @@ msgstr ""
 "шестью или более кнопками."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderExpert.xml:11
-msgid "Bootloader expert use"
-msgstr "Дополнительные возможности управления загрузчиком"
-
-#. type: Content of: <section><para>
-#: en/setupBootloaderExpert.xml:48
-msgid ""
-"If you haven't done so yet, please read <xref linkend=\"setupBootloader\"/> "
-"first."
-msgstr ""
-"Если вы еще этого не сделали, сначала ознакомьтесь с разделом <xref linkend="
-"\"setupBootloader\"/>."
-
-#. type: Content of: <section><section><info><title>
-#: en/setupBootloaderExpert.xml:54
-msgid "Adding a GRUB2 based system manually"
-msgstr "Добавление записи основанной на GRUB2 системы вручную"
-
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderExpert.xml:58
-msgid "A GRUB2 based system may be added to the Mageia boot menu as follows:"
-msgstr ""
-"Чтобы добавить основанную на GRUB2 систему в меню загрузки Mageia, выполните "
-"следующие действия:"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:63
-msgid ""
-"Boot into the system in question. In order to determine the GRUB2 version "
-"run the following command in a terminal:"
-msgstr ""
-"Скачать другую операционную систему. С целью определения версии GRUB2 "
-"выполните в терминале следующую команду:"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:67
-msgid "<literal>sudo grub-install --version</literal>"
-msgstr "<literal>sudo grub-install --version</literal>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:70
-msgid "or if that fails try:"
-msgstr ""
-"Если никаких полезных данных не будет выведено, попробуйте такую ​​команду:"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:73
-msgid "<literal>sudo grub2-install --version</literal>"
-msgstr "<literal>sudo grub2-install --version</literal>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:78
-msgid ""
-"If this returns \"GNU GRUB version 0.97\" (possibly with a custom suffix), "
-"then it is using GRUB (otherwise called GRUB legacy) not GRUB2 and your "
-"system should be correctly identified by Mageia during installation and "
-"added automatically to the menu."
-msgstr ""
-"Если в ответ будет возвращен «GNU GRUB version 0.97» (возможно с каким-то "
-"дополнительным суффиксом), в системе используется GRUB (который еще называют "
-"устаревшим GRUB), а не GRUB2. Итак, ваша система должным образом выявлена "
-"средствами Mageia при установке, а ее пункт будет добавлен в меню загрузки."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:86
-msgid "If this returns (GRUB) 1.98 or 1.99 or 2.xx, then you are using GRUB2."
-msgstr ""
-"Если будет возвращена строка с (GRUB) 1.98, 1.99 или 2.xx, то используется "
-"GRUB2."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:89
-msgid ""
-"Make a note of the version and enter this command to identify the root "
-"partition:"
-msgstr ""
-"Запишите номер версии и выполните следующую команду с целью определения "
-"названия корневого раздела:"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:93
-msgid "<literal>df -h / |(read; awk '{print $1; exit}')</literal>"
-msgstr "<literal>df -h / |(read; awk '{print $1; exit}')</literal>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:96
-msgid "This will output something like :"
-msgstr "В ответ будет выведено что-то такое:"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:104
-msgid "<literal>/dev/sdb11</literal>"
-msgstr "<literal>/dev/sdb11</literal>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:106
-msgid "sdb11 is the root partition - make a note of it."
-msgstr "sdb11 — корневой раздел, - запомните его название."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:111
-msgid ""
-"Now check that the /boot folder is in the same partition by entering the "
-"following command:"
-msgstr ""
-"После этого проверьте, сохраняется ли папка /boot на том же разделе, с "
-"помощью команды:"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:115
-msgid "<literal>df -h /boot |(read; awk '{print $1; exit}')</literal>"
-msgstr "<literal>df -h /boot |(read; awk '{print $1; exit}')</literal>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:120
-msgid ""
-"If the /boot partition is different to the root partition then make a note "
-"and use the /boot partition in the \"root\" line when editing menu.lst below."
-msgstr ""
-"Если раздел каталога /boot не совпадает с корневым разделом, запишите "
-"название раздела /boot и используйте ее в строке «root» при редактировании "
-"файла menu.lst, описанного ниже."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:127
-msgid "You can now shut down the system and install Mageia."
-msgstr "Теперь можно завершить работу системы и перейти к установке Mageia."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:132
-msgid ""
-"In your new running Mageia system, open a terminal and as root edit the "
-"file /boot/grub/menu.lst as follows:"
-msgstr ""
-"В запущенной системе Mageia откройте окно терминала и от имени "
-"администратора (root) откройте для редактирования файл /boot/grub/menu.lst. "
-"Добавьте в файл указанные ниже записи:"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:138
-msgid "To become root use:"
-msgstr "Чтобы получить права доступа root, выполните следующие команды:"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:141
-msgid "<literal>su -</literal>"
-msgstr "<literal>su -</literal>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:144
-msgid "(enter root password)"
-msgstr "(введите пароль root)"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:149
-msgid "To open the file in an editor use:"
-msgstr ""
-"Чтобы открыть файл в текстовом редакторе, воспользуйтесь такой командой:"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:152
-msgid "<literal>kwrite /boot/grub/menu.lst</literal>"
-msgstr "<literal>kwrite /boot/grub/menu.lst</literal>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:155
-msgid "(replace \"kwrite\" with \"gedit\" if you are using Gnome)"
-msgstr "(замените «kwrite» на «gedit», если вы пользуетесь Gnome)"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:160
-msgid ""
-"Add the following entry for your (e.g. Ubuntu) system, possibly as the "
-"second stanza. The position the item appears in the menu will depend on its "
-"position in the file:"
-msgstr ""
-"Добавьте следующую запись для вашей операционной системы (например Ubuntu). "
-"Расположения пункта в меню будет зависеть от расположения записи в файле"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:165
-msgid "<literal>title Ubuntu</literal>"
-msgstr "<literal>title Ubuntu</literal>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:168
-msgid "<literal>root (hd1,10)</literal>"
-msgstr "<literal>root (hd1,10)</literal>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:171
-msgid "<literal>kernel /boot/grub/core.img</literal>"
-msgstr "<literal>kernel /boot/grub/core.img</literal>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/setupBootloaderExpert.xml:177
-msgid ""
-"In the second line, \"hd1\" means the second hard drive, the \"10\" "
-"indicates the 11th partition. Drives and partitions in Mageia's legacy GRUB "
-"count from zero."
-msgstr ""
-"Во второй строке «hd1» означает второй диск, а «10» соответствует "
-"одиннадцатому разделу. Отсчет дисков и разделов в устаревшем GRUB Mageia "
-"выполняется от нуля."
-
-#. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/setupBootloaderExpert.xml:183
-msgid "Therefore:"
-msgstr "Поэтому:"
-
-#. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/setupBootloaderExpert.xml:186
-msgid "<literal>sdb11 = (hd1,10)</literal>"
-msgstr "<literal>sdb11 = (hd1,10)</literal>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/setupBootloaderExpert.xml:189
-msgid "<literal>sda1 = (hd0,0)</literal>"
-msgstr "<literal>sda1 = (hd0,0)</literal>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:195
-msgid "If the GRUB2 version is 2.xx then change the last line to :"
-msgstr "Если имеется GRUB2 версии 2.xx, то измените последнюю строку на такую:"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:198
-msgid "<literal>kernel /boot/grub/i386-pc/core.img</literal>"
-msgstr "<literal>kernel /boot/grub/i386-pc/core.img</literal>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:201
-msgid ""
-"If you needed to use \"grub2-install\" earlier then change <literal>\"grub"
-"\"</literal> to <literal>\"grub2\"</literal> in the last line."
-msgstr ""
-"Если раньше вы использовали «grub2-install», измените <literal>«grub»</"
-"literal> на <literal>«grub2»</literal> в последней строке."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:205
-msgid ""
-"If /boot was on a separate partition, then remove <literal>\"/boot\"</"
-"literal> from the last line."
-msgstr ""
-"Если /boot расположен на отдельном разделе, удалите <literal>«/boot»</"
-"literal> из последней строки."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloaderExpert.xml:211
-msgid ""
-"Save the file and re-boot. You should now see your \"Ubuntu\" entry in the "
-"menu and be able to boot from it."
-msgstr ""
-"Сохраните файл и перезагрузите компьютер. Теперь в меню должен быть пункт "
-"«Ubuntu», с помощью которого можно будет загрузить соответствующую систему."
-
-#. type: Content of: <section><section><info><title>
-#: en/setupBootloaderExpert.xml:220
-msgid "Using an existing GRUB2 bootloader"
-msgstr "Использование существующего загрузчика GRUB2"
-
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderExpert.xml:224
-msgid ""
-"If you didn't read the general part about using an existing bootloader yet, "
-"do so now. See <xref linkend=\"usingExistingBootloader\"/>"
-msgstr ""
-"Если вы еще не ознакомились с общей частью по уже установленному загрузчику, "
-"сделайте это сейчас. См. <xref linkend=\"usingExistingBootloader\"/>."
-
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderExpert.xml:229
-msgid ""
-"There is a known bug in OS-prober used during GRUB2 installation in some "
-"versions of Debian/Ubuntu that incorrectly creates grub.cfg when adding "
-"Mageia (or Mandriva) systems. This is simple to work around and details of a "
-"fix can be found in the Mageia forum. Search for \"prober\", the topic is "
-"\"grub problem\", post #9 has the information."
-msgstr ""
-"В некоторых версиях Debian/Ubuntu имеется известный недостаток, связанный с "
-"методом определения операционных систем при установке GRUB2. Из-за этого "
-"недостатка  ошибочно создается grub.cfg при добавлении записей операционных "
-"систем Mageia (или Mandriva). Обойти этот недостаток довольно просто. "
-"Подробности можно найти на форуме Mageia. Выполните поиск по ключевому слову "
-"«prober». Тема ветки - «grub problem». Решение приведены в сообщении 9."
-
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderExpert.xml:236
-msgid ""
-"To make the fix permanent so that it will survive an Ubuntu kernel update, "
-"the Mageia entry should be added to <literal>/etc/grub.d/40_custom</literal>"
-msgstr ""
-"Чтобы эти исправления не были устранены при обновлении ядра Ubuntu, следует "
-"добавить запись Mageia в файл <literal>/etc/grub.d/40_custom</literal>."
-
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderExpert.xml:240
-msgid ""
-"Stop Press: The bug is fixed in os-prober-1.53 released on 8th May 2012. So "
-"now, upgrading to the new version in your GRUB2 installation is the "
-"preferred solution."
-msgstr ""
-"Замечание: этот недостаток исправлен в os-prober-1.53, выпущенного 8 мая "
-"2012 года. Итак, теперь стоит отдать предпочтение обновлению до новой версии "
-"GRUB2 в вашей системе."
-
-#. type: Content of: <section><info><title>
 #: en/setupBootloader.xml:3
 msgid "Bootloader main options"
 msgstr "Основные параметры загрузчика"
 
-#.  2012-08-12 Copied this page, setupBootloader.xml,  from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.  
+#.  2012-08-12 Copied this page, setupBootloader.xml,  from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.
 #.  2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
 msgid ""
-"<imageobject> <imagedata width=\"100%\" revision=\"1\" align=\"center\" "
-"fileref=\"dx2-setupBootloader.png\" xml:id=\"setupBootloader-im1\" format="
-"\"PNG\" depth=\"600\"/> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\" /> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata width=\"100%\" revision=\"1\" align=\"center\" "
-"fileref=\"dx2-setupBootloader.png\" xml:id=\"setupBootloader-im1\" format="
-"\"PNG\" depth=\"600\"/> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\" /> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/setupBootloader.xml:16
@@ -2760,13 +2385,13 @@ msgstr "Выбор графического сервера (настройки �
 #. type: Content of: <section><mediaobject>
 #: en/configureX_card_list.xml:21
 msgid ""
-"<imageobject> <imagedata width=\"800\" revision=\"1\" align=\"center\" xml:"
-"id=\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
-"format=\"PNG\" depth=\"600\"/> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
+"\"PNG\" /> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata width=\"800\" revision=\"1\" align=\"center\" xml:"
-"id=\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
-"format=\"PNG\" depth=\"600\"/> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
+"\"PNG\" /> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:26
@@ -2885,13 +2510,13 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/configureX_monitor.xml:34
 msgid ""
-"<imageobject> <imagedata align=\"center\" depth=\"600\" fileref=\"dx2-"
-"configureX_monitor.png\" format=\"PNG\" revision=\"1\" width=\"800\" xml:id="
-"\"configureX_monitor-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" depth=\"600\" fileref=\"dx2-"
-"configureX_monitor.png\" format=\"PNG\" revision=\"1\" width=\"800\" xml:id="
-"\"configureX_monitor-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/configureX_monitor.xml:42
@@ -2995,12 +2620,12 @@ msgstr "Настройки графической карты и монитора
 #: en/configureX_chooser.xml:11
 msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" width=\"100%\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id="
-"\"configureX_chooser-im1\"> </imagedata> </imageobject>"
+"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
+"imagedata> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" width=\"100%\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id="
-"\"configureX_chooser-im1\"> </imagedata> </imageobject>"
+"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
+"imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/configureX_chooser.xml:18
@@ -3108,14 +2733,12 @@ msgstr ""
 #: en/setupBootloaderAddEntry.xml:10
 msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" width=\"800\" depth=\"600\" format=\"PNG\" "
-"align=\"center\" xml:id=\"bootloaderConfiguration-im1\"></imagedata> </"
-"imageobject>"
+"bootloaderConfiguration.png\" format=\"PNG\" align=\"center\" xml:id="
+"\"bootloaderConfiguration-im1\"></imagedata> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" width=\"800\" depth=\"600\" format=\"PNG\" "
-"align=\"center\" xml:id=\"bootloaderConfiguration-im1\"></imagedata> </"
-"imageobject>"
+"bootloaderConfiguration.png\" format=\"PNG\" align=\"center\" xml:id="
+"\"bootloaderConfiguration-im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/setupBootloaderAddEntry.xml:17
@@ -3132,14 +2755,12 @@ msgstr ""
 #: en/setupBootloaderAddEntry.xml:21
 msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"setupBootloaderAddEntry.png\" width=\"800\" depth=\"600\" format=\"PNG\" "
-"align=\"center\" xml:id=\"setupBootloaderAddEntry-im1\"></imagedata> </"
-"imageobject>"
+"setupBootloaderAddEntry.png\" format=\"PNG\" align=\"center\" xml:id="
+"\"setupBootloaderAddEntry-im1\"></imagedata> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"setupBootloaderAddEntry.png\" width=\"800\" depth=\"600\" format=\"PNG\" "
-"align=\"center\" xml:id=\"setupBootloaderAddEntry-im1\"></imagedata> </"
-"imageobject>"
+"setupBootloaderAddEntry.png\" format=\"PNG\" align=\"center\" xml:id="
+"\"setupBootloaderAddEntry-im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/setupBootloaderAddEntry.xml:26
@@ -3221,30 +2842,30 @@ msgstr ""
 #: en/minimal-install.xml:19
 msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"width=\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id=\"minimal-"
-"install-im1\"></imagedata> </imageobject>"
+"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
+"</imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"width=\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id=\"minimal-"
-"install-im1\"></imagedata> </imageobject>"
+"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
+"</imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/securityLevel.xml:12
 msgid "Security Level"
 msgstr "Уровень безопасности"
 
-#.  2012-12-25 marja - moved this part out of misc-params.xml" 
-#.  2013-05-05 marja - added screenshot 
+#.  2012-12-25 marja - moved this part out of misc-params.xml"
+#.  2013-05-05 marja - added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/securityLevel.xml:19
 msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"width=\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id="
-"\"securityLevel-im1\"></imagedata> </imageobject>"
+"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"width=\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id="
-"\"securityLevel-im1\"></imagedata> </imageobject>"
+"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
@@ -3274,18 +2895,18 @@ msgstr ""
 msgid "Select your Country / Region"
 msgstr "Выбор страны и региона"
 
-#.  2012-12-25 marja - moved this section out of misc-params 
-#.  2013-05-05 marja - added screenshot 
+#.  2012-12-25 marja - moved this section out of misc-params
+#.  2013-05-05 marja - added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/selectCountry.xml:21
 msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"width=\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id="
-"\"selectCountry-im1\"></imagedata> </imageobject>"
+"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"width=\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id="
-"\"selectCountry-im1\"></imagedata> </imageobject>"
+"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:27
@@ -3366,20 +2987,20 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 msgstr "Выбор источника (Nonfree)"
 
-#.  papoteur 2013-04-11  - created 
+#.  papoteur 2013-04-11  - created
 #.  marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)
-#.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
+#.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
 #: en/media_selection.xml:12
 msgid ""
-"<imageobject> <imagedata align=\"center\" depth=\"600\" fileref=\"dx2-"
-"media_selection.png\" format=\"PNG\" revision=\"1\" width=\"800\" xml:id="
-"\"media_selection-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" depth=\"600\" fileref=\"dx2-"
-"media_selection.png\" format=\"PNG\" revision=\"1\" width=\"800\" xml:id="
-"\"media_selection-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/media_selection.xml:18
@@ -3442,19 +3063,19 @@ msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr ""
 "Выбор носителя (настройки дополнительных носителей пакетов для установки)"
 
-#.  papoteur 2013-04-13  - created 
-#.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
-#.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
+#.  papoteur 2013-04-13  - created
+#.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection
+#.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell
 #. type: Content of: <section><mediaobject>
 #: en/add_supplemental_media.xml:18
 msgid ""
-"<imageobject> <imagedata align=\"center\" depth=\"600\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" width=\"800\" xml:"
-"id=\"dx2-add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
+"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
+"add_supplemental_media-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" depth=\"600\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" width=\"800\" xml:"
-"id=\"dx2-add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
+"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
+"add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/add_supplemental_media.xml:24
@@ -3495,3 +3116,276 @@ msgstr ""
 "с ограничениями в лицензировании и к репозиторию обновлений. С помощью URL-"
 "адреса можно связать с системой определенный репозиторий пакетов или "
 "развернутую вами с помощью NFS систему."
+
+#~ msgid "Choose hard disk to erase for <application>Mageia</application>"
+#~ msgstr ""
+#~ "Выбор диска для очистки с целью установки <application>Mageia</"
+#~ "application>."
+
+#~ msgid ""
+#~ "Select the hard disk that should be formatted to install "
+#~ "<application>Mageia</application>."
+#~ msgstr ""
+#~ "Выберите жесткий диск, который следует отформатировать для установки "
+#~ "<application>Mageia</application>."
+
+#~ msgid ""
+#~ "Be sure to select the correct hard disk. All data on the selected disk "
+#~ "will be lost. This step can not be undone."
+#~ msgstr ""
+#~ "Убедитесь, что именно тот жесткий диск. Все данные на выбранном диске "
+#~ "будут потеряны. Восстановить данные после очистки будет очень трудно (я "
+#~ "бы сказал не реально)."
+
+#~ msgid "Bootloader main options (old page)"
+#~ msgstr "Основные параметры загрузчика (устаревшая страница)"
+
+#~ msgid ""
+#~ "This page was moved to <xref linkend=\"setupBootloader\"></xref> because "
+#~ "that page has the filename the help button in the '''Bootloader main "
+#~ "options''' screen in installer links to."
+#~ msgstr ""
+#~ "Страница была перемещена на <xref linkend=\"setupBootloader\"></xref>."
+
+#~ msgid "Set up X, graphic card and monitor configuration (old page)"
+#~ msgstr ""
+#~ "Настройка графического сервера, графической карты и монитора (устаревшая "
+#~ "страница)"
+
+#~ msgid ""
+#~ "This page was moved to <xref linkend=\"configureX_chooser\"></xref> "
+#~ "because that page has the filename the help button in the '''Graphic Card "
+#~ "and Monitor Configuration''' screen in installer links to."
+#~ msgstr ""
+#~ "Страница была перемещена на <xref linkend=\"configureX_chooser\"></xref>"
+
+#~ msgid "Bootloader expert use"
+#~ msgstr "Дополнительные возможности управления загрузчиком"
+
+#~ msgid ""
+#~ "If you haven't done so yet, please read <xref linkend=\"setupBootloader\"/"
+#~ "> first."
+#~ msgstr ""
+#~ "Если вы еще этого не сделали, сначала ознакомьтесь с разделом <xref "
+#~ "linkend=\"setupBootloader\"/>."
+
+#~ msgid "Adding a GRUB2 based system manually"
+#~ msgstr "Добавление записи основанной на GRUB2 системы вручную"
+
+#~ msgid ""
+#~ "A GRUB2 based system may be added to the Mageia boot menu as follows:"
+#~ msgstr ""
+#~ "Чтобы добавить основанную на GRUB2 систему в меню загрузки Mageia, "
+#~ "выполните следующие действия:"
+
+#~ msgid ""
+#~ "Boot into the system in question. In order to determine the GRUB2 version "
+#~ "run the following command in a terminal:"
+#~ msgstr ""
+#~ "Скачать другую операционную систему. С целью определения версии GRUB2 "
+#~ "выполните в терминале следующую команду:"
+
+#~ msgid "<literal>sudo grub-install --version</literal>"
+#~ msgstr "<literal>sudo grub-install --version</literal>"
+
+#~ msgid "or if that fails try:"
+#~ msgstr ""
+#~ "Если никаких полезных данных не будет выведено, попробуйте такую ​​команду:"
+
+#~ msgid "<literal>sudo grub2-install --version</literal>"
+#~ msgstr "<literal>sudo grub2-install --version</literal>"
+
+#~ msgid ""
+#~ "If this returns \"GNU GRUB version 0.97\" (possibly with a custom "
+#~ "suffix), then it is using GRUB (otherwise called GRUB legacy) not GRUB2 "
+#~ "and your system should be correctly identified by Mageia during "
+#~ "installation and added automatically to the menu."
+#~ msgstr ""
+#~ "Если в ответ будет возвращен «GNU GRUB version 0.97» (возможно с каким-то "
+#~ "дополнительным суффиксом), в системе используется GRUB (который еще "
+#~ "называют устаревшим GRUB), а не GRUB2. Итак, ваша система должным образом "
+#~ "выявлена средствами Mageia при установке, а ее пункт будет добавлен в "
+#~ "меню загрузки."
+
+#~ msgid ""
+#~ "If this returns (GRUB) 1.98 or 1.99 or 2.xx, then you are using GRUB2."
+#~ msgstr ""
+#~ "Если будет возвращена строка с (GRUB) 1.98, 1.99 или 2.xx, то "
+#~ "используется GRUB2."
+
+#~ msgid ""
+#~ "Make a note of the version and enter this command to identify the root "
+#~ "partition:"
+#~ msgstr ""
+#~ "Запишите номер версии и выполните следующую команду с целью определения "
+#~ "названия корневого раздела:"
+
+#~ msgid "<literal>df -h / |(read; awk '{print $1; exit}')</literal>"
+#~ msgstr "<literal>df -h / |(read; awk '{print $1; exit}')</literal>"
+
+#~ msgid "This will output something like :"
+#~ msgstr "В ответ будет выведено что-то такое:"
+
+#~ msgid "<literal>/dev/sdb11</literal>"
+#~ msgstr "<literal>/dev/sdb11</literal>"
+
+#~ msgid "sdb11 is the root partition - make a note of it."
+#~ msgstr "sdb11 — корневой раздел, - запомните его название."
+
+#~ msgid ""
+#~ "Now check that the /boot folder is in the same partition by entering the "
+#~ "following command:"
+#~ msgstr ""
+#~ "После этого проверьте, сохраняется ли папка /boot на том же разделе, с "
+#~ "помощью команды:"
+
+#~ msgid "<literal>df -h /boot |(read; awk '{print $1; exit}')</literal>"
+#~ msgstr "<literal>df -h /boot |(read; awk '{print $1; exit}')</literal>"
+
+#~ msgid ""
+#~ "If the /boot partition is different to the root partition then make a "
+#~ "note and use the /boot partition in the \"root\" line when editing menu."
+#~ "lst below."
+#~ msgstr ""
+#~ "Если раздел каталога /boot не совпадает с корневым разделом, запишите "
+#~ "название раздела /boot и используйте ее в строке «root» при "
+#~ "редактировании файла menu.lst, описанного ниже."
+
+#~ msgid "You can now shut down the system and install Mageia."
+#~ msgstr "Теперь можно завершить работу системы и перейти к установке Mageia."
+
+#~ msgid ""
+#~ "In your new running Mageia system, open a terminal and as root edit the "
+#~ "file /boot/grub/menu.lst as follows:"
+#~ msgstr ""
+#~ "В запущенной системе Mageia откройте окно терминала и от имени "
+#~ "администратора (root) откройте для редактирования файл /boot/grub/menu."
+#~ "lst. Добавьте в файл указанные ниже записи:"
+
+#~ msgid "To become root use:"
+#~ msgstr "Чтобы получить права доступа root, выполните следующие команды:"
+
+#~ msgid "<literal>su -</literal>"
+#~ msgstr "<literal>su -</literal>"
+
+#~ msgid "(enter root password)"
+#~ msgstr "(введите пароль root)"
+
+#~ msgid "To open the file in an editor use:"
+#~ msgstr ""
+#~ "Чтобы открыть файл в текстовом редакторе, воспользуйтесь такой командой:"
+
+#~ msgid "<literal>kwrite /boot/grub/menu.lst</literal>"
+#~ msgstr "<literal>kwrite /boot/grub/menu.lst</literal>"
+
+#~ msgid "(replace \"kwrite\" with \"gedit\" if you are using Gnome)"
+#~ msgstr "(замените «kwrite» на «gedit», если вы пользуетесь Gnome)"
+
+#~ msgid ""
+#~ "Add the following entry for your (e.g. Ubuntu) system, possibly as the "
+#~ "second stanza. The position the item appears in the menu will depend on "
+#~ "its position in the file:"
+#~ msgstr ""
+#~ "Добавьте следующую запись для вашей операционной системы (например "
+#~ "Ubuntu). Расположения пункта в меню будет зависеть от расположения записи "
+#~ "в файле"
+
+#~ msgid "<literal>title Ubuntu</literal>"
+#~ msgstr "<literal>title Ubuntu</literal>"
+
+#~ msgid "<literal>root (hd1,10)</literal>"
+#~ msgstr "<literal>root (hd1,10)</literal>"
+
+#~ msgid "<literal>kernel /boot/grub/core.img</literal>"
+#~ msgstr "<literal>kernel /boot/grub/core.img</literal>"
+
+#~ msgid ""
+#~ "In the second line, \"hd1\" means the second hard drive, the \"10\" "
+#~ "indicates the 11th partition. Drives and partitions in Mageia's legacy "
+#~ "GRUB count from zero."
+#~ msgstr ""
+#~ "Во второй строке «hd1» означает второй диск, а «10» соответствует "
+#~ "одиннадцатому разделу. Отсчет дисков и разделов в устаревшем GRUB Mageia "
+#~ "выполняется от нуля."
+
+#~ msgid "Therefore:"
+#~ msgstr "Поэтому:"
+
+#~ msgid "<literal>sdb11 = (hd1,10)</literal>"
+#~ msgstr "<literal>sdb11 = (hd1,10)</literal>"
+
+#~ msgid "<literal>sda1 = (hd0,0)</literal>"
+#~ msgstr "<literal>sda1 = (hd0,0)</literal>"
+
+#~ msgid "If the GRUB2 version is 2.xx then change the last line to :"
+#~ msgstr ""
+#~ "Если имеется GRUB2 версии 2.xx, то измените последнюю строку на такую:"
+
+#~ msgid "<literal>kernel /boot/grub/i386-pc/core.img</literal>"
+#~ msgstr "<literal>kernel /boot/grub/i386-pc/core.img</literal>"
+
+#~ msgid ""
+#~ "If you needed to use \"grub2-install\" earlier then change <literal>\"grub"
+#~ "\"</literal> to <literal>\"grub2\"</literal> in the last line."
+#~ msgstr ""
+#~ "Если раньше вы использовали «grub2-install», измените <literal>«grub»</"
+#~ "literal> на <literal>«grub2»</literal> в последней строке."
+
+#~ msgid ""
+#~ "If /boot was on a separate partition, then remove <literal>\"/boot\"</"
+#~ "literal> from the last line."
+#~ msgstr ""
+#~ "Если /boot расположен на отдельном разделе, удалите <literal>«/boot»</"
+#~ "literal> из последней строки."
+
+#~ msgid ""
+#~ "Save the file and re-boot. You should now see your \"Ubuntu\" entry in "
+#~ "the menu and be able to boot from it."
+#~ msgstr ""
+#~ "Сохраните файл и перезагрузите компьютер. Теперь в меню должен быть пункт "
+#~ "«Ubuntu», с помощью которого можно будет загрузить соответствующую "
+#~ "систему."
+
+#~ msgid "Using an existing GRUB2 bootloader"
+#~ msgstr "Использование существующего загрузчика GRUB2"
+
+#~ msgid ""
+#~ "If you didn't read the general part about using an existing bootloader "
+#~ "yet, do so now. See <xref linkend=\"usingExistingBootloader\"/>"
+#~ msgstr ""
+#~ "Если вы еще не ознакомились с общей частью по уже установленному "
+#~ "загрузчику, сделайте это сейчас. См. <xref linkend="
+#~ "\"usingExistingBootloader\"/>."
+
+#~ msgid ""
+#~ "There is a known bug in OS-prober used during GRUB2 installation in some "
+#~ "versions of Debian/Ubuntu that incorrectly creates grub.cfg when adding "
+#~ "Mageia (or Mandriva) systems. This is simple to work around and details "
+#~ "of a fix can be found in the Mageia forum. Search for \"prober\", the "
+#~ "topic is \"grub problem\", post #9 has the information."
+#~ msgstr ""
+#~ "В некоторых версиях Debian/Ubuntu имеется известный недостаток, связанный "
+#~ "с методом определения операционных систем при установке GRUB2. Из-за "
+#~ "этого недостатка  ошибочно создается grub.cfg при добавлении записей "
+#~ "операционных систем Mageia (или Mandriva). Обойти этот недостаток "
+#~ "довольно просто. Подробности можно найти на форуме Mageia. Выполните "
+#~ "поиск по ключевому слову «prober». Тема ветки - «grub problem». Решение "
+#~ "приведены в сообщении 9."
+
+#~ msgid ""
+#~ "To make the fix permanent so that it will survive an Ubuntu kernel "
+#~ "update, the Mageia entry should be added to <literal>/etc/grub."
+#~ "d/40_custom</literal>"
+#~ msgstr ""
+#~ "Чтобы эти исправления не были устранены при обновлении ядра Ubuntu, "
+#~ "следует добавить запись Mageia в файл <literal>/etc/grub.d/40_custom</"
+#~ "literal>."
+
+#~ msgid ""
+#~ "Stop Press: The bug is fixed in os-prober-1.53 released on 8th May 2012. "
+#~ "So now, upgrading to the new version in your GRUB2 installation is the "
+#~ "preferred solution."
+#~ msgstr ""
+#~ "Замечание: этот недостаток исправлен в os-prober-1.53, выпущенного 8 мая "
+#~ "2012 года. Итак, теперь стоит отдать предпочтение обновлению до новой "
+#~ "версии GRUB2 в вашей системе."