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, 24 insertions, 25 deletions

diff --git a/po/nb.po b/po/nb.po
index 64bd68a..488b802 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -18,7 +18,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nb\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:13+0200\n"
 "Last-Translator: Olav Dahlum <odahlum@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <cooker-i18n@mandrivalinux.org>\n"
@@ -74,22 +74,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB eller mer"
 
-#: ../lib/Xconfig/card.pm:171
+#: ../lib/Xconfig/card.pm:174
 #, c-format
 msgid "X server"
 msgstr "X-tjener"
 
-#: ../lib/Xconfig/card.pm:172
+#: ../lib/Xconfig/card.pm:175
 #, c-format
 msgid "Choose an X server"
 msgstr "Velg en X-tjener"
 
-#: ../lib/Xconfig/card.pm:203
+#: ../lib/Xconfig/card.pm:206
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Multi-hode-oppsett"
 
-#: ../lib/Xconfig/card.pm:204
+#: ../lib/Xconfig/card.pm:207
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -98,12 +98,12 @@ msgstr ""
 "Systemet ditt støtter oppsett for flere hoder.\n"
 "Hva ønsker du å gjøre?"
 
-#: ../lib/Xconfig/card.pm:293
+#: ../lib/Xconfig/card.pm:296
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Velg minnestørrelsen til grafikk-kortet ditt"
 
-#: ../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 "
@@ -114,7 +114,7 @@ msgstr ""
 "ekstra finesser.\n"
 "Ønsker du å bruke den?"
 
-#: ../lib/Xconfig/card.pm:346
+#: ../lib/Xconfig/card.pm:349
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -123,17 +123,17 @@ msgstr ""
 "Den proprietære driveren ble ikke ordentlig installert. Bruker derfor den "
 "frie driveren."
 
-#: ../lib/Xconfig/card.pm:416
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Sett opp alle hoder uavhengig"
 
-#: ../lib/Xconfig/card.pm:417
+#: ../lib/Xconfig/card.pm:420
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Bruk Xinerama utvidelse"
 
-#: ../lib/Xconfig/card.pm:422
+#: ../lib/Xconfig/card.pm:425
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Sett bare opp kort «%s»%s"
@@ -300,7 +300,7 @@ msgstr "Automatisk"
 msgid "Resolutions"
 msgstr "Oppløsninger"
 
-#: ../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 "Andre"
@@ -1643,62 +1643,62 @@ msgstr "ingen"
 msgid "No mouse"
 msgstr "Ingen mus"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:475
 #, c-format
 msgid "Testing the mouse"
 msgstr "Tester musa"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:512
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Velg din musetype."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:513
 #, c-format
 msgid "Mouse choice"
 msgstr "Musevalg"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:529
 #, c-format
 msgid "Emulate third button?"
 msgstr "Emulere tredje knapp?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:533
 #, c-format
 msgid "Mouse Port"
 msgstr "Museport"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:534
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Velg hvilken serieport musen din er koblet til."
 
-#: ../lib/mouse.pm:556
+#: ../lib/mouse.pm:543
 #, c-format
 msgid "Buttons emulation"
 msgstr "Museknappemulering"
 
-#: ../lib/mouse.pm:558
+#: ../lib/mouse.pm:545
 #, c-format
 msgid "Button 2 Emulation"
 msgstr "Museknapp 2-emulering"
 
-#: ../lib/mouse.pm:559
+#: ../lib/mouse.pm:546
 #, c-format
 msgid "Button 3 Emulation"
 msgstr "Museknapp 3-emulering"
 
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:597
 #, c-format
 msgid "Please test the mouse"
 msgstr "Test musa."
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:599
 #, c-format
 msgid "To activate the mouse,"
 msgstr "For å aktivere musa,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:600
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "BEVEG HJULET DITT!"
@@ -1732,4 +1732,3 @@ msgstr "Tastaturtype"
 #, c-format
 msgid "Do you want the BackSpace to return Delete in console?"
 msgstr "Ønsker du at BackSpace skal returnere Delete i konsoll?"
-