Synthesized commit during git-svn import combining previous Mandriva history with Magiea.

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r391 | dmorgan | 2011-02-03 13:54:58 +0000 (Thu, 03 Feb 2011) | 1 line

Import cleaned drakx-kbd-mouse-x11
------------------------------------------------------------------------

In addition to the above commits, the following cleaning work has been recorded:

- License is GPLv2

- Problematic files:
 o lib/keyboard.pm: run_program::run('mandriva-setup-keyboard');  (does this need to be changed?) we keep it for now
 o lib/Xconfig/resolution_and_depth.pm: symlinkf "$theme{THEME}.xml", "$dir/Mandriva.xml"; (this will be changed, and should be synced with whatever will be does to the default Mageia wallpapers theme; this .xml file is used to change the wallpaper in GNOME/KDE depending on the time of the day)
=> switched to Mageia.xml

- Various icons that'll need to be changed in data/pixmaps: done with oxygen icons

1 files changed, 30 insertions, 28 deletions

diff --git a/po/ru.po b/po/ru.po
index 1a78e60..3899db4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
-"POT-Creation-Date: 2009-10-21 15:48+0200\n"
+"POT-Creation-Date: 2010-05-26 17:42+0200\n"
 "PO-Revision-Date: 2009-10-22 00:08+0500\n"
 "Last-Translator: akdengi <kazancas@mandriva.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -18,7 +18,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n!=1);\n\n"
+"Plural-Forms:  nplurals=2; plural=(n!=1);\n"
+"\n"
 
 #: ../lib/Xconfig/card.pm:20
 #, c-format
@@ -65,22 +66,22 @@ msgstr "32 МБ"
 msgid "64 MB or more"
 msgstr "64 МБ или больше"
 
-#: ../lib/Xconfig/card.pm:171
+#: ../lib/Xconfig/card.pm:174
 #, c-format
 msgid "X server"
 msgstr "X-сервер"
 
-#: ../lib/Xconfig/card.pm:172
+#: ../lib/Xconfig/card.pm:175
 #, c-format
 msgid "Choose an X server"
 msgstr "Выберите X-сервер"
 
-#: ../lib/Xconfig/card.pm:203
+#: ../lib/Xconfig/card.pm:206
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Настройка нескольких ядер"
 
-#: ../lib/Xconfig/card.pm:204
+#: ../lib/Xconfig/card.pm:207
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -89,12 +90,12 @@ msgstr ""
 "Ваша система поддерживает конфигурацию с несколькими графическими ядрами.\n"
 "Что вы хотите сделать?"
 
-#: ../lib/Xconfig/card.pm:293
+#: ../lib/Xconfig/card.pm:296
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Укажите объём памяти вашей видеокарты"
 
-#: ../lib/Xconfig/card.pm:319
+#: ../lib/Xconfig/card.pm:322
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -105,24 +106,24 @@ msgstr ""
 "обеспечить дополнительные функциональные возможности.\n"
 "Хотите использовать их?"
 
-#: ../lib/Xconfig/card.pm:346
+#: ../lib/Xconfig/card.pm:349
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr "Проприетарный драйвер не был установлен, используется свободный."
 
-#: ../lib/Xconfig/card.pm:416
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Настроить все головки независимо"
 
-#: ../lib/Xconfig/card.pm:417
+#: ../lib/Xconfig/card.pm:420
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Использовать расширение Xinerama"
 
-#: ../lib/Xconfig/card.pm:422
+#: ../lib/Xconfig/card.pm:425
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Настроить только карту \"%s\"%s"
@@ -287,7 +288,7 @@ msgstr "Автоматический"
 msgid "Resolutions"
 msgstr "Разрешения"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:394 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:394 ../lib/mouse.pm:500
 #, c-format
 msgid "Other"
 msgstr "Другие"
@@ -330,7 +331,8 @@ msgstr "Хотите протестировать настройки?"
 #: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
-msgstr "Предупреждение: тестирование этой видеокарты может подвесить ваш компьютер"
+msgstr ""
+"Предупреждение: тестирование этой видеокарты может подвесить ваш компьютер"
 
 #: ../lib/Xconfig/test.pm:65
 #, c-format
@@ -500,7 +502,8 @@ msgstr "Графический интерфейс при загрузке"
 #: ../lib/Xconfig/various.pm:269
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
-msgstr "Автоматический запускать графический интерфейс (Xorg) во время загрузки"
+msgstr ""
+"Автоматический запускать графический интерфейс (Xorg) во время загрузки"
 
 #: ../lib/Xconfig/various.pm:281
 #, c-format
@@ -1632,62 +1635,62 @@ msgstr "отсутствует"
 msgid "No mouse"
 msgstr "Мышь отсутствует"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:475
 #, c-format
 msgid "Testing the mouse"
 msgstr "Тестирование мыши"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:512
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Выберите тип своей мыши."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:513
 #, c-format
 msgid "Mouse choice"
 msgstr "Выбор мыши"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:529
 #, c-format
 msgid "Emulate third button?"
 msgstr "Эмулировать третью кнопку?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:533
 #, c-format
 msgid "Mouse Port"
 msgstr "Порт мыши"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:534
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Укажите порт, к которому подключена мышь."
 
-#: ../lib/mouse.pm:556
+#: ../lib/mouse.pm:543
 #, c-format
 msgid "Buttons emulation"
 msgstr "Эмуляция кнопок"
 
-#: ../lib/mouse.pm:558
+#: ../lib/mouse.pm:545
 #, c-format
 msgid "Button 2 Emulation"
 msgstr "Эмуляция двух кнопок"
 
-#: ../lib/mouse.pm:559
+#: ../lib/mouse.pm:546
 #, c-format
 msgid "Button 3 Emulation"
 msgstr "Эмуляция трёх кнопок"
 
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:597
 #, c-format
 msgid "Please test the mouse"
 msgstr "Протестируйте свою мышь"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:599
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Чтобы привести мышь в действие,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:600
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "ПОКРУТИТЕ КОЛЕСИКО!"
@@ -1721,4 +1724,3 @@ msgstr "Тип клавиатуры"
 #, c-format
 msgid "Do you want the BackSpace to return Delete in console?"
 msgstr "Хотите, чтобы клавиша BackSpace в консоли возвращала Delete?"
-