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, 77 insertions, 80 deletions

diff --git a/po/ky.po b/po/ky.po
index 526c7bb..3579e46 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-ky\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-12-25 22:50+0600\n"
 "Last-Translator: Ilyas Bakirov <just_ilyas@yahoo.com>\n"
 "Language-Team: Kyrgyz\n"
@@ -61,22 +61,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"
@@ -85,42 +85,47 @@ 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 support additional features.\n"
+"There is a proprietary driver available for your video card which may "
+"support additional features.\n"
 "Do you wish to use it?"
 msgstr ""
-"Сиздин видео картаңыз үчүн мүмкүн кошумча функционалдарды камтыган проприетардык драйверлер табылды.\n"
+"Сиздин видео картаңыз үчүн мүмкүн кошумча функционалдарды камтыган "
+"проприетардык драйверлер табылды.\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 "Проприетардык драйвери орнотулган жок, алдын ала бекер драйвер колдонулуп жатат."
+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 картасын гана конфигурациялоо"
 
-#: ../lib/Xconfig/main.pm:88
-#: ../lib/Xconfig/main.pm:89
+#: ../lib/Xconfig/main.pm:88 ../lib/Xconfig/main.pm:89
 #: ../lib/Xconfig/monitor.pm:136
 #, c-format
 msgid "Custom"
@@ -141,16 +146,14 @@ msgstr "Чыгуу"
 msgid "Graphic Card"
 msgstr "Графикалык карта"
 
-#: ../lib/Xconfig/main.pm:129
-#: ../lib/Xconfig/monitor.pm:130
+#: ../lib/Xconfig/main.pm:129 ../lib/Xconfig/monitor.pm:130
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Монитор"
 
-#: ../lib/Xconfig/main.pm:132
-#: ../lib/Xconfig/resolution_and_depth.pm:371
+#: ../lib/Xconfig/main.pm:132 ../lib/Xconfig/resolution_and_depth.pm:371
 #, c-format
 msgid "Resolution"
 msgstr "Майдалыгы"
@@ -173,7 +176,8 @@ msgstr "Плагиндер"
 #: ../lib/Xconfig/main.pm:179
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
-msgstr "Сиздин Xorg конфигурациялоо файлыңыз жабыркаган, биз аны эсепке албайбыз."
+msgstr ""
+"Сиздин Xorg конфигурациялоо файлыңыз жабыркаган, биз аны эсепке албайбыз."
 
 #: ../lib/Xconfig/main.pm:197
 #, c-format
@@ -203,8 +207,7 @@ msgstr "Монитор тандаңыз"
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:138
-#: ../lib/mouse.pm:45
+#: ../lib/Xconfig/monitor.pm:138 ../lib/mouse.pm:45
 #, c-format
 msgid "Generic"
 msgstr "Кадимки"
@@ -217,12 +220,15 @@ msgstr "Өндүрүүчү"
 #: ../lib/Xconfig/monitor.pm:157
 #, c-format
 msgid ""
-"The two critical parameters are the vertical refresh rate, which is the rate\n"
+"The two critical parameters are the vertical refresh rate, which is the "
+"rate\n"
 "at which the whole screen is refreshed, and most importantly the horizontal\n"
 "sync rate, which is the rate at which scanlines are displayed.\n"
 "\n"
-"It is VERY IMPORTANT that you do not specify a monitor type with a sync range\n"
-"that is beyond the capabilities of your monitor: you may damage your monitor.\n"
+"It is VERY IMPORTANT that you do not specify a monitor type with a sync "
+"range\n"
+"that is beyond the capabilities of your monitor: you may damage your "
+"monitor.\n"
 " If in doubt, choose a conservative setting."
 msgstr ""
 "Эки параметр критикалык болуп эсептелет: биринчиси - бүтүндөй экрандын\n"
@@ -270,8 +276,7 @@ msgid "16 million colors (24 bits)"
 msgstr "16 миллион түс (24 бит)"
 
 #: ../lib/Xconfig/resolution_and_depth.pm:75
-#: ../lib/Xconfig/resolution_and_depth.pm:362
-#: ../lib/mouse.pm:33
+#: ../lib/Xconfig/resolution_and_depth.pm:362 ../lib/mouse.pm:33
 #, c-format
 msgid "Automatic"
 msgstr "Автоматтык"
@@ -281,8 +286,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 "Башка"
@@ -456,7 +460,8 @@ msgstr "Чычкан курсору үчүн жабдыктык тездедүү
 #: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
-msgstr "RENDER тездетүүнү иштетүү (текст көрсөтүүдө каталарды алып келиши мүмкүн)"
+msgstr ""
+"RENDER тездетүүнү иштетүү (текст көрсөтүүдө каталарды алып келиши мүмкүн)"
 
 #: ../lib/Xconfig/various.pm:256
 #, c-format
@@ -499,7 +504,8 @@ msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
 "It can be configured to work using frame-buffer.\n"
 "\n"
-"For this you have to plug your graphic card to your TV before booting your computer.\n"
+"For this you have to plug your graphic card to your TV before booting your "
+"computer.\n"
 "Then choose the \"TVout\" entry in the bootloader\n"
 "\n"
 "Do you have this feature?"
@@ -507,7 +513,8 @@ msgstr ""
 "Сиздин видеокартада TV-OUT коннектору бар көрүнөт.\n"
 "Ал кадрлар буферин колдонуп иштөөгө конфигурацияланса болот.\n"
 "\n"
