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

diff --git a/po/ast.po b/po/ast.po
index 162ff8d..0e6a5bc 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
-"POT-Creation-Date: 2009-10-21 15:48+0200\n"
+"POT-Creation-Date: 2010-05-26 17:42+0200\n"
 "PO-Revision-Date: 2010-01-27 18:25+0100\n"
 "Last-Translator: marquinos <marquinos@mandriva.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -59,22 +59,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB o más"
 
-#: ../lib/Xconfig/card.pm:171
+#: ../lib/Xconfig/card.pm:174
 #, c-format
 msgid "X server"
 msgstr "Sirvidor X"
 
-#: ../lib/Xconfig/card.pm:172
+#: ../lib/Xconfig/card.pm:175
 #, c-format
 msgid "Choose an X server"
 msgstr "Escueyi un sirvidor X"
 
-#: ../lib/Xconfig/card.pm:203
+#: ../lib/Xconfig/card.pm:206
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Configuración multi-monitor"
 
-#: ../lib/Xconfig/card.pm:204
+#: ../lib/Xconfig/card.pm:207
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -83,42 +83,47 @@ msgstr ""
 "El sistema sofita configuración multi-monitor.\n"
 "¿Qué quies facer?"
 
-#: ../lib/Xconfig/card.pm:293
+#: ../lib/Xconfig/card.pm:296
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Escueyi la cantidá de memoria de la tarxeta gráfica"
 
-#: ../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 ""
-"Hai un controlador propietariu disponible pa la tarxeta de vídeu que puede sofitar carauterístiques adicionales.\n"
+"Hai un controlador propietariu disponible pa la tarxeta de vídeu que puede "
+"sofitar carauterístiques adicionales.\n"
 "¿Quies usalu?"
 
-#: ../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 "El controlador propietariu nun se instaló bien, camudando al controlador llibre."
+msgid ""
+"The proprietary driver was not properly installed, defaulting to free "
+"software driver."
+msgstr ""
+"El controlador propietariu nun se instaló bien, camudando al controlador "
+"llibre."
 
-#: ../lib/Xconfig/card.pm:416
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Configurar los monitores independientemente"
 
-#: ../lib/Xconfig/card.pm:417
+#: ../lib/Xconfig/card.pm:420
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Usar estensión Xinerama"
 
-#: ../lib/Xconfig/card.pm:422
+#: ../lib/Xconfig/card.pm:425
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Configurar namái la tarxeta \"%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"
@@ -139,8 +144,7 @@ msgstr "Colar"
 msgid "Graphic Card"
 msgstr "Tarxeta gráfica"
 
-#: ../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"
@@ -149,8 +153,7 @@ msgstr ""
 "_: Esti ye un preséu de visualización\n"
 "Monitor"
 
-#: ../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 "Resolución"
@@ -203,8 +206,7 @@ msgstr "Escueyi una pantalla"
 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 "Xenéricu"
@@ -217,16 +219,21 @@ msgstr "Fabricante"
 #: ../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 ""
-"Los dos parámetros críticos son la frecuencia de barríu vertical, qu'indica la frecuencia\n"
-"de refrescu de la pantalla entera, y más importante entá, la frecuencia de sincronización\n"
+"Los dos parámetros críticos son la frecuencia de barríu vertical, qu'indica "
+"la frecuencia\n"
+"de refrescu de la pantalla entera, y más importante entá, la frecuencia de "
+"sincronización\n"
 "horizontal, la frecuencia de les llínies de barríu horizontal.\n"
 "\n"
 "Ye MUI IMPORTANTE que nun especifiques una triba de pantalla con una\n"
@@ -270,8 +277,7 @@ msgid "16 million colors (24 bits)"
 msgstr "16 millones de colores (24 bits)"
 
 #: ../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 "Automáticu"
@@ -281,8 +287,7 @@ msgstr "Automáticu"
 msgid "Resolutions"
 msgstr "Resoluciones"
 
-#: ../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 "Otros"
@@ -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 ""
 "Parez que la tarxeta gráfica tien un coneutor de salida pa TV.\n"
 "Puede configurase pa trabayar col frame-buffer.\n"
 "\n"
-"Pa eso tienes que coneutar la tarxeta gráfica a la TV enantes d'arrancar l'ordenador.\n"
+"Pa eso tienes que coneutar la tarxeta gráfica a la TV enantes d'arrancar "
+"l'ordenador.\n"
 "Dempués, escueyi la entrada \"TVout\" nel cargador d'arranque\n"
 "\n"
 "¿Tienes esta carauterística?"
@@ -526,16 +533,14 @@ msgstr ""
 "_:opción estraña de ratiu\n"
 "otru"
 
-#: ../lib/keyboard.pm:186
-#: ../lib/keyboard.pm:218
+#: ../lib/keyboard.pm:186 ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTZ)"
 msgstr "Checu (QWERTZ)"
 
-#: ../lib/keyboard.pm:187
-#: ../lib/keyboard.pm:220
+#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -549,38 +554,33 @@ msgid ""
 "Dvorak"
 msgstr "Dvorak"
 
-#: ../lib/keyboard.pm:189
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:189 ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Spanish"
 msgstr "Español"
 
