1 files changed, 89 insertions, 87 deletions
diff --git a/docs/installer/ru.po b/docs/installer/ru.po
index 1c5b675c..2fd00463 100644
--- a/docs/installer/ru.po
+++ b/docs/installer/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2013-05-16 20:28+0400\n"
+"POT-Creation-Date: 2013-07-07 10:48+0400\n"
 "PO-Revision-Date: 2013-05-16 22:21+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Russian <saikov.vb@gmail.com>\n"
@@ -95,19 +95,19 @@ 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 ""
@@ -356,17 +356,17 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Выберете точки монтированния"
 
-#.  Made by marja on 2012 03 28
-#.  NEEDS TO BE REVIEWED!
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back
-#.  removed para xml:id's, marja, 20120409
+#.  Made by marja on 2012 03 28 
+#.  NEEDS TO BE REVIEWED! 
+#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
+#.  removed para xml:id's, marja, 20120409 
 #.  barjac 14/04/2012 Minor edit to improve grammar and replaced "at least ONE"
-#.        with "a", as I can't imagine having more than one root partition ;)
-#.  Lebarhon : I put [] where it seems having mistakes
+#.        with "a", as I can't imagine having more than one root partition ;) 
+#.  Lebarhon : I put [] where it seems having mistakes 
 #.  Marja: you're right, in English English it is "its type", however, the Americans
 #.        write "it's type". And you're right about the redundant part, too, I removed it
-#.  And JohnR says the Americans are WRONG! :-))
-#.  2012-04-19  Language proofreading done
+#.  And JohnR says the Americans are WRONG! :-)) 
+#.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
 msgid ""
@@ -869,8 +869,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Настройка ваших служб"
 
-#.  2012-12-25 marja - moved this section out of misc-params.xml
-#.  2013-05-05 marja - added screenshot
+#.  2012-12-25 marja - moved this section out of misc-params.xml 
+#.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureServices.xml:21
 msgid ""
@@ -1004,12 +1004,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "Подтверждение форматирования жесткого диска"
 
-#.  Made by marja on 2012 04 03
-#.  test comment - johnr
+#.  Made by marja on 2012 04 03 
+#.  test comment - johnr 
 #.  2012-04-24 marja - replaced "if you are not sure you selected the correct
 #.     hard disk." with "if you are not sure about your choice", because I'm sure I
-#.     saw this help screen when I had only one HD
-#.  2013-05-05 marja added screenshot
+#.     saw this help screen when I had only one HD 
+#.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/takeOverHdConfirm.xml:19
 msgid ""
@@ -1465,9 +1465,9 @@ 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
@@ -1528,10 +1528,10 @@ msgstr ""
 msgid "Formatting"
 msgstr "Форматирование"
 
-#.  Made by marja on 2012 03 29
-#.  NEEDS TO BE REVIEWED!
-#.  marja 2012-04-24 added screenshot
-#.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1
+#.  Made by marja on 2012 03 29 
+#.  NEEDS TO BE REVIEWED! 
+#.  marja 2012-04-24 added screenshot 
+#.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
 #: en/formatPartitions.xml:18
 msgid ""
@@ -1596,10 +1596,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Обновления"
 
-#.  Made by marja on 2012 03 30
-#.  NEEDS TO BE REVIEWED!
+#.  Made by marja on 2012 03 30 
+#.  NEEDS TO BE REVIEWED! 
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
-#.  marja, 2012-04-24 added screenshot
+#.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -1643,18 +1643,18 @@ 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
@@ -1981,8 +1981,8 @@ msgstr ""
 msgid "Configure your Timezone"
 msgstr "Настройка часового пояса"
 
-#.  2012-12-25 marja - moved this part out of misc-params.xml
-#.  2013-05-05 marja - added screenshot
+#.  2012-12-25 marja - moved this part out of misc-params.xml 
+#.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:20
 msgid ""
@@ -2050,14 +2050,14 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr "Настройка SCSI"
 
-#.  Made by marja on 2012 04 02
-#.  NEEDS TO BE REVIEWED!
-#.  JohnR - edited 2012-03-03
-#.  SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-)
-#.  barjac has re-reviewed and made some minor tweaks. Revisions incremented.
-#.  marja 2012-04-24 added screenshot
+#.  Made by marja on 2012 04 02 
+#.  NEEDS TO BE REVIEWED! 
+#.  JohnR - edited 2012-03-03 
+#.  SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-) 
+#.  barjac has re-reviewed and made some minor tweaks. Revisions incremented. 
+#.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
-#.        Mdv doc instead of on our setupSCSI file
+#.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -2099,10 +2099,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr "Выбор драйвера мыши"
 