-"Ал үчүн, компьютериңизди жүктөө алдында, видеокартаңызды телевизорго туташтырыңыз.\n"
+"Ал үчүн, компьютериңизди жүктөө алдында, видеокартаңызды телевизорго "
+"туташтырыңыз.\n"
 "Жүктөө учурунда \"TVout\" пунктун тандаңыз.\n"
 "\n"
 "Сизде ушундай мүмкүнчүлүк барбы?"
@@ -524,16 +531,14 @@ msgid ""
 "other"
 msgstr "башка"
 
-#: ../lib/keyboard.pm:186
-#: ../lib/keyboard.pm:218
+#: ../lib/keyboard.pm:186 ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTZ)"
 msgstr "Чехтик (QWERTZ)"
 
-#: ../lib/keyboard.pm:187
-#: ../lib/keyboard.pm:220
+#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -547,38 +552,33 @@ msgid ""
 "Dvorak"
 msgstr "Дворактык"
 
-#: ../lib/keyboard.pm:189
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:189 ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Spanish"
 msgstr "Испандык"
 
-#: ../lib/keyboard.pm:190
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Finnish"
 msgstr "Финдик"
 
-#: ../lib/keyboard.pm:191
-#: ../lib/keyboard.pm:235
+#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French"
 msgstr "Француздук"
 
-#: ../lib/keyboard.pm:192
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:236
 #, c-format
 msgid "UK keyboard"
 msgstr "UK ариптергичи"
 
-#: ../lib/keyboard.pm:193
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -592,24 +592,21 @@ msgid ""
 "Polish"
 msgstr "Поляктык"
 
-#: ../lib/keyboard.pm:195
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:195 ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian"
 msgstr "Орустук"
 
-#: ../lib/keyboard.pm:196
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:287
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swedish"
 msgstr "Шведдик"
 
-#: ../lib/keyboard.pm:197
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:322
 #, c-format
 msgid "US keyboard"
 msgstr "US ариптергичи"
@@ -1461,14 +1458,12 @@ msgstr "Кадимки дөңгөлөктүү PS2 чычканы"
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:35
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:35 ../lib/mouse.pm:69
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:36
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:36 ../lib/mouse.pm:64
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
@@ -1478,26 +1473,22 @@ msgstr "Genius NetMouse"
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:38
-#: ../lib/mouse.pm:48
+#: ../lib/mouse.pm:38 ../lib/mouse.pm:48
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:43
-#: ../lib/mouse.pm:75
+#: ../lib/mouse.pm:43 ../lib/mouse.pm:75
 #, c-format
 msgid "1 button"
 msgstr "1 баскыч"
 
-#: ../lib/mouse.pm:44
-#: ../lib/mouse.pm:53
+#: ../lib/mouse.pm:44 ../lib/mouse.pm:53
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Кадимки 2 баскычтуу чычкан"
 
-#: ../lib/mouse.pm:46
-#: ../lib/mouse.pm:55
+#: ../lib/mouse.pm:46 ../lib/mouse.pm:55
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Кадимки 3 баскычтуу чычкан; дөңгөлөктү эмуляциялоо менен"
@@ -1570,7 +1561,8 @@ msgstr "Logitech Mouse (удаалаш, эски C7 тибиндеги)"
 #: ../lib/mouse.pm:68
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
-msgstr "Logitech Mouse (удаалаш, эски C7 тибиндеги); дөңгөлөктү эмуляциялоо менен"
+msgstr ""
+"Logitech Mouse (удаалаш, эски C7 тибиндеги); дөңгөлөктү эмуляциялоо менен"
 
 #: ../lib/mouse.pm:70
 #, c-format
@@ -1637,62 +1629,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 "2 баскычты эмуляциялоо"
 
-#: ../lib/mouse.pm:559
+#: ../lib/mouse.pm:546
 #, c-format
 msgid "Button 3 Emulation"
 msgstr "3 баскычты эмуляциялоо"
 
-#: ../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 "ДӨҢГӨЛӨКТҮ КЫЙМЫЛГА КЕЛТИРИҢИЗ!"
@@ -1731,23 +1723,28 @@ msgstr "Консолдо BackSpace баскычын колдонгондо Delet
 #~ "_: keyboard\n"
 #~ "Lithuanian AZERTY (old)"
 #~ msgstr "Литвалык AZERTY (эски)"
+
 #~ msgid ""
 #~ "_: keyboard\n"
 #~ "Lithuanian AZERTY (new)"
 #~ msgstr "Литвалык AZERTY (жаңы)"
+
 #~ msgid ""
 #~ "_: keyboard\n"
 #~ "Lithuanian \"number row\" QWERTY"
 #~ msgstr "Литвалык \"сан катар\" QWERTY"
+
 #~ msgid ""
 #~ "_: keyboard\n"
 #~ "Lithuanian \"phonetic\" QWERTY"
 #~ msgstr "Литвалык \"фонетикалык\" QWERTY"
+
 #~ msgid "Mouse test"
 #~ msgstr "Чычкан текшерүү"
+
 #~ msgid "Please test your mouse:"
 #~ msgstr "Чычканыңызды текшериңиз:"
+
 #~ msgid "Plug'n Play probing failed. Please select the correct monitor"
 #~ msgstr ""
 #~ "Plug'n Play изилдөөсүнүн ийгиликсиздиги. Тийиштүү туура монитор тандаңыз"
-