-#: ../lib/keyboard.pm:190
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Finnish"
 msgstr "Finlandés"
 
-#: ../lib/keyboard.pm:191
-#: ../lib/keyboard.pm:235
+#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French"
 msgstr "Francés"
 
-#: ../lib/keyboard.pm:192
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:236
 #, c-format
 msgid "UK keyboard"
 msgstr "Británicu"
 
-#: ../lib/keyboard.pm:193
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -594,24 +594,21 @@ msgid ""
 "Polish"
 msgstr "Polacu"
 
-#: ../lib/keyboard.pm:195
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:195 ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian"
 msgstr "Rusu"
 
-#: ../lib/keyboard.pm:196
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:287
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swedish"
 msgstr "Suecu"
 
-#: ../lib/keyboard.pm:197
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:322
 #, c-format
 msgid "US keyboard"
 msgstr "Estadounidense"
@@ -1418,7 +1415,8 @@ msgid ""
 "allow switching between the different keyboard layouts\n"
 "(eg: latin and non latin)"
 msgstr ""
-"Equí puedes escoyer la tecla o combinación de tecles que permitiránncamudar ente los estremao esquemes de tecláu\n"
+"Equí puedes escoyer la tecla o combinación de tecles que permitiránncamudar "
+"ente los estremao esquemes de tecláu\n"
 "(ex.: llatín y non llatín)"
 
 #: ../lib/keyboard.pm:392
@@ -1462,14 +1460,12 @@ msgstr "Mur xenéricu PS2 con rueda"
 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"
@@ -1479,26 +1475,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 botón"
 
-#: ../lib/mouse.pm:44
-#: ../lib/mouse.pm:53
+#: ../lib/mouse.pm:44 ../lib/mouse.pm:53
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Mur de 2 botones xenéricu"
 
-#: ../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 "Mur de 3 botones xenéricu con emulación de rueda"
@@ -1638,62 +1630,62 @@ msgstr "dengún"
 msgid "No mouse"
 msgstr "Ensin mur"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:475
 #, c-format
 msgid "Testing the mouse"
 msgstr "Prebando'l mur"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:512
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Escueyi la triba de mur, por favor."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:513
 #, c-format
 msgid "Mouse choice"
 msgstr "Escoyeta del mur"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:529
 #, c-format
 msgid "Emulate third button?"
 msgstr "¿Emular el tercer botón?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:533
 #, c-format
 msgid "Mouse Port"
 msgstr "Puertu del mur"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:534
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Escueyi'l puertu serie al que ta conectáu'l mur, por favor."
 
-#: ../lib/mouse.pm:556
+#: ../lib/mouse.pm:543
 #, c-format
 msgid "Buttons emulation"
 msgstr "Emulación de botones"
 
-#: ../lib/mouse.pm:558
+#: ../lib/mouse.pm:545
 #, c-format
 msgid "Button 2 Emulation"
 msgstr "Emulación del botón 2"
 
-#: ../lib/mouse.pm:559
+#: ../lib/mouse.pm:546
 #, c-format
 msgid "Button 3 Emulation"
 msgstr "Emulación del botón 3"
 
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:597
 #, c-format
 msgid "Please test the mouse"
 msgstr "Preba'l mur, por favor."
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:599
 #, c-format
 msgid "To activate the mouse,"
 msgstr "P'activar el mur,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:600
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "¡MUEVA LA RUEDA!"
@@ -1732,24 +1724,32 @@ msgstr "¿Quies que la tecla BackSpace unvíe un Delete na consola?"
 #~ "_: keyboard\n"
 #~ "Lithuanian AZERTY (old)"
 #~ msgstr "Lituano AZERTY (antiguo)"
+
 #~ msgid ""
 #~ "_: keyboard\n"
 #~ "Lithuanian AZERTY (new)"
 #~ msgstr "Lituano AZERTY (nuevu)"
+
 #~ msgid ""
 #~ "_: keyboard\n"
 #~ "Lithuanian \"number row\" QWERTY"
 #~ msgstr "Lituano \"numbéricu\" QWERTY"
+
 #~ msgid ""
 #~ "_: keyboard\n"
 #~ "Lithuanian \"phonetic\" QWERTY"
 #~ msgstr "Lituano \"fonético\" QWERTY"
+
 #~ msgid "Mouse test"
 #~ msgstr "Preba del mur"
+
 #~ msgid "Please test your mouse:"
 #~ msgstr "Por favor, pruebe su mur:"
+
 #~ msgid "Plug'n Play probing failed. Please select the correct monitor"
-#~ msgstr "Falló la preba Plug'n Play. Por favor, escueya un monitor específico"
+#~ msgstr ""
+#~ "Falló la preba Plug'n Play. Por favor, escueya un monitor específico"
+
 #~ msgid ""
 #~ "The display resolution being used may not be correct. \n"
 #~ "\n"
@@ -1761,4 +1761,3 @@ msgstr "¿Quies que la tecla BackSpace unvíe un Delete na consola?"
 #~ "Si su escritoriu aparece estirase más allá de los berbesos de la "
 #~ "pantalla, \n"
 #~ "puede instalar %s pa ayudar a resolver el problema ¿Instalarlo agora?"
-