-#.  Made by marja on 2012 04 11
-#.  NEEDS TO BE REVIEWED!
+#.  Made by marja on 2012 04 11 
+#.  NEEDS TO BE REVIEWED! 
 #.  adding some "real" text now that we know the page shows up in the right place
-#.  marja 2012-04-24 adding screenshot
+#.  marja 2012-04-24 adding screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -2145,7 +2145,7 @@ msgstr ""
 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
@@ -2379,23 +2379,24 @@ msgstr ""
 "улучшить данное руководство."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:16
+#: en/configureX_card_list.xml:11
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Выбор графического сервера (настройки вашей графической карты)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:16
+#, fuzzy
 msgid ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
 "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\" /> </imageobject>"
+"\"PNG\"/> </imageobject>"
 msgstr ""
 "<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
+#: en/configureX_card_list.xml:21
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -2404,7 +2405,7 @@ msgstr ""
 "программа может правильно определить ваш видеоадаптер."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:28
+#: en/configureX_card_list.xml:24
 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:"
@@ -2414,22 +2415,22 @@ msgstr ""
 "иерархического списка по следующим критериям:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:32 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
 msgid "vendor"
 msgstr "разработчик"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:36
+#: en/configureX_card_list.xml:31
 msgid "then the name of your card"
 msgstr "затем название вашей карты"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:40
+#: en/configureX_card_list.xml:35
 msgid "and the type of card"
 msgstr "и тип вашей карты"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:44
+#: en/configureX_card_list.xml:39
 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 "
@@ -2440,10 +2441,11 @@ msgstr ""
 "соответствующий драйвер в категории «Xorg»."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:47
+#: en/configureX_card_list.xml:43
+#, fuzzy
 msgid ""
 "The Xorg listing provides more than 40 generic and open source video card "
-"drivers.  If you still can't find a named driver for your card there is the "
+"drivers. If you still can't find a named driver for your card there is the "
 "option of using the vesa driver which provides basic capabilities."
 msgstr ""
 "В категории «Xorg» вы можете воспользоваться одним из более 40 типовых "
@@ -2452,7 +2454,7 @@ msgstr ""
 "драйвер обеспечивает базовые возможности видео."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:51
+#: en/configureX_card_list.xml:48
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the Commandline Interface."
@@ -2461,24 +2463,24 @@ msgstr ""
 "доступ только к интерфейсу командной строки."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
+#: en/configureX_card_list.xml:51
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Non-free or Tainted repositories and in some "
-"cases only from the card manufacturers' websites"
+"may only be available in the Nonfree repository and in some cases only from "
+"the card manufacturers' websites."
 msgstr ""
 "Некоторые производители видеокарт сами создают проприетарные (закрытые) "
 "драйверы для Linux. Доступ к таким драйверов можно получить только с помощью "
-"репозиториев пакетов «Non-free» и «Tainted» или на сайтах производителей "
+"репозиториев пакетов «Nonfree» или на сайтах производителей "
 "карт."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:59
+#: en/configureX_card_list.xml:55
 msgid ""
-"The Non-free and Tainted repositories need to be explicitly enabled to "
-"access them, you should do this after your first reboot."
+"The Nonfree repository need to be explicitly enabled to access them.  If you "
+"didn't select it previously, you should do this after your first reboot."
 msgstr ""
-"Вам следует явным образом включить репозитории «Non-free» и «Tainted», чтобы "
+"Вам следует явным образом включить репозитории «Nonfree», чтобы "
 "иметь к ним доступ. Сделать это следует после первой перезагрузки системы."
 
 #. type: Content of: <section><info><title>
@@ -2855,8 +2857,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Уровень безопасности"
 
-#.  2012-12-25 marja - moved this part out of misc-params.xml"
-#.  2013-05-05 marja - added screenshot
+#.  2012-12-25 marja - moved this part out of misc-params.xml" 
+#.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/securityLevel.xml:19
 msgid ""
@@ -2896,8 +2898,8 @@ 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 ""
@@ -2988,9 +2990,9 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 msgstr "Выбор источника (Nonfree)"
 
-#.  papoteur 2013-04-11  - created
+#.  papoteur 2013-04-11  - created 
 #.  marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)
-#.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell
+#.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
 #: en/media_selection.xml:12
@@ -3064,9 +3066,9 @@ 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 ""