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, 40 insertions, 34 deletions

diff --git a/po/uz.po b/po/uz.po
index 61ae347..f48751d 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-kbd-mouse-x11-uz\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-22 21:22+0500\n"
 "Last-Translator: Nurali Abdurahmonov <mavnur@gmail.com>\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
@@ -63,22 +63,22 @@ msgstr "32 Mb"
 msgid "64 MB or more"
 msgstr "64 Mb yoki koʻproq"
 
-#: ../lib/Xconfig/card.pm:171
+#: ../lib/Xconfig/card.pm:174
 #, c-format
 msgid "X server"
 msgstr "X serveri"
 
-#: ../lib/Xconfig/card.pm:172
+#: ../lib/Xconfig/card.pm:175
 #, c-format
 msgid "Choose an X server"
 msgstr "Grafik kartani tanlash"
 
-#: ../lib/Xconfig/card.pm:203
+#: ../lib/Xconfig/card.pm:206
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Bir necha yadroni sozlash"
 
-#: ../lib/Xconfig/card.pm:204
+#: ../lib/Xconfig/card.pm:207
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -87,12 +87,12 @@ msgstr ""
 "Tizimingiz bir necha yadroni qoʻllay olada.\n"
 "Nima qilishni istaysiz?"
 
-#: ../lib/Xconfig/card.pm:293
+#: ../lib/Xconfig/card.pm:296
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Grafik kartangizni xotirasining hajmini tanlang"
 
-#: ../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 "
@@ -103,25 +103,26 @@ msgstr ""
 "kartaning qoʻshimcha imkoniyatlaridan foydalansa boʻladi.\n"
 "Undan foydalanishni istaysizmi?"
 
-#: ../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 ""
-"Proprietar drayver toʻgʻri oʻrnatilmagan, ochiq kodli daryverdan foydalaniladi."
+"Proprietar drayver toʻgʻri oʻrnatilmagan, ochiq kodli daryverdan "
+"foydalaniladi."
 
-#: ../lib/Xconfig/card.pm:416
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Barcha yadrolarni alohida-alohida sozlash"
 
-#: ../lib/Xconfig/card.pm:417
+#: ../lib/Xconfig/card.pm:420
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Xinerama kengaytmasidan foydalanish"
 
-#: ../lib/Xconfig/card.pm:422
+#: ../lib/Xconfig/card.pm:425
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Faqat \"%s\"%s kartasini moslash"
@@ -278,7 +279,7 @@ msgstr "Avtomatik"
 msgid "Resolutions"
 msgstr "Oʻlchamlar"
 
-#: ../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 "Boshqa"
@@ -322,8 +323,8 @@ msgstr "Moslamalarni sinab koʻrishni istaysizmi?"
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
-"Diqqat: bu grafik kartani sinab koʻrish kompyuterni qotib qolishiga olib kelishi "
-"mumkin"
+"Diqqat: bu grafik kartani sinab koʻrish kompyuterni qotib qolishiga olib "
+"kelishi mumkin"
 
 #: ../lib/Xconfig/test.pm:65
 #, c-format
@@ -351,7 +352,8 @@ msgstr "Bu toʻgʻrimi?"
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Ctrl-Alt-Backspace ni oʻchirish: %s\n"
 
-#: ../lib/Xconfig/various.pm:26, c-format
+#: ../lib/Xconfig/various.pm:26
+#, c-format
 msgid "no"
 msgstr "yoʻq"
 
@@ -453,7 +455,8 @@ msgstr "Sichqoncha koʻrsatgichi uchun uskuna akseleratoridan foydalanish"
 #: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
-msgstr "Render imkoniyatidan foydalanish (matnni koʻrsatishda xato boʻlishi mumkin)"
+msgstr ""
+"Render imkoniyatidan foydalanish (matnni koʻrsatishda xato boʻlishi mumkin)"
 
 #: ../lib/Xconfig/various.pm:256
 #, c-format
@@ -978,7 +981,8 @@ msgid ""
 "Laotian"
 msgstr "Laoscha"
 
-#: ../lib/keyboard.pm:264, c-format
+#: ../lib/keyboard.pm:264
+#, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
@@ -1563,8 +1567,8 @@ msgstr "Logitech sichqoncha (ketma-ket, eski C7 turi)"
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr ""
-"Gʻildirakni emulyasiya qiladigan Logitech sichqonchasi (seriya portlil, esk C7 "
-"turli)"
+"Gʻildirakni emulyasiya qiladigan Logitech sichqonchasi (seriya portlil, esk "
+"C7 turli)"
 
 #: ../lib/mouse.pm:70
 #, c-format
@@ -1616,7 +1620,8 @@ msgstr "Microsoft Xbox Controller S"
 msgid "VirtualBox mouse"
 msgstr "VirtualBox sichqonchasi"
 
-#: ../lib/mouse.pm:87, c-format
+#: ../lib/mouse.pm:87
+#, c-format
 msgid "VMware mouse"
 msgstr "VMware sichqonchasi"
 
@@ -1630,62 +1635,62 @@ msgstr "yoʻq"
 msgid "No mouse"
 msgstr "Sichqoncha yoʻq"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:475
 #, c-format
 msgid "Testing the mouse"
 msgstr "Sichqoncha tekshirilmoqda"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:512
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Iltimos sichqonchaning turini tanlang."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:513
 #, c-format
 msgid "Mouse choice"
 msgstr "Sichqonchani tanlash"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:529
 #, c-format
 msgid "Emulate third button?"
 msgstr "Uchinchi tugma emulyasiya qilinsinmi?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:533
 #, c-format
 msgid "Mouse Port"
 msgstr "Sichqonchaning porti"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:534
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Iltimos sichqoncha ulangan ketma-ket portini tanlang."
 
-#: ../lib/mouse.pm:556
+#: ../lib/mouse.pm:543
 #, c-format
 msgid "Buttons emulation"
 msgstr "Tugma emulyasiyasi"
 
-#: ../lib/mouse.pm:558
+#: ../lib/mouse.pm:545
 #, c-format
 msgid "Button 2 Emulation"
 msgstr "Ikkinchi tugmani emulyachiya qilish"
 
-#: ../lib/mouse.pm:559
+#: ../lib/mouse.pm:546
 #, c-format
 msgid "Button 3 Emulation"
 msgstr "Uchinchi tugmani emulyasiya qilish"
 
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:597
 #, c-format
 msgid "Please test the mouse"
 msgstr "Iltimos sichqonchani sinab koʻring"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:599
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Sichqonchani ishga tushirish uchun,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:600
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "GʻILDIRAKNI AYLANTIRING!"
@@ -1693,7 +1698,8 @@ msgstr "GʻILDIRAKNI AYLANTIRING!"
 #: ../tools/XFdrake:71
 #, c-format
 msgid "You need to reboot for changes to take effect"
-msgstr "Oʻzgarishlar toʻliq qoʻllanilishi uchun tizimga boshqadan kirishingiz kerak"
+msgstr ""
+"Oʻzgarishlar toʻliq qoʻllanilishi uchun tizimga boshqadan kirishingiz kerak"
 
 #: ../tools/keyboarddrake:37
 #, c-format