updated pot file

author: Pablo Saratxaga <pablo@mandriva.com> 2004-10-07 13:40:59 +0000
committer: Pablo Saratxaga <pablo@mandriva.com> 2004-10-07 13:40:59 +0000
commit: 79ecddfe11c0aa12f6ebefb6542b7c286b66400d (patch)
tree: 8a2aeb882e59d623794d2b734b74d7bd5035461a /perl-install/share/po/nn.po
parent: 54f5f51c6dcfc30abb2d64781404ba7bdbead24e (diff)
download: drakx-backup-do-not-use-79ecddfe11c0aa12f6ebefb6542b7c286b66400d.tar
drakx-backup-do-not-use-79ecddfe11c0aa12f6ebefb6542b7c286b66400d.tar.gz
drakx-backup-do-not-use-79ecddfe11c0aa12f6ebefb6542b7c286b66400d.tar.bz2
drakx-backup-do-not-use-79ecddfe11c0aa12f6ebefb6542b7c286b66400d.tar.xz
drakx-backup-do-not-use-79ecddfe11c0aa12f6ebefb6542b7c286b66400d.zip
1 files changed, 6523 insertions, 4933 deletions
diff --git a/perl-install/share/po/nn.po b/perl-install/share/po/nn.po
index 24700f4b5..2b6e2d0f1 100644
--- a/perl-install/share/po/nn.po
+++ b/perl-install/share/po/nn.po
@@ -1,3 +1,4 @@
+# Translation of nn to Norwegian Nynorsk
 # translation of DrakX-nn.po to Norwegian Nynorsk
 # translation of nn.po to Norwegian Nynorsk
 # translation of DrakX.pot to Norwegian Nynorsk
@@ -6,18 +7,78 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX-nn\n"
-"POT-Creation-Date: 2004-06-14 15:48+0200\n"
-"PO-Revision-Date: 2004-06-14 22:21+0200\n"
+"Project-Id-Version: nn\n"
+"POT-Creation-Date: 2004-10-07 21:57+0200\n"
+"PO-Revision-Date: 2004-09-12 11:56+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3\n"
+"X-Generator: KBabel 1.3.1\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../move/move.pm:402
+#: ../move/move.pm:292
+#, c-format
+msgid "Which USB key do you want to format?"
+msgstr "Kva USB-nøkkel vil du formatera?"
+
+#: ../move/move.pm:296
+#, c-format
+msgid ""
+"You are about to format a USB device \"%s\". This will delete all data on "
+"it.\n"
+"Make sure that the selected device is the USB key you want to format. \n"
+"We advise you to unplug all other USB storage devices while doing this "
+"operation."
+msgstr ""
+
+#: ../move/move.pm:448 ../move/move.pm:460
+#, c-format
+msgid "Key isn't writable"
+msgstr "Nøkkelen er ikkje skrivbar"
+
+#: ../move/move.pm:450
+#, c-format
+msgid ""
+"The USB key seems to have write protection enabled. Please\n"
+"unplug it, remove write protection, and then plug it again."
+msgstr ""
+"USB-nøkkelen er skriveverna. Ta han ut, fjern skrivevernet,\n"
+"og set han inn igjen."
+
+#: ../move/move.pm:452
+#, c-format
+msgid "Retry"
+msgstr "Prøv på nytt"
+
+#: ../move/move.pm:453 ../move/move.pm:497
+#, c-format
+msgid "Continue without USB key"
+msgstr "Hald fram utan USB-nøkkel"
+
+#: ../move/move.pm:462
+#, c-format
+msgid ""
+"The USB key seems to have write protection enabled, but we can't safely\n"
+"unplug it now.\n"
+"\n"
+"\n"
+"Click the button to reboot the machine, unplug it, remove write protection,\n"
+"plug the key again, and launch Mandrake Move again."
+msgstr ""
+"USB-nøkkelen er skriveverna, men du kan ikkje sikkert fjerna han no.\n"
+"\n"
+"\n"
+"Trykk «Start på nytt» for å starta maskina på nytt, fjern nøkkelen,\n"
+"slå av skrivevernet, og start så Mandrake Move på nytt."
+
+#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1353
+#, c-format
+msgid "Reboot"
+msgstr "Start på nytt"
+
+#: ../move/move.pm:473
 #, c-format
 msgid ""
 "Your USB key doesn't have any valid Windows (FAT) partitions.\n"
@@ -40,7 +101,7 @@ msgstr ""
 "Du kan òg halda fram utan USB-nøkkel. Du kan då bruka\n"
 "Mandrake Move som eit vanleg CD-basert operativesystem."
 
-#: ../move/move.pm:412
+#: ../move/move.pm:483
 #, c-format
 msgid ""
 "We didn't detect any USB key on your system. If you\n"
@@ -65,156 +126,111 @@ msgstr ""
 "Du kan òg halda fram utan USB-nøkkel. Du kan då bruka\n"
 "Mandrake Move som eit vanleg CD-basert operativesystem."
 
-#: ../move/move.pm:423
+#: ../move/move.pm:494
 #, c-format
 msgid "Need a key to save your data"
 msgstr "Treng nøkkel for å kunna lagra data"
 
-#: ../move/move.pm:425
+#: ../move/move.pm:496
 #, c-format
 msgid "Detect USB key again"
 msgstr "Sjå etter USB-nøkkel på nytt"
 
-#: ../move/move.pm:426 ../move/move.pm:456
-#, c-format
-msgid "Continue without USB key"
-msgstr "Hald fram utan USB-nøkkel"
-
-#: ../move/move.pm:437 ../move/move.pm:451
-#, c-format
-msgid "Key isn't writable"
-msgstr "Nøkkelen er ikkje skrivbar"
-
-#: ../move/move.pm:439
-#, c-format
-msgid ""
-"The USB key seems to have write protection enabled, but we can't safely\n"
-"unplug it now.\n"
-"\n"
-"\n"
-"Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
-msgstr ""
-"USB-nøkkelen er skriveverna, men du kan ikkje sikkert fjerna han no.\n"
-"\n"
-"\n"
-"Trykk «Start på nytt» for å starta maskina på nytt, fjern nøkkelen,\n"
-"slå av skrivevernet, og start så Mandrake Move på nytt."
-
-#: ../move/move.pm:445 help.pm:418 install_steps_interactive.pm:1306
-#, c-format
-msgid "Reboot"
-msgstr "Start på nytt"
-
-#: ../move/move.pm:453
-#, c-format
-msgid ""
-"The USB key seems to have write protection enabled. Please\n"
-"unplug it, remove write protection, and then plug it again."
-msgstr ""
-"USB-nøkkelen er skriveverna. Ta han ut, fjern skrivevernet,\n"
-"og set han inn igjen."
-
-#: ../move/move.pm:455
-#, c-format
-msgid "Retry"
-msgstr "Prøv på nytt"
-
-#: ../move/move.pm:466
+#: ../move/move.pm:517
 #, c-format
 msgid "Setting up USB key"
 msgstr "Set opp USB-nøkkel"
 
-#: ../move/move.pm:466
+#: ../move/move.pm:517
 #, c-format
 msgid "Please wait, setting up system configuration files on USB key..."
 msgstr "Vent litt. Set opp systemoppsettfilene på USB-nøkkelen ..."
 
-#: ../move/move.pm:488
+#: ../move/move.pm:546
 #, c-format
 msgid "Enter your user information, password will be used for screensaver"
 msgstr "Skriv inn brukarinformasjon. Passordet blir brukt for skjermspararen."
 
-#: ../move/move.pm:498
+#: ../move/move.pm:556
 #, c-format
 msgid "Auto configuration"
 msgstr "Autooppsett"
 
-#: ../move/move.pm:498
+#: ../move/move.pm:556
 #, c-format
 msgid "Please wait, detecting and configuring devices..."
 msgstr "Vent litt. Ser etter og set opp maskinvare ..."
 
-#: ../move/move.pm:545 ../move/move.pm:601 ../move/move.pm:605
-#: ../move/tree/mdk_totem:86 diskdrake/dav.pm:77 diskdrake/hd_gtk.pm:117
-#: diskdrake/interactive.pm:220 diskdrake/interactive.pm:233
-#: diskdrake/interactive.pm:374 diskdrake/interactive.pm:389
-#: diskdrake/interactive.pm:510 diskdrake/interactive.pm:515
-#: diskdrake/smbnfs_gtk.pm:42 fsedit.pm:262 install_steps.pm:82
-#: install_steps_interactive.pm:40 interactive/http.pm:118
-#: interactive/http.pm:119 network/netconnect.pm:936 network/netconnect.pm:939
-#: network/netconnect.pm:984 network/netconnect.pm:988
-#: network/netconnect.pm:1055 network/netconnect.pm:1105
-#: network/netconnect.pm:1110 network/netconnect.pm:1125
-#: network/netconnect.pm:1333 printer/printerdrake.pm:213
-#: printer/printerdrake.pm:220 printer/printerdrake.pm:245
-#: printer/printerdrake.pm:393 printer/printerdrake.pm:398
-#: printer/printerdrake.pm:411 printer/printerdrake.pm:421
-#: printer/printerdrake.pm:1067 printer/printerdrake.pm:1114
-#: printer/printerdrake.pm:1151 printer/printerdrake.pm:1195
-#: printer/printerdrake.pm:1199 printer/printerdrake.pm:1213
-#: printer/printerdrake.pm:1303 printer/printerdrake.pm:1383
-#: printer/printerdrake.pm:1387 printer/printerdrake.pm:1391
-#: printer/printerdrake.pm:1440 printer/printerdrake.pm:1497
-#: printer/printerdrake.pm:1501 printer/printerdrake.pm:1515
-#: printer/printerdrake.pm:1625 printer/printerdrake.pm:1629
-#: printer/printerdrake.pm:1666 printer/printerdrake.pm:1731
-#: printer/printerdrake.pm:1749 printer/printerdrake.pm:1758
-#: printer/printerdrake.pm:1767 printer/printerdrake.pm:1778
-#: printer/printerdrake.pm:1840 printer/printerdrake.pm:2285
-#: printer/printerdrake.pm:2551 printer/printerdrake.pm:2557
-#: printer/printerdrake.pm:3010 printer/printerdrake.pm:3014
-#: printer/printerdrake.pm:3018 printer/printerdrake.pm:3421
-#: printer/printerdrake.pm:3664 printer/printerdrake.pm:3677
-#: printer/printerdrake.pm:3817 printer/printerdrake.pm:3909
-#: standalone/drakTermServ:404 standalone/drakTermServ:758
-#: standalone/drakTermServ:765 standalone/drakTermServ:960
-#: standalone/drakTermServ:1430 standalone/drakTermServ:1435
-#: standalone/drakTermServ:1442 standalone/drakTermServ:1453
-#: standalone/drakTermServ:1475 standalone/drakauth:36
-#: standalone/drakbackup:511 standalone/drakbackup:625
-#: standalone/drakbackup:1118 standalone/drakbackup:1151
-#: standalone/drakbackup:1644 standalone/drakbackup:1807
-#: standalone/drakbackup:2419 standalone/drakbackup:4084
-#: standalone/drakbackup:4304 standalone/drakboot:255 standalone/drakbug:267
-#: standalone/drakbug:286 standalone/drakbug:292 standalone/drakconnect:621
-#: standalone/drakconnect:624 standalone/drakconnect:645
-#: standalone/drakfloppy:302 standalone/drakfloppy:306
-#: standalone/drakfloppy:312 standalone/drakfont:210 standalone/drakfont:223
-#: standalone/drakfont:259 standalone/drakfont:600 standalone/draksplash:21
-#: standalone/drakxtv:105 standalone/logdrake:170 standalone/logdrake:467
-#: standalone/logdrake:472 standalone/scannerdrake:58
-#: standalone/scannerdrake:200 standalone/scannerdrake:259
-#: standalone/scannerdrake:688 standalone/scannerdrake:699
-#: standalone/scannerdrake:838 standalone/scannerdrake:849
-#: standalone/scannerdrake:919 wizards.pm:95 wizards.pm:99 wizards.pm:121
+#: ../move/move.pm:604 ../move/move.pm:660 ../move/move.pm:664
+#: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:116 diskdrake/interactive.pm:223
+#: diskdrake/interactive.pm:236 diskdrake/interactive.pm:377
+#: diskdrake/interactive.pm:392 diskdrake/interactive.pm:515
+#: diskdrake/interactive.pm:520 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:167
+#: install_steps.pm:82 install_steps_interactive.pm:38 interactive/http.pm:117
+#: interactive/http.pm:118 network/netconnect.pm:995 network/netconnect.pm:999
+#: network/netconnect.pm:1004 network/netconnect.pm:1045
+#: network/netconnect.pm:1049 network/netconnect.pm:1187
+#: network/netconnect.pm:1192 network/netconnect.pm:1210
+#: network/netconnect.pm:1393 printer/printerdrake.pm:238
+#: printer/printerdrake.pm:245 printer/printerdrake.pm:270
+#: printer/printerdrake.pm:416 printer/printerdrake.pm:421
+#: printer/printerdrake.pm:434 printer/printerdrake.pm:444
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:1182
+#: printer/printerdrake.pm:1229 printer/printerdrake.pm:1266
+#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1314
+#: printer/printerdrake.pm:1328 printer/printerdrake.pm:1418
+#: printer/printerdrake.pm:1498 printer/printerdrake.pm:1502
+#: printer/printerdrake.pm:1506 printer/printerdrake.pm:1555
+#: printer/printerdrake.pm:1612 printer/printerdrake.pm:1616
+#: printer/printerdrake.pm:1630 printer/printerdrake.pm:1740
+#: printer/printerdrake.pm:1744 printer/printerdrake.pm:1781
+#: printer/printerdrake.pm:1846 printer/printerdrake.pm:1864
+#: printer/printerdrake.pm:1873 printer/printerdrake.pm:1882
+#: printer/printerdrake.pm:1893 printer/printerdrake.pm:1955
+#: printer/printerdrake.pm:2408 printer/printerdrake.pm:2672
+#: printer/printerdrake.pm:2678 printer/printerdrake.pm:3188
+#: printer/printerdrake.pm:3192 printer/printerdrake.pm:3196
+#: printer/printerdrake.pm:3606 printer/printerdrake.pm:3846
+#: printer/printerdrake.pm:3866 printer/printerdrake.pm:3942
+#: printer/printerdrake.pm:4007 printer/printerdrake.pm:4123
+#: standalone/drakTermServ:379 standalone/drakTermServ:731
+#: standalone/drakTermServ:738 standalone/drakTermServ:933
+#: standalone/drakTermServ:1403 standalone/drakTermServ:1408
+#: standalone/drakTermServ:1415 standalone/drakTermServ:1426
+#: standalone/drakTermServ:1447 standalone/drakauth:37
+#: standalone/drakbackup:512 standalone/drakbackup:626
+#: standalone/drakbackup:1128 standalone/drakbackup:1161
+#: standalone/drakbackup:1665 standalone/drakbackup:1821
+#: standalone/drakbackup:2416 standalone/drakbackup:4105
+#: standalone/drakbackup:4325 standalone/drakbug:235 standalone/drakbug:254
+#: standalone/drakbug:260 standalone/drakclock:125 standalone/drakconnect:648
+#: standalone/drakconnect:651 standalone/drakconnect:670
+#: standalone/drakfloppy:297 standalone/drakfloppy:301
+#: standalone/drakfloppy:307 standalone/drakfont:210 standalone/drakfont:223
+#: standalone/drakfont:259 standalone/drakfont:604 standalone/draksplash:21
+#: standalone/draksplash:501 standalone/drakxtv:107 standalone/logdrake:169
+#: standalone/logdrake:437 standalone/logdrake:442 standalone/scannerdrake:59
+#: standalone/scannerdrake:196 standalone/scannerdrake:255
+#: standalone/scannerdrake:684 standalone/scannerdrake:695
+#: standalone/scannerdrake:834 standalone/scannerdrake:845
+#: standalone/scannerdrake:915 wizards.pm:95 wizards.pm:99 wizards.pm:121
 #, c-format
 msgid "Error"
 msgstr "Feil"
 
-#: ../move/move.pm:546 install_steps.pm:83
+#: ../move/move.pm:605 install_steps.pm:83
 #, c-format
 msgid ""
 "An error occurred, but I don't know how to handle it nicely.\n"
 "Continue at your own risk."
 msgstr "Det oppstod ein kritisk feil. Hald fram på eige ansvar."
 
-#: ../move/move.pm:601 install_steps_interactive.pm:40
+#: ../move/move.pm:660 install_steps_interactive.pm:38
 #, c-format
 msgid "An error occurred"
 msgstr "Det oppstod ein feil"
 
-#: ../move/move.pm:607
+#: ../move/move.pm:666
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -248,32 +264,39 @@ msgstr ""
 "kan du sjå nærare på loggfilene i konsoll 3 og 4 for å finna\n"
 "ut kva som har gått galt."
 
-#: ../move/move.pm:622
+#: ../move/move.pm:681
 #, c-format
 msgid "Remove system config files"
 msgstr "Fjern systemoppsettfiler"
 
-#: ../move/move.pm:623
+#: ../move/move.pm:682
 #, c-format
 msgid "Simply reboot"
 msgstr "Enkel omstart"
 
-#: ../move/tree/mdk_totem:60
+#: ../move/tree/mdk_totem:50 ../move/tree/mdk_totem:96
 #, c-format
 msgid "You can only run with no CDROM support"
 msgstr "Du kan berre køyra utan CD-ROM-støtte"
 
-#: ../move/tree/mdk_totem:81
+#: ../move/tree/mdk_totem:71
 #, c-format
 msgid "Kill those programs"
 msgstr "Avslutt programma"
 
-#: ../move/tree/mdk_totem:82
+#: ../move/tree/mdk_totem:72
 #, c-format
 msgid "No CDROM support"
 msgstr "Ikkje CD-ROM-støtte"
 
-#: ../move/tree/mdk_totem:87
+#: ../move/tree/mdk_totem:76 diskdrake/hd_gtk.pm:95
+#: diskdrake/interactive.pm:1005 diskdrake/interactive.pm:1015
+#: diskdrake/interactive.pm:1068
+#, c-format
+msgid "Read carefully!"
+msgstr "Les nøye!"
+
+#: ../move/tree/mdk_totem:77
 #, c-format
 msgid ""
 "You can't use another CDROM when the following programs are running: \n"
@@ -332,22 +355,22 @@ msgstr "32 MiB"
 msgid "64 MB or more"
 msgstr "64 MiB eller meir"
 
-#: Xconfig/card.pm:151
+#: Xconfig/card.pm:155
 #, c-format
 msgid "X server"
 msgstr "X-tenar"
 
-#: Xconfig/card.pm:152
+#: Xconfig/card.pm:156
 #, c-format
 msgid "Choose an X server"
 msgstr "Vel X-tenar"
 
-#: Xconfig/card.pm:184
+#: Xconfig/card.pm:188
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Fleirhovudoppsett"
 
-#: Xconfig/card.pm:185
+#: Xconfig/card.pm:189
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -356,80 +379,80 @@ msgstr ""
 "Systemet ditt støttar fleirhovudoppsett.\n"
 "Kva vil du gjera?"
 
-#: Xconfig/card.pm:251
+#: Xconfig/card.pm:255
 #, c-format
-msgid "Can't install XFree package: %s"
-msgstr "Kan ikkje installera XFree-pakke: %s"
+msgid "Can't install Xorg package: %s"
+msgstr "Kan ikkje installera Xorg-pakke: %s"
 
-#: Xconfig/card.pm:261
+#: Xconfig/card.pm:265
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Vel minnestorleik til skjermkortet"
 
-#: Xconfig/card.pm:332
+#: Xconfig/card.pm:352
 #, c-format
-msgid "XFree configuration"
-msgstr "XFree-oppsett"
+msgid "Xorg configuration"
+msgstr "Xorg-oppsett"
 
-#: Xconfig/card.pm:334
+#: Xconfig/card.pm:354
 #, c-format
-msgid "Which configuration of XFree do you want to have?"
-msgstr "Kva XFree-oppsett ønskjer du?"
+msgid "Which configuration of Xorg do you want to have?"
+msgstr "Kva Xorg-oppsett ønskjer du?"
 
-#: Xconfig/card.pm:367
+#: Xconfig/card.pm:387
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Set opp alle hovuda for seg"
 
-#: Xconfig/card.pm:368
+#: Xconfig/card.pm:388
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Bruk Xinerama-utviding"
 
-#: Xconfig/card.pm:373
+#: Xconfig/card.pm:393
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Set berre opp kortet «%s»%s"
 
-#: Xconfig/card.pm:385 Xconfig/various.pm:23
+#: Xconfig/card.pm:405 Xconfig/various.pm:23
 #, c-format
-msgid "XFree %s"
-msgstr "XFree %s"
+msgid "Xorg %s"
+msgstr "Xorg %s"
 
-#: Xconfig/card.pm:392 Xconfig/various.pm:22
+#: Xconfig/card.pm:412 Xconfig/various.pm:22
 #, c-format
-msgid "XFree %s with 3D hardware acceleration"
-msgstr "XFree %s med 3D-maskinvareakselerasjon"
+msgid "Xorg %s with 3D hardware acceleration"
+msgstr "Xorg %s med 3D-maskinvareakselerasjon"
 
-#: Xconfig/card.pm:394
+#: Xconfig/card.pm:414
 #, c-format
-msgid "Your card can have 3D hardware acceleration support with XFree %s."
-msgstr "Kortet støttar 3D-maskinvareakselerasjon med XFree %s."
+msgid "Your card can have 3D hardware acceleration support with Xorg %s."
+msgstr "Kortet støttar 3D-maskinvareakselerasjon med Xorg %s."
 
-#: Xconfig/card.pm:400
+#: Xconfig/card.pm:420
 #, c-format
-msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
-msgstr "XFree %s med EKSPERIMENTELL 3D-maskinvareakselerasjon"
+msgid "Xorg %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "Xorg %s med EKSPERIMENTELL 3D-maskinvareakselerasjon"
 
-#: Xconfig/card.pm:402
+#: Xconfig/card.pm:422
 #, c-format
 msgid ""
-"Your card can have 3D hardware acceleration support with XFree %s,\n"
+"Your card can have 3D hardware acceleration support with Xorg %s,\n"
 "NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER."
 msgstr ""
 "Kortet støttar 3D-maskinvareakselerasjon med Xfree %s.\n"
 "MERK AT DETTE ER EKSPERIMENTELL STØTTTE OG KAN LÅSA MASKINA DI."
 
-#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:112 any.pm:833
+#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:116 any.pm:912
 #, c-format
 msgid "Custom"
 msgstr "Eigendefinert"
 
-#: Xconfig/main.pm:115 diskdrake/dav.pm:28 help.pm:14
-#: install_steps_interactive.pm:83 printer/printerdrake.pm:608
-#: printer/printerdrake.pm:4076 standalone/draksplash:120
-#: standalone/harddrake2:194 standalone/logdrake:175
-#: standalone/scannerdrake:450
+#: Xconfig/main.pm:115 diskdrake/dav.pm:26 help.pm:14
+#: install_steps_interactive.pm:88 printer/printerdrake.pm:712
+#: printer/printerdrake.pm:3937 printer/printerdrake.pm:4382
+#: standalone/draksplash:120 standalone/harddrake2:265 standalone/logdrake:174
+#: standalone/net_applet:160 standalone/scannerdrake:446
 #, c-format
 msgid "Quit"
 msgstr "Avslutt"
@@ -439,12 +462,12 @@ msgstr "Avslutt"
 msgid "Graphic Card"
 msgstr "Skjermkort"
 
-#: Xconfig/main.pm:120 Xconfig/monitor.pm:106
+#: Xconfig/main.pm:120 Xconfig/monitor.pm:110
 #, c-format
 msgid "Monitor"
 msgstr "Skjerm"
 
-#: Xconfig/main.pm:123 Xconfig/resolution_and_depth.pm:217
+#: Xconfig/main.pm:123 Xconfig/resolution_and_depth.pm:222
 #, c-format
 msgid "Resolution"
 msgstr "Oppløysing"
@@ -454,14 +477,19 @@ msgstr "Oppløysing"
 msgid "Test"
 msgstr "Test"
 
-#: Xconfig/main.pm:133 diskdrake/dav.pm:67 diskdrake/interactive.pm:415
-#: diskdrake/removable.pm:25 diskdrake/smbnfs_gtk.pm:80
-#: standalone/drakfont:494 standalone/drakfont:554 standalone/harddrake2:191
+#: Xconfig/main.pm:133 diskdrake/dav.pm:65 diskdrake/interactive.pm:418
+#: diskdrake/removable.pm:24 diskdrake/smbnfs_gtk.pm:80
+#: standalone/drakfont:494 standalone/drakfont:556 standalone/harddrake2:262
 #, c-format
 msgid "Options"
 msgstr "Val"
 
-#: Xconfig/main.pm:177
+#: Xconfig/main.pm:167
+#, c-format
+msgid "Your Xorg configuration file is broken, we will ignore it."
+msgstr ""
+
+#: Xconfig/main.pm:184
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -474,38 +502,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: Xconfig/monitor.pm:107
+#: Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Vel skjerm for hovud %d"
 
-#: Xconfig/monitor.pm:107
+#: Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Vel skjerm"
 
-#: Xconfig/monitor.pm:113
+#: Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Finn automatisk"
 
-#: Xconfig/monitor.pm:114 mouse.pm:49
+#: Xconfig/monitor.pm:118 mouse.pm:49
 #, c-format
 msgid "Generic"
 msgstr "Generell"
 
-#: Xconfig/monitor.pm:115 standalone/drakconnect:569 standalone/harddrake2:73
-#: standalone/harddrake2:74
+#: Xconfig/monitor.pm:119 standalone/drakconnect:567 standalone/harddrake2:49
+#: standalone/harddrake2:83
 #, c-format
 msgid "Vendor"
 msgstr "Merke"
 
-#: Xconfig/monitor.pm:125
+#: Xconfig/monitor.pm:129
 #, c-format
 msgid "Plug'n Play probing failed. Please select the correct monitor"
 msgstr "Klarte ikkje finna rett skjermtype. Vel skjermtype."
 
-#: Xconfig/monitor.pm:130
+#: Xconfig/monitor.pm:134
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -527,12 +555,12 @@ msgstr ""
 "større enn skjermen din tåler, då dette kan øydeleggja skjermen.\n"
 "Er du i tvil bør du derfor velja eit lågt frekvensområde."
 
-#: Xconfig/monitor.pm:137
+#: Xconfig/monitor.pm:141
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Vassrett frekvens"
 
-#: Xconfig/monitor.pm:138
+#: Xconfig/monitor.pm:142
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Loddrett frekvens"
@@ -557,58 +585,60 @@ msgstr "65 tusen fargar (16 bit)"
 msgid "16 million colors (24 bits)"
 msgstr "16 millionar fargar (24 bit)"
 
-#: Xconfig/resolution_and_depth.pm:130
+#: Xconfig/resolution_and_depth.pm:135
 #, c-format
 msgid "Resolutions"
 msgstr "Oppløysingar"
 
-#: Xconfig/resolution_and_depth.pm:264
+#: Xconfig/resolution_and_depth.pm:270
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Vel oppløysing og fargedjupn"
 
-#: Xconfig/resolution_and_depth.pm:265
+#: Xconfig/resolution_and_depth.pm:271
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Skjermkort: %s"
 
-#: Xconfig/resolution_and_depth.pm:278 interactive.pm:403
-#: interactive/gtk.pm:760 interactive/http.pm:103 interactive/http.pm:157
-#: interactive/newt.pm:308 interactive/newt.pm:410 interactive/stdio.pm:39
+#: Xconfig/resolution_and_depth.pm:284 interactive.pm:403
+#: interactive/gtk.pm:766 interactive/http.pm:103 interactive/http.pm:156
+#: interactive/newt.pm:317 interactive/newt.pm:419 interactive/stdio.pm:39
 #: interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172
-#: standalone/drakbackup:3941 standalone/drakbackup:4001
-#: standalone/drakbackup:4045 standalone/drakconnect:165
-#: standalone/drakconnect:799 standalone/drakconnect:886
-#: standalone/drakconnect:985 standalone/drakups:194
-#: standalone/net_monitor:307 ugtk2.pm:413 ugtk2.pm:510 ugtk2.pm:1084
-#: ugtk2.pm:1107
+#: standalone/drakTermServ:201 standalone/drakTermServ:474
+#: standalone/drakbackup:3962 standalone/drakbackup:4022
+#: standalone/drakbackup:4066 standalone/drakconnect:165
+#: standalone/drakconnect:850 standalone/drakconnect:937
+#: standalone/drakconnect:1036 standalone/drakfont:577 standalone/drakroam:388
+#: standalone/drakups:208 standalone/net_monitor:345 ugtk2.pm:417 ugtk2.pm:515
+#: ugtk2.pm:1122 ugtk2.pm:1145
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: Xconfig/resolution_and_depth.pm:278 any.pm:883 diskdrake/smbnfs_gtk.pm:81
-#: help.pm:197 help.pm:457 install_steps_gtk.pm:490
-#: install_steps_interactive.pm:775 interactive.pm:404 interactive/gtk.pm:764
-#: interactive/http.pm:104 interactive/http.pm:161 interactive/newt.pm:307
-#: interactive/newt.pm:414 interactive/stdio.pm:39 interactive/stdio.pm:142
-#: interactive/stdio.pm:176 printer/printerdrake.pm:3088
-#: standalone/drakautoinst:217 standalone/drakbackup:3871
-#: standalone/drakbackup:3929 standalone/drakconnect:164
-#: standalone/drakconnect:884 standalone/drakconnect:984
-#: standalone/drakfont:663 standalone/drakfont:740 standalone/drakups:201
-#: standalone/logdrake:175 standalone/net_monitor:303 ugtk2.pm:407
-#: ugtk2.pm:508 ugtk2.pm:517 ugtk2.pm:1084
+#: Xconfig/resolution_and_depth.pm:284 diskdrake/smbnfs_gtk.pm:81 help.pm:89
+#: help.pm:444 install_steps_gtk.pm:458 install_steps_interactive.pm:412
+#: install_steps_interactive.pm:840 interactive.pm:404 interactive/gtk.pm:770
+#: interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:316
+#: interactive/newt.pm:423 interactive/stdio.pm:39 interactive/stdio.pm:142
+#: interactive/stdio.pm:176 printer/printerdrake.pm:3266
+#: standalone/drakautoinst:217 standalone/drakbackup:3888
+#: standalone/drakbackup:3892 standalone/drakbackup:3950
+#: standalone/drakconnect:164 standalone/drakconnect:935
+#: standalone/drakconnect:1035 standalone/drakfont:667 standalone/drakfont:744
+#: standalone/drakups:215 standalone/logdrake:174 standalone/net_monitor:344
+#: ugtk2.pm:411 ugtk2.pm:513 ugtk2.pm:522 ugtk2.pm:1122
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: Xconfig/resolution_and_depth.pm:278 diskdrake/hd_gtk.pm:154
-#: install_steps_gtk.pm:269 install_steps_gtk.pm:670 interactive.pm:498
-#: interactive/gtk.pm:624 interactive/gtk.pm:626 standalone/drakTermServ:304
-#: standalone/drakbackup:3867 standalone/drakbug:157
-#: standalone/drakconnect:160 standalone/drakconnect:239
-#: standalone/drakfont:512 standalone/drakperm:134 standalone/draksec:296
-#: standalone/harddrake2:190 ugtk2.pm:1197 ugtk2.pm:1198
+#: Xconfig/resolution_and_depth.pm:284 diskdrake/hd_gtk.pm:153
+#: install_steps_gtk.pm:239 install_steps_gtk.pm:644 interactive.pm:498
+#: interactive/gtk.pm:628 interactive/gtk.pm:630 standalone/drakTermServ:280
+#: standalone/drakbackup:3884 standalone/drakbug:128
+#: standalone/drakconnect:160 standalone/drakconnect:245
+#: standalone/drakfont:512 standalone/drakperm:134 standalone/draksec:337
+#: standalone/draksec:339 standalone/draksec:357 standalone/draksec:359
+#: standalone/harddrake2:261 ugtk2.pm:1235 ugtk2.pm:1236
 #, c-format
 msgid "Help"
 msgstr "Hjelp"
@@ -701,8 +731,8 @@ msgstr "Oppløysing: %s\n"
 
 #: Xconfig/various.pm:43
 #, c-format
-msgid "XFree86 driver: %s\n"
-msgstr "XFree86-drivar: %s\n"
+msgid "Xorg driver: %s\n"
+msgstr "Xorg-drivar: %s\n"
 
 #: Xconfig/various.pm:72
 #, c-format
@@ -713,8 +743,8 @@ msgstr "Grafisk oppstart"
 #, c-format
 msgid ""
 "I can setup your computer to automatically start the graphical interface "
-"(XFree) upon booting.\n"
-"Would you like XFree to start when you reboot?"
+"(Xorg) upon booting.\n"
+"Would you like Xorg to start when you reboot?"
 msgstr ""
 "Det mogleg å starta det grafiske grensesnittet automatisk når maskina blir "
 "slått på.\n"
@@ -746,20 +776,53 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr "Kva fjernsynsstandard brukar fjernsynet ditt?"
 
-#: any.pm:103 harddrake/sound.pm:150 interactive.pm:441 standalone/drakbug:259
-#: standalone/drakconnect:167 standalone/draksec:56 standalone/drakups:90
-#: standalone/drakxtv:90 standalone/harddrake2:140
-#: standalone/service_harddrake:126
+#: any.pm:116 harddrake/sound.pm:170 interactive.pm:441 standalone/drakbug:227
+#: standalone/drakconnect:167 standalone/drakconnect:611 standalone/draksec:68
+#: standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:211
+#: standalone/service_harddrake:199
 #, c-format
 msgid "Please wait"
 msgstr "Vent litt "
 
-#: any.pm:103
+#: any.pm:116
 #, c-format
 msgid "Bootloader installation in progress"
 msgstr "Installerer oppstartslastar"
 
-#: any.pm:142
+#: any.pm:127
+#, c-format
+msgid ""
+"LILO wants to assign a new Volume ID to drive %s.  However, changing\n"
+"the Volume ID of a Windows NT, 2000, or XP boot disk is a fatal Windows "
+"error.\n"
+"This caution does not apply to Windows 95 or 98, or to NT data disks.\n"
+"\n"
+"Assign a new Volume ID?"
+msgstr ""
+
+#: any.pm:138
+#, c-format
+msgid "Installation of bootloader failed. The following error occurred:"
+msgstr "Klarte ikkje installera oppstartslastar:"
+
+#: any.pm:144
+#, c-format
+msgid ""
+"You may need to change your Open Firmware boot-device to\n"
+" enable the bootloader.  If you don't see the bootloader prompt at\n"
+" reboot, hold down Command-Option-O-F at reboot and enter:\n"
+" setenv boot-device %s,\\\\:tbxi\n"
+" Then type: shut-down\n"
+"At your next boot you should see the bootloader prompt."
+msgstr ""
+"Det kan henda du må endra Open Firmware-oppstartseininga for å bruka "
+"oppstartslastaren. Viss du ikkje oppstartsmenyen når du startar maskina om "
+"att, held nede «Command + Option + O + F» ved omstart, og skriv:\n"
+" setenv boot-device %s,\\\\:tbxi\n"
+"Skriv så: shut-down\n"
+"Ved neste omstart skal du då sjå menyen."
+
+#: any.pm:181
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -774,274 +837,259 @@ msgstr ""
 "\n"
 "Kven av diskane er oppstartsdisk?"
 
-#: any.pm:165 any.pm:197 help.pm:800
+#: any.pm:204 help.pm:739
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr "Første sektor på stasjonen (MBR)"
 
-#: any.pm:166
+#: any.pm:205
 #, c-format
 msgid "First sector of the root partition"
 msgstr "Første sektor på rotpartisjonen"
 
-#: any.pm:168
+#: any.pm:207
 #, c-format
 msgid "On Floppy"
 msgstr "På ein diskett"
 
-#: any.pm:170 help.pm:768 help.pm:800 printer/printerdrake.pm:3418
+#: any.pm:209 help.pm:739 printer/printerdrake.pm:3603
 #, c-format
 msgid "Skip"
 msgstr "Hopp over"
 
-#: any.pm:175
-#, c-format
-msgid "SILO Installation"
-msgstr "SILO-installering"
-
-#: any.pm:175
+#: any.pm:213
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "LILO-/grub-installering"
 
-#: any.pm:176
+#: any.pm:214
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "Kor vil du installera oppstartslastaren?"
 
-#: any.pm:197
-#, c-format
-msgid "First sector of boot partition"
-msgstr "Første sektor på oppstartspartisjonen"
-
-#: any.pm:209
+#: any.pm:239 standalone/drakboot:307
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "Oppsettype"
 
-#: any.pm:211 any.pm:248
+#: any.pm:241 any.pm:275
 #, c-format
 msgid "Bootloader main options"
 msgstr "Hovudval for oppstartslastar"
 
-#: any.pm:215
+#: any.pm:245
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "Minnestorleik i MiB"
 
-#: any.pm:217
+#: any.pm:247
 #, c-format
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr "Valet «Avgrens kommandolinjeval» er ubrukeleg utan passord"
 
-#: any.pm:218 any.pm:531 install_steps_interactive.pm:1150
+#: any.pm:248 any.pm:586 install_steps_interactive.pm:1215
 #, c-format
 msgid "The passwords do not match"
 msgstr "Passorda er ikkje like"
 
-#: any.pm:218 any.pm:531 diskdrake/interactive.pm:1262
-#: install_steps_interactive.pm:1150
+#: any.pm:248 any.pm:586 diskdrake/interactive.pm:1261
+#: install_steps_interactive.pm:1215
 #, c-format
 msgid "Please try again"
 msgstr "Prøv igjen"
 
-#: any.pm:223 any.pm:251 help.pm:768
+#: any.pm:253 any.pm:278
 #, c-format
 msgid "Bootloader to use"
 msgstr "Oppstartslastar"
 
-#: any.pm:225
-#, c-format
-msgid "Bootloader installation"
-msgstr "Installering av oppstartslastar"
-
-#: any.pm:227 any.pm:253 help.pm:768
+#: any.pm:255 any.pm:280
 #, c-format
 msgid "Boot device"
 msgstr "Oppstartseining"
 
-#: any.pm:229
+#: any.pm:257
 #, c-format
 msgid "Delay before booting default image"
 msgstr "Ventetid før oppstart med standardbilete"
 
-#: any.pm:230 help.pm:768
+#: any.pm:258
 #, c-format
 msgid "Enable ACPI"
 msgstr "Bruk ACPI"
 
-#: any.pm:232 help.pm:768
+#: any.pm:260
 #, c-format
 msgid "Force no APIC"
 msgstr "Tving ikkje-APIC"
 
-#: any.pm:234
+#: any.pm:262
 #, c-format
 msgid "Force No Local APIC"
 msgstr "Tving ikkje-lokal APIC"
 
-#: any.pm:236 any.pm:558 diskdrake/smbnfs_gtk.pm:180
-#: install_steps_interactive.pm:1155 network/netconnect.pm:574
-#: printer/printerdrake.pm:1374 printer/printerdrake.pm:1494
-#: standalone/drakbackup:1626 standalone/drakbackup:3496
-#: standalone/drakups:278
+#: any.pm:264 any.pm:613 diskdrake/smbnfs_gtk.pm:180
+#: install_steps_interactive.pm:1220 network/netconnect.pm:595
+#: printer/printerdrake.pm:1489 printer/printerdrake.pm:1609
+#: standalone/drakbackup:1647 standalone/drakbackup:3490
+#: standalone/drakups:295
 #, c-format
 msgid "Password"
 msgstr "Passord"
 
-#: any.pm:237 any.pm:559 install_steps_interactive.pm:1156
+#: any.pm:265 any.pm:614 install_steps_interactive.pm:1221
 #, c-format
 msgid "Password (again)"
 msgstr "Passord (på nytt)"
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "Restrict command line options"
 msgstr "Avgrens kommandolinjeval"
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "restrict"
 msgstr "avgrens"
 
-#: any.pm:240
+#: any.pm:268
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "Tøm «/tmp» ved kvar oppstart"
 
-#: any.pm:241
+#: any.pm:269
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Nøyaktig minnestorleik om nødvendig (fann %d MiB)"
 
-#: any.pm:243
-#, c-format
-msgid "Enable multiple profiles"
-msgstr "Bruk fleire profilar"
-
-#: any.pm:252
+#: any.pm:279
 #, c-format
 msgid "Init Message"
 msgstr "Startmelding"
 
-#: any.pm:254
+#: any.pm:281
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "Pause for Open Firmware"
 
-#: any.pm:255
+#: any.pm:282
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "Tidsgrense for kjerneoppstart"
 
-#: any.pm:256
+#: any.pm:283
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "Skal det vera mogleg å starta opp frå CD?"
 
-#: any.pm:257
+#: any.pm:284
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "Skal det vera mogleg å starta opp frå Open Firmware?"
 
-#: any.pm:258
+#: any.pm:285
 #, c-format
 msgid "Default OS?"
 msgstr "Standardoperativsystem?"
 
-#: any.pm:302
+#: any.pm:338
 #, c-format
 msgid "Image"
 msgstr "Bilete"
 
-#: any.pm:303 any.pm:312
+#: any.pm:339 any.pm:349
 #, c-format
 msgid "Root"
 msgstr "Rot"
 
-#: any.pm:304 any.pm:325
+#: any.pm:340 any.pm:362
 #, c-format
 msgid "Append"
 msgstr "Legg til"
 
-#: any.pm:306
+#: any.pm:342 standalone/drakboot:309 standalone/drakboot:313
 #, c-format
 msgid "Video mode"
 msgstr "Videomodus"
 
-#: any.pm:308
+#: any.pm:344
 #, c-format
 msgid "Initrd"
 msgstr "Initrd"
 
-#: any.pm:317 any.pm:322 any.pm:324
+#: any.pm:345
+#, c-format
+msgid "Network profile"
+msgstr "Nettverksprofil"
+
+#: any.pm:354 any.pm:359 any.pm:361
 #, c-format
 msgid "Label"
 msgstr "Merkelapp"
 
-#: any.pm:319 any.pm:329 harddrake/v4l.pm:275 standalone/drakfloppy:89
-#: standalone/drakfloppy:95
+#: any.pm:356 any.pm:366 harddrake/v4l.pm:275 standalone/drakfloppy:84
+#: standalone/drakfloppy:90 standalone/draksec:52
 #, c-format
 msgid "Default"
 msgstr "Standard"
 
-#: any.pm:326
+#: any.pm:363
 #, c-format
 msgid "Initrd-size"
 msgstr "Initrd-storleik"
 
-#: any.pm:328
+#: any.pm:365
 #, c-format
 msgid "NoVideo"
 msgstr "Ingen video"
 
-#: any.pm:339
+#: any.pm:376
 #, c-format
 msgid "Empty label not allowed"
 msgstr "Kan ikkje ha tom merkelapp"
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "Du må velja ein kjerne"
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a root partition"
 msgstr "Du må velja ein rotpartisjon"
 
-#: any.pm:341
+#: any.pm:378
 #, c-format
 msgid "This label is already used"
 msgstr "Merkelappen er allereie brukt"
 
-#: any.pm:354
+#: any.pm:392
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "Kva type oppføring vil du leggja til?"
 
-#: any.pm:355
+#: any.pm:393
 #, c-format
 msgid "Linux"
 msgstr "Linux"
 
-#: any.pm:355
+#: any.pm:393
 #, c-format
 msgid "Other OS (SunOS...)"
 msgstr "Anna operativsystem (SunOS ...)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "Anna operativsystem (MacOS ...)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "Anna operativsystem (Windows ...)"
 
-#: any.pm:384
+#: any.pm:422
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -1050,74 +1098,74 @@ msgstr ""
 "Her er oppføringane på oppstartsmenyen.\n"
 "Du kan leggja til fleire, eller endra dei som er der."
 
-#: any.pm:516
+#: any.pm:572
 #, c-format
 msgid "access to X programs"
 msgstr "tilgang til X-program"
 
-#: any.pm:517
+#: any.pm:573
 #, c-format
 msgid "access to rpm tools"
 msgstr "tilgang til rpm-verktøy"
 
-#: any.pm:518
+#: any.pm:574
 #, c-format
 msgid "allow \"su\""
 msgstr "godta «su»"
 
-#: any.pm:519
+#: any.pm:575
 #, c-format
 msgid "access to administrative files"
 msgstr "tilgang til administrative filer"
 
-#: any.pm:520
+#: any.pm:576
 #, c-format
 msgid "access to network tools"
 msgstr "tilgang til nettverksverktøy"
 
-#: any.pm:521
+#: any.pm:577
 #, c-format
 msgid "access to compilation tools"
 msgstr "tilgang til kompileringsverktøy"
 
-#: any.pm:527
+#: any.pm:582
 #, c-format
 msgid "(already added %s)"
 msgstr "(allereie lagt til «%s»)"
 
-#: any.pm:532
+#: any.pm:587
 #, c-format
 msgid "This password is too simple"
 msgstr "Passordet er for lett"
 
-#: any.pm:533
+#: any.pm:588
 #, c-format
 msgid "Please give a user name"
 msgstr "Skriv inn brukarnamn"
 
-#: any.pm:534
+#: any.pm:589
 #, c-format
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 "Brukarnamnet kan berre innehelda små bokstavar, tala og teikna «-» og «_»"
 
-#: any.pm:535
+#: any.pm:590
 #, c-format
 msgid "The user name is too long"
 msgstr "Brukarnamnet er for langt"
 
-#: any.pm:536
+#: any.pm:591
 #, c-format
 msgid "This user name has already been added"
 msgstr "Brukarnamnet finst allereie"
 
-#: any.pm:540
+#: any.pm:595
 #, c-format
 msgid "Add user"
 msgstr "Legg til brukar"
 
-#: any.pm:541
+#: any.pm:596
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -1126,73 +1174,77 @@ msgstr ""
 "Skriv inn ny brukar\n"
 "%s"
 
-#: any.pm:544 diskdrake/dav.pm:68 diskdrake/hd_gtk.pm:158
-#: diskdrake/removable.pm:27 diskdrake/smbnfs_gtk.pm:82 help.pm:544
-#: interactive/http.pm:152 printer/printerdrake.pm:165
-#: printer/printerdrake.pm:352 printer/printerdrake.pm:4076
-#: standalone/drakbackup:2708 standalone/scannerdrake:641
-#: standalone/scannerdrake:791
+#: any.pm:599 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:157
+#: diskdrake/removable.pm:26 diskdrake/smbnfs_gtk.pm:82 help.pm:530
+#: interactive/http.pm:151 printer/printerdrake.pm:191
+#: printer/printerdrake.pm:376 printer/printerdrake.pm:4382
+#: standalone/drakbackup:2703 standalone/scannerdrake:637
+#: standalone/scannerdrake:787
 #, c-format
 msgid "Done"
 msgstr "Ferdig"
 
-#: any.pm:545 help.pm:52
+#: any.pm:600 help.pm:51
 #, c-format
 msgid "Accept user"
 msgstr "Godta brukar"
 
-#: any.pm:556
+#: any.pm:611
 #, c-format
 msgid "Real name"
 msgstr "Fullt namn"
 
-#: any.pm:557 help.pm:52 printer/printerdrake.pm:1373
-#: printer/printerdrake.pm:1493
+#: any.pm:612 standalone/drakbackup:1642
 #, c-format
-msgid "User name"
-msgstr "Brukarnamn"
+msgid "Login name"
+msgstr "Brukarnamn:"
 
-#: any.pm:560
+#: any.pm:615
 #, c-format
 msgid "Shell"
 msgstr "Skal"
 
-#: any.pm:562
+#: any.pm:617
 #, c-format
 msgid "Icon"
 msgstr "Ikon"
 
-#: any.pm:603 security/l10n.pm:14
+#: any.pm:664 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "Automatisk innlogging"
 
-#: any.pm:604
+#: any.pm:665
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr "Du kan automatisk logga på standardbrukaren ved oppstart."
 
-#: any.pm:605 help.pm:52
+#: any.pm:666 help.pm:51
 #, c-format
 msgid "Do you want to use this feature?"
 msgstr "Ønskjer du å bruka denne funksjonen?"
 
-#: any.pm:606
+#: any.pm:667
 #, c-format
 msgid "Choose the default user:"
 msgstr "Vel standardbrukar:"
 
-#: any.pm:607
+#: any.pm:668
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "Vel vindaugsbehandlar:"
 
-#: any.pm:619
+#: any.pm:680
 #, c-format
 msgid "Please choose a language to use."
 msgstr "Vel språk."
 
-#: any.pm:640
+#: any.pm:681
+#, c-format
+msgid "Language choice"
+msgstr "Språkval"
+
+#: any.pm:707
 #, c-format
 msgid ""
 "Mandrakelinux can support multiple languages. Select\n"
@@ -1202,48 +1254,57 @@ msgstr ""
 "Mandrakelinux støttar fleire språk. Her\n"
 "kan du velja kva språk du vil ha tilgjengeleg."
 
-#: any.pm:658 help.pm:660
+#: any.pm:725 help.pm:647
 #, c-format
 msgid "Use Unicode by default"
 msgstr "Bruk Unicode som standard"
 
-#: any.pm:659 help.pm:660
+#: any.pm:726 help.pm:647
 #, c-format
 msgid "All languages"
 msgstr "Alle språk"
 
-#: any.pm:698 help.pm:581 help.pm:991 install_steps_interactive.pm:895
+#: any.pm:765 help.pm:566 help.pm:855 install_steps_interactive.pm:960
 #, c-format
 msgid "Country / Region"
 msgstr "Land/område"
 
-#: any.pm:699
+#: any.pm:766
 #, c-format
 msgid "Please choose your country."
 msgstr "Vel land."
 
-#: any.pm:701
+#: any.pm:768
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "Her er heile lista over land"
 
-#: any.pm:702 diskdrake/interactive.pm:297 help.pm:544 help.pm:581 help.pm:621
-#: help.pm:991 install_steps_interactive.pm:114
+#: any.pm:769
 #, c-format
-msgid "More"
-msgstr "Meir"
+msgid "Other Countries"
+msgstr "Andre land"
+
+#: any.pm:777
+#, c-format
+msgid "Input method:"
+msgstr "Skrivemetode:"
+
+#: any.pm:778 install_any.pm:420 printer/printerdrake.pm:99
+#, c-format
+msgid "None"
+msgstr "Ingen"
 
-#: any.pm:833
+#: any.pm:912
 #, c-format
 msgid "No sharing"
 msgstr "Inga deling"
 
-#: any.pm:833
+#: any.pm:912
 #, c-format
 msgid "Allow all users"
 msgstr "Tillèt alle brukarar"
 
-#: any.pm:837
+#: any.pm:916
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1258,7 +1319,7 @@ msgstr ""
 "\n"
 "Med «Eigendefinert» kan du velja oppsett for kvar brukar for seg.\n"
 
-#: any.pm:849
+#: any.pm:928
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
@@ -1267,7 +1328,7 @@ msgstr ""
 "NFS: Det tradisjonelle Unix-fildelingssystemet, og dårleg støtta på Mac og "
 "Windows."
 
-#: any.pm:852
+#: any.pm:931
 #, c-format
 msgid ""
 "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux "
@@ -1276,18 +1337,28 @@ msgstr ""
 "SMB: Eit fildelingssystem brukt i Windows, Mac OS X og i fleire moderne "
 "Linux-system."
 
-#: any.pm:860
+#: any.pm:939
 #, c-format
 msgid ""
 "You can export using NFS or SMB. Please select which you would like to use."
 msgstr "Du kan eksportera med NFS og SMB. Vel kven av dei du vil bruka."
 
-#: any.pm:883
+#: any.pm:964
 #, c-format
 msgid "Launch userdrake"
 msgstr "Set opp brukarar"
 
-#: any.pm:885
+#: any.pm:964 printer/printerdrake.pm:3478 printer/printerdrake.pm:3481
+#: printer/printerdrake.pm:3482 printer/printerdrake.pm:3483
+#: printer/printerdrake.pm:4676 standalone/drakTermServ:289
+#: standalone/drakbackup:4084 standalone/drakbug:151 standalone/drakfont:500
+#: standalone/drakfont:594 standalone/net_monitor:123
+#: standalone/printerdrake:559
+#, c-format
+msgid "Close"
+msgstr "Lukk"
+
+#: any.pm:966
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -1297,92 +1368,191 @@ msgstr ""
 "«fileshare». Du kan bruka brukaroppsettprogrammet til\n"
 "å leggja til brukarar her."
 
-#: authentication.pm:12
+#: authentication.pm:16
 #, c-format
-msgid "Local files"
-msgstr "Lokale filer"
+msgid "Local file"
+msgstr "Lokal fil"
 
-#: authentication.pm:12
+#: authentication.pm:17
 #, c-format
 msgid "LDAP"
 msgstr "LDAP"
 
-#: authentication.pm:12
+#: authentication.pm:18
 #, c-format
 msgid "NIS"
 msgstr "NIS"
 
-#: authentication.pm:12 authentication.pm:72
+#: authentication.pm:19 authentication.pm:127
 #, c-format
 msgid "Windows Domain"
 msgstr "Windows-domene"
 
-#: authentication.pm:12
+#: authentication.pm:20
 #, c-format
-msgid "Active Directory"
-msgstr "Active Directory"
+msgid "Active Directory with SFU"
+msgstr "Active Directory med SFU"
 
-#: authentication.pm:38
+#: authentication.pm:21
+#, c-format
+msgid "Active Directory with Winbind"
+msgstr "Active Directory med Winbind"
+
+#: authentication.pm:30
+#, c-format
+msgid "Local file:"
+msgstr "Lokal fil:"
+
+#: authentication.pm:30
+#, c-format
+msgid ""
+"Use local for all authentication and information user tell in local file"
+msgstr ""
+
+#: authentication.pm:31
+#, c-format
+msgid "LDAP:"
+msgstr "LDAP:"
+
+#: authentication.pm:31
+#, c-format
+msgid ""
+"Tells your computer to use LDAP for some or all authentication. LDAP "
+"consolidates certain types of information within your organization."
+msgstr ""
+
+#: authentication.pm:32
+#, c-format
+msgid "NIS:"
+msgstr "NIS:"
+
+#: authentication.pm:32
+#, c-format
+msgid ""
+"Allows you to run a group of computers in the same Network Information "
+"Service domain with a common password and group file."
+msgstr ""
+
+#: authentication.pm:33
+#, c-format
+msgid "Windows Domain:"
+msgstr "Windows-domene:"
+
+#: authentication.pm:33
+#, c-format
+msgid ""
+"Winbind allows the system to retrieve information and authenticate users in "
+"a Windows domain."
+msgstr ""
+
+#: authentication.pm:34
+#, c-format
+msgid "Active Directory with SFU:"
+msgstr "Active Directory med SFU:"
+
+#: authentication.pm:34 authentication.pm:35
+#, c-format
+msgid ""
+"Kerberos is a secure system for providing network authentication services."
+msgstr ""
+
+#: authentication.pm:35
+#, c-format
+msgid "Active Directory with Winbind:"
+msgstr "Active Directory med Winbind:"
+
+#: authentication.pm:60
 #, c-format
 msgid "Authentication LDAP"
 msgstr "Autentisering for LDAP"
 
-#: authentication.pm:39
+#: authentication.pm:61
 #, c-format
 msgid "LDAP Base dn"
 msgstr "LDAP-grunn-DN"
 
-#: authentication.pm:40
+#: authentication.pm:62 share/compssUsers.pl:101
 #, c-format
 msgid "LDAP Server"
 msgstr "LDAP-tenar"
 
-#: authentication.pm:50
+#: authentication.pm:75 fsedit.pm:21
+#, c-format
+msgid "simple"
+msgstr "enkel"
+
+#: authentication.pm:76
+#, c-format
+msgid "TLS"
+msgstr "TLS"
+
+#: authentication.pm:77
+#, c-format
+msgid "SSL"
+msgstr "SSL"
+
+#: authentication.pm:78
+#, c-format
+msgid "security layout (SASL/Kerberos)"
+msgstr "tryggleiksoppsett (SASL/Kerberos)"
+
+#: authentication.pm:85 authentication.pm:123
 #, c-format
 msgid "Authentication Active Directory"
 msgstr "Autentisering for Active Directory"
 
-#: authentication.pm:51 diskdrake/smbnfs_gtk.pm:181
+#: authentication.pm:86 authentication.pm:125 diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Domain"
 msgstr "Domene"
 
-#: authentication.pm:52 diskdrake/dav.pm:65 help.pm:137
+#: authentication.pm:88 diskdrake/dav.pm:63 help.pm:146
+#: printer/printerdrake.pm:135 share/compssUsers.pl:81
 #, c-format
 msgid "Server"
 msgstr "Tenar"
 
-#: authentication.pm:53
+#: authentication.pm:89
 #, c-format
 msgid "LDAP users database"
 msgstr "LDAP-brukardatabase"
 
-#: authentication.pm:54
+#: authentication.pm:90
+#, c-format
+msgid "Use Anonymous BIND "
+msgstr "Bruk anonym BIND "
+
+#: authentication.pm:91
 #, c-format
 msgid "LDAP user allowed to browse the Active Directory"
 msgstr "Tillèt LDAP-brukar å sjå gjennom Active Directory"
 
-#: authentication.pm:55
+#: authentication.pm:92
 #, c-format
 msgid "Password for user"
 msgstr "Passord for brukar"
 
-#: authentication.pm:62
+#: authentication.pm:93
+#, c-format
+msgid "Encryption"
+msgstr "Kryptering"
+
+#: authentication.pm:104
 #, c-format
 msgid "Authentication NIS"
 msgstr "Autentisering for NS"
 
-#: authentication.pm:63
+#: authentication.pm:105
 #, c-format
 msgid "NIS Domain"
 msgstr "NIS-domene"
 
-#: authentication.pm:64
+#: authentication.pm:106
 #, c-format
 msgid "NIS Server"
 msgstr "NIS-tenar"
 
-#: authentication.pm:69
+#: authentication.pm:111
 #, c-format
 msgid ""
 "For this to work for a W2K PDC, you will probably need to have the admin "
@@ -1411,28 +1581,38 @@ msgstr ""
 "administratoren.\n"
 "Kommandoen «wbinfo -t» kontrollerer at autentiseringsløyndomen er god nok."
 
-#: authentication.pm:71
+#: authentication.pm:123
 #, c-format
 msgid "Authentication Windows Domain"
 msgstr "Autentisering for Windows-domene"
 
-#: authentication.pm:73
+#: authentication.pm:128
 #, c-format
 msgid "Domain Admin User Name"
 msgstr "Brukarnamn for domeneadministrator"
 
-#: authentication.pm:74
+#: authentication.pm:129
 #, c-format
 msgid "Domain Admin Password"
 msgstr "Passord for domeneadministrator"
 
-#: authentication.pm:149
+#: authentication.pm:130
+#, c-format
+msgid "Use Idmap for store UID/SID "
+msgstr ""
+
+#: authentication.pm:131
+#, c-format
+msgid "Default Idmap "
+msgstr "Standard Idmap "
+
+#: authentication.pm:231
 #, c-format
 msgid "Can't use broadcast with no NIS domain"
 msgstr "Kan ikkje kringkasta utan NIS-domene"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: bootloader.pm:532
+#: bootloader.pm:673
 #, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
@@ -1447,42 +1627,37 @@ msgstr ""
 "eller vent (for standard operativsystem).\n"
 "\n"
 
-#: bootloader.pm:663
-#, c-format
-msgid "SILO"
-msgstr "SILO"
-
-#: bootloader.pm:665 help.pm:768
+#: bootloader.pm:787
 #, c-format
 msgid "LILO with graphical menu"
 msgstr "LILO med grafisk meny"
 
-#: bootloader.pm:666 help.pm:768
+#: bootloader.pm:788
 #, c-format
 msgid "LILO with text menu"
 msgstr "LILO med tekstmeny"
 
-#: bootloader.pm:668
+#: bootloader.pm:789
 #, c-format
 msgid "Grub"
 msgstr "Grub"
 
-#: bootloader.pm:670
+#: bootloader.pm:790
 #, c-format
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: bootloader.pm:1142
+#: bootloader.pm:852
 #, c-format
 msgid "not enough room in /boot"
 msgstr "Ikkje nok plass på «/boot»"
 
-#: bootloader.pm:1170
+#: bootloader.pm:1266
 #, c-format
 msgid "You can't install the bootloader on a %s partition\n"
 msgstr "Du kan ikkje installera oppstartslastaren på ein «%s»-partisjon\n"
 
-#: bootloader.pm:1214
+#: bootloader.pm:1311
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
@@ -1490,7 +1665,7 @@ msgid ""
 msgstr ""
 "Oppstartslastaren må oppdaterast, då partisjonane har fått ny rekkjefølgje"
 
-#: bootloader.pm:1221
+#: bootloader.pm:1326
 #, c-format
 msgid ""
 "The bootloader can't be installed correctly. You have to boot rescue and "
@@ -1499,7 +1674,7 @@ msgstr ""
 "Klarte ikkje installera oppstartslastaren. Du må køyra redningsmodus og "
 "velja «%s»"
 
-#: bootloader.pm:1222
+#: bootloader.pm:1327
 #, c-format
 msgid "Re-install Boot Loader"
 msgstr "Installer oppstartslastar på nytt"
@@ -1559,76 +1734,79 @@ msgstr "Manglar kdesu"
 msgid "consolehelper missing"
 msgstr "Manglar konsollhjelpar"
 
-#: crypto.pm:14 crypto.pm:28 lang.pm:240 network/adsl_consts.pm:44
-#: network/adsl_consts.pm:55 network/adsl_consts.pm:65
-#: network/adsl_consts.pm:75 network/adsl_consts.pm:86
-#: network/adsl_consts.pm:97 network/adsl_consts.pm:107
-#: network/adsl_consts.pm:117 network/adsl_consts.pm:264
-#: network/netconnect.pm:46
+#: crypto.pm:14 crypto.pm:28 lang.pm:254 network/adsl_consts.pm:309
+#: network/adsl_consts.pm:320 network/adsl_consts.pm:330
+#: network/adsl_consts.pm:340 network/adsl_consts.pm:350
+#: network/adsl_consts.pm:361 network/adsl_consts.pm:372
+#: network/adsl_consts.pm:382 network/adsl_consts.pm:392
+#: network/netconnect.pm:47
 #, c-format
 msgid "France"
 msgstr "Frankrike"
 
-#: crypto.pm:15 lang.pm:216
+#: crypto.pm:15 lang.pm:229
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: crypto.pm:16 crypto.pm:29 lang.pm:188 network/adsl_consts.pm:26
-#: network/adsl_consts.pm:36 network/netconnect.pm:49
+#: crypto.pm:16 crypto.pm:29 lang.pm:201 network/adsl_consts.pm:59
+#: network/adsl_consts.pm:66 network/adsl_consts.pm:77
+#: network/adsl_consts.pm:85 network/netconnect.pm:50
 #, c-format
 msgid "Belgium"
 msgstr "Belgia"
 
-#: crypto.pm:17 crypto.pm:30 lang.pm:221
+#: crypto.pm:17 crypto.pm:30 lang.pm:235
 #, c-format
 msgid "Czech Republic"
 msgstr "Tsjekkia"
 
-#: crypto.pm:18 crypto.pm:31 lang.pm:222 network/adsl_consts.pm:134
-#: network/adsl_consts.pm:142
+#: crypto.pm:18 crypto.pm:31 lang.pm:236 network/adsl_consts.pm:410
+#: network/adsl_consts.pm:418
 #, c-format
 msgid "Germany"
 msgstr "Tyskland"
 
-#: crypto.pm:19 crypto.pm:32 lang.pm:253
+#: crypto.pm:19 crypto.pm:32 lang.pm:267 network/adsl_consts.pm:428
 #, c-format
 msgid "Greece"
 msgstr "Hellas"
 
-#: crypto.pm:20 crypto.pm:33 lang.pm:326
+#: crypto.pm:20 crypto.pm:33 lang.pm:340
 #, c-format
 msgid "Norway"
 msgstr "Noreg"
 
-#: crypto.pm:21 crypto.pm:34 lang.pm:355 network/adsl_consts.pm:240
+#: crypto.pm:21 crypto.pm:34 lang.pm:369 network/adsl_consts.pm:561
 #, c-format
 msgid "Sweden"
 msgstr "Sverige"
 
-#: crypto.pm:22 crypto.pm:36 lang.pm:325 network/adsl_consts.pm:178
-#: network/netconnect.pm:47
+#: crypto.pm:22 crypto.pm:36 lang.pm:339 network/adsl_consts.pm:495
+#: network/netconnect.pm:48
 #, c-format
 msgid "Netherlands"
 msgstr "Nederland"
 
-#: crypto.pm:23 crypto.pm:37 lang.pm:273 network/adsl_consts.pm:158
-#: network/adsl_consts.pm:168 network/netconnect.pm:48 standalone/drakxtv:45
+#: crypto.pm:23 crypto.pm:37 lang.pm:287 network/adsl_consts.pm:452
+#: network/adsl_consts.pm:462 network/adsl_consts.pm:469
+#: network/netconnect.pm:49 standalone/drakxtv:47
 #, c-format
 msgid "Italy"
 msgstr "Italia"
 
-#: crypto.pm:24 crypto.pm:38 lang.pm:181 network/adsl_consts.pm:20
+#: crypto.pm:24 crypto.pm:38 lang.pm:194 network/adsl_consts.pm:36
+#: network/adsl_consts.pm:44 network/adsl_consts.pm:52
 #, c-format
 msgid "Austria"
 msgstr "Austerrike"
 
-#: crypto.pm:35 crypto.pm:65 lang.pm:389 network/netconnect.pm:50
+#: crypto.pm:35 crypto.pm:65 lang.pm:403 network/netconnect.pm:51
 #, c-format
 msgid "United States"
 msgstr "USA"
 
-#: diskdrake/dav.pm:19
+#: diskdrake/dav.pm:17
 #, c-format
 msgid ""
 "WebDAV is a protocol that allows you to mount a web server's directory\n"
@@ -1641,66 +1819,60 @@ msgstr ""
 "verkar berre viss vevtenaren er sette opp som ein WebDAV-tenar.\n"
 "Vel «Ny» om du ønskjer å montera WebDAV-mapper."
 
-#: diskdrake/dav.pm:27
+#: diskdrake/dav.pm:25
 #, c-format
 msgid "New"
 msgstr "Ny"
 
-#: diskdrake/dav.pm:63 diskdrake/interactive.pm:422 diskdrake/smbnfs_gtk.pm:75
+#: diskdrake/dav.pm:61 diskdrake/interactive.pm:425 diskdrake/smbnfs_gtk.pm:75
 #, c-format
 msgid "Unmount"
 msgstr "Avmonter"
 
-#: diskdrake/dav.pm:64 diskdrake/interactive.pm:419 diskdrake/smbnfs_gtk.pm:76
+#: diskdrake/dav.pm:62 diskdrake/interactive.pm:422 diskdrake/smbnfs_gtk.pm:76
 #, c-format
 msgid "Mount"
 msgstr "Monter"
 
-#: diskdrake/dav.pm:66 diskdrake/interactive.pm:413
-#: diskdrake/interactive.pm:621 diskdrake/interactive.pm:640
-#: diskdrake/removable.pm:24 diskdrake/smbnfs_gtk.pm:79
+#: diskdrake/dav.pm:64 diskdrake/interactive.pm:416
+#: diskdrake/interactive.pm:627 diskdrake/interactive.pm:646
+#: diskdrake/removable.pm:23 diskdrake/smbnfs_gtk.pm:79
 #, c-format
 msgid "Mount point"
 msgstr "Monteringspunkt"
 
-#: diskdrake/dav.pm:85
+#: diskdrake/dav.pm:83
 #, c-format
 msgid "Please enter the WebDAV server URL"
 msgstr "Skriv inn WebDAV-tenaradresse"
 
-#: diskdrake/dav.pm:89
+#: diskdrake/dav.pm:87
 #, c-format
 msgid "The URL must begin with http:// or https://"
 msgstr "URL-en må begynna med «http://» eller «https://»"
 
-#: diskdrake/dav.pm:111
+#: diskdrake/dav.pm:109
 #, c-format
 msgid "Server: "
 msgstr "Tenar: "
 
-#: diskdrake/dav.pm:112 diskdrake/interactive.pm:474
-#: diskdrake/interactive.pm:1154 diskdrake/interactive.pm:1232
+#: diskdrake/dav.pm:110 diskdrake/interactive.pm:479
+#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1232
 #, c-format
 msgid "Mount point: "
 msgstr "Monteringspunkt: "
 
-#: diskdrake/dav.pm:113 diskdrake/interactive.pm:1240
+#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1239
 #, c-format
 msgid "Options: %s"
 msgstr "Val: %s"
 
-#: diskdrake/hd_gtk.pm:96 diskdrake/interactive.pm:1000
-#: diskdrake/interactive.pm:1010 diskdrake/interactive.pm:1070
-#, c-format
-msgid "Read carefully!"
-msgstr "Les nøye!"
-
-#: diskdrake/hd_gtk.pm:96
+#: diskdrake/hd_gtk.pm:95
 #, c-format
 msgid "Please make a backup of your data first"
 msgstr "Reservekopier alle viktige data først"
 
-#: diskdrake/hd_gtk.pm:99
+#: diskdrake/hd_gtk.pm:98
 #, c-format
 msgid ""
 "If you plan to use aboot, be careful to leave a free space (2048 sectors is "
@@ -1710,17 +1882,17 @@ msgstr ""
 "Viss du skal bruka aboot må du hugsa å lata det vera litt ledig plass\n"
 "(2048 sektorar er nok) på begynnelsen av disken"
 
-#: diskdrake/hd_gtk.pm:156 help.pm:544
+#: diskdrake/hd_gtk.pm:155 help.pm:530
 #, c-format
 msgid "Wizard"
 msgstr "Vegvisar"
 
-#: diskdrake/hd_gtk.pm:189
+#: diskdrake/hd_gtk.pm:188
 #, c-format
 msgid "Choose action"
 msgstr "Vel handling"
 
-#: diskdrake/hd_gtk.pm:193
+#: diskdrake/hd_gtk.pm:192
 #, c-format
 msgid ""
 "You have one big Microsoft Windows partition.\n"
@@ -1731,180 +1903,186 @@ msgstr ""
 "Du bør først endra storleiken på denne\n"
 "(trykk på han og vel «Endra storleik»)"
 
-#: diskdrake/hd_gtk.pm:195
+#: diskdrake/hd_gtk.pm:194
 #, c-format
 msgid "Please click on a partition"
 msgstr "Trykk på ein partisjon"
 
-#: diskdrake/hd_gtk.pm:209 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:477
-#: standalone/drakbackup:2942 standalone/drakbackup:3004
+#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:474
+#: standalone/drakbackup:2938 standalone/drakbackup:2998
 #, c-format
 msgid "Details"
 msgstr "Vis detaljar"
 
-#: diskdrake/hd_gtk.pm:255
+#: diskdrake/hd_gtk.pm:254
 #, c-format
 msgid "No hard drives found"
 msgstr "Fann ingen harddiskar"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Ext2"
 msgstr "Ext2"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Journalised FS"
 msgstr "Journalfilsystem"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Swap"
 msgstr "Vekslepartisjon"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "SunOS"
 msgstr "SunOS"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "HFS"
 msgstr "HFS"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Windows"
 msgstr "Windows"
 
-#: diskdrake/hd_gtk.pm:327 install_steps_gtk.pm:329 mouse.pm:167
-#: services.pm:164 standalone/drakbackup:1582 standalone/drakperm:254
+#: diskdrake/hd_gtk.pm:326 install_steps_gtk.pm:298 mouse.pm:168
+#: services.pm:164 standalone/drakbackup:1603 standalone/drakperm:250
 #, c-format
 msgid "Other"
 msgstr "Anna"
 
-#: diskdrake/hd_gtk.pm:327 diskdrake/interactive.pm:1172
+#: diskdrake/hd_gtk.pm:326 diskdrake/interactive.pm:1172
 #, c-format
 msgid "Empty"
 msgstr "Tom"
 
-#: diskdrake/hd_gtk.pm:331
+#: diskdrake/hd_gtk.pm:330
 #, c-format
 msgid "Filesystem types:"
 msgstr "Filsystemtypar:"
 
-#: diskdrake/hd_gtk.pm:348 diskdrake/hd_gtk.pm:350 diskdrake/hd_gtk.pm:353
+#: diskdrake/hd_gtk.pm:347 diskdrake/hd_gtk.pm:349 diskdrake/hd_gtk.pm:352
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "Bruk «%s» i stadenfor"
 
-#: diskdrake/hd_gtk.pm:348 diskdrake/hd_gtk.pm:353
-#: diskdrake/interactive.pm:414 diskdrake/interactive.pm:574
-#: diskdrake/removable.pm:26 diskdrake/removable.pm:49
-#: standalone/harddrake2:72
+#: diskdrake/hd_gtk.pm:347 diskdrake/hd_gtk.pm:352
+#: diskdrake/interactive.pm:417 diskdrake/interactive.pm:580
+#: diskdrake/removable.pm:25 diskdrake/removable.pm:48
+#: standalone/harddrake2:101
 #, c-format
 msgid "Type"
 msgstr "Type"
 
-#: diskdrake/hd_gtk.pm:348 diskdrake/interactive.pm:436
+#: diskdrake/hd_gtk.pm:347 diskdrake/interactive.pm:441
 #, c-format
 msgid "Create"
 msgstr "Opprett"
 
 #. -PO: "Delete" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: diskdrake/hd_gtk.pm:350 diskdrake/interactive.pm:423
-#: standalone/drakperm:124 standalone/printerdrake:236
+#: diskdrake/hd_gtk.pm:349 diskdrake/interactive.pm:426
+#: standalone/drakperm:124 standalone/printerdrake:242
 #, c-format
 msgid "Delete"
 msgstr "Slett"
 
-#: diskdrake/hd_gtk.pm:353
+#: diskdrake/hd_gtk.pm:352
 #, c-format
 msgid "Use ``Unmount'' first"
 msgstr "Bruk «Avmonter» først"
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose another partition"
 msgstr "Vel ein annan partisjon"
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose a partition"
 msgstr "Vel partisjon"
 
-#: diskdrake/interactive.pm:213
+#: diskdrake/interactive.pm:216
 #, c-format
 msgid "Exit"
 msgstr "Avslutt"
 
-#: diskdrake/interactive.pm:246 help.pm:544
+#: diskdrake/interactive.pm:249 help.pm:530
 #, c-format
 msgid "Undo"
 msgstr "Angra"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to normal mode"
 msgstr "Skift til normalmodus"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to expert mode"
 msgstr "Skift til ekspertmodus"
 
-#: diskdrake/interactive.pm:265
+#: diskdrake/interactive.pm:268
 #, c-format
 msgid "Continue anyway?"
 msgstr "Vil du likevel halda fram?"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without saving"
 msgstr "Avslutt utan å lagra"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without writing the partition table?"
 msgstr "Vil du avslutta utan å lagra partisjontabellen?"
 
-#: diskdrake/interactive.pm:275
+#: diskdrake/interactive.pm:278
 #, c-format
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "Vil du lagra endringar i «/etc/fstab»"
 
-#: diskdrake/interactive.pm:282 install_steps_interactive.pm:301
+#: diskdrake/interactive.pm:285 install_steps_interactive.pm:313
 #, c-format
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
 "Du må starta på nytt for at endringane i partisjontabellen skal trå i kraft"
 
-#: diskdrake/interactive.pm:295 help.pm:544
+#: diskdrake/interactive.pm:298 help.pm:530
 #, c-format
 msgid "Clear all"
 msgstr "Fjern alle"
 
-#: diskdrake/interactive.pm:296 help.pm:544
+#: diskdrake/interactive.pm:299 help.pm:530
 #, c-format
 msgid "Auto allocate"
 msgstr "Tildel automatisk"
 
-#: diskdrake/interactive.pm:302
+#: diskdrake/interactive.pm:300 help.pm:530 help.pm:566 help.pm:606
+#: help.pm:855 install_steps_interactive.pm:124
+#, c-format
+msgid "More"
+msgstr "Meir"
+
+#: diskdrake/interactive.pm:305
 #, c-format
 msgid "Hard drive information"
 msgstr "Harddiskinformasjon"
 
-#: diskdrake/interactive.pm:334
+#: diskdrake/interactive.pm:337
 #, c-format
 msgid "All primary partitions are used"
 msgstr "Alle primærpartisjonane er brukt"
 
-#: diskdrake/interactive.pm:335
+#: diskdrake/interactive.pm:338
 #, c-format
 msgid "I can't add any more partitions"
 msgstr "Kan ikkje legga til fleire partisjonar"
 
-#: diskdrake/interactive.pm:336
+#: diskdrake/interactive.pm:339
 #, c-format
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
@@ -1913,37 +2091,37 @@ msgstr ""
 "Du har fleire partisjonar. Du må først sletta éin av dei for å kunna laga "
 "ein utvida partisjon."
 
-#: diskdrake/interactive.pm:347 help.pm:544
+#: diskdrake/interactive.pm:350 help.pm:530
 #, c-format
 msgid "Save partition table"
 msgstr "Lagra partisjonstabell"
 
-#: diskdrake/interactive.pm:348 help.pm:544
+#: diskdrake/interactive.pm:351 help.pm:530
 #, c-format
 msgid "Restore partition table"
 msgstr "Opna partisjonstabell"
 
-#: diskdrake/interactive.pm:349 help.pm:544
+#: diskdrake/interactive.pm:352 help.pm:530
 #, c-format
 msgid "Rescue partition table"
 msgstr "Redd partisjonstabell"
 
-#: diskdrake/interactive.pm:351 help.pm:544
+#: diskdrake/interactive.pm:354 help.pm:530
 #, c-format
 msgid "Reload partition table"
 msgstr "Last partisjonstabell på nytt"
 
-#: diskdrake/interactive.pm:353
+#: diskdrake/interactive.pm:356
 #, c-format
 msgid "Removable media automounting"
 msgstr "Automontering av fjernbare medium"
 
-#: diskdrake/interactive.pm:362 diskdrake/interactive.pm:382
+#: diskdrake/interactive.pm:365 diskdrake/interactive.pm:385
 #, c-format
 msgid "Select file"
 msgstr "Vel fil"
 
-#: diskdrake/interactive.pm:369
+#: diskdrake/interactive.pm:372
 #, c-format
 msgid ""
 "The backup partition table has not the same size\n"
@@ -1952,23 +2130,23 @@ msgstr ""
 "Partisjonstabellenkopien har ikkje same storleik.\n"
 "Vil du likevel halda fram?"
 
-#: diskdrake/interactive.pm:383 harddrake/sound.pm:226 keyboard.pm:340
-#: network/netconnect.pm:450 network/netconnect.pm:469
-#: printer/printerdrake.pm:936 printer/printerdrake.pm:1891
-#: printer/printerdrake.pm:1953 printer/printerdrake.pm:1987
-#: printer/printerdrake.pm:2291 printer/printerdrake.pm:3149
-#: printer/printerdrake.pm:3426 printer/printerdrake.pm:3545
-#: printer/printerdrake.pm:4543 standalone/drakTermServ:340
-#: standalone/drakTermServ:1072 standalone/drakTermServ:1128
-#: standalone/drakTermServ:1801 standalone/drakbackup:510
-#: standalone/drakbackup:609 standalone/drakboot:156 standalone/drakclock:214
-#: standalone/drakconnect:921 standalone/drakfloppy:296 standalone/drakups:27
-#: standalone/scannerdrake:50 standalone/scannerdrake:913
+#: diskdrake/interactive.pm:386 harddrake/sound.pm:246 keyboard.pm:351
+#: lang.pm:1046 network/netconnect.pm:470 printer/printerdrake.pm:1037
+#: printer/printerdrake.pm:2009 printer/printerdrake.pm:2075
+#: printer/printerdrake.pm:2110 printer/printerdrake.pm:2414
+#: printer/printerdrake.pm:3330 printer/printerdrake.pm:3611
+#: printer/printerdrake.pm:3733 printer/printerdrake.pm:4823
+#: standalone/drakTermServ:315 standalone/drakTermServ:1045
+#: standalone/drakTermServ:1101 standalone/drakTermServ:1769
+#: standalone/drakbackup:511 standalone/drakbackup:610 standalone/drakboot:165
+#: standalone/drakclock:225 standalone/drakconnect:972
+#: standalone/drakfloppy:291 standalone/drakups:27 standalone/scannerdrake:51
+#: standalone/scannerdrake:909
 #, c-format
 msgid "Warning"
 msgstr "Åtvaring"
 
-#: diskdrake/interactive.pm:384
+#: diskdrake/interactive.pm:387
 #, c-format
 msgid ""
 "Insert a floppy in drive\n"
@@ -1977,92 +2155,92 @@ msgstr ""
 "Sett inn ein diskett i stasjonen.\n"
 "Alt innhald på denne disketten blir sletta."
 
-#: diskdrake/interactive.pm:395
+#: diskdrake/interactive.pm:398
 #, c-format
 msgid "Trying to rescue partition table"
 msgstr "Prøver å redda partisjonstabell"
 
-#: diskdrake/interactive.pm:401
+#: diskdrake/interactive.pm:404
 #, c-format
 msgid "Detailed information"
 msgstr "Detaljert informasjon"
 
-#: diskdrake/interactive.pm:416 diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:419 diskdrake/interactive.pm:717
 #, c-format
 msgid "Resize"
 msgstr "Endra storleik"
 
-#: diskdrake/interactive.pm:417 diskdrake/interactive.pm:779
+#: diskdrake/interactive.pm:420 diskdrake/interactive.pm:783
 #, c-format
 msgid "Move"
 msgstr "Flytt"
 
-#: diskdrake/interactive.pm:418
+#: diskdrake/interactive.pm:421
 #, c-format
 msgid "Format"
 msgstr "Formater"
 
-#: diskdrake/interactive.pm:420
+#: diskdrake/interactive.pm:423
 #, c-format
 msgid "Add to RAID"
 msgstr "Legg til i RAID"
 
-#: diskdrake/interactive.pm:421
+#: diskdrake/interactive.pm:424
 #, c-format
 msgid "Add to LVM"
 msgstr "Legg til i LVM"
 
-#: diskdrake/interactive.pm:424
+#: diskdrake/interactive.pm:427
 #, c-format
 msgid "Remove from RAID"
 msgstr "Fjern frå RAID"
 
-#: diskdrake/interactive.pm:425
+#: diskdrake/interactive.pm:428
 #, c-format
 msgid "Remove from LVM"
 msgstr "Fjern frå LVM"
 
-#: diskdrake/interactive.pm:426
+#: diskdrake/interactive.pm:429
 #, c-format
 msgid "Modify RAID"
 msgstr "Endra RAID"
 
-#: diskdrake/interactive.pm:427
+#: diskdrake/interactive.pm:430
 #, c-format
 msgid "Use for loopback"
 msgstr "Bruk til filmontering"
 
-#: diskdrake/interactive.pm:467
+#: diskdrake/interactive.pm:472
 #, c-format
 msgid "Create a new partition"
 msgstr "Lag ny partisjon"
 
-#: diskdrake/interactive.pm:470
+#: diskdrake/interactive.pm:475
 #, c-format
 msgid "Start sector: "
 msgstr "Startsektor: "
 
-#: diskdrake/interactive.pm:472 diskdrake/interactive.pm:881
+#: diskdrake/interactive.pm:477 diskdrake/interactive.pm:884
 #, c-format
 msgid "Size in MB: "
 msgstr "Storleik i MiB: "
 
-#: diskdrake/interactive.pm:473 diskdrake/interactive.pm:882
+#: diskdrake/interactive.pm:478 diskdrake/interactive.pm:885
 #, c-format
 msgid "Filesystem type: "
 msgstr "Filsystemtype: "
 
-#: diskdrake/interactive.pm:478
+#: diskdrake/interactive.pm:483
 #, c-format
 msgid "Preference: "
 msgstr "Innstilling: "
 
-#: diskdrake/interactive.pm:481
+#: diskdrake/interactive.pm:486
 #, c-format
 msgid "Logical volume name "
 msgstr "Logisk volumnamn"
 
-#: diskdrake/interactive.pm:510
+#: diskdrake/interactive.pm:515
 #, c-format
 msgid ""
 "You can't create a new partition\n"
@@ -2073,12 +2251,12 @@ msgstr ""
 "(sidan du har nådd grensa på talet på partisjonar).\n"
 "Du må først fjerna ein primærpartisjon, og så laga ein utvida partisjon."
 
-#: diskdrake/interactive.pm:540
+#: diskdrake/interactive.pm:545
 #, c-format
 msgid "Remove the loopback file?"
 msgstr "Vil du fjerna filmonteringsfila?"
 
-#: diskdrake/interactive.pm:559
+#: diskdrake/interactive.pm:564
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
@@ -2086,32 +2264,32 @@ msgstr ""
 "Når du har endra partisjonstypen til «%s» vil alle data på denne partisjonen "
 "vera tapt"
 
-#: diskdrake/interactive.pm:570
+#: diskdrake/interactive.pm:576
 #, c-format
 msgid "Change partition type"
 msgstr "Endra partisjonstype"
 
-#: diskdrake/interactive.pm:571 diskdrake/removable.pm:48
+#: diskdrake/interactive.pm:577 diskdrake/removable.pm:47
 #, c-format
 msgid "Which filesystem do you want?"
 msgstr "Kva filsystem vil du ha?"
 
-#: diskdrake/interactive.pm:579
+#: diskdrake/interactive.pm:585
 #, c-format
 msgid "Switching from ext2 to ext3"
 msgstr "Byter frå «ext2» til «ext3»"
 
-#: diskdrake/interactive.pm:608
+#: diskdrake/interactive.pm:614
 #, c-format
 msgid "Where do you want to mount the loopback file %s?"
 msgstr "Kor vil du montera filmonteringsfila «%s»?"
 
-#: diskdrake/interactive.pm:609
+#: diskdrake/interactive.pm:615
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Kor vil du montera eininga «%s»?"
 
-#: diskdrake/interactive.pm:614
+#: diskdrake/interactive.pm:620
 #, c-format
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
@@ -2120,50 +2298,50 @@ msgstr ""
 "Klarte ikkje fjerna monteringspunkt, då partisjonen er brukt\n"
 "til filmontering. Du må først fjerna filmonteringsfila."
 
-#: diskdrake/interactive.pm:639
+#: diskdrake/interactive.pm:645
 #, c-format
 msgid "Where do you want to mount %s?"
 msgstr "Kor vil du montera «%s»?"
 
-#: diskdrake/interactive.pm:663 diskdrake/interactive.pm:743
-#: install_interactive.pm:156 install_interactive.pm:186
+#: diskdrake/interactive.pm:669 diskdrake/interactive.pm:748
+#: install_interactive.pm:156 install_interactive.pm:188
 #, c-format
 msgid "Resizing"
 msgstr "Endrar storleik"
 
-#: diskdrake/interactive.pm:663
+#: diskdrake/interactive.pm:669
 #, c-format
 msgid "Computing FAT filesystem bounds"
 msgstr "Reknar ut grenser for FAT-filsystem"
 
-#: diskdrake/interactive.pm:699
+#: diskdrake/interactive.pm:705
 #, c-format
 msgid "This partition is not resizeable"
 msgstr "Kan ikkje endra storleik på partisjonenen"
 
-#: diskdrake/interactive.pm:704
+#: diskdrake/interactive.pm:710
 #, c-format
 msgid "All data on this partition should be backed-up"
 msgstr "Du bør ta reservekopi av alle data på denne partisjonen"
 
-#: diskdrake/interactive.pm:706
+#: diskdrake/interactive.pm:712
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr ""
 "Når du har endra storleik på «%s» vil alle data på denne partisjonen vera "
 "tapt"
 
-#: diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:717
 #, c-format
 msgid "Choose the new size"
 msgstr "Vel ny storleik"
 
-#: diskdrake/interactive.pm:712
+#: diskdrake/interactive.pm:718
 #, c-format
 msgid "New size in MB: "
 msgstr "Ny storleik i MiB: "
 
-#: diskdrake/interactive.pm:756 install_interactive.pm:194
+#: diskdrake/interactive.pm:761 install_interactive.pm:196
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
@@ -2172,147 +2350,142 @@ msgstr ""
 "For å sikra dataintegritet på partisjonen/-ane\n"
 "blir det køyrt filsystemkontroll neste gongar du startar Windows™"
 
-#: diskdrake/interactive.pm:780
+#: diskdrake/interactive.pm:784
 #, c-format
 msgid "Which disk do you want to move it to?"
 msgstr "Kva disk vil du flytta han til?"
 
-#: diskdrake/interactive.pm:781
+#: diskdrake/interactive.pm:785
 #, c-format
 msgid "Sector"
 msgstr "Sektor"
 
-#: diskdrake/interactive.pm:782
+#: diskdrake/interactive.pm:786
 #, c-format
 msgid "Which sector do you want to move it to?"
 msgstr "Kva sektor vil du flytta han til?"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving"
 msgstr "Flyttar"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving partition..."
 msgstr "Flyttar partisjon ..."
 
-#: diskdrake/interactive.pm:807
+#: diskdrake/interactive.pm:810
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Vel ein eksisterande RAID å leggja til i"
 
-#: diskdrake/interactive.pm:808 diskdrake/interactive.pm:825
+#: diskdrake/interactive.pm:812 diskdrake/interactive.pm:828
 #, c-format
 msgid "new"
 msgstr "ny"
 
-#: diskdrake/interactive.pm:823
+#: diskdrake/interactive.pm:826
 #, c-format
 msgid "Choose an existing LVM to add to"
 msgstr "Vel ein eksisterande LVM å leggja til i"
 
-#: diskdrake/interactive.pm:829
+#: diskdrake/interactive.pm:832
 #, c-format
 msgid "LVM name?"
 msgstr "LVM-namn?"
 
-#: diskdrake/interactive.pm:866
+#: diskdrake/interactive.pm:869
 #, c-format
 msgid "This partition can't be used for loopback"
 msgstr "Partisjonen kan ikkje brukast til filmontering."
 
-#: diskdrake/interactive.pm:879
+#: diskdrake/interactive.pm:882
 #, c-format
 msgid "Loopback"
 msgstr "Filmontering"
 
-#: diskdrake/interactive.pm:880
+#: diskdrake/interactive.pm:883
 #, c-format
 msgid "Loopback file name: "
 msgstr "Filmonteringsfil: "
 
-#: diskdrake/interactive.pm:885
+#: diskdrake/interactive.pm:888
 #, c-format
 msgid "Give a file name"
 msgstr "Skriv inn filnamn"
 
-#: diskdrake/interactive.pm:888
+#: diskdrake/interactive.pm:891
 #, c-format
 msgid "File is already used by another loopback, choose another one"
 msgstr "Fila er allereie brukt til filmontering. Vel ei anna fil."
 
-#: diskdrake/interactive.pm:889
+#: diskdrake/interactive.pm:892
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "Fila finst allereie. Vil du bruka ho?"
 
-#: diskdrake/interactive.pm:912
+#: diskdrake/interactive.pm:915
 #, c-format
 msgid "Mount options"
 msgstr "Monteringsval"
 
-#: diskdrake/interactive.pm:919
+#: diskdrake/interactive.pm:922
 #, c-format
 msgid "Various"
 msgstr "Ymse"
 
-#: diskdrake/interactive.pm:983
+#: diskdrake/interactive.pm:987
 #, c-format
 msgid "device"
 msgstr "eining"
 
-#: diskdrake/interactive.pm:984
+#: diskdrake/interactive.pm:988
 #, c-format
 msgid "level"
 msgstr "nivå"
 
-#: diskdrake/interactive.pm:985
+#: diskdrake/interactive.pm:989
 #, c-format
-msgid "chunk size"
-msgstr "blokkstorleik"
+msgid "chunk size in KiB"
+msgstr "blokkstorleik i KiB"
 
-#: diskdrake/interactive.pm:1001
+#: diskdrake/interactive.pm:1006
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "Åtvaring: Denne operasjonen er farleg."
 
-#: diskdrake/interactive.pm:1016
+#: diskdrake/interactive.pm:1021
 #, c-format
 msgid "What type of partitioning?"
 msgstr "Kva type partisjonering?"
 
-#: diskdrake/interactive.pm:1032
-#, c-format
-msgid "The package %s is needed. Install it?"
-msgstr "Treng pakken «%s». Vil du installera han?"
-
-#: diskdrake/interactive.pm:1061
+#: diskdrake/interactive.pm:1059
 #, c-format
 msgid "You'll need to reboot before the modification can take place"
 msgstr "Du må starta på nytt for at endringane skal trå i kraft"
 
-#: diskdrake/interactive.pm:1070
+#: diskdrake/interactive.pm:1068
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "Partisjonstabellen til «%s» blir no lagra."
 
-#: diskdrake/interactive.pm:1083
+#: diskdrake/interactive.pm:1081
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Når du har formatert «%s» vil alle data på denne partisjonen vera tapt"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Move files to the new partition"
 msgstr "Flytt filer til ny partisjon"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Hide files"
 msgstr "Skjul filer"
 
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1102
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
@@ -2321,53 +2494,53 @@ msgstr ""
 "Mappa «%s» inneheld allereie data\n"
 "(%s)"
 
-#: diskdrake/interactive.pm:1112
+#: diskdrake/interactive.pm:1113
 #, c-format
 msgid "Moving files to the new partition"
 msgstr "Flyttar filer til ny partisjon"
 
-#: diskdrake/interactive.pm:1116
+#: diskdrake/interactive.pm:1117
 #, c-format
 msgid "Copying %s"
 msgstr "Kopierer «%s»"
 
-#: diskdrake/interactive.pm:1120
+#: diskdrake/interactive.pm:1121
 #, c-format
 msgid "Removing %s"
 msgstr "Fjernar «%s»"
 
-#: diskdrake/interactive.pm:1134
+#: diskdrake/interactive.pm:1135
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr "Partisjonen «%s» har no namnet «%s»"
 
-#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1217
+#: diskdrake/interactive.pm:1156 diskdrake/interactive.pm:1217
 #, c-format
 msgid "Device: "
 msgstr "Eining: "
 
-#: diskdrake/interactive.pm:1156
+#: diskdrake/interactive.pm:1157
 #, c-format
 msgid "Devfs name: "
 msgstr "Devfs-namn:"
 
-#: diskdrake/interactive.pm:1157
+#: diskdrake/interactive.pm:1158
 #, c-format
 msgid "Volume label: "
 msgstr "Namn på dataområde:"
 
-#: diskdrake/interactive.pm:1158
+#: diskdrake/interactive.pm:1159
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS-stasjonsbokstav: %s (berre gjetting)\n"
 
-#: diskdrake/interactive.pm:1162 diskdrake/interactive.pm:1170
-#: diskdrake/interactive.pm:1236
+#: diskdrake/interactive.pm:1163 diskdrake/interactive.pm:1170
+#: diskdrake/interactive.pm:1235
 #, c-format
 msgid "Type: "
 msgstr "Type: "
 
-#: diskdrake/interactive.pm:1166 install_steps_gtk.pm:341
+#: diskdrake/interactive.pm:1167 install_steps_gtk.pm:310
 #, c-format
 msgid "Name: "
 msgstr "Namn: "
@@ -2414,8 +2587,8 @@ msgstr "Montert\n"
 
 #: diskdrake/interactive.pm:1184
 #, c-format
-msgid "RAID md%s\n"
-msgstr "RAID MD%s\n"
+msgid "RAID %s\n"
+msgstr "RAID %s\n"
 
 #: diskdrake/interactive.pm:1186
 #, c-format
@@ -2442,8 +2615,8 @@ msgstr "Nivå %s\n"
 
 #: diskdrake/interactive.pm:1190
 #, c-format
-msgid "Chunk size %s\n"
-msgstr "Blokkstorleik %s\n"
+msgid "Chunk size %d KiB\n"
+msgstr "Blokkstorleik %d KiB\n"
 
 #: diskdrake/interactive.pm:1191
 #, c-format
@@ -2516,38 +2689,38 @@ msgstr "Partisjonstabelltype: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "på kanal %d – id %d\n"
 
-#: diskdrake/interactive.pm:1257
+#: diskdrake/interactive.pm:1256
 #, c-format
 msgid "Filesystem encryption key"
 msgstr "Krypteringsnøkkel for filsystem"
 
-#: diskdrake/interactive.pm:1258
+#: diskdrake/interactive.pm:1257
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Vel krypteringsnøkkel for filsystemet"
 
-#: diskdrake/interactive.pm:1261
+#: diskdrake/interactive.pm:1260
 #, c-format
 msgid "This encryption key is too simple (must be at least %d characters long)"
 msgstr "Krypteringsnøkkelen er for enkel. Han må vera på minst %d teikn."
 
-#: diskdrake/interactive.pm:1262
+#: diskdrake/interactive.pm:1261
 #, c-format
 msgid "The encryption keys do not match"
 msgstr "Krypteringsnøklane er ikkje like"
 
-#: diskdrake/interactive.pm:1265 network/netconnect.pm:979
-#: standalone/drakconnect:404
+#: diskdrake/interactive.pm:1264 network/netconnect.pm:1040
+#: standalone/drakconnect:395
 #, c-format
 msgid "Encryption key"
 msgstr "Krypteringsnøkkel"
 
-#: diskdrake/interactive.pm:1266
+#: diskdrake/interactive.pm:1265
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Krypteringsnøkkel (på nytt)"
 
-#: diskdrake/removable.pm:47
+#: diskdrake/removable.pm:46
 #, c-format
 msgid "Change type"
 msgstr "Endra type"
@@ -2578,7 +2751,7 @@ msgid ""
 "Please enter your username, password and domain name to access this host."
 msgstr "Skriv inn brukarnamn, passord og domenenamn for verten."
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3495
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3489
 #, c-format
 msgid "Username"
 msgstr "Brukarnamn"
@@ -2593,34 +2766,79 @@ msgstr "Søk etter tenarar"
 msgid "Search new servers"
 msgstr "Søk etter nye tenarar"
 
-#: do_pkgs.pm:21
+#: do_pkgs.pm:16 do_pkgs.pm:31
 #, c-format
 msgid "The package %s needs to be installed. Do you want to install it?"
 msgstr "Pakken «%s» må installerast. Vil du installera han no?"
 
-#: do_pkgs.pm:26
+#: do_pkgs.pm:21 do_pkgs.pm:36
 #, c-format
 msgid "Mandatory package %s is missing"
 msgstr "Manglar den obligatoriske pakken «%s»"
 
-#: do_pkgs.pm:143
+#: do_pkgs.pm:172
 #, c-format
 msgid "Installing packages..."
 msgstr "Installerer pakkar ..."
 
-#: do_pkgs.pm:217
+#: do_pkgs.pm:216
 #, c-format
 msgid "Removing packages..."
 msgstr "Fjernar pakkar ..."
 
-#: fs.pm:416
+#: fs.pm:445 fs.pm:494
+#, c-format
+msgid "Mounting partition %s"
+msgstr "Monterer partisjonen «%s»"
+
+#: fs.pm:446 fs.pm:495
+#, c-format
+msgid "mounting partition %s in directory %s failed"
+msgstr "Klarte ikkje montera partisjonen «%s» i mappa «%s»"
+
+#: fs.pm:466 fs.pm:473
+#, c-format
+msgid "Checking %s"
+msgstr "Kontrollerer «%s»"
+
+#: fs.pm:511 partition_table.pm:387
+#, c-format
+msgid "error unmounting %s: %s"
+msgstr "Feil ved avmontering av «%s»: %s"
+
+#: fs.pm:543
+#, c-format
+msgid "Enabling swap partition %s"
+msgstr "Slår på vekslepartisjonen «%s»"
+
+#: fs/format.pm:39 fs/format.pm:46
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formaterer partisjonen «%s»"
+
+#: fs/format.pm:43
+#, c-format
+msgid "Creating and formatting file %s"
+msgstr "Lagar og formaterer partisjonen «%s»"
+
+#: fs/format.pm:78
+#, c-format
+msgid "I don't know how to format %s in type %s"
+msgstr "Kan ikkje formatera «%s» som type «%s»"
+
+#: fs/format.pm:80
+#, c-format
+msgid "%s formatting of %s failed"
+msgstr "%s-formatering av %s mislukka"
+
+#: fs/mount_options.pm:112
 #, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
 "(e.g, for faster access on the news spool to speed up news servers)."
 msgstr "Ikkje oppdater tilgangstider på inodar på filsystemet."
 
-#: fs.pm:419
+#: fs/mount_options.pm:115
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
@@ -2629,12 +2847,12 @@ msgstr ""
 "Kan berre monterast eksplisitt (for eksempel vil\n"
 "ikkje «-a»-valet montera filsystemet)."
 
-#: fs.pm:422
+#: fs/mount_options.pm:118
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
 msgstr "Ikkje tolk teikn- og blokkspesialeiningar på filsystemet."
 
-#: fs.pm:424
+#: fs/mount_options.pm:120
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2645,7 +2863,7 @@ msgstr ""
 "filsystemet. Dette valet kan vera nyttig for tenarar som\n"
 "har filsystem med programfiler for andre operativsystem."
 
-#: fs.pm:428
+#: fs/mount_options.pm:124
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2656,17 +2874,17 @@ msgstr ""
 "å ha nokon verknad. (Dette er ikkje trygt om du ikkje har\n"
 "suidperl(1) installert, sjølv om det kan verka slik.)"
 
-#: fs.pm:432
+#: fs/mount_options.pm:128
 #, c-format
 msgid "Mount the file system read-only."
 msgstr "Monter filsystemet som skriveverna."
 
-#: fs.pm:434
+#: fs/mount_options.pm:130
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr "All lesing og skriving til filsystemet skal gjerast synkront."
 
-#: fs.pm:438
+#: fs/mount_options.pm:134
 #, c-format
 msgid ""
 "Allow an ordinary user to mount the file system. The\n"
@@ -2682,65 +2900,25 @@ msgstr ""
 "«noxec», «nosuid» og «nodev» (med mindre det blir overstyrt\n"
 "av seinare val, eksempelvis «user,exec,dev,suid»)."
 
-#: fs.pm:446
+#: fs/mount_options.pm:142
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr "Gjev skrivetilgang til vanlege brukarar"
 
-#: fs.pm:448
+#: fs/mount_options.pm:144
 #, c-format
 msgid "Give read-only access to ordinary users"
 msgstr "Gjev berre lesetilgang til vanlege brukarar"
 
-#: fs.pm:588 fs.pm:598 fs.pm:602 fs.pm:606 fs.pm:610 fs.pm:614 swap.pm:12
-#, c-format
-msgid "%s formatting of %s failed"
-msgstr "%s-formatering av %s mislukka"
-
-#: fs.pm:655
-#, c-format
-msgid "I don't know how to format %s in type %s"
-msgstr "Kan ikkje formatera «%s» som type «%s»"
-
-#: fs.pm:662 fs.pm:669
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formaterer partisjonen «%s»"
-
-#: fs.pm:666
-#, c-format
-msgid "Creating and formatting file %s"
-msgstr "Lagar og formaterer partisjonen «%s»"
-
-#: fs.pm:726 fs.pm:775
+#: fs/type.pm:364
 #, c-format
-msgid "Mounting partition %s"
-msgstr "Monterer partisjonen «%s»"
-
-#: fs.pm:727 fs.pm:776
-#, c-format
-msgid "mounting partition %s in directory %s failed"
-msgstr "Klarte ikkje montera partisjonen «%s» i mappa «%s»"
-
-#: fs.pm:747 fs.pm:754
-#, c-format
-msgid "Checking %s"
-msgstr "Kontrollerer «%s»"
-
-#: fs.pm:792 partition_table.pm:639
-#, c-format
-msgid "error unmounting %s: %s"
-msgstr "Feil ved avmontering av «%s»: %s"
-
-#: fs.pm:824
-#, c-format
-msgid "Enabling swap partition %s"
-msgstr "Slår på vekslepartisjonen «%s»"
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "Du kan ikkje bruka JFS på partisjonar mindre enn 16 MiB"
 
-#: fsedit.pm:21
+#: fs/type.pm:365
 #, c-format
-msgid "simple"
-msgstr "enkel"
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "Du kan ikkje bruka ReiserFS på partisjonar mindre enn 32 MiB"
 
 #: fsedit.pm:25
 #, c-format
@@ -2752,7 +2930,7 @@ msgstr "med «/usr»"
 msgid "server"
 msgstr "tenar"
 
-#: fsedit.pm:263
+#: fsedit.pm:168
 #, c-format
 msgid ""
 "I can't read the partition table of device %s, it's too corrupted for me :(\n"
@@ -2769,32 +2947,22 @@ msgstr ""
 "\n"
 "Godtek du å sletta alle partisjonane?\n"
 
-#: fsedit.pm:524
-#, c-format
-msgid "You can't use JFS for partitions smaller than 16MB"
-msgstr "Du kan ikkje bruka JFS på partisjonar mindre enn 16 MiB"
-
-#: fsedit.pm:525
-#, c-format
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "Du kan ikkje bruka ReiserFS på partisjonar mindre enn 32 MiB"
-
-#: fsedit.pm:544
+#: fsedit.pm:385
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "Alle monteringspunkt må starta med teiknet «/»"
 
-#: fsedit.pm:545
+#: fsedit.pm:386
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
 msgstr "Monteringspunkt kan berre innhelda tal og bokstavar"
 
-#: fsedit.pm:546
+#: fsedit.pm:387
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Det finst allereie ein partisjon med monteringspunktet «%s»\n"
 
-#: fsedit.pm:548
+#: fsedit.pm:389
 #, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
@@ -2805,13 +2973,13 @@ msgstr ""
 "Ingen oppstartslastar kan bruka denne utan ein «/boot»-partisjon.\n"
 "Hugs derfor å leggja til ein «/boot»-partisjon òg."
 
-#: fsedit.pm:551
+#: fsedit.pm:392
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr ""
 "Du kan ikkje bruka eit LVM logisk dataområde for monteringspunktet «%s»."
 
-#: fsedit.pm:553
+#: fsedit.pm:394
 #, c-format
 msgid ""
 "You've selected a LVM Logical Volume as root (/).\n"
@@ -2822,7 +2990,7 @@ msgstr ""
 "Oppstartslastaren kan ikkje bruka denne utan ein «/boot»-partisjon.\n"
 "Hugs derfor å leggja til ein «/boot»-partisjon òg."
 
-#: fsedit.pm:556
+#: fsedit.pm:397
 #, c-format
 msgid ""
 "You may not be able to install lilo (since lilo doesn't handle a LV on "
@@ -2831,12 +2999,12 @@ msgstr ""
 "Det kan henda du ikkje kan installera lilo (sidan lilo ikkje kan handtera "
 "eitt logiske dataområde delt over fleire fysiske)"
 
-#: fsedit.pm:559 fsedit.pm:561
+#: fsedit.pm:400 fsedit.pm:402
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "Denne mappa bør bli verande i rotfilsystemet"
 
-#: fsedit.pm:563 fsedit.pm:565
+#: fsedit.pm:404 fsedit.pm:406
 #, c-format
 msgid ""
 "You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
@@ -2845,133 +3013,127 @@ msgstr ""
 "Du treng eit ekte filsystem(«ext2», «ext3», «reiserfs», «xfs» eller «jfs») "
 "for dette monteringspunktet\n"
 
-#: fsedit.pm:567
+#: fsedit.pm:408
 #, c-format
 msgid "You can't use an encrypted file system for mount point %s"
 msgstr "Du kan ikkje bruka eit kryptert filsystem for monteringspunktet «%s»"
 
-#: fsedit.pm:628
+#: fsedit.pm:469
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "Ikkje nok ledig plass for automatisk oppsett"
 
-#: fsedit.pm:630
+#: fsedit.pm:471
 #, c-format
 msgid "Nothing to do"
 msgstr "Ingenting å gjera"
 
-#: fsedit.pm:726
+#: fsedit.pm:569
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Klarte ikkje opna «%s» for skriving: %s"
 
-#: harddrake/data.pm:55
+#: harddrake/data.pm:61
 #, c-format
 msgid "Floppy"
 msgstr "Diskett"
 
-#: harddrake/data.pm:65
+#: harddrake/data.pm:71
 #, c-format
 msgid "Zip"
 msgstr "Zip"
 
-#: harddrake/data.pm:75
+#: harddrake/data.pm:81
 #, c-format
 msgid "Disk"
 msgstr "Disk"
 
-#: harddrake/data.pm:84
+#: harddrake/data.pm:90
 #, c-format
 msgid "CDROM"
 msgstr "CD-ROM"
 
-#: harddrake/data.pm:94
+#: harddrake/data.pm:100
 #, c-format
 msgid "CD/DVD burners"
 msgstr "CD- og DVD-brennarar"
 
-#: harddrake/data.pm:104
+#: harddrake/data.pm:110
 #, c-format
 msgid "DVD-ROM"
 msgstr "DVD-ROM"
 
-#: harddrake/data.pm:114 standalone/drakbackup:2025
+#: harddrake/data.pm:120 standalone/drakbackup:2045
 #, c-format
 msgid "Tape"
 msgstr "Band"
 
-#: harddrake/data.pm:123
+#: harddrake/data.pm:129
 #, c-format
 msgid "Videocard"
 msgstr "Skjermkort"
 
-#: harddrake/data.pm:133
+#: harddrake/data.pm:139
 #, c-format
 msgid "Tvcard"
 msgstr "Fjernsynskort"
 
-#: harddrake/data.pm:142
+#: harddrake/data.pm:148
 #, c-format
 msgid "Other MultiMedia devices"
 msgstr "Andre multimedieeiningar"
 
-#: harddrake/data.pm:151
+#: harddrake/data.pm:157
 #, c-format
 msgid "Soundcard"
 msgstr "Lydkort"
 
-#: harddrake/data.pm:160
+#: harddrake/data.pm:166
 #, c-format
 msgid "Webcam"
 msgstr "Vevkamera"
 
-#: harddrake/data.pm:174
+#: harddrake/data.pm:181
 #, c-format
 msgid "Processors"
 msgstr "Prosessorar"
 
-#: harddrake/data.pm:183
+#: harddrake/data.pm:191
 #, c-format
 msgid "ISDN adapters"
 msgstr "ISDN-kort"
 
-#: harddrake/data.pm:192
+#: harddrake/data.pm:201
 #, c-format
 msgid "Ethernetcard"
 msgstr "Nettverkskort"
 
-#: harddrake/data.pm:208 network/netconnect.pm:464
+#: harddrake/data.pm:219 network/netconnect.pm:484
 #, c-format
 msgid "Modem"
 msgstr "Modem"
 
-#: harddrake/data.pm:217
+#: harddrake/data.pm:229
 #, c-format
 msgid "ADSL adapters"
 msgstr "ADSL-kort"
 
-#: harddrake/data.pm:230
+#: harddrake/data.pm:243
 #, c-format
 msgid "AGP controllers"
 msgstr "AGP-kontrollarar"
 
-#: harddrake/data.pm:239
+#: harddrake/data.pm:252
 #, c-format
 msgid "Bridges and system controllers"
 msgstr "Bruer og systemkontrollarar"
 
-#: harddrake/data.pm:248 help.pm:203 help.pm:991
-#: install_steps_interactive.pm:927 printer/printerdrake.pm:687
-#: printer/printerdrake.pm:4175
+#: harddrake/data.pm:261 help.pm:186 help.pm:855
+#: install_steps_interactive.pm:992 printer/printerdrake.pm:875
 #, c-format
 msgid "Printer"
 msgstr "Skrivar"
 
-#: harddrake/data.pm:257 help.pm:991 install_steps_interactive.pm:920
-#, c-format
-msgid "Mouse"
-msgstr "Mus"
-
 #: harddrake/data.pm:271
 #, c-format
 msgid "Joystick"
@@ -2994,50 +3156,72 @@ msgstr "Firewire-kontrollarar"
 
 #: harddrake/data.pm:308
 #, c-format
+msgid "PCMCIA controllers"
+msgstr "PCMCIA-kontrollarar"
+
+#: harddrake/data.pm:321
+#, c-format
 msgid "SCSI controllers"
 msgstr "SCSI-kontrollarar"
 
-#: harddrake/data.pm:317
+#: harddrake/data.pm:330
 #, c-format
 msgid "USB controllers"
 msgstr "USB-kontrollarar"
 
-#: harddrake/data.pm:326
+#: harddrake/data.pm:339
 #, c-format
 msgid "USB ports"
 msgstr "USB-portar"
 
-#: harddrake/data.pm:335
+#: harddrake/data.pm:348
 #, c-format
 msgid "SMBus controllers"
 msgstr "SMBus-kontrollarar"
 
-#: harddrake/data.pm:344
+#: harddrake/data.pm:357
+#, c-format
+msgid "UPS"
+msgstr "UPS"
+
+#: harddrake/data.pm:366 help.pm:855 install_steps_interactive.pm:120
+#: install_steps_interactive.pm:952 standalone/keyboarddrake:24
+#, c-format
+msgid "Keyboard"
+msgstr "Tastatur"
+
+#: harddrake/data.pm:379 help.pm:855 install_steps_interactive.pm:985
+#, c-format
+msgid "Mouse"
+msgstr "Mus"
+
+#: harddrake/data.pm:393
 #, c-format
 msgid "Scanner"
 msgstr "Skannar"
 
-#: harddrake/data.pm:354 standalone/harddrake2:336
+#: harddrake/data.pm:403 standalone/harddrake2:431
 #, c-format
 msgid "Unknown/Others"
 msgstr "Ukjend/andre"
 
-#: harddrake/data.pm:374
+#: harddrake/data.pm:431
 #, c-format
 msgid "cpu # "
 msgstr "Prosessornummer "
 
-#: harddrake/sound.pm:150 standalone/drakconnect:169
+#: harddrake/sound.pm:170 standalone/drakconnect:169
+#: standalone/drakconnect:613
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Vent litt ... Gjer klar oppsett"
 
-#: harddrake/sound.pm:186
+#: harddrake/sound.pm:206
 #, c-format
 msgid "No alternative driver"
 msgstr "Ingen alternativ drivar"
 
-#: harddrake/sound.pm:187
+#: harddrake/sound.pm:207
 #, c-format
 msgid ""
 "There's no known OSS/ALSA alternative driver for your sound card (%s) which "
@@ -3046,12 +3230,12 @@ msgstr ""
 "Det finst ingen OSS- eller ALSA-drivarar for lydkortet ditt («%s») som "
 "brukar «%s»"
 
-#: harddrake/sound.pm:193
+#: harddrake/sound.pm:213
 #, c-format
 msgid "Sound configuration"
 msgstr "Lydoppsett"
 
-#: harddrake/sound.pm:195
+#: harddrake/sound.pm:215
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
@@ -3059,7 +3243,7 @@ msgid ""
 msgstr ""
 "Her kan du velja ein annan OSS- eller ALSA-drivar for lydkortet ditt («%s»)."
 
-#: harddrake/sound.pm:197
+#: harddrake/sound.pm:217
 #, c-format
 msgid ""
 "\n"
@@ -3071,7 +3255,7 @@ msgstr ""
 "\n"
 "Kortet brukar %s«%s»-drivaren (standarddrivaren for kortet er «%s»)."
 
-#: harddrake/sound.pm:199
+#: harddrake/sound.pm:219
 #, c-format
 msgid ""
 "OSS (Open Sound System) was the first sound API. It's an OS independent "
@@ -3102,32 +3286,36 @@ msgstr ""
 "For å bruka ALSA kan du enten bruka det gamle OSS-grensesnittet, eller det "
 "nye ALSA-grensesnittet, med mange nye funksjonar.\n"
 
-#: harddrake/sound.pm:213 harddrake/sound.pm:293 standalone/drakups:134
+#: harddrake/sound.pm:233 harddrake/sound.pm:318 standalone/drakups:146
 #, c-format
 msgid "Driver:"
 msgstr "Drivar:"
 
-#: harddrake/sound.pm:218
+#: harddrake/sound.pm:238
 #, c-format
 msgid "Trouble shooting"
 msgstr "Feilsøkjing"
 
-#: harddrake/sound.pm:226
+#: harddrake/sound.pm:246
 #, c-format
 msgid ""
 "The old \"%s\" driver is blacklisted.\n"
 "\n"
 "It has been reported to oops the kernel on unloading.\n"
 "\n"
-"The new \"%s\" driver'll only be used on next bootstrap."
+"The new \"%s\" driver will only be used on next bootstrap."
 msgstr ""
+"Den gamle «%s»-drivaren er svartelista, då han visstnok kan «oopsa» kjernen "
+"ved utlasting.\n"
+"\n"
+"Den nye «%s»-drivaren blir berre brukt ved neste oppstart."
 
-#: harddrake/sound.pm:234
+#: harddrake/sound.pm:254
 #, c-format
 msgid "No open source driver"
 msgstr "Ingen open kjeldekode-drivar"
 
-#: harddrake/sound.pm:235
+#: harddrake/sound.pm:255
 #, c-format
 msgid ""
 "There's no free driver for your sound card (%s), but there's a proprietary "
@@ -3136,32 +3324,33 @@ msgstr ""
 "Det finst ingen fri drivar for lydkortet ditt («%s»), men det finst ein "
 "godseigd drivar på «%s»."
 
-#: harddrake/sound.pm:238
+#: harddrake/sound.pm:258
 #, c-format
 msgid "No known driver"
 msgstr "Ingen kjend drivar"
 
-#: harddrake/sound.pm:239
+#: harddrake/sound.pm:259
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
 msgstr "Det finst ingen kjend drivar for lydkortet ditt («%s»)"
 
-#: harddrake/sound.pm:243
+#: harddrake/sound.pm:263
 #, c-format
 msgid "Unknown driver"
 msgstr "Ukjend drivar"
 
-#: harddrake/sound.pm:244
+#: harddrake/sound.pm:264
 #, c-format
 msgid "Error: The \"%s\" driver for your sound card is unlisted"
 msgstr "Feil: Drivaren «%s» for lydkortet ditt er ikkje med i lista"
 
-#: harddrake/sound.pm:257
+#: harddrake/sound.pm:278
 #, c-format
 msgid "Sound trouble shooting"
 msgstr "Feilsøkjing av lyd"
 
-#: harddrake/sound.pm:258
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: harddrake/sound.pm:281
 #, c-format
 msgid ""
 "The classic bug sound tester is to run the following commands:\n"
@@ -3201,17 +3390,18 @@ msgstr ""
 "\n"
 "– «/sbin/fuser -v /dev/dsp» fortel deg kva program som brukar lydkortet.\n"
 
-#: harddrake/sound.pm:284
+#: harddrake/sound.pm:307
 #, c-format
 msgid "Let me pick any driver"
 msgstr "Vel drivar"
 
-#: harddrake/sound.pm:287
+#: harddrake/sound.pm:310
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr "Val av annan drivar"
 
-#: harddrake/sound.pm:288
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: harddrake/sound.pm:313
 #, c-format
 msgid ""
 "If you really think that you know which driver is the right one for your "
@@ -3296,17 +3486,17 @@ msgstr "Bruk radiostøtte"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you do agree with all the\n"
-"terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"
-"will reboot your computer."
+"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
+"button will reboot your computer."
 msgstr ""
 "Du bør lesa vilkåra i lisensavtala nøye før du eventuelt held fram.\n"
 "Avtala dekkjer heile Mandrakelinux-distribusjonen. Kryss av for\n"
 "«%s» berre viss du er einig i alle vilkåra. Elles vil «%s»-knappen\n"
 "starta maskina på nytt."
 
-#: help.pm:14 install_steps_gtk.pm:598 install_steps_interactive.pm:88
-#: install_steps_interactive.pm:690 standalone/drakautoinst:216
+#: help.pm:14 install_steps_gtk.pm:567 install_steps_interactive.pm:94
+#: install_steps_interactive.pm:745 standalone/drakautoinst:216
 #, c-format
 msgid "Accept"
 msgstr "Godta"
@@ -3314,42 +3504,41 @@ msgstr "Godta"
 #: help.pm:17
 #, c-format
 msgid ""
-"GNU/Linux is a multi-user system, meaning each user may have their own\n"
-"preferences, their own files and so on. You can read the ``Starter Guide''\n"
-"to learn more about multi-user systems. But unlike \"root\", who is the\n"
-"system administrator, the users you add at this point will not be\n"
-"authorized to change anything except their own files and their own\n"
-"configurations, protecting the system from unintentional or malicious\n"
-"changes that impact on the system as a whole. You will have to create at\n"
-"least one regular user for yourself -- this is the account which you should\n"
-"use for routine, day-to-day use. Although it is very easy to log in as\n"
-"\"root\" to do anything and everything, it may also be very dangerous! A\n"
-"very simple mistake could mean that your system will not work any more. If\n"
-"you make a serious mistake as a regular user, the worst that will happen is\n"
-"that you will lose some information, but not affect the entire system.\n"
+"GNU/Linux is a multi-user system which means each user can have his or her\n"
+"own preferences, own files and so on. But unlike \"root\", who is the\n"
+"system administrator, the users you add at this point won't be authorized\n"
+"to change anything except their own files and their own configurations,\n"
+"protecting the system from unintentional or malicious changes which could\n"
+"impact on the system as a whole. You'll have to create at least one regular\n"
+"user for yourself -- this is the account which you should use for routine,\n"
+"day-to-day usage. Although it's very easy to log in as \"root\" to do\n"
+"anything and everything, it may also be very dangerous! A very simple\n"
+"mistake could mean that your system won't work any more. If you make a\n"
+"serious mistake as a regular user, the worst that can happen is that you'll\n"
+"lose some information, but you won't affect the entire system.\n"
 "\n"
 "The first field asks you for a real name. Of course, this is not mandatory\n"
 "-- you can actually enter whatever you like. DrakX will use the first word\n"
-"you typed in this field and copy it to the \"%s\" field, which is the name\n"
+"you type in this field and copy it to the \"%s\" one, which is the name\n"
 "this user will enter to log onto the system. If you like, you may override\n"
 "the default and change the user name. The next step is to enter a password.\n"
 "From a security point of view, a non-privileged (regular) user password is\n"
-"not as crucial as the \"root\" password, but that is no reason to neglect\n"
-"it by making it blank or too simple: after all, your files could be the\n"
-"ones at risk.\n"
+"not as crucial as the \"root\" password, but that's no reason to neglect it\n"
+"by making it blank or too simple: after all, your files could be the ones\n"
+"at risk.\n"
 "\n"
 "Once you click on \"%s\", you can add other users. Add a user for each one\n"
-"of your friends: your father or your sister, for example. Click \"%s\" when\n"
-"you have finished adding users.\n"
+"of your friends, your father, your sister, etc. Click \"%s\" when you're\n"
+"finished adding users.\n"
 "\n"
 "Clicking the \"%s\" button allows you to change the default \"shell\" for\n"
 "that user (bash by default).\n"
 "\n"
-"When you have finished adding users, you will be asked to choose a user who\n"
-"can automatically log into the system when the computer boots up. If you\n"
-"are interested in that feature (and do not care much about local security),\n"
-"choose the desired user and window manager, then click \"%s\". If you are\n"
-"not interested in this feature, uncheck the \"%s\" box."
+"When you're finished adding users, you'll be asked to choose a user who\n"
+"will be automatically logged into the system when the computer boots up. If\n"
+"you're interested in that feature (and don't care much about local\n"
+"security), choose the desired user and window manager, then click on\n"
+"\"%s\". If you're not interested in this feature, uncheck the \"%s\" box."
 msgstr ""
 "GNU/Linux er eit fleirbrukarsystem, der kvar brukar har sine eigne "
 "innstillingar\n"
@@ -3404,23 +3593,28 @@ msgstr ""
 "denne\n"
 "funksjonen, så fjern merket for «%s»."
 
-#: help.pm:52 help.pm:197 help.pm:444 help.pm:691 help.pm:784 help.pm:1005
-#: install_steps_gtk.pm:277 interactive.pm:403 interactive/newt.pm:308
-#: network/netconnect.pm:271 network/tools.pm:166 printer/printerdrake.pm:3090
-#: standalone/drakTermServ:397 standalone/drakbackup:3920
-#: standalone/drakbackup:4014 standalone/drakbackup:4031
-#: standalone/drakbackup:4049 ugtk2.pm:510
+#: help.pm:51 printer/printerdrake.pm:1488 printer/printerdrake.pm:1608
+#, c-format
+msgid "User name"
+msgstr "Brukarnamn"
+
+#: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:247
+#: interactive.pm:403 interactive/newt.pm:317 network/netconnect.pm:280
+#: network/tools.pm:198 printer/printerdrake.pm:3268
+#: standalone/drakTermServ:372 standalone/drakbackup:3941
+#: standalone/drakbackup:4035 standalone/drakbackup:4052
+#: standalone/drakbackup:4070 ugtk2.pm:515
 #, c-format
 msgid "Next"
 msgstr "Neste"
 
-#: help.pm:52 help.pm:418 help.pm:444 help.pm:660 help.pm:733 help.pm:768
+#: help.pm:51 help.pm:409 help.pm:431 help.pm:647 help.pm:722
 #: interactive.pm:371
 #, c-format
 msgid "Advanced"
 msgstr "Avansert"
 
-#: help.pm:55
+#: help.pm:54
 #, c-format
 msgid ""
 "Listed here are the existing Linux partitions detected on your hard drive.\n"
@@ -3485,36 +3679,45 @@ msgstr ""
 " Med SCSI-harddiskar tyder «a» lågaste SCSI-ID, og «b»\n"
 " nest lågaste SCSI-ID, og så vidare."
 
-#: help.pm:86
+#: help.pm:85
 #, c-format
 msgid ""
 "The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
-"CD and ask you to insert the correct CD as required."
+"CD and ask you to insert the required one. If you do not have the requested\n"
+"CD at hand, just click on \"%s\", the corresponding packages will not be\n"
+"installed."
 msgstr ""
-"Mandrakelinux-distribusjonen ligg fordelt på fleire plater. Du blir "
-"automatisk\n"
-"bedt om bytta plate for alle pakkar som ikkje er tilgjengeleg på denne."
+"Mandrakelinux-distribusjonen ligg fordelt på fleire plater. Viss ein pakke "
+"ligg på ei anna plate, vert du automatisk bedt om å setja ho i. Berre trykk "
+"«%s» om du ikkje har denne plata. Dei aktuelle pakkane vert då ikkje "
+"installerte."
 
-#: help.pm:91
+#: help.pm:92
 #, c-format
 msgid ""
-"It is now time to specify which programs you wish to install on your\n"
-"system. There are thousands of packages available for Mandrakelinux, and\n"
-"to make it simpler to manage the packages have been placed into groups of\n"
-"similar applications.\n"
+"It's now time to specify which programs you wish to install on your system.\n"
+"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"simpler to manage, they have been placed into groups of similar\n"
+"applications.\n"
 "\n"
-"Packages are sorted into groups corresponding to a particular use of your\n"
-"machine. Mandrakelinux sorts packages groups in four categories. You can\n"
-"mix and match applications from the various categories, so a\n"
-"``Workstation'' installation can still have applications from the\n"
-"``Development'' category installed.\n"
+"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"match applications from the various categories, so a ``Workstation''\n"
+"installation can still have applications from the ``Server'' category\n"
+"installed.\n"
 "\n"
 " * \"%s\": if you plan to use your machine as a workstation, select one or\n"
-"more of the groups that are in the workstation category.\n"
+"more of the groups in the workstation category.\n"
 "\n"
 " * \"%s\": if you plan on using your machine for programming, select the\n"
-"appropriate groups from that category.\n"
+"appropriate groups from that category. The special \"LSB\" group will\n"
+"configure your system so that it complies as much as possible with the\n"
+"Linux Standard Base specifications.\n"
+"\n"
+"   Selecting the \"LSB\" group will also install the \"2.4\" kernel series,\n"
+"instead of the default \"2.6\" one. This is to ensure 100%%-LSB compliance\n"
+"of the system. However, if you do not select the \"LSB\" group you will\n"
+"still have a system which is nearly 100%% LSB-compliant.\n"
 "\n"
 " * \"%s\": if your machine is intended to be a server, select which of the\n"
 "more common services you wish to install on your machine.\n"
@@ -3524,9 +3727,19 @@ msgid ""
 "interface available.\n"
 "\n"
 "Moving the mouse cursor over a group name will display a short explanatory\n"
-"text about that group. If you unselect all groups when performing a regular\n"
-"installation (as opposed to an upgrade), a dialog will pop up proposing\n"
-"different options for a minimal installation:\n"
+"text about that group.\n"
+"\n"
+"You can check the \"%s\" box, which is useful if you're familiar with the\n"
+"packages being offered or if you want to have total control over what will\n"
+"be installed.\n"
+"\n"
+"If you start the installation in \"%s\" mode, you can deselect all groups\n"
+"and prevent the installation of any new packages. This is useful for\n"
+"repairing or updating an existing system.\n"
+"\n"
+"If you deselect all groups when performing a regular installation (as\n"
+"opposed to an upgrade), a dialog will pop up suggesting different options\n"
+"for a minimal installation:\n"
 "\n"
 " * \"%s\": install the minimum number of packages possible to have a\n"
 "working graphical desktop.\n"
@@ -3536,43 +3749,46 @@ msgid ""
 "\n"
 " * \"%s\": will install the absolute minimum number of packages necessary\n"
 "to get a working Linux system. With this installation you will only have a\n"
-"command line interface. The total size of this installation is about 65\n"
-"megabytes.\n"
-"\n"
-"You can check the \"%s\" box, which is useful if you are familiar with the\n"
-"packages being offered or if you want to have total control over what will\n"
-"be installed.\n"
-"\n"
-"If you started the installation in \"%s\" mode, you can unselect all groups\n"
-"to avoid installing any new package. This is useful for repairing or\n"
-"updating an existing system."
+"command-line interface. The total size of this installation is about 65\n"
+"megabytes."
 msgstr ""
 "Det må no velja kva program du ønskjer å installera på maskina. Det finst\n"
 "tusenvis av programpakkar for Mandrakelinux, og desse er her ordna i "
 "grupper.\n"
 "\n"
-"Pakkane er grupperte etter bruksområde, og desse gruppene er så grupperte\n"
-"i fire kategoriar. Du kan velja program frå alle kategoriane, så eit\n"
-"«Arbeidsstasjon»-system kan godt ha program frå «Utvikling»-kategorien.\n"
+"Pakkane er grupperte i fire kategoriar, men du kan velja program frå alle\n"
+"kategoriane, så eit «Arbeidsstasjon»-system kan godt ha program frå\n"
+" «Tenar»-kategorien.\n"
 "\n"
-" – «%s»: Om du har tenkt å bruka maskina som ein arbeidsstasjon, vel éi "
-"eller\n"
-"fleire av gruppene i arbeidsstasjonskategorien.\n"
+" – «%s»: Om du har tenkt å bruka maskina som ein arbeidsstasjon, vel éi\n"
+"eller fleire av gruppene i arbeidsstasjonskategorien.\n"
 "\n"
-" – «%s»: Om du har tenkt å bruka maskina for programmering, vel dei "
-"gruppene\n"
-"du ønskjer i programmeringskategorien.\n"
-" – «%s»: Om du har tenkt å bruka maskina som ein tenar, vel dei av "
-"tenestene\n"
+" – «%s»: Om du har tenkt å bruka maskina for programmering, vel dei gruppene "
+"du ønskjer i programmeringskategorien. «LSB»-gruppa vil prøva\n"
+"å setja opp systemet i samsvar med «Linux Standard Base»-standarden.\n"
+"\n"
+"   Vel du «LSB»-gruppa vert lg 2.4-kjernen og ikkje 2.6-kjernen installert.\n"
+"Dette er for å sikra 100 %% samsvar med LSB. Men sjølv om du ikkje vel\n"
+"«LSB»-gruppa vil du framleis ha eit system som er nesten 100 %% i samsvar\n"
+"med denne standarden.\n"
+"– «%s»: Om du har tenkt å bruka maskina som ein tenar, vel dei av tenestene\n"
 "du ønskjer å installera på maskina.\n"
 "\n"
 " – «%s»: Det er her du vel det grafiske skrivebordsmiljøet du vil ha. Du må\n"
 "velja minst eitt for at å ha det grafiske grensesnittet tilgjengeleg.\n"
 "\n"
-"Om du plasserer peikaren over eit gruppenamn, blir det vist ei kort "
-"forklaring\n"
-"for den gruppa. Om du fjernar alle gruppene ved ei vanleg installering "
-"(ikkje\n"
+"Om du plasserer peikaren over eit gruppenamn, blir det vist ei kort\n"
+"forklaring for den gruppa.\n"
+"\n"
+"Du kan kryssa av for «%s» om du kjenner til pakkane, eller av annan grunn\n"
+"ønskjer full kontroll over kva som blir installert.\n"
+"\n"
+"Om du starta installasjonen i «%s»-modus, kan du fjerna alle grupper, for\n"
+"å unngå installera nye pakkar. Dette er nyttig for å reparera eller "
+"oppgradera\n"
+"eit system.\n"
+"\n"
+"Om du fjernar alle gruppene ved ei vanleg installering (ikkje\n"
 "ei oppgradering), blir du spurd om kva type minimal installering du "
 "ønskjer:\n"
 "\n"
@@ -3583,92 +3799,84 @@ msgstr ""
 "\n"
 " – «%s»: Installer absolutt minst mogleg pakkar for eit fungerande Linux-\n"
 "system. Du vil då berre få eit kommandolinjegrensesnitt. Total storleik for\n"
-"dette valet er rundt 65 MiB.\n"
-"\n"
-"Du kan kryssa av for «%s» om du kjenner til pakkane, eller av annan grunn\n"
-"ønskjer full kontroll over kva som blir installert.\n"
-"\n"
-"Om du starta installasjonen i «%s»-modus, kan du fjerna alle grupper, for\n"
-"å unngå installera nye pakkar. Dette er nyttig for å reparera eller "
-"oppgradera\n"
-"eit system."
+"dette valet er rundt 65 MiB."
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:23
 #, c-format
 msgid "Workstation"
 msgstr "Arbeidstasjon"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:64 share/compssUsers.pl:162
+#: share/compssUsers.pl:164
 #, c-format
 msgid "Development"
 msgstr "Utvikling"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:144
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafisk miljø"
 
-#: help.pm:137 install_steps_interactive.pm:552
+#: help.pm:146 install_steps_gtk.pm:242 install_steps_interactive.pm:646
+#, c-format
+msgid "Individual package selection"
+msgstr "Direkte pakkeval"
+
+#: help.pm:146 help.pm:588
+#, c-format
+msgid "Upgrade"
+msgstr "Oppgrader"
+
+#: help.pm:146 install_steps_interactive.pm:600
 #, c-format
 msgid "With X"
 msgstr "Med X"
 
-#: help.pm:137
+#: help.pm:146
 #, c-format
 msgid "With basic documentation"
 msgstr "Med grunnleggjande hjelpetekstar"
 
-#: help.pm:137
+#: help.pm:146
 #, c-format
 msgid "Truly minimal install"
 msgstr "Heilt minimal installasjon"
 
-#: help.pm:137 install_steps_gtk.pm:272 install_steps_interactive.pm:598
-#, c-format
-msgid "Individual package selection"
-msgstr "Direkte pakkeval"
-
-#: help.pm:137 help.pm:602
-#, c-format
-msgid "Upgrade"
-msgstr "Oppgrader"
-
-#: help.pm:140
-#, c-format
+#: help.pm:149
+#, fuzzy, c-format
 msgid ""
-"If you told the installer that you wanted to individually select packages,\n"
-"it will present a tree containing all packages classified by groups and\n"
-"subgroups. While browsing the tree, you can select entire groups,\n"
-"subgroups, or individual packages.\n"
+"If you choose to install packages individually, the installer will present\n"
+"a tree containing all packages classified by groups and subgroups. While\n"
+"browsing the tree, you can select entire groups, subgroups, or individual\n"
+"packages.\n"
 "\n"
-"Whenever you select a package on the tree, a description appears on the\n"
-"right to let you know the purpose of the package.\n"
+"Whenever you select a package on the tree, a description will appear on the\n"
+"right to let you know the purpose of that package.\n"
 "\n"
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
-"you will be asked to confirm that you really want those servers to be\n"
+"you'll be asked to confirm that you really want those servers to be\n"
 "installed. By default Mandrakelinux will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
-"the time the distribution was shipped, it is entirely possible that that\n"
+"the time the distribution was shipped, it is entirely possible that\n"
 "security holes were discovered after this version of Mandrakelinux was\n"
-"finalized. If you do not know what a particular service is supposed to do\n"
-"or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
-"install the listed services and they will be started automatically by\n"
-"default during boot. !!\n"
+"finalized. If you don't know what a particular service is supposed to do or\n"
+"why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
+"the listed services and they will be started automatically at boot time. !!\n"
 "\n"
 "The \"%s\" option is used to disable the warning dialog which appears\n"
 "whenever the installer automatically selects a package to resolve a\n"
-"dependency issue. Some packages have relationships between each them such\n"
-"that installation of one package requires that some other program is also\n"
-"required to be installed. The installer can determine which packages are\n"
-"required to satisfy a dependency to successfully complete the installation.\n"
+"dependency issue. Some packages depend on others and the installation of\n"
+"one particular package may require the installation of another package. The\n"
+"installer can determine which packages are required to satisfy a dependency\n"
+"to successfully complete the installation.\n"
 "\n"
 "The tiny floppy disk icon at the bottom of the list allows you to load a\n"
 "package list created during a previous installation. This is useful if you\n"
 "have a number of machines that you wish to configure identically. Clicking\n"
-"on this icon will ask you to insert a floppy disk previously created at the\n"
-"end of another installation. See the second tip of last step on how to\n"
-"create such a floppy."
+"on this icon will ask you to insert the floppy disk created at the end of\n"
+"another installation. See the second tip of the last step on how to create\n"
+"such a floppy."
 msgstr ""
 "Viss du valte å velja pakkar sjølv, får du ei oversikt over alle pakkar,\n"
 "delt inn i grupper og undergrupper. Du kan velja å installera heile "
@@ -3700,124 +3908,66 @@ msgstr ""
 "installasjonssteg for meir informasjon om korleis du lagar ei slik "
 "pakkeliste."
 
-#: help.pm:172 help.pm:301 help.pm:329 help.pm:457 install_any.pm:411
-#: interactive.pm:149 modules/interactive.pm:71 standalone/harddrake2:225
-#: ugtk2.pm:1083 wizards.pm:156
+#: help.pm:180 help.pm:285 help.pm:313 help.pm:444 install_any.pm:722
+#: interactive.pm:149 modules/interactive.pm:71 standalone/drakbackup:2503
+#: standalone/draksec:54 standalone/harddrake2:299 ugtk2.pm:1121
+#: wizards.pm:156
 #, c-format
 msgid "No"
 msgstr "Nei"
 
-#: help.pm:172 help.pm:301 help.pm:457 install_any.pm:411 interactive.pm:149
-#: modules/interactive.pm:71 printer/printerdrake.pm:607 standalone/drakgw:288
-#: standalone/drakgw:289 standalone/drakgw:297 standalone/drakgw:307
-#: standalone/harddrake2:224 ugtk2.pm:1083 wizards.pm:156
+#: help.pm:180 help.pm:285 help.pm:444 install_any.pm:722 interactive.pm:149
+#: modules/interactive.pm:71 printer/printerdrake.pm:711
+#: standalone/drakbackup:2503 standalone/drakgw:290 standalone/drakgw:291
+#: standalone/drakgw:299 standalone/drakgw:309 standalone/draksec:55
+#: standalone/harddrake2:298 ugtk2.pm:1121 wizards.pm:156
 #, c-format
 msgid "Yes"
 msgstr "Ja"
 
-#: help.pm:172
+#: help.pm:180
 #, c-format
 msgid "Automatic dependencies"
 msgstr "Automatisk avhengnadshandtering"
 
-#: help.pm:175
-#, c-format
-msgid ""
-"You will now set up your Internet/network connection. If you wish to\n"
-"connect your computer to the Internet or to a local network, click \"%s\".\n"
-"Mandrakelinux will attempt to auto-detect network devices and modems. If\n"
-"this detection fails, uncheck the \"%s\" box. You may also choose not to\n"
-"configure the network, or to do it later, in which case clicking the \"%s\"\n"
-"button will take you to the next step.\n"
-"\n"
-"When configuring your network, the available connections options are:\n"
-"Normal modem connection, Winmodem connection, ISDN modem, ADSL connection,\n"
-"cable modem, and finally a simple LAN connection (Ethernet).\n"
-"\n"
-"We will not detail each configuration option - just make sure that you have\n"
-"all the parameters, such as IP address, default gateway, DNS servers, etc.\n"
-"from your Internet Service Provider or system administrator.\n"
-"\n"
-"About Winmodem Connection. Winmodems are special integrated low-end modems\n"
-"that require additional software to work compared to Normal modems. Some of\n"
-"those modems actually work under Mandrakelinux, some others do not. You\n"
-"can consult the list of supported modems at LinModems.\n"
-"\n"
-"You can consult the ``Starter Guide'' chapter about Internet connections\n"
-"for details about the configuration, or simply wait until your system is\n"
-"installed and use the program described there to configure your connection."
-msgstr ""
-"Du kan no setja opp eit Internett- eller nettverkssamband. Trykk «%s»\n"
-"for å kopla til Internett eller eit lokalt nettverk. Mandrakelinux vil då "
-"prøva\n"
-"å finna eventuelle nettverkseiningar og modem automatisk. Kryss vekk\n"
-"«%s» om dette ikkje fungerer. Du kan òg trykkja «%s» for å ikkje setja\n"
-"opp nettverket, eller eventuelt setja det opp seinare.\n"
-"\n"
-"Ved oppsett av nettverk kan du velja mellom desse sambandstypane:\n"
-"Vanleg modem, Win-modem, ISDN, ADSL, kabelmodem og lokalnettverk "
-"(«Ethernet»).\n"
-"\n"
-"Her står ikkje detaljar om kvart val, men sørg for at du kjenner til all "
-"nødvendig\n"
-"teknisk informasjon, som IP-adresse, standardrutar og DNS-tenarar. Kontakt\n"
-"eventuelt nettleverandøren din eller systemansvarleg for å få tak i dette.\n"
-"\n"
-"Win-modem er spesielle billigmodem som krev ekstra programvare for å "
-"fungera\n"
-"som vanlege modem. Nokre av dei er støtta i Mandrakelinux, men ikkje alle. "
-"Du\n"
-"finn ei lista over støtta Win-modem hos LinModems.\n"
-"\n"
-"Du finn meir informasjon om Internett-samband i brukarrettleiinga. "
-"Eventuelt\n"
-"kan du venta til systemet er installert, og bruka oppsettprogrammet der\n"
-"til å setja opp nettsambandet."
-
-#: help.pm:197
-#, c-format
-msgid "Use auto detection"
-msgstr "Oppdag automatisk"
-
-#: help.pm:200
+#: help.pm:183
 #, c-format
 msgid ""
 "\"%s\": clicking on the \"%s\" button will open the printer configuration\n"
 "wizard. Consult the corresponding chapter of the ``Starter Guide'' for more\n"
-"information on how to setup a new printer. The interface presented there is\n"
-"similar to the one used during installation."
+"information on how to set up a new printer. The interface presented in our\n"
+"manual is similar to the one used during installation."
 msgstr ""
 "«%s»: Trykk «%s» for å opna vegvisaren for skrivaroppsett. Sjå\n"
 "brukarrettleiinga for meir informasjon om oppsett av skrivarar. "
 "Brukargrensesnittet\n"
 "vist der liknar på det brukt ved installering."
 
-#: help.pm:203 help.pm:581 help.pm:991 install_steps_gtk.pm:648
-#: standalone/drakbackup:2313 standalone/drakbackup:2321
-#: standalone/drakbackup:2329 standalone/drakbackup:2337
+#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:622
+#: standalone/drakbackup:2329 standalone/drakbackup:2333
+#: standalone/drakbackup:2337 standalone/drakbackup:2341
 #, c-format
 msgid "Configure"
 msgstr "Set opp"
 
-#: help.pm:206
-#, c-format
+#: help.pm:189
+#, fuzzy, c-format
 msgid ""
-"This dialog is used to choose which services you wish to start at boot\n"
+"This dialog is used to select which services you wish to start at boot\n"
 "time.\n"
 "\n"
-"DrakX will list all the services available on the current installation.\n"
-"Review each one carefully and uncheck those which are not needed at boot\n"
+"DrakX will list all services available on the current installation. Review\n"
+"each one of them carefully and uncheck those which aren't needed at boot\n"
 "time.\n"
 "\n"
 "A short explanatory text will be displayed about a service when it is\n"
-"selected. However, if you are not sure whether a service is useful or not,\n"
+"selected. However, if you're not sure whether a service is useful or not,\n"
 "it is safer to leave the default behavior.\n"
 "\n"
 "!! At this stage, be very careful if you intend to use your machine as a\n"
-"server: you will probably not want to start any services that you do not\n"
-"need. Please remember that several services can be dangerous if they are\n"
-"enabled on a server. In general, select only the services you really need.\n"
-"!!"
+"server: you probably don't want to start any services which you don't need.\n"
+"Please remember that some services can be dangerous if they're enabled on a\n"
+"server. In general, select only those services you really need. !!"
 msgstr ""
 "No kan du velja kva tenester du vil starta ved oppstart.\n"
 "\n"
@@ -3832,7 +3982,7 @@ msgstr ""
 "fleire\n"
 "av tenestene kan vera farlege om dei køyrer på ein tenar.!!"
 
-#: help.pm:224
+#: help.pm:206
 #, c-format
 msgid ""
 "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to\n"
@@ -3840,16 +3990,17 @@ msgid ""
 "motherboard is set to local time, you may deactivate this by unselecting\n"
 "\"%s\", which will let GNU/Linux know that the system clock and the\n"
 "hardware clock are in the same time zone. This is useful when the machine\n"
-"also hosts another operating system like Windows.\n"
+"also hosts another operating system.\n"
 "\n"
-"The \"%s\" option will automatically regulate the clock by connecting to a\n"
-"remote time server on the Internet. For this feature to work, you must have\n"
-"a working Internet connection. It is best to choose a time server located\n"
-"near you. This option actually installs a time server that can be used by\n"
-"other machines on your local network as well."
+"The \"%s\" option will automatically regulate the system clock by\n"
+"connecting to a remote time server on the Internet. For this feature to\n"
+"work, you must have a working Internet connection. We recommend that you\n"
+"choose a time server located near you. This option actually installs a time\n"
+"server which can be used by other machines on your local network as well."
 msgstr ""
-"GNU/Linux handterer klokka internt etter GMT (Greenwich Mean Time), og\n"
-"viser ho etter denne tidssona du vel. Men om klokka på hovudkortet heller\n"
+"GNU/Linux handterer klokka internt etter GMT (Greenwich Mean Time), men\n"
+"viser ho etter den tidssona du sjølv vel. Men om klokka på hovudkortet "
+"heller\n"
 "er sett til lokaltid, kan du slå av denne funksjonen ved å trykkja «%s». "
 "Dette\n"
 "er nyttig om maskina køyrer andre operativsystem i tillegg, som Windows™.\n"
@@ -3860,27 +4011,27 @@ msgstr ""
 "tidstenar\n"
 "som andre maskiner på lokalnettet òg kan bruka."
 
-#: help.pm:235 install_steps_interactive.pm:822
+#: help.pm:217 install_steps_interactive.pm:887
 #, c-format
 msgid "Hardware clock set to GMT"
 msgstr "Maskinvareklokka er sett til GMT"
 
-#: help.pm:235
+#: help.pm:217
 #, c-format
 msgid "Automatic time synchronization"
 msgstr "Automatisk tidssynkronisering"
 
-#: help.pm:238
+#: help.pm:220
 #, c-format
 msgid ""
 "Graphic Card\n"
 "\n"
 "   The installer will normally automatically detect and configure the\n"
-"graphic card installed on your machine. If it is not the case, you can\n"
+"graphic card installed on your machine. If this is not correct, you can\n"
 "choose from this list the card you actually have installed.\n"
 "\n"
 "   In the situation where different servers are available for your card,\n"
-"with or without 3D acceleration, you are asked to choose the server that\n"
+"with or without 3D acceleration, you're asked to choose the server which\n"
 "best suits your needs."
 msgstr ""
 "Skjermkort\n"
@@ -3893,39 +4044,41 @@ msgstr ""
 "Viss det finst tenarar med og utan 3D-akselerasjon for skjermkortet ditt,\n"
 "kan du velja tenaren som passar best for deg."
 
-#: help.pm:249
-#, c-format
+#: help.pm:231
+#, fuzzy, c-format
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
 "WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"
 "\n"
-"You will be presented with a list of different parameters to change to get\n"
-"an optimal graphical display: Graphic Card\n"
+"You'll see a list of different parameters to change to get an optimal\n"
+"graphical display.\n"
+"\n"
+"Graphic Card\n"
 "\n"
 "   The installer will normally automatically detect and configure the\n"
-"graphic card installed on your machine. If it is not the case, you can\n"
+"graphic card installed on your machine. If this is not correct, you can\n"
 "choose from this list the card you actually have installed.\n"
 "\n"
 "   In the situation where different servers are available for your card,\n"
-"with or without 3D acceleration, you are asked to choose the server that\n"
+"with or without 3D acceleration, you're asked to choose the server which\n"
 "best suits your needs.\n"
 "\n"
 "\n"
 "\n"
 "Monitor\n"
 "\n"
-"   The installer will normally automatically detect and configure the\n"
-"monitor connected to your machine. If it is incorrect, you can choose from\n"
-"this list the monitor you actually have connected to your computer.\n"
+"   Normally the installer will automatically detect and configure the\n"
+"monitor connected to your machine. If it is not correct, you can choose\n"
+"from this list the monitor which is connected to your computer.\n"
 "\n"
 "\n"
 "\n"
 "Resolution\n"
 "\n"
 "   Here you can choose the resolutions and color depths available for your\n"
-"hardware. Choose the one that best suits your needs (you will be able to\n"
-"change that after installation though). A sample of the chosen\n"
+"graphics hardware. Choose the one which best suits your needs (you will be\n"
+"able to make changes after the installation). A sample of the chosen\n"
 "configuration is shown in the monitor picture.\n"
 "\n"
 "\n"
@@ -3934,31 +4087,80 @@ msgid ""
 "\n"
 "   Depending on your hardware, this entry might not appear.\n"
 "\n"
-"   the system will try to open a graphical screen at the desired\n"
-"resolution. If you can see the message during the test and answer \"%s\",\n"
-"then DrakX will proceed to the next step. If you cannot see the message, it\n"
+"   The system will try to open a graphical screen at the desired\n"
+"resolution. If you see the test message during the test and answer \"%s\",\n"
+"then DrakX will proceed to the next step. If you do not see it, then it\n"
 "means that some part of the auto-detected configuration was incorrect and\n"
-"the test will automatically end after 12 seconds, bringing you back to the\n"
+"the test will automatically end after 12 seconds and return you to the\n"
 "menu. Change settings until you get a correct graphical display.\n"
 "\n"
 "\n"
 "\n"
 "Options\n"
 "\n"
-"   Here you can choose whether you want to have your machine automatically\n"
-"switch to a graphical interface at boot. Obviously, you want to check\n"
-"\"%s\" if your machine is to act as a server, or if you were not successful\n"
-"in getting the display configured."
+"   This steps allows you to choose whether you want your machine to\n"
+"automatically switch to a graphical interface at boot. Obviously, you may\n"
+"want to check \"%s\" if your machine is to act as a server, or if you were\n"
+"not successful in getting the display configured."
 msgstr ""
+"X er hjarta i det grafiske grensesnittet til GNU/Linux, og alle dei grafiske "
+"skrivebordsmiljøa (KDE, GNOME, AfterStep, med fleire) som følgjer med "
+"Mandrakelinux avheng av X.\n"
+"\n"
+"Du vil sjå ei liste over forskjellige innstillingar til det grafiske "
+"oppsettet:\n"
+"\n"
+"Skjermkort\n"
+"\n"
+"   Installasjonsprogrammet vil vanlegvis finna og setja opp skjermkortet på "
+"maskina di automatisk, men du kan òg velja kortet frå lista sjølv.\n"
+"\n"
+"   Om det finst to tenarar, éin med og éin utan 3D-støtte, for kortet ditt, "
+"må du sjølv velja kven av dei du ønskjer.\n"
+"\n"
+"\n"
+"\n"
+"Skjerm \n"
+"   Installasjonsprogrammet vil vanlegvis finna og setja opp skjermen kopla "
+"til maskina di automatisk, men du kan òg velja skjermen frå lista sjølv.\n"
+"\n"
+"\n"
+"\n"
+"Skjermoppløysing\n"
+"\n"
+"   Her kan du velja skjermoppløysing og fargedjupn for skjermen din. Vel dei "
+"innstillingane som passar best for deg, og hugs at du alltids kan endra dei "
+"igjen etter installasjonen. Det blir òg vist eit bilete av korleis oppsettet "
+"vil sjå ut på skjermen.\n"
+"\n"
+"\n"
+"\n"
+"Test\n"
+"\n"
+"   Om denne innstillingen blir vist er avhengig av maskinvaren din.\n"
+"\n"
+"   Systemet vil prøva å visa eit testskjermbilete med innstillingane du "
+"valte. Klarar du å sjå spørsmålet på testbiletet, og svara «%s», går "
+"vegvisaren vidare til neste steg. Viss ikkje, er nokre av innstillingane "
+"feil, og testbiletet forsvinn etter 12 sekund. Du kan då endra "
+"innstillingane til du har eit skjermoppsett som fungerer.\n"
+"\n"
+"\n"
+"\n"
+"Val\n"
+"\n"
+"   Her kan du velja om vil starta det grafiske grensesnittet automatisk ved "
+"oppstart. Du bør velja «%s» berre om maskina skal brukast til tenar, eller "
+"om du ikkje klarte å setja opp X rett."
 
-#: help.pm:304
+#: help.pm:288
 #, c-format
 msgid ""
 "Monitor\n"
 "\n"
-"   The installer will normally automatically detect and configure the\n"
-"monitor connected to your machine. If it is incorrect, you can choose from\n"
-"this list the monitor you actually have connected to your computer."
+"   Normally the installer will automatically detect and configure the\n"
+"monitor connected to your machine. If it is not correct, you can choose\n"
+"from this list the monitor which is connected to your computer."
 msgstr ""
 "Skjerm\n"
 "\n"
@@ -3967,14 +4169,14 @@ msgstr ""
 "skjermen\n"
 "sjølv frå denne oversikta."
 
-#: help.pm:311
+#: help.pm:295
 #, c-format
 msgid ""
 "Resolution\n"
 "\n"
 "   Here you can choose the resolutions and color depths available for your\n"
-"hardware. Choose the one that best suits your needs (you will be able to\n"
-"change that after installation though). A sample of the chosen\n"
+"graphics hardware. Choose the one which best suits your needs (you will be\n"
+"able to make changes after the installation). A sample of the chosen\n"
 "configuration is shown in the monitor picture."
 msgstr ""
 "Oppløysing\n"
@@ -3984,25 +4186,25 @@ msgstr ""
 "innstillingane\n"
 "i ettertid). Det blir vist eit eksempel på valt oppsett på skjermbiletet."
 
-#: help.pm:319
-#, c-format
+#: help.pm:303
+#, fuzzy, c-format
 msgid ""
 "In the situation where different servers are available for your card, with\n"
-"or without 3D acceleration, you are asked to choose the server that best\n"
+"or without 3D acceleration, you're asked to choose the server which best\n"
 "suits your needs."
 msgstr ""
 "Viss det finst tenarar med og utan 3D-akselerasjon for skjermkortet ditt,\n"
 "kan du velja tenaren som passar best for deg."
 
-#: help.pm:324
-#, c-format
+#: help.pm:308
+#, fuzzy, c-format
 msgid ""
 "Options\n"
 "\n"
-"   Here you can choose whether you want to have your machine automatically\n"
-"switch to a graphical interface at boot. Obviously, you want to check\n"
-"\"%s\" if your machine is to act as a server, or if you were not successful\n"
-"in getting the display configured."
+"   This steps allows you to choose whether you want your machine to\n"
+"automatically switch to a graphical interface at boot. Obviously, you may\n"
+"want to check \"%s\" if your machine is to act as a server, or if you were\n"
+"not successful in getting the display configured."
 msgstr ""
 "Val\n"
 "\n"
@@ -4010,115 +4212,168 @@ msgstr ""
 "automatisk. Du bør velja «%s» viss du skal bruka maskina som ein tenar,\n"
 "eller du før ikkje har klart å setja opp det grafiske oppsettet før."
 
-#: help.pm:332
-#, c-format
+#: help.pm:316
+#, fuzzy, c-format
 msgid ""
-"At this point, you need to decide where you want to install the Mandrake\n"
-"Linux operating system on your hard drive. If your hard drive is empty or\n"
-"if an existing operating system is using all the available space you will\n"
-"have to partition the drive. Basically, partitioning a hard drive consists\n"
-"of logically dividing it to create the space needed to install your new\n"
+"You now need to decide where you want to install the Mandrakelinux\n"
+"operating system on your hard drive. If your hard drive is empty or if an\n"
+"existing operating system is using all the available space you will have to\n"
+"partition the drive. Basically, partitioning a hard drive means to\n"
+"logically divide it to create the space needed to install your new\n"
 "Mandrakelinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
-"and can lead to lost data if there is an existing operating system already\n"
-"installed on the drive, partitioning can be intimidating and stressful if\n"
-"you are an inexperienced user. Fortunately, DrakX includes a wizard which\n"
+"and can lead to data losses, partitioning can be intimidating and stressful\n"
+"for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on your hard drive configuration, several options are available:\n"
+"Depending on the configuration of your hard drive, several options are\n"
+"available:\n"
 "\n"
-" * \"%s\": this option will perform an automatic partitioning of your blank\n"
+" * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
-" * \"%s\": the wizard has detected one or more existing Linux partitions on\n"
+" * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
 "your hard drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\": if Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
-"data, provided you have previously defragmented the Windows partition.\n"
-"Backing up your data is strongly recommended.. Using this option is\n"
+"data, provided you've previously defragmented the Windows partition.\n"
+"Backing up your data is strongly recommended. Using this option is\n"
 "recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
 "procedure, the size of your Microsoft Windows partition will be smaller\n"
-"then when you started. You will have less free space under Microsoft\n"
-"Windows to store your data or to install new software.\n"
+"than when you started. You'll have less free space under Microsoft Windows\n"
+"to store your data or to install new software.\n"
 "\n"
-" * \"%s\": if you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrakelinux system,\n"
-"choose this option. Be careful, because you will not be able to undo your\n"
-"choice after you confirm.\n"
+" * \"%s\". If you want to delete all data and all partitions present on\n"
+"your hard drive and replace them with your new Mandrakelinux system, choose\n"
+"this option. Be careful, because you won't be able to undo this operation\n"
+"after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\": this will simply erase everything on the drive and begin fresh,\n"
-"partitioning everything from scratch. All data on your disk will be lost.\n"
+" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+"Microsoft Windows. Choosing this option will simply erase everything on the\n"
+"drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-" * \"%s\": choose this option if you want to manually partition your hard\n"
+" * \"%s\". Choose this option if you want to manually partition your hard\n"
 "drive. Be careful -- it is a powerful but dangerous choice and you can very\n"
 "easily lose all your data. That's why this option is really only\n"
 "recommended if you have done something like this before and have some\n"
 "experience. For more instructions on how to use the DiskDrake utility,\n"
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
+"No må du velja kor du vil installera Mandrakelinux på harddisken din. Viss "
+"harddisken er tom, eller viss eit anna operativsystem brukar heile disken, "
+"må du først partisjonera han. Å partisjonera vil seia å dela opp disken, "
+"slik at for eksempel kvart operativsystem får sin eigen del.\n"
+"\n"
+"Då du vanlegvis ikkje kan angra partisjonering av harddisken, og feilaktig "
+"partisjonering kan føra til at du mistar data om det allereie er installert "
+"eit operativsystem, kan dette vera noko vanskeleg for uvørne brukarar. "
+"Heldigvis finst det her ein vegvisar som losar deg gjennom heile prosessen. "
+"Før du held fram bør du først ta deg godt tid til å lesa denne "
+"hjelpeteksten.\n"
+"\n"
+"Litt avhengig av harddiskoppsettet ditt kan du ha eitt eller fleire av desse "
+"vala:\n"
+"\n"
+"– «%s»: Dette utfører automatisk partisjonering av den tomme harddisken din. "
+"Du vil ikkje få fleire spørsmål om du vel dette.\n"
+"\n"
+"– «%s»: Vegvisaren har funne éin eller fleire Linux-partisjonar på "
+"harddisken din. Vel dette om du ønskjer å bruka dei. Du blir så bedt om å "
+"velja monteringspunkt for kvar av partisjonane. Dei gamle monteringspunkta "
+"blir valt som standard, og vanlegvis bør du ikkje endra på dette.\n"
+"\n"
+"– «%s»: Om Microsoft Windows er installert og tar opp all plass på "
+"harddisken din, må du frigjera noko plass til Mandrakelinux. Du kan anten "
+"sletta Windows-partisjonen din (sjå «Slett heile disken»-valet), eller endra "
+"storleiken på Windows-partisjonen (både FAT- og NTFS-filsystema er støtta). "
+"Du vil ikkje mista noko data ved endra storleiken på partisjonen, så lenge "
+"du har defragmentert han på førehand. Men du bør uansett ta reservekopi av "
+"alle dataa. Du bør velja dette valet om du ønskjer å bruka både "
+"Mandrakelinux og Microsoft Windows på same maskina.\n"
+"\n"
+"   Før du vel dette, bør du vera klar over at Windows-partisjonen vil vera "
+"mindre etterpå, slik at du har mindre ledig plass til å lagra dokument eller "
+"installera programvare.\n"
+"\n"
+"– «%s»: Vel dette om du ønskjer å sletta alle data og alle partisjonar på "
+"harddisken din, og installera Mandrakelinux over desse. Ver forsiktig, då du "
+"ikkje kan angra denne handlinga.\n"
+"\n"
+"   !! Viss du vel dette, blir alle dataa på harddisken din sletta. !!\n"
+"\n"
+"– «%s»: Dette vil sletta alt på harddisken, og partisjonera alt på nytt. "
+"Alle data på disken går tapt.\n"
+"\n"
+"   !! Viss du vel dette, blir alle dataa på harddisken din sletta. !!\n"
+"\n"
+"– «%s»: Vel dette om du vil partisjonera harddisken manuelt. Ver forsiktig. "
+"Dette er eit kraftig verktøy, men det er lett å mista data. Derfor bør du "
+"berre velja dette om du har erfaring med dette frå før. Sjå bruksrettleiinga "
+"for meir informasjon."
 
-#: help.pm:389 install_interactive.pm:95
+#: help.pm:374 install_interactive.pm:95
 #, c-format
 msgid "Use free space"
 msgstr "Bruk ledig plass"
 
-#: help.pm:389
+#: help.pm:374
 #, c-format
 msgid "Use existing partition"
 msgstr "Bruk gammal partisjon"
 
-#: help.pm:389 install_interactive.pm:137
+#: help.pm:374 install_interactive.pm:137
 #, c-format
 msgid "Use the free space on the Windows partition"
 msgstr "Bruk ledig plass på Windows-partisjon"
 
-#: help.pm:389 install_interactive.pm:211
+#: help.pm:374 install_interactive.pm:213
 #, c-format
 msgid "Erase entire disk"
 msgstr "Slett heile disken"
 
-#: help.pm:389
+#: help.pm:374
 #, c-format
 msgid "Remove Windows"
 msgstr "Fjern Windows"
 
-#: help.pm:389 install_interactive.pm:226
+#: help.pm:374 install_interactive.pm:228
 #, c-format
 msgid "Custom disk partitioning"
 msgstr "Eigendefinert partisjonering"
 
-#: help.pm:392
-#, c-format
+#: help.pm:377
+#, fuzzy, c-format
 msgid ""
 "There you are. Installation is now complete and your GNU/Linux system is\n"
-"ready to use. Just click \"%s\" to reboot the system. Don't forget to\n"
-"remove the installation media (CD-ROM or floppy). The first thing you\n"
+"ready to be used. Just click on \"%s\" to reboot the system. Don't forget\n"
+"to remove the installation media (CD-ROM or floppy). The first thing you\n"
 "should see after your computer has finished doing its hardware tests is the\n"
-"bootloader menu, giving you the choice of which operating system to start.\n"
+"boot-loader menu, giving you the choice of which operating system to start.\n"
 "\n"
 "The \"%s\" button shows two more buttons to:\n"
 "\n"
-" * \"%s\": to create an installation floppy disk that will automatically\n"
-"perform a whole installation without the help of an operator, similar to\n"
-"the installation you just configured.\n"
+" * \"%s\": enables you to create an installation floppy disk which will\n"
+"automatically perform a whole installation without the help of an operator,\n"
+"similar to the installation you've just configured.\n"
 "\n"
-"   Note that two different options are available after clicking the button:\n"
+"   Note that two different options are available after clicking on that\n"
+"button:\n"
 "\n"
 "    * \"%s\". This is a partially automated installation. The partitioning\n"
 "step is the only interactive procedure.\n"
@@ -4126,87 +4381,133 @@ msgid ""
 "    * \"%s\". Fully automated installation: the hard disk is completely\n"
 "rewritten, all data is lost.\n"
 "\n"
-"   This feature is very handy when installing a number of similar machines.\n"
-"See the Auto install section on our web site for more information.\n"
+"   This feature is very handy when installing on a number of similar\n"
+"machines. See the Auto install section on our web site for more\n"
+"information.\n"
 "\n"
-" * \"%s\": saves a list of the packages selected in this installation. To\n"
-"use this selection with another installation, insert the floppy and start\n"
-"the installation. At the prompt, press the [F1] key and type >>linux\n"
-"defcfg=\"floppy\" <<."
+" * \"%s\"(*): saves a list of the packages selected in this installation.\n"
+"To use this selection with another installation, insert the floppy and\n"
+"start the installation. At the prompt, press the [F1] key, type >>linux\n"
+"defcfg=\"floppy\"<< and press the [Enter] key.\n"
+"\n"
+"(*) You need a FAT-formatted floppy. To create one under GNU/Linux, type\n"
+"\"mformat a:\", or \"fdformat /dev/fd0\" followed by \"mkfs.vfat\n"
+"/dev/fd0\"."
 msgstr ""
+"Sånn! Installasjonen er no ferdig, og Mandrakelinux er klar til bruk. Berre "
+"trykk «%s» for å starta maskina på nytt. Ikkje gløym å fjerna "
+"installasjonsmediet (CD-ROM-en eller disketten) først. Når maskina er starta "
+"opp att, får du sjå ein meny der du kan velja kva operativsystem du vil "
+"køyra.\n"
+"\n"
+"«%s»-knappen viser to knappar til:\n"
+"\n"
+"– «%s»: Lag ein installasjonsdiskett for automatisk installering med same "
+"oppsettet du har brukt no.\n"
+"\n"
+"   Du får òg to nye val når du har trykt på knappen:\n"
+"    – «%s»: Halvautomatisk installering. Det er berre partisjoneringsdelen "
+"som er manuell.\n"
+"    – «%s»: Heilautomatisk installering. Harddisken blir heilt tømt, og alle "
+"gamle data går tapt.\n"
+"\n"
+"   Denne funksjonen er veldig nyttig når du skal installera Mandrakelinux på "
+"fleire like maskiner. Sjå avsnittet om autoinstallering på nettstaden vår "
+"for meir informasjon.\n"
+"\n"
+"– «%s»: Lagrar ei liste over pakkane brukt i denne installasjonen. Du kan "
+"bruka denne pakkelista når du installera på ei anna maskin ved å setja inn "
+"disketten, og starta installasjonen. Trykk «F1» når installasjonsprogrammet "
+"startar, og skriv inn «linux defcfg=\"floppy\"»."
 
-#: help.pm:418
+#: help.pm:409
 #, c-format
 msgid "Generate auto-install floppy"
 msgstr "Lag diskett for automatisk installering"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Replay"
 msgstr "Spel av"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Automated"
 msgstr "Automatisert"
 
-#: help.pm:418 install_steps_interactive.pm:1319
+#: help.pm:409 install_steps_interactive.pm:1366
 #, c-format
 msgid "Save packages selection"
 msgstr "Lagra pakkeval"
 
-#: help.pm:421
-#, c-format
+#: help.pm:412
+#, fuzzy, c-format
 msgid ""
-"Any partitions that have been newly defined must be formatted for use\n"
-"(formatting means creating a file system).\n"
-"\n"
-"At this time, you may wish to reformat some already existing partitions to\n"
-"erase any data they contain. If you wish to do that, please select those\n"
-"partitions as well.\n"
+"If you chose to reuse some legacy GNU/Linux partitions, you may wish to\n"
+"reformat some of them and erase any data they contain. To do so, please\n"
+"select those partitions as well.\n"
 "\n"
-"Please note that it is not necessary to reformat all pre-existing\n"
+"Please note that it's not necessary to reformat all pre-existing\n"
 "partitions. You must reformat the partitions containing the operating\n"
-"system (such as \"/\", \"/usr\" or \"/var\") but you do not have to\n"
-"reformat partitions containing data that you wish to keep (typically\n"
-"\"/home\").\n"
+"system (such as \"/\", \"/usr\" or \"/var\") but you don't have to reformat\n"
+"partitions containing data that you wish to keep (typically \"/home\").\n"
 "\n"
-"Please be careful when selecting partitions. After formatting, all data on\n"
-"the selected partitions will be deleted and you will not be able to recover\n"
-"it.\n"
+"Please be careful when selecting partitions. After the formatting is\n"
+"completed, all data on the selected partitions will be deleted and you\n"
+"won't be able to recover it.\n"
 "\n"
-"Click on \"%s\" when you are ready to format the partitions.\n"
+"Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
 "Mandrakelinux operating system installation.\n"
 "\n"
-"Click on \"%s\" if you wish to select partitions that will be checked for\n"
+"Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
 msgstr ""
+"Alle nye partisjonar må formaterast før du kan bruka dei. Å formatera\n"
+"vil seia å laga eit filsystem.\n"
+"\n"
+"Du kan òg velja å formatera gamle partisjonar for å sletta alle data på "
+"dei.\n"
+"\n"
+"Merk at det ikkje er nødvendig å formatera alle gamle partisjonar på nytt. "
+"Du må formatera partisjonane som inneheld operativsystemet (som «/», «/usr» "
+"og «/var»), men du treng ikkje formatera partisjonar med brukardata du "
+"ønskjer å behalda (som «/home»).\n"
+"\n"
+"Ver forsiktig når du vel partisjonar. Etter formatering blir alle data på "
+"partisjonane sletta, og du ikkje gjenoppretta dei seinare.\n"
+"\n"
+"Trykk «%s» når du er klar til å formatera partisjonane.\n"
+"\n"
+"Trykk «%s» om du vil velja ein annan partisjon for Mandrakelinux-systemet.\n"
+"\n"
+"Trykk «%s» om du ønskjer å velja partisjonar å gjennomsøkja etter fysiske "
+"feil."
 
-#: help.pm:444 help.pm:1005 install_steps_gtk.pm:433 interactive.pm:404
-#: interactive/newt.pm:307 printer/printerdrake.pm:3088
-#: standalone/drakTermServ:376 standalone/drakbackup:3880
-#: standalone/drakbackup:3919 standalone/drakbackup:4030
-#: standalone/drakbackup:4045 ugtk2.pm:508
+#: help.pm:431 install_steps_gtk.pm:402 interactive.pm:404
+#: interactive/newt.pm:316 printer/printerdrake.pm:3266
+#: standalone/drakTermServ:351 standalone/drakbackup:3901
+#: standalone/drakbackup:3940 standalone/drakbackup:4051
+#: standalone/drakbackup:4066 ugtk2.pm:513
 #, c-format
 msgid "Previous"
 msgstr "Førre"
 
-#: help.pm:447
-#, c-format
+#: help.pm:434
+#, fuzzy, c-format
 msgid ""
-"At the time you are installing Mandrakelinux, it is likely that some\n"
-"packages will have been updated since the initial release. Bugs may have\n"
-"been fixed, security issues resolved. To allow you to benefit from these\n"
-"updates, you are now able to download them from the Internet. Check \"%s\"\n"
-"if you have a working Internet connection, or \"%s\" if you prefer to\n"
-"install updated packages later.\n"
+"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"have been updated since the initial release. Bugs may have been fixed,\n"
+"security issues resolved. To allow you to benefit from these updates,\n"
+"you're now able to download them from the Internet. Check \"%s\" if you\n"
+"have a working Internet connection, or \"%s\" if you prefer to install\n"
+"updated packages later.\n"
 "\n"
-"Choosing \"%s\" will display a list of places from which updates can be\n"
-"retrieved. You should choose one near to you. A package-selection tree will\n"
-"appear: review the selection, and press \"%s\" to retrieve and install the\n"
-"selected package(s), or \"%s\" to abort."
+"Choosing \"%s\" will display a list of web locations from which updates can\n"
+"be retrieved. You should choose one near to you. A package-selection tree\n"
+"will appear: review the selection, and press \"%s\" to retrieve and install\n"
+"the selected package(s), or \"%s\" to abort."
 msgstr ""
 "Det har no truleg komme fleire oppdateringar til pakkane i\n"
 "Mandrakelinux sidan denne utgåva vart produsert. Det kan for\n"
@@ -4220,28 +4521,27 @@ msgstr ""
 "Vel pakkane du ønskjer å oppdatera, og trykk «%s» for lasta dei ned\n"
 "og installera dei, eller vel «%s» for å avbryta."
 
-#: help.pm:457 help.pm:602 install_steps_gtk.pm:432
-#: install_steps_interactive.pm:148 standalone/drakbackup:4077
+#: help.pm:444 help.pm:588 install_steps_gtk.pm:401
+#: install_steps_interactive.pm:158 standalone/drakbackup:4098
 #, c-format
 msgid "Install"
 msgstr "Installer"
 
-#: help.pm:460
-#, c-format
+#: help.pm:447
+#, fuzzy, c-format
 msgid ""
-"At this point, DrakX will allow you to choose the security level desired\n"
-"for the machine. As a rule of thumb, the security level should be set\n"
-"higher if the machine will contain crucial data, or if it will be a machine\n"
-"directly exposed to the Internet. The trade-off of a higher security level\n"
-"is generally obtained at the expense of ease of use.\n"
+"At this point, DrakX will allow you to choose the security level you desire\n"
+"for your machine. As a rule of thumb, the security level should be set\n"
+"higher if the machine is to contain crucial data, or if it's to be directly\n"
+"exposed to the Internet. The trade-off that a higher security level is\n"
+"generally obtained at the expense of ease of use.\n"
 "\n"
-"If you do not know what to choose, stay with the default option. You will\n"
-"be able to change that security level later with tool draksec from the\n"
-"Mandrake Control Center.\n"
+"If you don't know what to choose, keep the default option. You'll be able\n"
+"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"Control Center.\n"
 "\n"
-"The \"%s\" field can inform the system of the user on this computer who\n"
-"will be responsible for security. Security messages will be sent to that\n"
-"address."
+"Fill the \"%s\" field with the e-mail address of the person responsible for\n"
+"security. Security messages will be sent to that address."
 msgstr ""
 "Du kan no velja tryggleiksnivå for maskina. Vanlegvis bør du ha høgare\n"
 "tryggleiksnivå viss maskina inneheld svært viktige data, eller er direkte\n"
@@ -4254,12 +4554,12 @@ msgstr ""
 "I «%s»-feltet kan du velja kven som skal vera tryggleiksansvarleg for\n"
 "maskina. Han eller ho får då tilsendt alle tryggleiksmeldingar."
 
-#: help.pm:472
+#: help.pm:458
 #, c-format
 msgid "Security Administrator"
 msgstr "Tryggleiksansvarleg"
 
-#: help.pm:475
+#: help.pm:461
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
@@ -4333,18 +4633,83 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
+"No må du velja kva partisjonar du vil installera Mandrakelinux på. Om du "
+"allereie har ferdige partisjonar, frå tidlegare installasjonar av GNU/Linux "
+"eller av partisjoneringsverktøy, kan du bruka desse. Elles må du laga nye "
+"partisjonar.\n"
+"\n"
+"For å laga partisjonar, må du først velja ein harddisk. Du gjer dette ved å "
+"velja «hda» for første IDE-harddisk, «hdb» for andre, «sda» for første SCSI-"
+"harddisk, og så vidare.\n"
+"\n"
+"Du har desse vala ved partisjonering av harddisken du valte:\n"
+"\n"
+" – «%s»: Slettar alle partisjonar på harddisken.\n"
+"\n"
+" – «%s»: Lagar automatisk ext3- og vekslepartisjonar på den ledige "
+"harddiskplassen.\n"
+"\n"
+"«%s»: Gjev tilgang til fleire funksjonar:\n"
+"\n"
+" – «%s»: Lagrar partisjonstabellen på ein diskett. Dette er nyttig for "
+"eventuell seinare gjenoppretting. Du bør lagra partisjonstabellen.\n"
+"\n"
+" – «%s»: Lèt deg gjenoppretta ein tidlegare lagra partisjonstabell frå ein "
+"diskett.\n"
+"\n"
+" – «%s»: Om partisjonstabellen er øydelagt, kan du prøva å gjenoppretta han "
+"her. Ver forsiktig, og hugs at dette ikkje alltid vil verka.\n"
+"\n"
+" – «%s»: Avbryter alle endringar, og lastar inn den opphavlege "
+"partisjonstabellen.\n"
+"\n"
+" – «%s»: Viss du fjernar krysset her, må brukarane manuelt montera og "
+"avmontera flyttbare medium, som diskettar og CD-plater.\n"
+"\n"
+" – «%s»: Bruk dette valet om du vil bruka ein vegvisar til å partisjonera "
+"harddisken. Du bør velja dette om du ikkje har god kjennskap til "
+"harddiskpartisjonering.\n"
+"\n"
+" – «%s»: Bruk dette valet for å avbryta endringane.\n"
+"\n"
+" – «%s»: Fleire partisjonsval og meir informasjon om harddisken.\n"
+"\n"
+" – «%s»: Når du er ferdig å partisjonera harddisken, vil dette lagra "
+"endringane dine.\n"
+"\n"
+"Du kan fininnstilla partisjonsstorleiken ved å bruka piltastane på "
+"tastaturet.\n"
+"\n"
+"Merk: Du har tilgang til alle funksjonane frå tastaturet. Du kan flytta "
+"mellom partisjonar med «Tab», «Pil opp»- og «Pil ned»-tastane.\n"
+"\n"
+"Når ein partisjon er valt kan du bruka:\n"
+"\n"
+" – «Ctrl + C» for å laga ein ny partisjon (når ein tom partisjon er valt).\n"
+"\n"
+" – «Ctrl + D» for å sletta ein partisjon.\n"
+"\n"
+" – «Ctrl + M» for å definera monteringspunkt.\n"
+"\n"
+"Du kan lesa meir om forskjellige filsystem i kapittelet «ext2FS» i "
+"referansehandboka.\n"
+"\n"
+"Om du installerer på ei PPC-maskin, bør du laga ein liten HFS-"
+"oppstartslastarpartisjon på minst 1 MiB for yaboot. Vis du lagar partisjonen "
+"større, kanskje 50 MiB, kan du bruka han til å lagra ein ekstra kjerne, og "
+"eventuelt ramdisk-bilete for nødsituasjonar.r"
 
-#: help.pm:544
+#: help.pm:530
 #, c-format
 msgid "Removable media auto-mounting"
 msgstr "Automatisk montering av fjernbare medium"
 
-#: help.pm:544
+#: help.pm:530
 #, c-format
 msgid "Toggle between normal/expert mode"
 msgstr "Byt mellom normal- og ekspertmodus"
 
-#: help.pm:547
+#: help.pm:533
 #, c-format
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
@@ -4378,61 +4743,60 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 
-#: help.pm:578
-#, c-format
+#: help.pm:564
+#, fuzzy, c-format
 msgid ""
-"\"%s\": check the current country selection. If you are not in this\n"
-"country, click on the \"%s\" button and choose another one. If your country\n"
-"is not in the first list shown, click the \"%s\" button to get the complete\n"
-"country list."
+"\"%s\": check the current country selection. If you're not in this country,\n"
+"click on the \"%s\" button and choose another. If your country isn't in the\n"
+"list shown, click on the \"%s\" button to get the complete country list."
 msgstr ""
 "«%s»: Kontroller landsvalet. Trykk «%s» for velja eit anna land om\n"
 "du ikkje held til her. Du kan velja «%s» for å få ei fullstendig liste\n"
 "over land."
 
-#: help.pm:584
+#: help.pm:569
 #, c-format
 msgid ""
 "This step is activated only if an existing GNU/Linux partition has been\n"
 "found on your machine.\n"
 "\n"
-"DrakX now needs to know if you want to perform a new install or an upgrade\n"
-"of an existing Mandrakelinux system:\n"
+"DrakX now needs to know if you want to perform a new installation or an\n"
+"upgrade of an existing Mandrakelinux system:\n"
 "\n"
-" * \"%s\": For the most part, this completely wipes out the old system. If\n"
-"you wish to change how your hard drives are partitioned, or change the file\n"
-"system, you should use this option. However, depending on your partitioning\n"
-"scheme, you can prevent some of your existing data from being over-written.\n"
+" * \"%s\". For the most part, this completely wipes out the old system.\n"
+"However, depending on your partitioning scheme, you can prevent some of\n"
+"your existing data (notably \"home\" directories) from being over-written.\n"
+"If you wish to change how your hard drives are partitioned, or to change\n"
+"the file system, you should use this option.\n"
 "\n"
-" * \"%s\": this installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current\n"
-"partitioning scheme and user data is not altered. Most of other\n"
-"configuration steps remain available, similar to a standard installation.\n"
+" * \"%s\". This installation class allows you to update the packages\n"
+"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"scheme and user data won't be altered. Most of the other configuration\n"
+"steps remain available and are similar to a standard installation.\n"
 "\n"
 "Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
-"running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
+"running version \"8.1\" or later. Performing an upgrade on versions prior\n"
 "to Mandrakelinux version \"8.1\" is not recommended."
 msgstr ""
 
-#: help.pm:605
-#, c-format
+#: help.pm:591
+#, fuzzy, c-format
 msgid ""
-"Depending on the language you chose in section , DrakX will automatically\n"
-"select a particular type of keyboard configuration. Check that the\n"
-"selection suits you or choose another keyboard layout.\n"
+"Depending on the language you chose (), DrakX will automatically select a\n"
+"particular type of keyboard configuration. Check that the selection suits\n"
+"you or choose another keyboard layout.\n"
 "\n"
-"Also, you may not have a keyboard that corresponds exactly to your\n"
+"Also, you may not have a keyboard which corresponds exactly to your\n"
 "language: for example, if you are an English-speaking Swiss native, you may\n"
 "have a Swiss keyboard. Or if you speak English and are located in Quebec,\n"
 "you may find yourself in the same situation where your native language and\n"
-"country-set keyboard do not match. In either case, this installation step\n"
+"country-set keyboard don't match. In either case, this installation step\n"
 "will allow you to select an appropriate keyboard from a list.\n"
 "\n"
-"Click on the \"%s\" button to be presented with the complete list of\n"
-"supported keyboards.\n"
+"Click on the \"%s\" button to be shown a list of supported keyboards.\n"
 "\n"
 "If you choose a keyboard layout based on a non-Latin alphabet, the next\n"
-"dialog will allow you to choose the key binding that will switch the\n"
+"dialog will allow you to choose the key binding which will switch the\n"
 "keyboard between the Latin and non-Latin layouts."
 msgstr ""
 "DrakX vil automatisk velja eit passande tastaturoppsett avhengig av språket\n"
@@ -4452,25 +4816,27 @@ msgstr ""
 "og\n"
 "ikkje-latinsk oppsett."
 
-#: help.pm:624
+#: help.pm:609
 #, c-format
 msgid ""
-"Your choice of preferred language will affect the language of the\n"
-"documentation, the installer and the system in general. Select first the\n"
-"region you are located in, and then the language you speak.\n"
+"The first step is to choose your preferred language.\n"
+"\n"
+"Your choice of preferred language will affect the installer, the\n"
+"documentation, and the system in general. First select the region you're\n"
+"located in, then the language you speak.\n"
 "\n"
 "Clicking on the \"%s\" button will allow you to select other languages to\n"
 "be installed on your workstation, thereby installing the language-specific\n"
-"files for system documentation and applications. For example, if you will\n"
-"host users from Spain on your machine, select English as the default\n"
-"language in the tree view and \"%s\" in the Advanced section.\n"
+"files for system documentation and applications. For example, if Spanish\n"
+"users are to use your machine, select English as the default language in\n"
+"the tree view and \"%s\" in the Advanced section.\n"
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
-"cover all existing languages. Though full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux will be using it\n"
-"or not depending on the user choices:\n"
+"cover all existing languages. However full support for it in GNU/Linux is\n"
+"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"depend on the user's choices:\n"
 "\n"
-" * If you choose a languages with a strong legacy encoding (latin1\n"
+" * If you choose a language with a strong legacy encoding (latin1\n"
 "languages, Russian, Japanese, Chinese, Korean, Thai, Greek, Turkish, most\n"
 "iso-8859-2 languages), the legacy encoding will be used by default;\n"
 "\n"
@@ -4479,66 +4845,74 @@ msgid ""
 " * If two or more languages are required, and those languages are not using\n"
 "the same encoding, then unicode will be used for the whole system;\n"
 "\n"
-" * Finally, unicode can also be forced for the system at user request by\n"
-"selecting option \"%s\" independently of which language(s) have been\n"
-"chosen.\n"
+" * Finally, unicode can also be forced for use throughout the system at a\n"
+"user's request by selecting the \"%s\" option independently of which\n"
+"languages were been chosen.\n"
 "\n"
 "Note that you're not limited to choosing a single additional language. You\n"
-"may choose several ones, or even install them all by selecting the \"%s\"\n"
-"box. Selecting support for a language means translations, fonts, spell\n"
-"checkers, etc. for that language will also be installed.\n"
+"may choose several, or even install them all by selecting the \"%s\" box.\n"
+"Selecting support for a language means translations, fonts, spell checkers,\n"
+"etc. will also be installed for that language.\n"
 "\n"
-"To switch between the various languages installed on the system, you can\n"
-"launch the \"/usr/sbin/localedrake\" command as \"root\" to change the\n"
-"language used by the entire system. Running the command as a regular user\n"
-"will only change the language settings for that particular user."
+"To switch between the various languages installed on your system, you can\n"
+"launch the \"localedrake\" command as \"root\" to change the language used\n"
+"by the entire system. Running the command as a regular user will only\n"
+"change the language settings for that particular user."
 msgstr ""
 
-#: help.pm:660
+#: help.pm:647
 #, c-format
 msgid "Espanol"
 msgstr "Spansk"
 
-#: help.pm:663
+#: help.pm:650
 #, c-format
 msgid ""
 "Usually, DrakX has no problems detecting the number of buttons on your\n"
 "mouse. If it does, it assumes you have a two-button mouse and will\n"
 "configure it for third-button emulation. The third-button mouse button of a\n"
-"two-button mouse can be ``pressed'' by simultaneously clicking the left and\n"
+"two-button mouse can be obtained by simultaneously clicking the left and\n"
 "right mouse buttons. DrakX will automatically know whether your mouse uses\n"
 "a PS/2, serial or USB interface.\n"
 "\n"
-"In case you have a 3 buttons mouse without wheel, you can choose the mouse\n"
-"that says \"%s\". DrakX will then configure your mouse so that you can\n"
-"simulate the wheel with it: to do so, press the middle button and move your\n"
-"mouse up and down.\n"
+"If you have a 3-button mouse without a wheel, you can choose a \"%s\"\n"
+"mouse. DrakX will then configure your mouse so that you can simulate the\n"
+"wheel with it: to do so, press the middle button and move your mouse\n"
+"pointer up and down.\n"
 "\n"
 "If for some reason you wish to specify a different type of mouse, select it\n"
 "from the list provided.\n"
 "\n"
-"If you choose a mouse other than the default, a test screen will be\n"
+"You can select the \"%s\" entry to chose a ``generic'' mouse type which\n"
+"will work with nearly all mice.\n"
+"\n"
+"If you choose a mouse other than the default one, a test screen will be\n"
 "displayed. Use the buttons and wheel to verify that the settings are\n"
 "correct and that the mouse is working correctly. If the mouse is not\n"
-"working well, press the space bar or [Return] key to cancel the test and to\n"
-"go back to the list of choices.\n"
+"working well, press the space bar or [Return] key to cancel the test and\n"
+"you will be returned to the mouse list.\n"
 "\n"
-"Wheel mice are occasionally not detected automatically, so you will need to\n"
+"Occasionally wheel mice are not detected automatically, so you will need to\n"
 "select your mouse from a list. Be sure to select the one corresponding to\n"
 "the port that your mouse is attached to. After selecting a mouse and\n"
-"pressing the \"%s\" button, a mouse image is displayed on-screen. Scroll\n"
-"the mouse wheel to ensure that it is activated correctly. Once you see the\n"
-"on-screen scroll wheel moving as you scroll your mouse wheel, test the\n"
-"buttons and check that the mouse pointer moves on-screen as you move your\n"
-"mouse."
+"pressing the \"%s\" button, a mouse image will be displayed on-screen.\n"
+"Scroll the mouse wheel to ensure that it is activating correctly. As you\n"
+"scroll your mouse wheel, you will see the on-screen scroll wheel moving.\n"
+"Test the buttons and check that the mouse pointer moves on-screen as you\n"
+"move your mouse about."
 msgstr ""
 
-#: help.pm:691
+#: help.pm:681
 #, c-format
 msgid "with Wheel emulation"
 msgstr "med hjulemulering"
 
-#: help.pm:694
+#: help.pm:681
+#, c-format
+msgid "Universal | Any PS/2 & USB mice"
+msgstr "Universell (alle PS/2- og USB-mus)"
+
+#: help.pm:684
 #, c-format
 msgid ""
 "Please select the correct port. For example, the \"COM1\" port under\n"
@@ -4547,16 +4921,16 @@ msgstr ""
 "Vel porten som er brukt. For eksempel har porten som heiter\n"
 "«COM1» under Windows fått namnet «ttyS0» i GNU/Linux."
 
-#: help.pm:698
+#: help.pm:688
 #, c-format
 msgid ""
 "This is the most crucial decision point for the security of your GNU/Linux\n"
-"system: you have to enter the \"root\" password. \"Root\" is the system\n"
+"system: you must enter the \"root\" password. \"Root\" is the system\n"
 "administrator and is the only user authorized to make updates, add users,\n"
 "change the overall system configuration, and so on. In short, \"root\" can\n"
-"do everything! That is why you must choose a password that is difficult to\n"
-"guess - DrakX will tell you if the password you chose is too easy. As you\n"
-"can see, you are not forced to enter a password, but we strongly advise you\n"
+"do everything! That's why you must choose a password which is difficult to\n"
+"guess: DrakX will tell you if the password you chose is too simple. As you\n"
+"can see, you're not forced to enter a password, but we strongly advise\n"
 "against this. GNU/Linux is just as prone to operator error as any other\n"
 "operating system. Since \"root\" can overcome all limitations and\n"
 "unintentionally erase all data on partitions by carelessly accessing the\n"
@@ -4565,201 +4939,104 @@ msgid ""
 "\n"
 "The password should be a mixture of alphanumeric characters and at least 8\n"
 "characters long. Never write down the \"root\" password -- it makes it far\n"
-"too easy to compromise a system.\n"
+"too easy to compromise your system.\n"
 "\n"
-"One caveat -- do not make the password too long or complicated because you\n"
+"One caveat: don't make the password too long or too complicated because you\n"
 "must be able to remember it!\n"
 "\n"
-"The password will not be displayed on screen as you type it in. To reduce\n"
-"the chance of a blind typing error you will need to enter the password\n"
-"twice. If you do happen to make the same typing error twice, this\n"
-"``incorrect'' password will be the one you will have use the first time you\n"
-"connect.\n"
+"The password won't be displayed on screen as you type it. To reduce the\n"
+"chance of a blind typing error you'll need to enter the password twice. If\n"
+"you do happen to make the same typing error twice, you'll have to use this\n"
+"``incorrect'' password the first time you'll try to connect as \"root\".\n"
 "\n"
-"If you wish access to this computer to be controlled by an authentication\n"
-"server, click the \"%s\" button.\n"
+"If you want an authentication server to control access to your computer,\n"
+"click on the \"%s\" button.\n"
 "\n"
 "If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n"
-"services, select the appropriate one for \"%s\". If you do not know which\n"
+"services, select the appropriate one for \"%s\". If you don't know which\n"
 "one to use, you should ask your network administrator.\n"
 "\n"
-"If you happen to have problems with remembering passwords, if your computer\n"
-"will never be connected to the Internet and you absolutely trust everybody\n"
-"who uses your computer, you can choose to have \"%s\"."
+"If you happen to have problems with remembering passwords, or if your\n"
+"computer will never be connected to the Internet and you absolutely trust\n"
+"everybody who uses your computer, you can choose to have \"%s\"."
 msgstr ""
 
-#: help.pm:733
+#: help.pm:722
 #, c-format
 msgid "authentication"
 msgstr "autentisering"
 
 #. -PO: keep this short or else the buttons will not fit in the window
-#: help.pm:733 install_steps_interactive.pm:1146
+#: help.pm:722 install_steps_interactive.pm:1211
 #, c-format
 msgid "No password"
 msgstr "Ingen passord"
 
-#: help.pm:736
+#: help.pm:725
 #, c-format
 msgid ""
-"This dialog allows you to fine tune your bootloader:\n"
-"\n"
-" * \"%s\": there are three choices for your bootloader:\n"
-"\n"
-"    * \"%s\": if you prefer GRUB (text menu).\n"
-"\n"
-"    * \"%s\": if you prefer LILO with its text menu interface.\n"
-"\n"
-"    * \"%s\": if you prefer LILO with its graphical interface.\n"
-"\n"
-" * \"%s\": in most cases, you will not change the default (\"%s\"), but if\n"
-"you prefer, the bootloader can be installed on the second hard drive\n"
-"(\"%s\"), or even on a floppy disk (\"%s\");\n"
-"\n"
-" * \"%s\": after a boot or a reboot of the computer, this is the delay\n"
-"given to the user at the console to select a boot entry other than the\n"
-"default.\n"
-"\n"
-" * \"%s\": ACPI is a new standard (appeared during year 2002) for power\n"
-"management, notably for laptops. If you know your hardware supports it and\n"
-"you need it, check this box.\n"
-"\n"
-" * \"%s\": If you noticed hardware problems on your machine (IRQ conflicts,\n"
-"instabilities, machine freeze, ...) you should try disabling APIC by\n"
-"checking this box.\n"
-"\n"
-"!! Be aware that if you choose not to install a bootloader (by selecting\n"
-"\"%s\"), you must ensure that you have a way to boot your Mandrakelinux\n"
-"system! Be sure you know what you are doing before changing any of the\n"
-"options. !!\n"
-"\n"
-"Clicking the \"%s\" button in this dialog will offer advanced options which\n"
-"are normally reserved for the expert user."
-msgstr ""
-
-#: help.pm:768
-#, c-format
-msgid "GRUB"
-msgstr "GRUB"
-
-#: help.pm:768
-#, c-format
-msgid "/dev/hda"
-msgstr "/dev/hda"
-
-#: help.pm:768
-#, c-format
-msgid "/dev/hdb"
-msgstr "/dev/hdb"
-
-#: help.pm:768
-#, c-format
-msgid "/dev/fd0"
-msgstr "/dev/fd0"
-
-#: help.pm:768
-#, c-format
-msgid "Delay before booting the default image"
-msgstr "Ventetid før oppstart med standardbilete"
-
-#: help.pm:771
-#, c-format
-msgid ""
-"After you have configured the general bootloader parameters, the list of\n"
-"boot options that will be available at boot time will be displayed.\n"
-"\n"
-"If there are other operating systems installed on your machine they will\n"
-"automatically be added to the boot menu. You can fine-tune the existing\n"
-"options by clicking \"%s\" to create a new entry; selecting an entry and\n"
-"clicking \"%s\" or \"%s\" to modify or remove it. \"%s\" validates your\n"
-"changes.\n"
-"\n"
-"You may also not want to give access to these other operating systems to\n"
-"anyone who goes to the console and reboots the machine. You can delete the\n"
-"corresponding entries for the operating systems to remove them from the\n"
-"bootloader menu, but you will need a boot disk in order to boot those other\n"
-"operating systems!"
-msgstr ""
-
-#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#: standalone/drakbackup:1513 standalone/drakfont:589 standalone/drakfont:655
-#: standalone/drakups:280 standalone/drakups:329 standalone/drakups:349
-#: standalone/drakvpn:333 standalone/drakvpn:694
-#, c-format
-msgid "Add"
-msgstr "Legg til"
-
-#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#, c-format
-msgid "Modify"
-msgstr "Endra"
-
-#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#: standalone/drakups:282 standalone/drakups:331 standalone/drakups:351
-#: standalone/drakvpn:333 standalone/drakvpn:694
-#, c-format
-msgid "Remove"
-msgstr "Fjern"
-
-#: help.pm:787
-#, c-format
-msgid ""
-"LILO and GRUB are GNU/Linux bootloaders. Normally, this stage is totally\n"
-"automated. DrakX will analyze the disk boot sector and act according to\n"
-"what it finds there:\n"
+"A boot loader is a little program which is started by the computer at boot\n"
+"time. It's responsible for starting up the whole system. Normally, the boot\n"
+"loader installation is totally automated. DrakX will analyze the disk boot\n"
+"sector and act according to what it finds there:\n"
 "\n"
 " * if a Windows boot sector is found, it will replace it with a GRUB/LILO\n"
-"boot sector. This way you will be able to load either GNU/Linux or any\n"
-"other OS installed on your machine.\n"
+"boot sector. This way you'll be able to load either GNU/Linux or any other\n"
+"OS installed on your machine.\n"
 "\n"
-" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
-"one.\n"
+" * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If it cannot make a determination, DrakX will ask you where to place the\n"
-"bootloader. Generally, the \"%s\" is the safest place. Choosing \"%s\"\n"
-"won't install any bootloader. Use it only if you know what you are doing."
+"If DrakX can't determine where to place the boot sector, it'll ask you\n"
+"where it should place it. Generally, the \"%s\" is the safest place.\n"
+"Choosing \"%s\" won't install any boot loader. Use this option only if you\n"
+"know what you're doing."
 msgstr ""
 
-#: help.pm:803
+#: help.pm:742
 #, c-format
 msgid ""
-"Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrakelinux offers two. Each of the printing systems\n"
-"is best suited to particular types of configuration.\n"
+"Now, it's time to select a printing system for your computer. Other\n"
+"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
 "if you have a direct connection to your printer, you want to be able to\n"
-"panic out of printer jams, and you do not have networked printers. (\"%s\"\n"
+"panic out of printer jams, and you don't have networked printers. (\"%s\"\n"
 "will handle only very simple network cases and is somewhat slow when used\n"
-"with networks.) It's recommended that you use \"pdq\" if this is your first\n"
-"experience with GNU/Linux.\n"
-"\n"
-" * \"%s\" - `` Common Unix Printing System'', is an excellent choice for\n"
-"printing to your local printer or to one halfway around the planet. It is\n"
-"simple to configure and can act as a server or a client for the ancient\n"
-"\"lpd \" printing system, so it is compatible with older operating systems\n"
-"which may still need print services. While quite powerful, the basic setup\n"
-"is almost as easy as \"pdq\". If you need to emulate a \"lpd\" server, make\n"
-"sure you turn on the \"cups-lpd \" daemon. \"%s\" includes graphical\n"
-"front-ends for printing or choosing printer options and for managing the\n"
-"printer.\n"
+"within networks.) It's recommended that you use \"pdq\" if this is your\n"
+"first experience with GNU/Linux.\n"
+"\n"
+" * \"%s\" stands for `` Common Unix Printing System'' and is an excellent\n"
+"choice for printing to your local printer or to one halfway around the\n"
+"planet. It's simple to configure and can act as a server or a client for\n"
+"the ancient \"lpd\" printing system, so it's compatible with older\n"
+"operating systems which may still need print services. While quite\n"
+"powerful, the basic setup is almost as easy as \"pdq\". If you need to\n"
+"emulate a \"lpd\" server, make sure you turn on the \"cups-lpd\" daemon.\n"
+"\"%s\" includes graphical front-ends for printing or choosing printer\n"
+"options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you don't like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrake Control\n"
-"Center and clicking the expert button."
+"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"Control Center and clicking on the \"%s\" button."
 msgstr ""
 
-#: help.pm:826
+#: help.pm:765
 #, c-format
 msgid "pdq"
 msgstr "pdq"
 
-#: help.pm:826 printer/cups.pm:115 printer/data.pm:83
+#: help.pm:765 printer/cups.pm:115 printer/data.pm:104
 #, c-format
 msgid "CUPS"
 msgstr "CUPS"
 
-#: help.pm:829
+#: help.pm:765
+#, c-format
+msgid "Expert"
+msgstr "Ekspert"
+
+#: help.pm:768
 #, c-format
 msgid ""
 "DrakX will first detect any IDE devices present in your computer. It will\n"
@@ -4780,157 +5057,74 @@ msgid ""
 "configure the driver."
 msgstr ""
 
-#: help.pm:847
-#, c-format
-msgid ""
-"You can add additional entries in yaboot for other operating systems,\n"
-"alternate kernels, or for an emergency boot image.\n"
-"\n"
-"For other OSs, the entry consists only of a label and the \"root\"\n"
-"partition.\n"
-"\n"
-"For Linux, there are a few possible options:\n"
-"\n"
-" * Label: this is the name you will have to type at the yaboot prompt to\n"
-"select this boot option.\n"
-"\n"
-" * Image: this is the name of the kernel to boot. Typically, vmlinux or a\n"
-"variation of vmlinux with an extension.\n"
-"\n"
-" * Root: the \"root\" device or ``/'' for your Linux installation.\n"
-"\n"
-" * Append: on Apple hardware, the kernel append option is often used to\n"
-"assist in initializing video hardware, or to enable keyboard mouse button\n"
-"emulation for the missing 2nd and 3rd mouse buttons on a stock Apple mouse.\n"
-"The following are some examples:\n"
-"\n"
-"   \t      video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
-"hda=autotune\n"
-"\n"
-"   \t      video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
-"\n"
-" * Initrd: this option can be used either to load initial modules before\n"
-"the boot device is available, or to load a ramdisk image for an emergency\n"
-"boot situation.\n"
-"\n"
-" * Initrd-size: the default ramdisk size is generally 4096 Kbytes. If you\n"
-"need to allocate a large ramdisk, this option can be used to specify a\n"
-"ramdisk larger than the default.\n"
-"\n"
-" * Read-write: normally the \"root\" partition is initially mounted as\n"
-"read-only, to allow a file system check before the system becomes ``live''.\n"
-"You can override the default with this option.\n"
-"\n"
-" * NoVideo: should the Apple video hardware prove to be exceptionally\n"
-"problematic, you can select this option to boot in ``novideo'' mode, with\n"
-"native frame buffer support.\n"
-"\n"
-" * Default: selects this entry as being the default Linux selection,\n"
-"selectable by pressing ENTER at the yaboot prompt. This entry will also be\n"
-"highlighted with a ``*'' if you press [Tab] to see the boot selections."
-msgstr ""
-
-#: help.pm:894
-#, c-format
-msgid ""
-"Yaboot is a bootloader for NewWorld Macintosh hardware and can be used to\n"
-"boot GNU/Linux, MacOS or MacOSX. Normally, MacOS and MacOSX are correctly\n"
-"detected and installed in the bootloader menu. If this is not the case, you\n"
-"can add an entry by hand in this screen. Take care to choose the correct\n"
-"parameters.\n"
-"\n"
-"Yaboot's main options are:\n"
-"\n"
-" * Init Message: a simple text message displayed before the boot prompt.\n"
-"\n"
-" * Boot Device: indicates where you want to place the information required\n"
-"to boot to GNU/Linux. Generally, you set up a bootstrap partition earlier\n"
-"to hold this information.\n"
-"\n"
-" * Open Firmware Delay: unlike LILO, there are two delays available with\n"
-"yaboot. The first delay is measured in seconds and at this point, you can\n"
-"choose between CD, OF boot, MacOS or Linux;\n"
-"\n"
-" * Kernel Boot Timeout: this timeout is similar to the LILO boot delay.\n"
-"After selecting Linux, you will have this delay in 0.1 second increments\n"
-"before your default kernel description is selected;\n"
-"\n"
-" * Enable CD Boot?: checking this option allows you to choose ``C'' for CD\n"
-"at the first boot prompt.\n"
-"\n"
-" * Enable OF Boot?: checking this option allows you to choose ``N'' for\n"
-"Open Firmware at the first boot prompt.\n"
-"\n"
-" * Default OS: you can select which OS will boot by default when the Open\n"
-"Firmware Delay expires."
-msgstr ""
-
-#: help.pm:926
+#: help.pm:786
 #, c-format
 msgid ""
-"\"%s\": if a sound card is detected on your system, it is displayed here.\n"
-"If you notice the sound card displayed is not the one that is actually\n"
-"present on your system, you can click on the button and choose another\n"
-"driver."
+"\"%s\": if a sound card is detected on your system, it'll be displayed\n"
+"here. If you notice the sound card isn't the one actually present on your\n"
+"system, you can click on the button and choose a different driver."
 msgstr ""
 "«%s»: Eventuelle lydkort funne blir vist her. Viss lydkortet vist her ikkje "
 "er\n"
 "installert i maskina di, kan du trykkja knappen og velja ein annan drivar."
 
-#: help.pm:929 help.pm:991 install_steps_interactive.pm:954
-#: install_steps_interactive.pm:971
+#: help.pm:788 help.pm:855 install_steps_interactive.pm:1019
+#: install_steps_interactive.pm:1036
 #, c-format
 msgid "Sound card"
 msgstr "Lydkort"
 
-#: help.pm:932
+#: help.pm:791
 #, c-format
 msgid ""
-"As a review, DrakX will present a summary of information it has about your\n"
-"system. Depending on your installed hardware, you may have some or all of\n"
-"the following entries. Each entry is made up of the configuration item to\n"
-"be configured, followed by a quick summary of the current configuration.\n"
-"Click on the corresponding \"%s\" button to change that.\n"
+"As a review, DrakX will present a summary of information it has gathered\n"
+"about your system. Depending on the hardware installed on your machine, you\n"
+"may have some or all of the following entries. Each entry is made up of the\n"
+"hardware item to be configured, followed by a quick summary of the current\n"
+"configuration. Click on the corresponding \"%s\" button to make the change.\n"
 "\n"
 " * \"%s\": check the current keyboard map configuration and change it if\n"
 "necessary.\n"
 "\n"
-" * \"%s\": check the current country selection. If you are not in this\n"
-"country, click on the \"%s\" button and choose another one. If your country\n"
-"is not in the first list shown, click the \"%s\" button to get the complete\n"
+" * \"%s\": check the current country selection. If you're not in this\n"
+"country, click on the \"%s\" button and choose another. If your country\n"
+"isn't in the list shown, click on the \"%s\" button to get the complete\n"
 "country list.\n"
 "\n"
-" * \"%s\": By default, DrakX deduces your time zone based on the country\n"
+" * \"%s\": by default, DrakX deduces your time zone based on the country\n"
 "you have chosen. You can click on the \"%s\" button here if this is not\n"
 "correct.\n"
 "\n"
-" * \"%s\": check the current mouse configuration and click on the button to\n"
-"change it if necessary.\n"
+" * \"%s\": verify the current mouse configuration and click on the button\n"
+"to change it if necessary.\n"
 "\n"
 " * \"%s\": clicking on the \"%s\" button will open the printer\n"
 "configuration wizard. Consult the corresponding chapter of the ``Starter\n"
-"Guide'' for more information on how to setup a new printer. The interface\n"
-"presented there is similar to the one used during installation.\n"
+"Guide'' for more information on how to set up a new printer. The interface\n"
+"presented in our manual is similar to the one used during installation.\n"
+"\n"
+" * \"%s\": if a sound card is detected on your system, it'll be displayed\n"
+"here. If you notice the sound card isn't the one actually present on your\n"
+"system, you can click on the button and choose a different driver.\n"
 "\n"
-" * \"%s\": if a sound card is detected on your system, it is displayed\n"
-"here. If you notice the sound card displayed is not the one that is\n"
-"actually present on your system, you can click on the button and choose\n"
-"another driver.\n"
+" * \"%s\": if you have a TV card, this is where information about its\n"
+"configuration will be displayed. If you have a TV card and it isn't\n"
+"detected, click on \"%s\" to try to configure it manually.\n"
+"\n"
+" * \"%s\": you can click on \"%s\" to change the parameters associated with\n"
+"the card if you feel the configuration is wrong.\n"
 "\n"
 " * \"%s\": by default, DrakX configures your graphical interface in\n"
-"\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on\n"
+"\"800x600\" or \"1024x768\" resolution. If that doesn't suit you, click on\n"
 "\"%s\" to reconfigure your graphical interface.\n"
 "\n"
-" * \"%s\": if a TV card is detected on your system, it is displayed here.\n"
-"If you have a TV card and it is not detected, click on \"%s\" to try to\n"
-"configure it manually.\n"
-"\n"
-" * \"%s\": if an ISDN card is detected on your system, it will be displayed\n"
-"here. You can click on \"%s\" to change the parameters associated with the\n"
-"card.\n"
+" * \"%s\": if you wish to configure your Internet or local network access,\n"
+"you can do so now. Refer to the printed documentation or use the\n"
+"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"from full in-line help.\n"
 "\n"
-" * \"%s\": If you wish to configure your Internet or local network access\n"
-"now.\n"
+" * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
+"you're installing on is to be located behind a proxy server.\n"
 "\n"
 " * \"%s\": this entry allows you to redefine the security level as set in a\n"
 "previous step ().\n"
@@ -4940,66 +5134,67 @@ msgid ""
 "the corresponding section of the ``Starter Guide'' for details about\n"
 "firewall settings.\n"
 "\n"
-" * \"%s\": if you wish to change your bootloader configuration, click that\n"
-"button. This should be reserved to advanced users.\n"
+" * \"%s\": if you wish to change your bootloader configuration, click this\n"
+"button. This should be reserved to advanced users. Refer to the printed\n"
+"documentation or the in-line help about bootloader configuration in the\n"
+"Mandrakelinux Control Center.\n"
 "\n"
-" * \"%s\": here you'll be able to fine control which services will be run\n"
+" * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
 "idea to review this setup."
 msgstr ""
 
-#: help.pm:991 install_steps_interactive.pm:110
-#: install_steps_interactive.pm:887 standalone/keyboarddrake:23
-#, c-format
-msgid "Keyboard"
-msgstr "Tastatur"
-
-#: help.pm:991 install_steps_interactive.pm:913 standalone/drakclock:75
+#: help.pm:855 install_steps_interactive.pm:978 standalone/drakclock:101
 #, c-format
 msgid "Timezone"
 msgstr "Tidssone"
 
-#: help.pm:991
-#, c-format
-msgid "Graphical Interface"
-msgstr "Grafisk grensesnitt"
-
-#: help.pm:991 install_steps_interactive.pm:987
+#: help.pm:855 install_steps_interactive.pm:1052
 #, c-format
 msgid "TV card"
 msgstr "Fjernsynskort"
 
-#: help.pm:991
+#: help.pm:855
 #, c-format
 msgid "ISDN card"
 msgstr "ISDN-kort"
 
-#: help.pm:991 install_steps_interactive.pm:1005 standalone/drakbackup:2010
+#: help.pm:855
+#, c-format
+msgid "Graphical Interface"
+msgstr "Grafisk grensesnitt"
+
+#: help.pm:855 install_steps_interactive.pm:1070 standalone/drakbackup:2030
 #, c-format
 msgid "Network"
 msgstr "Nettverk"
 
-#: help.pm:991 install_steps_interactive.pm:1031
+#: help.pm:855 install_steps_interactive.pm:1085
+#, c-format
+msgid "Proxies"
+msgstr "Mellomtenarar"
+
+#: help.pm:855 install_steps_interactive.pm:1096
 #, c-format
 msgid "Security Level"
 msgstr "Tryggleiksnivå"
 
-#: help.pm:991 install_steps_interactive.pm:1045
+#: help.pm:855 install_steps_interactive.pm:1110
 #, c-format
 msgid "Firewall"
 msgstr "Brannmur"
 
-#: help.pm:991 install_steps_interactive.pm:1059
+#: help.pm:855 install_steps_interactive.pm:1124
 #, c-format
 msgid "Bootloader"
 msgstr "Oppstartslastar"
 
-#: help.pm:991 install_steps_interactive.pm:1069 services.pm:195
+#: help.pm:855 install_steps_interactive.pm:1137 services.pm:195
 #, c-format
 msgid "Services"
 msgstr "Tenester"
 
-#: help.pm:994
+#: help.pm:858
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
@@ -5009,7 +5204,7 @@ msgstr ""
 "Vel harddisken du ønskjer å sletta for å installera den nye Mandrakelinux-\n"
 "partisjonen. Alle data på denne stasjonen vil då gå tapt for all framtid."
 
-#: help.pm:999
+#: help.pm:863
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
@@ -5029,7 +5224,17 @@ msgstr ""
 "Trykk «%s» for å avbryta operasjonen utan å tapa data eller partisjonar\n"
 "på harddisken."
 
-#: install2.pm:119
+#: help.pm:869
+#, c-format
+msgid "Next ->"
+msgstr "Neste ->"
+
+#: help.pm:869
+#, c-format
+msgid "<- Previous"
+msgstr "<- Førre"
+
+#: install2.pm:117
 #, c-format
 msgid ""
 "Can't access kernel modules corresponding to your kernel (file %s is "
@@ -5041,12 +5246,82 @@ msgstr ""
 "versjon enn installasjonsmediet. Du bør då laga ein ny, oppdatert "
 "oppstartsdiskett."
 
-#: install2.pm:169
+#: install2.pm:167
 #, c-format
 msgid "You must also format %s"
 msgstr "Du må òg formatera «%s»"
 
-#: install_any.pm:402
+#: install_any.pm:390
+#, c-format
+msgid ""
+"The following installation media have been found.\n"
+"If you want to skip some of them, you can unselect them now."
+msgstr ""
+
+#: install_any.pm:411
+#, c-format
+msgid "Do you have further supplementary media?"
+msgstr "Har du fleire medium?"
+
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_any.pm:414
+#, c-format
+msgid ""
+"The following media have been found and will be used during install: %s.\n"
+"\n"
+"\n"
+"Do you have a supplementary installation media to configure?"
+msgstr ""
+"Fann følgjande medium som vert brukt til installering: %s.\n"
+"\n"
+"\n"
+"Har du fleire installasjonsmedium å setja opp?"
+
+#: install_any.pm:420 printer/printerdrake.pm:2652
+#: printer/printerdrake.pm:2659 standalone/scannerdrake:176
+#: standalone/scannerdrake:184 standalone/scannerdrake:235
+#: standalone/scannerdrake:242
+#, c-format
+msgid "CD-ROM"
+msgstr "CD-ROM"
+
+#: install_any.pm:420
+#, c-format
+msgid "Network (http)"
+msgstr "Nettverk (HTTP)"
+
+#: install_any.pm:420
+#, c-format
+msgid "Network (ftp)"
+msgstr "Nettverk (FTP)"
+
+#: install_any.pm:464 standalone/drakbackup:112
+#, c-format
+msgid "No device found"
+msgstr "Fann ingen einingar"
+
+#: install_any.pm:468
+#, c-format
+msgid "Insert the CD"
+msgstr "Sett inn CD-en"
+
+#: install_any.pm:492
+#, c-format
+msgid "Insert the CD 1 again"
+msgstr "Sett inn CD 1 igjen"
+
+#: install_any.pm:502 install_any.pm:506
+#, c-format
+msgid "URL of the mirror?"
+msgstr "Adresse til spegelen?"
+
+#: install_any.pm:532
+#, c-format
+msgid "Can't find hdlist file on this mirror"
+msgstr "Finn ikkje «hdlist»-fila på denne spegelen"
+
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_any.pm:713
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -5071,7 +5346,8 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil installera tenarane?\n"
 
-#: install_any.pm:423
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_any.pm:736
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -5084,17 +5360,17 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil fjerna pakkane?\n"
 
-#: install_any.pm:818
+#: install_any.pm:1116
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Set inn ein diskett med FAT-filsystemet i stasjon «%s»"
 
-#: install_any.pm:822
+#: install_any.pm:1120
 #, c-format
 msgid "This floppy is not FAT formatted"
 msgstr "Disketten er ikkje formatert med FAT-filsystemet"
 
-#: install_any.pm:834
+#: install_any.pm:1132
 #, c-format
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
@@ -5103,12 +5379,17 @@ msgstr ""
 "Start installasjonen med «linux defcfg=floppy» om du ønskjer å bruka dette "
 "lagra pakkevalet."
 
-#: install_any.pm:862 partition_table.pm:848
+#: install_any.pm:1160 partition_table.pm:595
 #, c-format
 msgid "Error reading file %s"
 msgstr "Klarte ikkje lesa fila «%s»"
 
-#: install_any.pm:987
+#: install_any.pm:1361
+#, fuzzy, c-format
+msgid "%s (was %s)"
+msgstr "%s på %s"
+
+#: install_any.pm:1396
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
@@ -5117,12 +5398,12 @@ msgstr ""
 "Det oppstod ein feil: Fann ingen gyldige einingar for nytt filsystem. "
 "Kontroller maskinvaren."
 
-#: install_gtk.pm:161
+#: install_gtk.pm:160
 #, c-format
 msgid "System installation"
 msgstr "Systeminstallering"
 
-#: install_gtk.pm:164
+#: install_gtk.pm:163
 #, c-format
 msgid "System configuration"
 msgstr "Systemoppsett"
@@ -5158,7 +5439,7 @@ msgstr ""
 "\n"
 "Vil du likevel halda fram?"
 
-#: install_interactive.pm:70 install_steps.pm:207
+#: install_interactive.pm:70 install_steps.pm:211
 #, c-format
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Du må ha ein FAT-partisjon montert i «/boot/efi»"
@@ -5219,7 +5500,7 @@ msgstr "Kva partisjon vil du endra storleik på?"
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
-"the following error occured: %s"
+"the following error occurred: %s"
 msgstr ""
 "Klarte ikkje endra storleik på partisjonen:\n"
 "%s"
@@ -5239,7 +5520,8 @@ msgstr ""
 "Windows-partisjonen for fragmentert. Start maskina på nytt under Windows, og "
 "køyr defragmenteringsverktøyet. Prøv så å installera Mandrakelinux på nytt."
 
-#: install_interactive.pm:164
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_interactive.pm:166
 #, c-format
 msgid ""
 "WARNING!\n"
@@ -5264,54 +5546,54 @@ msgstr ""
 "\n"
 "Trykk «OK» når du er klar."
 
-#: install_interactive.pm:176
+#: install_interactive.pm:178
 #, c-format
 msgid "Which size do you want to keep for Windows on"
 msgstr "Kva storleik vil du behalda for Windows på"
 
-#: install_interactive.pm:177
+#: install_interactive.pm:179
 #, c-format
 msgid "partition %s"
 msgstr "partisjon %s"
 
-#: install_interactive.pm:186
+#: install_interactive.pm:188
 #, c-format
 msgid "Resizing Windows partition"
 msgstr "Endrar storleik på Windows-partisjon"
 
-#: install_interactive.pm:191
+#: install_interactive.pm:193
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "Klarte ikkje krympa/auka FAT: %s"
 
-#: install_interactive.pm:206
+#: install_interactive.pm:208
 #, c-format
 msgid "There is no FAT partition to resize (or not enough space left)"
 msgstr ""
 "Finn ingen FAT-partisjon å endra storleik på (eller det er ikkje nok ledig "
 "plass)."
 
-#: install_interactive.pm:211
+#: install_interactive.pm:213
 #, c-format
 msgid "Remove Windows(TM)"
 msgstr "Fjern Windows™"
 
-#: install_interactive.pm:213
+#: install_interactive.pm:215
 #, c-format
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr "Du har meir enn éin harddisk. Kven av dei vil du installera Linux på?"
 
-#: install_interactive.pm:217
+#: install_interactive.pm:219
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr "Alle eksisterande partisjonar og data går tapt på stasjon «%s»."
 
-#: install_interactive.pm:230
+#: install_interactive.pm:232
 #, c-format
 msgid "Use fdisk"
 msgstr "Bruk fdisk"
 
-#: install_interactive.pm:233
+#: install_interactive.pm:235
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -5320,32 +5602,33 @@ msgstr ""
 "Du kan no partisjonera «%s».\n"
 "Hugs å lagra med «w» når du er ferdig."
 
-#: install_interactive.pm:269
+#: install_interactive.pm:271
 #, c-format
 msgid "I can't find any room for installing"
 msgstr "Ikkje nok plass for installering"
 
-#: install_interactive.pm:273
+#: install_interactive.pm:275
 #, c-format
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "Partisjonsvegvisaren fann følgjande løysingar:"
 
-#: install_interactive.pm:279
+#: install_interactive.pm:281
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Feil ved partisjonering: %s"
 
-#: install_interactive.pm:286
+#: install_interactive.pm:288
 #, c-format
 msgid "Bringing up the network"
 msgstr "Koplar til nettverket"
 
-#: install_interactive.pm:291
+#: install_interactive.pm:293
 #, c-format
 msgid "Bringing down the network"
 msgstr "Koplar frå nettverket"
 
-#: install_messages.pm:9
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_messages.pm:10
 #, c-format
 msgid ""
 "Introduction\n"
@@ -5363,7 +5646,7 @@ msgid ""
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"MandrakeSoft S.A. which applies to the Software Products.\n"
+"Mandrakesoft S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5385,7 +5668,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"MandrakeSoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5393,14 +5676,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if MandrakeSoft S.A. has been advised of the possibility or "
-"occurence of such \n"
+"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, MandrakeSoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5430,10 +5713,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to MandrakeSoft.\n"
-"The programs developed by MandrakeSoft S.A. are governed by the GPL License. "
+"to Mandrakesoft.\n"
+"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by MandrakeSoft S.A. is governed by a specific license. Please refer to the "
+"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5444,11 +5727,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"MandrakeSoft S.A. reserves its rights to modify or adapt the Software "
+"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
 "Products, as a whole or in \n"
 "parts, by all means and for all purposes.\n"
 "\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "
-"MandrakeSoft S.A.  \n"
+"Mandrakesoft S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5464,10 +5747,10 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact MandrakeSoft S.A.  \n"
+"For any question on this document, please contact Mandrakesoft S.A.  \n"
 msgstr ""
 
-#: install_messages.pm:89
+#: install_messages.pm:90
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -5486,7 +5769,8 @@ msgstr ""
 "sikker på om ein patent gjeld deg, bør du sjekka dei lokale lovene der du "
 "bur."
 
-#: install_messages.pm:96
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_messages.pm:98
 #, c-format
 msgid ""
 "\n"
@@ -5519,7 +5803,7 @@ msgid ""
 "copyright laws applicable to software programs.\n"
 msgstr ""
 
-#: install_messages.pm:128
+#: install_messages.pm:131
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
@@ -5551,30 +5835,31 @@ msgstr ""
 "Meir informasjon om korleis du set opp systemet ditt finn du\n"
 "i den offisielle Mandrakelinux-bruksrettleiinga."
 
-#: install_messages.pm:141
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_messages.pm:144
 #, c-format
-msgid "http://www.mandrakelinux.com/en/100errata.php3"
-msgstr "http://www.mandrakelinux.com/en/100errata.php3"
+msgid "http://www.mandrakelinux.com/en/101errata.php3"
+msgstr "http://www.mandrakelinux.com/en/101errata.php3"
 
-#: install_steps.pm:242
+#: install_steps.pm:246
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "Kopier monteringspunktet «%s»"
 
-#: install_steps.pm:407
+#: install_steps.pm:477
 #, c-format
 msgid ""
 "Some important packages didn't get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
-"Check the cdrom on an installed computer using \"rpm -qpl Mandrake/RPMS/*.rpm"
+"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm"
 "\"\n"
 msgstr ""
 "Nokre viktige pakkar vart ikkje installerte skikkeleg.\n"
 "Enten er det CD-ROM-stasjonen eller CD-plata di som øydelagd.\n"
-"Kontroller CD-plata på ei anna maskin med kommandoen: rpm -qpl Mandrake/RPMS/"
-"*.rpm\n"
+"Kontroller CD-plata på ei anna maskin med kommandoen: rpm -qpl media/main/*."
+"rpm\n"
 
-#: install_steps.pm:533
+#: install_steps.pm:603
 #, c-format
 msgid "No floppy drive available"
 msgstr "Det finst ingen diskettstasjon"
@@ -5584,7 +5869,7 @@ msgstr "Det finst ingen diskettstasjon"
 msgid "Entering step `%s'\n"
 msgstr "Køyrer steg «%s»\n"
 
-#: install_steps_gtk.pm:178
+#: install_steps_gtk.pm:184
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
@@ -5597,67 +5882,67 @@ msgstr ""
 "Du kan då installera i tekstmodus i staden for. Trykk «F1» ved oppstart av\n"
 "CD-plata, og skriv «text» om du ønskjer dette."
 
-#: install_steps_gtk.pm:232 install_steps_interactive.pm:580
+#: install_steps_gtk.pm:235 install_steps_interactive.pm:628
 #, c-format
 msgid "Package Group Selection"
 msgstr "Pakkegruppeval"
 
-#: install_steps_gtk.pm:294 install_steps_interactive.pm:519
+#: install_steps_gtk.pm:264 install_steps_interactive.pm:567
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Totalstorleik: %d / %d MiB"
 
-#: install_steps_gtk.pm:340
+#: install_steps_gtk.pm:309
 #, c-format
 msgid "Bad package"
 msgstr "Ugyldig pakke"
 
-#: install_steps_gtk.pm:342
+#: install_steps_gtk.pm:311
 #, c-format
 msgid "Version: "
 msgstr "Versjon: "
 
-#: install_steps_gtk.pm:343
+#: install_steps_gtk.pm:312
 #, c-format
 msgid "Size: "
 msgstr "Storleik: "
 
-#: install_steps_gtk.pm:343
+#: install_steps_gtk.pm:312
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KiB\n"
 
-#: install_steps_gtk.pm:344
+#: install_steps_gtk.pm:313
 #, c-format
 msgid "Importance: "
 msgstr "Prioritet: "
 
-#: install_steps_gtk.pm:377
+#: install_steps_gtk.pm:346
 #, c-format
 msgid "You can't select/unselect this package"
 msgstr "Du kan ikkje velja eller fjerna denne pakken"
 
-#: install_steps_gtk.pm:381
+#: install_steps_gtk.pm:350
 #, c-format
 msgid "due to missing %s"
 msgstr "på grunn av manglande «%s»"
 
-#: install_steps_gtk.pm:382
+#: install_steps_gtk.pm:351
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "då «%s» ikkje er tilfredsstilt"
 
-#: install_steps_gtk.pm:383
+#: install_steps_gtk.pm:352
 #, c-format
 msgid "trying to promote %s"
 msgstr "Prøver å prioritera «%s»"
 
-#: install_steps_gtk.pm:384
+#: install_steps_gtk.pm:353
 #, c-format
 msgid "in order to keep %s"
 msgstr "for å kunna behalda «%s»"
 
-#: install_steps_gtk.pm:389
+#: install_steps_gtk.pm:358
 #, c-format
 msgid ""
 "You can't select this package as there is not enough space left to install it"
@@ -5665,27 +5950,27 @@ msgstr ""
 "Du kan ikkje velja denne pakken, då det ikkje er nok ledig plass til å "
 "installera han."
 
-#: install_steps_gtk.pm:392
+#: install_steps_gtk.pm:361
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Desse pakkane blir installerte"
 
-#: install_steps_gtk.pm:393
+#: install_steps_gtk.pm:362
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Desse pakkane blir fjerna"
 
-#: install_steps_gtk.pm:417
+#: install_steps_gtk.pm:386
 #, c-format
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Dette er ein obligatorisk pakke. Du kan ikkje velja han vekk."
 
-#: install_steps_gtk.pm:419
+#: install_steps_gtk.pm:388
 #, c-format
 msgid "You can't unselect this package. It is already installed"
 msgstr "Du kan ikkje velja vekk denne pakken, då han allereie er installert."
 
-#: install_steps_gtk.pm:422
+#: install_steps_gtk.pm:391
 #, c-format
 msgid ""
 "This package must be upgraded.\n"
@@ -5694,215 +5979,223 @@ msgstr ""
 "Pakken må oppgraderast?\n"
 "Er du sikker på at du vil velja han vekk?"
 
-#: install_steps_gtk.pm:425
+#: install_steps_gtk.pm:394
 #, c-format
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "Kan ikkje velja vekk pakken. Han må oppgraderast."
 
-#: install_steps_gtk.pm:430
+#: install_steps_gtk.pm:399
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Vis automatiske valde pakkar"
 
-#: install_steps_gtk.pm:435
+#: install_steps_gtk.pm:404
 #, c-format
 msgid "Load/Save on floppy"
 msgstr "Opna/lagra på diskett"
 
-#: install_steps_gtk.pm:436
+#: install_steps_gtk.pm:405
 #, c-format
 msgid "Updating package selection"
 msgstr "Oppdaterer pakkeval"
 
-#: install_steps_gtk.pm:441
+#: install_steps_gtk.pm:410
 #, c-format
 msgid "Minimal install"
 msgstr "Minimal installering"
 
-#: install_steps_gtk.pm:455 install_steps_interactive.pm:427
+#: install_steps_gtk.pm:424 install_steps_interactive.pm:481
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Vel pakkane du ønskjer å installera"
 
-#: install_steps_gtk.pm:471 install_steps_interactive.pm:666
+#: install_steps_gtk.pm:440 install_steps_interactive.pm:720
 #, c-format
 msgid "Installing"
 msgstr "Installerer"
 
-#: install_steps_gtk.pm:477
-#, c-format
-msgid "No details"
-msgstr "Skjul detaljar"
-
-#: install_steps_gtk.pm:478
+#: install_steps_gtk.pm:447
 #, c-format
 msgid "Estimating"
 msgstr "Estimerer"
 
-#: install_steps_gtk.pm:484
+#: install_steps_gtk.pm:453
 #, c-format
 msgid "Time remaining "
 msgstr "Tid igjen"
 
-#: install_steps_gtk.pm:496
+#: install_steps_gtk.pm:464
 #, c-format
 msgid "Please wait, preparing installation..."
 msgstr "Vent litt – førebur installering ..."
 
-#: install_steps_gtk.pm:557
+#: install_steps_gtk.pm:474
+#, c-format
+msgid "No details"
+msgstr "Skjul detaljar"
+
+#: install_steps_gtk.pm:527
 #, c-format
 msgid "%d packages"
 msgstr "%d pakkar"
 
-#: install_steps_gtk.pm:562
+#: install_steps_gtk.pm:532
 #, c-format
 msgid "Installing package %s"
 msgstr "Installerer pakken «%s»"
 
-#: install_steps_gtk.pm:598 install_steps_interactive.pm:88
-#: install_steps_interactive.pm:690
+#: install_steps_gtk.pm:567 install_steps_interactive.pm:94
+#: install_steps_interactive.pm:745
 #, c-format
 msgid "Refuse"
 msgstr "Ikkje godta"
 
-#: install_steps_gtk.pm:599 install_steps_interactive.pm:691
+#: install_steps_gtk.pm:571 install_steps_interactive.pm:749
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
-"\n"
 "Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
 "done.\n"
 "If you don't have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
+"Byt CD-ROM\n"
+"\n"
+"Set inn plata merkt «%s» og trykk «OK». Trykk eventuelt «Avbryt» om du ikkje "
+"har denne plata."
 
-#: install_steps_gtk.pm:614 install_steps_interactive.pm:703
+#: install_steps_gtk.pm:586 install_steps_interactive.pm:760
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Feil ved ordning av pakkar:"
 
-#: install_steps_gtk.pm:614 install_steps_gtk.pm:618
-#: install_steps_interactive.pm:703 install_steps_interactive.pm:707
+#: install_steps_gtk.pm:586 install_steps_gtk.pm:590
+#: install_steps_interactive.pm:760 install_steps_interactive.pm:764
 #, c-format
 msgid "Go on anyway?"
 msgstr "Vil du likevel helda fram?"
 
-#: install_steps_gtk.pm:618 install_steps_interactive.pm:707
+#: install_steps_gtk.pm:590 install_steps_interactive.pm:764
 #, c-format
 msgid "There was an error installing packages:"
 msgstr "Feil ved installering av pakkar:"
 
-#: install_steps_gtk.pm:658 install_steps_interactive.pm:869
-#: install_steps_interactive.pm:1021
+#: install_steps_gtk.pm:632 install_steps_interactive.pm:934
+#: install_steps_interactive.pm:1086
 #, c-format
 msgid "not configured"
 msgstr "ikkje sett opp"
 
-#: install_steps_interactive.pm:81
+#: install_steps_interactive.pm:86
 #, c-format
 msgid "Do you want to recover your system?"
 msgstr "Vil du gjenoppretta systemet?"
 
-#: install_steps_interactive.pm:82
+#: install_steps_interactive.pm:87
 #, c-format
 msgid "License agreement"
 msgstr "Lisensavtale"
 
-#: install_steps_interactive.pm:111
+#: install_steps_interactive.pm:91
+#, c-format
+msgid "Release Notes"
+msgstr "Versjonsnotat"
+
+#: install_steps_interactive.pm:121
 #, c-format
 msgid "Please choose your keyboard layout."
 msgstr "Vel tastaturoppsett."
 
-#: install_steps_interactive.pm:113
+#: install_steps_interactive.pm:123
 #, c-format
 msgid "Here is the full list of available keyboards"
 msgstr "Her er heile lista over tastaturoppsett"
 
-#: install_steps_interactive.pm:143
+#: install_steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Installer/oppgrader"
 
-#: install_steps_interactive.pm:144
+#: install_steps_interactive.pm:154
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Er dette ei installering eller ei oppgradering?"
 
-#: install_steps_interactive.pm:150
+#: install_steps_interactive.pm:160
 #, c-format
 msgid "Upgrade %s"
 msgstr "Oppgrader «%s»"
 
-#: install_steps_interactive.pm:160
+#: install_steps_interactive.pm:170
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Krypteringsnøkkel for «%s»"
 
-#: install_steps_interactive.pm:177
+#: install_steps_interactive.pm:187
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Vel mustype."
 
-#: install_steps_interactive.pm:186 standalone/mousedrake:46
+#: install_steps_interactive.pm:196 standalone/mousedrake:46
 #, c-format
 msgid "Mouse Port"
 msgstr "Musport"
 
-#: install_steps_interactive.pm:187 standalone/mousedrake:47
+#: install_steps_interactive.pm:197 standalone/mousedrake:47
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Vel serieporten som musa er kopla til."
 
-#: install_steps_interactive.pm:197
+#: install_steps_interactive.pm:207
 #, c-format
 msgid "Buttons emulation"
 msgstr "Knappemulering"
 
-#: install_steps_interactive.pm:199
+#: install_steps_interactive.pm:209
 #, c-format
 msgid "Button 2 Emulation"
 msgstr "2-knappsemulering"
 
-#: install_steps_interactive.pm:200
+#: install_steps_interactive.pm:210
 #, c-format
 msgid "Button 3 Emulation"
 msgstr "3-knappsemulering"
 
-#: install_steps_interactive.pm:221
+#: install_steps_interactive.pm:231
 #, c-format
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: install_steps_interactive.pm:221
+#: install_steps_interactive.pm:231
 #, c-format
 msgid "Configuring PCMCIA cards..."
 msgstr "Set opp PCMIA-kort ..."
 
-#: install_steps_interactive.pm:228
+#: install_steps_interactive.pm:238
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: install_steps_interactive.pm:228
+#: install_steps_interactive.pm:238
 #, c-format
 msgid "Configuring IDE"
 msgstr "Set opp IDE"
 
-#: install_steps_interactive.pm:248 network/tools.pm:155
+#: install_steps_interactive.pm:258 network/tools.pm:187
 #, c-format
 msgid "No partition available"
 msgstr "Ingen tilgjengelege partisjonar"
 
-#: install_steps_interactive.pm:251
+#: install_steps_interactive.pm:261
 #, c-format
 msgid "Scanning partitions to find mount points"
 msgstr "Ser gjennom partisjonar etter monteringspunkt"
 
-#: install_steps_interactive.pm:258
+#: install_steps_interactive.pm:268
 #, c-format
 msgid "Choose the mount points"
 msgstr "Vel monteringspunkta"
 
-#: install_steps_interactive.pm:288
+#: install_steps_interactive.pm:300
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -5911,17 +6204,17 @@ msgstr ""
 "Ikkje nok ledig plass for oppstartslastar på 1 MiB. Installasjonen held "
 "fram, men du må sjølv laga ein oppstartslastarpartisjon i DiskDrake."
 
-#: install_steps_interactive.pm:325
+#: install_steps_interactive.pm:337
 #, c-format
 msgid "Choose the partitions you want to format"
 msgstr "Vel partisjonane du vil formatera"
 
-#: install_steps_interactive.pm:327
+#: install_steps_interactive.pm:339
 #, c-format
 msgid "Check bad blocks?"
 msgstr "Sjå etter øydelagde blokkar?"
 
-#: install_steps_interactive.pm:359
+#: install_steps_interactive.pm:371
 #, c-format
 msgid ""
 "Failed to check filesystem %s. Do you want to repair the errors? (beware, "
@@ -5930,32 +6223,43 @@ msgstr ""
 "Klarte ikkje kontrollera filsystemet «%s». Vil du ordna feila? (Merk at du "
 "då kan tapa data.)"
 
-#: install_steps_interactive.pm:362
+#: install_steps_interactive.pm:374
 #, c-format
 msgid "Not enough swap space to fulfill installation, please add some"
 msgstr "Ikkje nok veksleplass for installering. Du må leggja til meir."
 
-#: install_steps_interactive.pm:369
+#: install_steps_interactive.pm:381
 #, c-format
 msgid "Looking for available packages and rebuilding rpm database..."
 msgstr "Ser etter tilgjengelege pakkar, og bygger programdatabasen på nytt ..."
 
-#: install_steps_interactive.pm:370 install_steps_interactive.pm:389
+#: install_steps_interactive.pm:382 install_steps_interactive.pm:442
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Ser etter tilgjengelege pakkar ..."
 
-#: install_steps_interactive.pm:373
+#: install_steps_interactive.pm:385
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Ser på allereie installerte pakkar ..."
 
-#: install_steps_interactive.pm:377
+#: install_steps_interactive.pm:389
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Ser etter pakkar å oppgradera ..."
 
-#: install_steps_interactive.pm:398
+#: install_steps_interactive.pm:405 install_steps_interactive.pm:834
+#, c-format
+msgid ""
+"Contacting Mandrakelinux web site to get the list of available mirrors..."
+msgstr "Kontaktar Mandrakelinux-nettstaden for oversikt over speglar ..."
+
+#: install_steps_interactive.pm:411 install_steps_interactive.pm:839
+#, c-format
+msgid "Choose a mirror from which to get the packages"
+msgstr "Vel spegelen du vil installera pakakr frå"
+
+#: install_steps_interactive.pm:451
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%d "
@@ -5964,7 +6268,7 @@ msgstr ""
 "Maskina har ikkje nok ledig plass for installering eller oppgradering (%d < %"
 "d)"
 
-#: install_steps_interactive.pm:439
+#: install_steps_interactive.pm:493
 #, c-format
 msgid ""
 "Please choose load or save package selection on floppy.\n"
@@ -5973,42 +6277,42 @@ msgstr ""
 "Vel å lagra eller henta pakkeval på/frå diskett.\n"
 "Formatet er likt det laga av «auto_install»."
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Load from floppy"
 msgstr "Hent frå diskett"
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Save on floppy"
 msgstr "Lagra på diskett"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Package selection"
 msgstr "Pakkeval"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Loading from floppy"
 msgstr "Hentar frå diskett"
 
-#: install_steps_interactive.pm:450
+#: install_steps_interactive.pm:504
 #, c-format
 msgid "Insert a floppy containing package selection"
 msgstr "Set inn ein diskett som inneheld pakkevalslista."
 
-#: install_steps_interactive.pm:533
+#: install_steps_interactive.pm:581
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Valt storleik er større enn tilgjengeleg plass"
 
-#: install_steps_interactive.pm:548
+#: install_steps_interactive.pm:596
 #, c-format
 msgid "Type of install"
 msgstr "Installasjonstype"
 
-#: install_steps_interactive.pm:549
+#: install_steps_interactive.pm:597
 #, c-format
 msgid ""
 "You haven't selected any group of packages.\n"
@@ -6017,22 +6321,22 @@ msgstr ""
 "Du har ikkje valt noko pakkegruppe.\n"
 "Vel kva type minimal installasjon du vil ha:"
 
-#: install_steps_interactive.pm:553
+#: install_steps_interactive.pm:601
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Med grunnleggjande hjelpetekstar (tilrådd)"
 
-#: install_steps_interactive.pm:554
+#: install_steps_interactive.pm:602
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Heilt minimal (òg utan urpmi)"
 
-#: install_steps_interactive.pm:597 standalone/drakxtv:50
+#: install_steps_interactive.pm:645 standalone/drakxtv:52
 #, c-format
 msgid "All"
 msgstr "Alle"
 
-#: install_steps_interactive.pm:641
+#: install_steps_interactive.pm:694
 #, c-format
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
@@ -6043,17 +6347,17 @@ msgstr ""
 "Vel «Avbryt» viss du ikkje har nokon av platene.\n"
 "Manglar du berre nokre av platene, så vel desse vekk, og trykk «OK»."
 
-#: install_steps_interactive.pm:646
+#: install_steps_interactive.pm:699
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "CD-en merkt «%s»"
 
-#: install_steps_interactive.pm:666
+#: install_steps_interactive.pm:720
 #, c-format
 msgid "Preparing installation"
 msgstr "Førebur installasjon"
 
-#: install_steps_interactive.pm:675
+#: install_steps_interactive.pm:729
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -6062,17 +6366,17 @@ msgstr ""
 "Installerer pakken «%s»\n"
 "%d%%"
 
-#: install_steps_interactive.pm:721
+#: install_steps_interactive.pm:778
 #, c-format
 msgid "Post-install configuration"
 msgstr "Oppsett etter installering"
 
-#: install_steps_interactive.pm:727
+#: install_steps_interactive.pm:784
 #, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
 msgstr "Set inn oppdateringsmoduldiskett i stasjon «%s»"
 
-#: install_steps_interactive.pm:748
+#: install_steps_interactive.pm:813
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -6082,7 +6386,7 @@ msgid ""
 "To download these packages, you will need to have a working Internet \n"
 "connection.\n"
 "\n"
-"Do you want to install the updates ?"
+"Do you want to install the updates?"
 msgstr ""
 "Du kan no lasta ned oppdaterte pakkar. Desse pakkane vart oppdaterte\n"
 "etter at distribusjonen var ferdigstilt, og kan innehelda tryggleiks- eller\n"
@@ -6092,83 +6396,72 @@ msgstr ""
 "\n"
 "Ønskjer du å installera oppdateringane?"
 
-#: install_steps_interactive.pm:769
-#, c-format
-msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
-msgstr "Kontaktar Mandrakelinux-nettstaden for oversikt over speglar ..."
-
-#: install_steps_interactive.pm:774
-#, c-format
-msgid "Choose a mirror from which to get the packages"
-msgstr "Vel spegelen du vil installera pakakr frå"
-
-#: install_steps_interactive.pm:788
+#: install_steps_interactive.pm:853
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr "Kontaktar spegel for oversikt over pakkar ..."
 
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "Klarte ikkje kontakta spegelen «%s»"
 
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
 #, c-format
 msgid "Would you like to try again?"
 msgstr "Vil du prøva på nytt?"
 
-#: install_steps_interactive.pm:818 standalone/drakclock:45
+#: install_steps_interactive.pm:883 standalone/drakclock:46
 #, c-format
 msgid "Which is your timezone?"
 msgstr "I kva tidssone held du til?"
 
-#: install_steps_interactive.pm:823
+#: install_steps_interactive.pm:888
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "Automatisk tidssynkronisering (med NTP)"
 
-#: install_steps_interactive.pm:831
+#: install_steps_interactive.pm:896
 #, c-format
 msgid "NTP Server"
 msgstr "NTP-tenar"
 
-#: install_steps_interactive.pm:873 steps.pm:30
+#: install_steps_interactive.pm:938 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "Samandrag"
 
-#: install_steps_interactive.pm:886 install_steps_interactive.pm:894
-#: install_steps_interactive.pm:912 install_steps_interactive.pm:919
-#: install_steps_interactive.pm:1068 services.pm:135
-#: standalone/drakbackup:1572
+#: install_steps_interactive.pm:951 install_steps_interactive.pm:959
+#: install_steps_interactive.pm:977 install_steps_interactive.pm:984
+#: install_steps_interactive.pm:1136 services.pm:135
+#: standalone/drakbackup:1593
 #, c-format
 msgid "System"
 msgstr "System"
 
-#: install_steps_interactive.pm:926 install_steps_interactive.pm:953
-#: install_steps_interactive.pm:970 install_steps_interactive.pm:986
-#: install_steps_interactive.pm:997
+#: install_steps_interactive.pm:991 install_steps_interactive.pm:1018
+#: install_steps_interactive.pm:1035 install_steps_interactive.pm:1051
+#: install_steps_interactive.pm:1062
 #, c-format
 msgid "Hardware"
 msgstr "Maskinvare"
 
-#: install_steps_interactive.pm:932 install_steps_interactive.pm:941
+#: install_steps_interactive.pm:997 install_steps_interactive.pm:1006
 #, c-format
 msgid "Remote CUPS server"
 msgstr "CUPS-tenar på nettverket"
 
-#: install_steps_interactive.pm:932
+#: install_steps_interactive.pm:997
 #, c-format
 msgid "No printer"
 msgstr "Ingen skrivar"
 
-#: install_steps_interactive.pm:974
+#: install_steps_interactive.pm:1039
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Har du eit ISA-lydkort?"
 
-#: install_steps_interactive.pm:976
+#: install_steps_interactive.pm:1041
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -6176,98 +6469,92 @@ msgid ""
 msgstr ""
 "Køyr «sndconfig» etter installasjonen er ferdig for å setja opp lydkortet."
 
-#: install_steps_interactive.pm:978
+#: install_steps_interactive.pm:1043
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Fann ingen lydkort. Køyr «harddrake» etter installasjonen er ferdig."
 
-#: install_steps_interactive.pm:998
+#: install_steps_interactive.pm:1063
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafisk grensesnitt"
 
-#: install_steps_interactive.pm:1004 install_steps_interactive.pm:1019
+#: install_steps_interactive.pm:1069 install_steps_interactive.pm:1084
 #, c-format
 msgid "Network & Internet"
 msgstr "Nettverk og Internett"
 
-#: install_steps_interactive.pm:1020
-#, c-format
-msgid "Proxies"
-msgstr "Mellomtenarar"
-
-#: install_steps_interactive.pm:1021
+#: install_steps_interactive.pm:1086
 #, c-format
 msgid "configured"
 msgstr "oppsett"
 
-#: install_steps_interactive.pm:1030 install_steps_interactive.pm:1044
+#: install_steps_interactive.pm:1095 install_steps_interactive.pm:1109
 #: steps.pm:20
 #, c-format
 msgid "Security"
 msgstr "Tryggleik"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, c-format
 msgid "activated"
 msgstr "påslått"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, c-format
 msgid "disabled"
 msgstr "avslått"
 
-#: install_steps_interactive.pm:1058
+#: install_steps_interactive.pm:1123
 #, c-format
 msgid "Boot"
 msgstr "Oppstart"
 
-#  -PO: example: lilo-graphic on /dev/hda1
 #. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1062
+#: install_steps_interactive.pm:1127
 #, c-format
 msgid "%s on %s"
 msgstr "%s på %s"
 
-#: install_steps_interactive.pm:1073 services.pm:177
+#: install_steps_interactive.pm:1141 services.pm:177
 #, c-format
 msgid "Services: %d activated for %d registered"
 msgstr "Tenester: %d slått på av %d registrerte"
 
-#: install_steps_interactive.pm:1083
+#: install_steps_interactive.pm:1151
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 "Du har ikkje sett opp det grafiske grensesnittet. Er du sikker på at du "
 "ikkje vil ha det?"
 
-#: install_steps_interactive.pm:1141
+#: install_steps_interactive.pm:1205
 #, c-format
 msgid "Set root password and network authentication methods"
 msgstr "Vel «root»-passord og nettverksautentiseringsmetodar"
 
-#: install_steps_interactive.pm:1142
+#: install_steps_interactive.pm:1206
 #, c-format
 msgid "Set root password"
 msgstr "Vel «root»-passord"
 
-#: install_steps_interactive.pm:1152
+#: install_steps_interactive.pm:1217
 #, c-format
 msgid "This password is too short (it must be at least %d characters long)"
 msgstr "Passordet er for kort (det må ha minst %d teikn)"
 
-#: install_steps_interactive.pm:1157 network/netconnect.pm:575
-#: standalone/drakauth:26 standalone/drakconnect:461
+#: install_steps_interactive.pm:1222 network/netconnect.pm:596
+#: standalone/drakauth:25 standalone/drakauth:27 standalone/drakconnect:457
 #, c-format
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: install_steps_interactive.pm:1188
+#: install_steps_interactive.pm:1254
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Førebur oppstartslastar ..."
 
-#: install_steps_interactive.pm:1198
+#: install_steps_interactive.pm:1264
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
@@ -6275,41 +6562,26 @@ msgid ""
 "The install will continue, but you'll\n"
 " need to use BootX or some other means to boot your machine"
 msgstr ""
+"Oppstartslastaren yaboot vil ikkje fungera, då du har ei OldWorld- eller ei "
+"ukjend maskin. Installasjonsprogrammet vil helda fram, men du må bruka BootX "
+"eller ein annan måte å starta maskina di på."
 
-#: install_steps_interactive.pm:1204
+#: install_steps_interactive.pm:1270
 #, c-format
 msgid "Do you want to use aboot?"
-msgstr ""
+msgstr "Vil du bruka aboot?"
 
-#: install_steps_interactive.pm:1207
+#: install_steps_interactive.pm:1273
 #, c-format
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
+"Feil ved installering av «aboot».\n"
+"Vil du prøva å tvinga gjennom installering, sjølv om det kan øydeleggja den "
+"første partisjonen?"
 
-#: install_steps_interactive.pm:1218
-#, c-format
-msgid "Installing bootloader"
-msgstr "Installerer oppstartslastar"
-
-#: install_steps_interactive.pm:1225
-#, c-format
-msgid "Installation of bootloader failed. The following error occured:"
-msgstr "Klarte ikkje installera oppstartslastar:"
-
-#: install_steps_interactive.pm:1230
-#, c-format
-msgid ""
-"You may need to change your Open Firmware boot-device to\n"
-" enable the bootloader.  If you don't see the bootloader prompt at\n"
-" reboot, hold down Command-Option-O-F at reboot and enter:\n"
-" setenv boot-device %s,\\\\:tbxi\n"
-" Then type: shut-down\n"
-"At your next boot you should see the bootloader prompt."
-msgstr ""
-
-#: install_steps_interactive.pm:1243
+#: install_steps_interactive.pm:1294
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -6318,22 +6590,22 @@ msgstr ""
 "Med dette tryggleiksnivået er det berre administratoren som får tilgang til "
 "filer på Windows-partisjonen."
 
-#: install_steps_interactive.pm:1275 standalone/drakautoinst:76
+#: install_steps_interactive.pm:1322 standalone/drakautoinst:76
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Set inn ein tom diskett i stasjon «%s»"
 
-#: install_steps_interactive.pm:1280
+#: install_steps_interactive.pm:1327
 #, c-format
 msgid "Please insert another floppy for drivers disk"
 msgstr "Set inn endå ein drivardiskett"
 
-#: install_steps_interactive.pm:1282
+#: install_steps_interactive.pm:1329
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Lagar diskett for automatisk installasjon ..."
 
-#: install_steps_interactive.pm:1294
+#: install_steps_interactive.pm:1341
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -6344,12 +6616,12 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil avslutta?"
 
-#: install_steps_interactive.pm:1309
+#: install_steps_interactive.pm:1356
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "Lag diskett for automatisk installasjon"
 
-#: install_steps_interactive.pm:1311
+#: install_steps_interactive.pm:1358
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -6358,13 +6630,19 @@ msgid ""
 "\n"
 "You may prefer to replay the installation.\n"
 msgstr ""
+"Du kan heilautomatisera autoinstalleringa om du ønskjer. Denne vil då "
+"overskriva heile harddisken. (Dette er meint for installering på ei anna "
+"maskin.)\n"
+"\n"
+"Du kan òg velja å køyra gjennom installasjonen på nytt.\n"
 
 #: install_steps_newt.pm:20
 #, c-format
 msgid "Mandrakelinux Installation %s"
 msgstr "Mandrakelinux-installering %s"
 
-#: install_steps_newt.pm:33
+#. -PO: This string must fit in a 80-char wide text screen
+#: install_steps_newt.pm:34
 #, c-format
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
@@ -6377,17 +6655,37 @@ msgstr ""
 msgid "Choose a file"
 msgstr "Vel fil"
 
+#: interactive.pm:295 interactive/gtk.pm:482 standalone/drakbackup:1534
+#: standalone/drakfont:592 standalone/drakfont:659 standalone/drakups:297
+#: standalone/drakups:357 standalone/drakups:377 standalone/drakvpn:333
+#: standalone/drakvpn:694
+#, c-format
+msgid "Add"
+msgstr "Legg til"
+
+#: interactive.pm:295 interactive/gtk.pm:482
+#, c-format
+msgid "Modify"
+msgstr "Endra"
+
+#: interactive.pm:295 interactive/gtk.pm:482 standalone/drakups:299
+#: standalone/drakups:359 standalone/drakups:379 standalone/drakvpn:333
+#: standalone/drakvpn:694
+#, c-format
+msgid "Remove"
+msgstr "Fjern"
+
 #: interactive.pm:372
 #, c-format
 msgid "Basic"
 msgstr "Grunnleggjande"
 
-#: interactive.pm:403 interactive/newt.pm:308 ugtk2.pm:510
+#: interactive.pm:403 interactive/newt.pm:317 ugtk2.pm:515
 #, c-format
 msgid "Finish"
 msgstr "Fullfør"
 
-#: interactive/newt.pm:83
+#: interactive/newt.pm:92
 #, c-format
 msgid "Do"
 msgstr "Gjer"
@@ -6448,6 +6746,9 @@ msgid ""
 "or just hit Enter to proceed.\n"
 "Your choice? "
 msgstr ""
+"Vel det første talet du ønskjer å endra, eller trykk «Enter» for å helda "
+"fram.\n"
+"Vel: "
 
 #: interactive/stdio.pm:138
 #, c-format
@@ -6455,1751 +6756,1975 @@ msgid ""
 "=> Notice, a label changed:\n"
 "%s"
 msgstr ""
+"Merk: Ein merkelapp er endra:\n"
+"%s"
 
 #: interactive/stdio.pm:145
 #, c-format
 msgid "Re-submit"
 msgstr "Send inn på nytt"
 
-#: keyboard.pm:161 keyboard.pm:193
+#: keyboard.pm:163 keyboard.pm:194
 #, c-format
-msgid "Czech (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTZ)"
 msgstr "Tsjekkisk (QWERTZ)"
 
-#: keyboard.pm:162 keyboard.pm:195
+#: keyboard.pm:164 keyboard.pm:196
 #, c-format
-msgid "German"
+msgid ""
+"_: keyboard\n"
+"German"
 msgstr "Tysk"
 
-#: keyboard.pm:163
+#: keyboard.pm:165
 #, c-format
-msgid "Dvorak"
+msgid ""
+"_: keyboard\n"
+"Dvorak"
 msgstr "Dvorak"
 
-#: keyboard.pm:164 keyboard.pm:204
+#: keyboard.pm:166 keyboard.pm:206
 #, c-format
-msgid "Spanish"
+msgid ""
+"_: keyboard\n"
+"Spanish"
 msgstr "Spansk"
 
-#: keyboard.pm:165 keyboard.pm:205
+#: keyboard.pm:167 keyboard.pm:207
 #, c-format
-msgid "Finnish"
+msgid ""
+"_: keyboard\n"
+"Finnish"
 msgstr "Finsk"
 
-#: keyboard.pm:166 keyboard.pm:206
+#: keyboard.pm:168 keyboard.pm:208
 #, c-format
-msgid "French"
+msgid ""
+"_: keyboard\n"
+"French"
 msgstr "Fransk"
 
-#: keyboard.pm:167 keyboard.pm:246
+#: keyboard.pm:169 keyboard.pm:254
 #, c-format
-msgid "Norwegian"
+msgid ""
+"_: keyboard\n"
+"Norwegian"
 msgstr "Norsk"
 
-#: keyboard.pm:168
+#: keyboard.pm:170
 #, c-format
-msgid "Polish"
+msgid ""
+"_: keyboard\n"
+"Polish"
 msgstr "Polsk"
 
-#: keyboard.pm:169 keyboard.pm:255
+#: keyboard.pm:171 keyboard.pm:264
 #, c-format
-msgid "Russian"
+msgid ""
+"_: keyboard\n"
+"Russian"
 msgstr "Russisk"
 
-#: keyboard.pm:171 keyboard.pm:259
+#: keyboard.pm:173 keyboard.pm:268
 #, c-format
-msgid "Swedish"
+msgid ""
+"_: keyboard\n"
+"Swedish"
 msgstr "Svensk"
 
-#: keyboard.pm:172 keyboard.pm:278
+#: keyboard.pm:174 keyboard.pm:287
 #, c-format
 msgid "UK keyboard"
 msgstr "Britisk tastatur"
 
-#: keyboard.pm:173 keyboard.pm:279
+#: keyboard.pm:175 keyboard.pm:288
 #, c-format
 msgid "US keyboard"
 msgstr "USA-tastatur"
 
-#: keyboard.pm:175
+#: keyboard.pm:177
 #, c-format
-msgid "Albanian"
+msgid ""
+"_: keyboard\n"
+"Albanian"
 msgstr "Albansk"
 
-#: keyboard.pm:176
+#: keyboard.pm:178
 #, c-format
-msgid "Armenian (old)"
+msgid ""
+"_: keyboard\n"
+"Armenian (old)"
 msgstr "Armensk (gammal)"
 
-#: keyboard.pm:177
+#: keyboard.pm:179
 #, c-format
-msgid "Armenian (typewriter)"
+msgid ""
+"_: keyboard\n"
+"Armenian (typewriter)"
 msgstr "Armensk (skrivemaskin)"
 
-#: keyboard.pm:178
+#: keyboard.pm:180
 #, c-format
-msgid "Armenian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Armenian (phonetic)"
 msgstr "Armensk (fonetisk)"
 
-#: keyboard.pm:179
+#: keyboard.pm:181
 #, c-format
-msgid "Arabic"
+msgid ""
+"_: keyboard\n"
+"Arabic"
 msgstr "Arabisk"
 
-#: keyboard.pm:180
+#: keyboard.pm:182
 #, c-format
-msgid "Azerbaidjani (latin)"
+msgid ""
+"_: keyboard\n"
+"Azerbaidjani (latin)"
 msgstr "Aserbajdsjansk (latinsk)"
 
-#: keyboard.pm:182
+#: keyboard.pm:183
 #, c-format
-msgid "Belgian"
+msgid ""
+"_: keyboard\n"
+"Belgian"
 msgstr "Belgisk"
 
-#: keyboard.pm:183
+#: keyboard.pm:184
 #, c-format
-msgid "Bengali"
+msgid ""
+"_: keyboard\n"
+"Bengali"
 msgstr "Bengali"
 
-#: keyboard.pm:184
+#: keyboard.pm:185
 #, c-format
-msgid "Bulgarian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (phonetic)"
 msgstr "Bulgarsk (fonetisk)"
 
-#: keyboard.pm:185
+#: keyboard.pm:186
 #, c-format
-msgid "Bulgarian (BDS)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (BDS)"
 msgstr "Bulgarsk (BDS)"
 
-#: keyboard.pm:186
+#: keyboard.pm:187
 #, c-format
-msgid "Brazilian (ABNT-2)"
+msgid ""
+"_: keyboard\n"
+"Brazilian (ABNT-2)"
 msgstr "Bulgarsk (ABNT-2)"
 
-#: keyboard.pm:189
+#: keyboard.pm:188
 #, c-format
-msgid "Bosnian"
+msgid ""
+"_: keyboard\n"
+"Bosnian"
 msgstr "Bosnisk"
 
-#: keyboard.pm:190
+#: keyboard.pm:189
 #, c-format
-msgid "Belarusian"
+msgid ""
+"_: keyboard\n"
+"Belarusian"
 msgstr "Kviterussisk"
 
 #: keyboard.pm:191
 #, c-format
-msgid "Swiss (German layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (German layout)"
 msgstr "Sveitsisk (tysk oppsett)"
 
-#: keyboard.pm:192
+#: keyboard.pm:193
 #, c-format
-msgid "Swiss (French layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (French layout)"
 msgstr "Sveitsisk (fransk oppsett)"
 
-#: keyboard.pm:194
+#: keyboard.pm:195
 #, c-format
-msgid "Czech (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTY)"
 msgstr "Tsjekkisk (QWERTY)"
 
-#: keyboard.pm:196
+#: keyboard.pm:197
 #, c-format
-msgid "German (no dead keys)"
+msgid ""
+"_: keyboard\n"
+"German (no dead keys)"
 msgstr "Tysk (utan dødtastar)"
 
-#: keyboard.pm:197
+#: keyboard.pm:198
 #, c-format
-msgid "Devanagari"
+msgid ""
+"_: keyboard\n"
+"Devanagari"
 msgstr "Devanagari"
 
-#: keyboard.pm:198
+#: keyboard.pm:199
 #, c-format
-msgid "Danish"
+msgid ""
+"_: keyboard\n"
+"Danish"
 msgstr "Dansk"
 
-#: keyboard.pm:199
+#: keyboard.pm:200
 #, c-format
-msgid "Dvorak (US)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (US)"
 msgstr "Dvorak (USA)"
 
-#: keyboard.pm:200
+#: keyboard.pm:201
 #, c-format
-msgid "Dvorak (Esperanto)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Esperanto)"
 msgstr "Dvorak (esperanto)"
 
-#: keyboard.pm:201
+#: keyboard.pm:202
 #, c-format
-msgid "Dvorak (Norwegian)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Norwegian)"
 msgstr "Dvorak (norsk)"
 
-#: keyboard.pm:202
+#: keyboard.pm:203
 #, c-format
-msgid "Dvorak (Swedish)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Swedish)"
 msgstr "Dvorak (svensk)"
 
-#: keyboard.pm:203
+#: keyboard.pm:205
 #, c-format
-msgid "Estonian"
+msgid ""
+"_: keyboard\n"
+"Estonian"
 msgstr "Estisk"
 
-#: keyboard.pm:207
+#: keyboard.pm:209
 #, c-format
-msgid "Georgian (\"Russian\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Russian\" layout)"
 msgstr "Georgisk («russisk» oppsett)"
 
-#: keyboard.pm:208
+#: keyboard.pm:210
 #, c-format
-msgid "Georgian (\"Latin\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Latin\" layout)"
 msgstr "Georgisk («latinsk» oppsett)"
 
-#: keyboard.pm:209
+#: keyboard.pm:211
 #, c-format
-msgid "Greek"
+msgid ""
+"_: keyboard\n"
+"Greek"
 msgstr "Gresk"
 
-#: keyboard.pm:210
+#: keyboard.pm:212
 #, c-format
-msgid "Greek (polytonic)"
-msgstr ""
+msgid ""
+"_: keyboard\n"
+"Greek (polytonic)"
+msgstr "Gresk (polytonal)"
 
-#: keyboard.pm:211
+#: keyboard.pm:213
 #, c-format
-msgid "Gujarati"
+msgid ""
+"_: keyboard\n"
+"Gujarati"
 msgstr "Gujarati"
 
-#: keyboard.pm:212
+#: keyboard.pm:214
 #, c-format
-msgid "Gurmukhi"
+msgid ""
+"_: keyboard\n"
+"Gurmukhi"
 msgstr "Gurmukhi"
 
-#: keyboard.pm:213
+#: keyboard.pm:216
 #, c-format
-msgid "Hungarian"
+msgid ""
+"_: keyboard\n"
+"Hungarian"
 msgstr "Ungarsk"
 
-#: keyboard.pm:214
+#: keyboard.pm:217
 #, c-format
-msgid "Croatian"
+msgid ""
+"_: keyboard\n"
+"Croatian"
 msgstr "Kroatisk"
 
-#: keyboard.pm:215
+#: keyboard.pm:218
 #, c-format
-msgid "Irish"
+msgid ""
+"_: keyboard\n"
+"Irish"
 msgstr "Irsk"
 
-#: keyboard.pm:216
+#: keyboard.pm:219
 #, c-format
-msgid "Israeli"
+msgid ""
+"_: keyboard\n"
+"Israeli"
 msgstr "Israelsk"
 
-#: keyboard.pm:217
+#: keyboard.pm:220
 #, c-format
-msgid "Israeli (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Israeli (phonetic)"
 msgstr "Israelsk (fonetisk)"
 
-#: keyboard.pm:218
+#: keyboard.pm:221
 #, c-format
-msgid "Iranian"
+msgid ""
+"_: keyboard\n"
+"Iranian"
 msgstr "Iransk"
 
-#: keyboard.pm:219
+#: keyboard.pm:222
 #, c-format
-msgid "Icelandic"
+msgid ""
+"_: keyboard\n"
+"Icelandic"
 msgstr "Islandsk"
 
-#: keyboard.pm:220
+#: keyboard.pm:223
 #, c-format
-msgid "Italian"
+msgid ""
+"_: keyboard\n"
+"Italian"
 msgstr "Italiensk"
 
-#: keyboard.pm:221
+#: keyboard.pm:224
 #, c-format
-msgid "Inuktitut"
+msgid ""
+"_: keyboard\n"
+"Inuktitut"
 msgstr "Inuittisk"
 
-#: keyboard.pm:225
+#: keyboard.pm:229
 #, c-format
-msgid "Japanese 106 keys"
-msgstr ""
+msgid ""
+"_: keyboard\n"
+"Japanese 106 keys"
+msgstr "Japansk – 106-tastars"
 
-#: keyboard.pm:226
+#: keyboard.pm:230
 #, c-format
-msgid "Kannada"
+msgid ""
+"_: keyboard\n"
+"Kannada"
 msgstr "Kannada"
 
-#: keyboard.pm:229
+#: keyboard.pm:233
 #, c-format
-msgid "Korean keyboard"
+msgid ""
+"_: keyboard\n"
+"Korean"
 msgstr "Koreansk tastatur"
 
-#: keyboard.pm:230
+#: keyboard.pm:234
 #, c-format
-msgid "Kyrgyz keyboard"
+msgid ""
+"_: keyboard\n"
+"Kyrgyz"
 msgstr "Kirgisisk tastatur"
 
-#: keyboard.pm:231
+#: keyboard.pm:235
 #, c-format
-msgid "Latin American"
+msgid ""
+"_: keyboard\n"
+"Latin American"
 msgstr "Latin-Amerika"
 
-#: keyboard.pm:232
+#: keyboard.pm:236
 #, c-format
-msgid "Laotian"
+msgid ""
+"_: keyboard\n"
+"Laotian"
 msgstr "Laotisk"
 
-#: keyboard.pm:233
+#: keyboard.pm:238
 #, c-format
-msgid "Lithuanian AZERTY (old)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (old)"
 msgstr "Litauisk AZERTY (gammalt)"
 
-#: keyboard.pm:235
+#: keyboard.pm:241
 #, c-format
-msgid "Lithuanian AZERTY (new)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (new)"
 msgstr "Litauisk AZERTY (nytt)"
 
-#: keyboard.pm:236
+#: keyboard.pm:243
 #, c-format
-msgid "Lithuanian \"number row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"number row\" QWERTY"
 msgstr "Litauisk talrad-QWERTY"
 
-#: keyboard.pm:237
+#: keyboard.pm:245
 #, c-format
-msgid "Lithuanian \"phonetic\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"phonetic\" QWERTY"
 msgstr "Litauisk fonetisk QWERTY"
 
-#: keyboard.pm:238
+#: keyboard.pm:246
 #, c-format
-msgid "Latvian"
+msgid ""
+"_: keyboard\n"
+"Latvian"
 msgstr "Latvisk"
 
-#: keyboard.pm:239
+#: keyboard.pm:247
 #, c-format
-msgid "Malayalam"
+msgid ""
+"_: keyboard\n"
+"Malayalam"
 msgstr "Malayalam"
 
-#: keyboard.pm:240
+#: keyboard.pm:248
 #, c-format
-msgid "Macedonian"
+msgid ""
+"_: keyboard\n"
+"Macedonian"
 msgstr "Makedonsk"
 
-#: keyboard.pm:241
+#: keyboard.pm:249
 #, c-format
-msgid "Myanmar (Burmese)"
+msgid ""
+"_: keyboard\n"
+"Myanmar (Burmese)"
 msgstr "Burmesisk"
 
-#: keyboard.pm:242
+#: keyboard.pm:250
 #, c-format
-msgid "Mongolian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Mongolian (cyrillic)"
 msgstr "Mongolsk (kyrillisk)"
 
-#: keyboard.pm:243
+#: keyboard.pm:251
 #, c-format
-msgid "Maltese (UK)"
+msgid ""
+"_: keyboard\n"
+"Maltese (UK)"
 msgstr "Maltesisk (Storbritannia)"
 
-#: keyboard.pm:244
+#: keyboard.pm:252
 #, c-format
-msgid "Maltese (US)"
+msgid ""
+"_: keyboard\n"
+"Maltese (US)"
 msgstr "Maltesisk (USA)"
 
-#: keyboard.pm:245
+#: keyboard.pm:253
 #, c-format
-msgid "Dutch"
+msgid ""
+"_: keyboard\n"
+"Dutch"
 msgstr "Nederlandsk"
 
-#: keyboard.pm:247
+#: keyboard.pm:255
 #, c-format
-msgid "Oriya"
+msgid ""
+"_: keyboard\n"
+"Oriya"
 msgstr "Oriya"
 
-#: keyboard.pm:248
+#: keyboard.pm:256
 #, c-format
-msgid "Polish (qwerty layout)"
+msgid ""
+"_: keyboard\n"
+"Polish (qwerty layout)"
 msgstr "Polsk (QWERTY-oppsett)"
 
-#: keyboard.pm:249
+#: keyboard.pm:257
 #, c-format
-msgid "Polish (qwertz layout)"
+msgid ""
+"_: keyboard\n"
+"Polish (qwertz layout)"
 msgstr "Polsk (QWERTZ-oppsett)"
 
-#: keyboard.pm:250
+#: keyboard.pm:258
 #, c-format
-msgid "Portuguese"
+msgid ""
+"_: keyboard\n"
+"Portuguese"
 msgstr "Portugisisk"
 
-#: keyboard.pm:251
+#: keyboard.pm:260
 #, c-format
-msgid "Canadian (Quebec)"
+msgid ""
+"_: keyboard\n"
+"Canadian (Quebec)"
 msgstr "Kanadisk (Quebec)"
 
-#: keyboard.pm:253
+#: keyboard.pm:262
 #, c-format
-msgid "Romanian (qwertz)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwertz)"
 msgstr "Rumensk (QWERTZ)"
 
-#: keyboard.pm:254
+#: keyboard.pm:263
 #, c-format
-msgid "Romanian (qwerty)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwerty)"
 msgstr "Romansk (QWERTZY)"
 
-#: keyboard.pm:256
+#: keyboard.pm:265
 #, c-format
-msgid "Russian (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Russian (phonetic)"
 msgstr "Russisk (fonetisk)"
 
-#: keyboard.pm:257
+#: keyboard.pm:266
 #, c-format
-msgid "Saami (norwegian)"
+msgid ""
+"_: keyboard\n"
+"Saami (norwegian)"
 msgstr "Samisk (norsk)"
 
-#: keyboard.pm:258
+#: keyboard.pm:267
 #, c-format
-msgid "Saami (swedish/finnish)"
+msgid ""
+"_: keyboard\n"
+"Saami (swedish/finnish)"
 msgstr "Samisk (finsk/svensk)"
 
-#: keyboard.pm:260
+#: keyboard.pm:269
 #, c-format
-msgid "Slovenian"
+msgid ""
+"_: keyboard\n"
+"Slovenian"
 msgstr "Slovensk"
 
-#: keyboard.pm:261
+#: keyboard.pm:270
 #, c-format
-msgid "Slovakian (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTZ)"
 msgstr "Slovensk (QWERTZ)"
 
-#: keyboard.pm:262
+#: keyboard.pm:271
 #, c-format
-msgid "Slovakian (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTY)"
 msgstr "Slovensk (QWERTY)"
 
-#: keyboard.pm:264
+#: keyboard.pm:273
 #, c-format
-msgid "Serbian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Serbian (cyrillic)"
 msgstr "Serbisk (kyrillisk)"
 
-#: keyboard.pm:265
+#: keyboard.pm:274
 #, c-format
-msgid "Syriac"
+msgid ""
+"_: keyboard\n"
+"Syriac"
 msgstr "Syrisk"
 
-#: keyboard.pm:266
+#: keyboard.pm:275
 #, c-format
-msgid "Syriac (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Syriac (phonetic)"
 msgstr "Syrisk (fonetisk)"
 
-#: keyboard.pm:267
+#: keyboard.pm:276
 #, c-format
-msgid "Telugu"
+msgid ""
+"_: keyboard\n"
+"Telugu"
 msgstr "Telugu"
 
-#: keyboard.pm:269
+#: keyboard.pm:278
 #, c-format
-msgid "Tamil (ISCII-layout)"
+msgid ""
+"_: keyboard\n"
+"Tamil (ISCII-layout)"
 msgstr "Tamil (ISCII-oppsett)"
 
-#: keyboard.pm:270
+#: keyboard.pm:279
 #, c-format
-msgid "Tamil (Typewriter-layout)"
+msgid ""
+"_: keyboard\n"
+"Tamil (Typewriter-layout)"
 msgstr "Tamil (skrivemaskin-oppsett)"
 
-#: keyboard.pm:271
+#: keyboard.pm:280
 #, c-format
-msgid "Thai keyboard"
+msgid ""
+"_: keyboard\n"
+"Thai"
 msgstr "Thai-tastatur"
 
-#: keyboard.pm:273
+#: keyboard.pm:282
 #, c-format
-msgid "Tajik keyboard"
+msgid ""
+"_: keyboard\n"
+"Tajik"
 msgstr "Tadsjikisk tastatur"
 
-#: keyboard.pm:274
+#: keyboard.pm:283
 #, c-format
-msgid "Turkish (traditional \"F\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (traditional \"F\" model)"
 msgstr "Tyrkisk (tradisjonell F-modell)"
 
-#: keyboard.pm:275
+#: keyboard.pm:284
 #, c-format
-msgid "Turkish (modern \"Q\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (modern \"Q\" model)"
 msgstr "Tyrkisk (moderne Q-modell)"
 
-#: keyboard.pm:277
+#: keyboard.pm:286
 #, c-format
-msgid "Ukrainian"
+msgid ""
+"_: keyboard\n"
+"Ukrainian"
 msgstr "Ukrainsk"
 
-#: keyboard.pm:280
+#: keyboard.pm:289
 #, c-format
 msgid "US keyboard (international)"
 msgstr "USA-tastatur (internasjonalt)"
 
-#: keyboard.pm:281
+#: keyboard.pm:290
 #, c-format
-msgid "Uzbek (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Uzbek (cyrillic)"
 msgstr "Usbekisk (kyrillisk)"
 
-#: keyboard.pm:282
+#: keyboard.pm:292
 #, c-format
-msgid "Vietnamese \"numeric row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamesisk talrad-QWERTY"
 
-#: keyboard.pm:283
+#: keyboard.pm:293
 #, c-format
-msgid "Yugoslavian (latin)"
-msgstr ""
+msgid ""
+"_: keyboard\n"
+"Yugoslavian (latin)"
+msgstr "Serbisk (latinsk alfabet)"
 
-#: keyboard.pm:290
+#: keyboard.pm:300
 #, c-format
 msgid "Right Alt key"
 msgstr "«Alt Gr»"
 
-#: keyboard.pm:291
+#: keyboard.pm:301
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Begge «Shift»-tastane samtidig"
 
-#: keyboard.pm:292
+#: keyboard.pm:302
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "«Ctrl» og «Shift» samtidig"
 
-#: keyboard.pm:293
+#: keyboard.pm:303
 #, c-format
 msgid "CapsLock key"
 msgstr "«Caps Lock»"
 
-#: keyboard.pm:294
+#: keyboard.pm:304
+#, fuzzy, c-format
+msgid "Shift and CapsLock keys simultaneously"
+msgstr "«Ctrl» og «Alt» samtidig"
+
+#: keyboard.pm:305
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "«Ctrl» og «Alt» samtidig"
 
-#: keyboard.pm:295
+#: keyboard.pm:306
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "«Alt» og «Shift» samtidig"
 
-#: keyboard.pm:296
+#: keyboard.pm:307
 #, c-format
 msgid "\"Menu\" key"
 msgstr "«Meny»"
 
-#: keyboard.pm:297
+#: keyboard.pm:308
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Venstre «Windows»-tast"
 
-#: keyboard.pm:298
+#: keyboard.pm:309
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Høgre «Windows»-tast"
 
-#: keyboard.pm:299
+#: keyboard.pm:310
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Begge «Ctrl»-tastane samtidig"
 
-#: keyboard.pm:300
+#: keyboard.pm:311
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Begge «Alt»-tastane samtidig"
 
-#: keyboard.pm:301
+#: keyboard.pm:312
 #, c-format
 msgid "Left Shift key"
 msgstr "Venstre «Shift»-tast"
 
-#: keyboard.pm:302
+#: keyboard.pm:313
 #, c-format
 msgid "Right Shift key"
 msgstr "Høgre «Shift»-tast"
 
-#: keyboard.pm:303
+#: keyboard.pm:314
 #, c-format
 msgid "Left Alt key"
 msgstr "Venstre «Alt»-tast"
 
-#: keyboard.pm:304
+#: keyboard.pm:315
 #, c-format
 msgid "Left Control key"
 msgstr "Venstre «Ctrl»-tast"
 
-#: keyboard.pm:305
+#: keyboard.pm:316
 #, c-format
 msgid "Right Control key"
 msgstr "Høgre «Ctrl»-tast"
 
-#: keyboard.pm:336
+#: keyboard.pm:347
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
 "allow switching between the different keyboard layouts\n"
 "(eg: latin and non latin)"
 msgstr ""
+"Her kan du velja tast eller tastekombinasjon for å byta mellom forskjellige "
+"tastaturoppsett."
 
-#: keyboard.pm:341
+#: keyboard.pm:352
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
 "During installation, you will need to use the Right Control\n"
 "key to switch between the different keyboard layouts."
 msgstr ""
+"Denne vil først fungera etter installasjonen er fullført.\n"
+"Under installasjonen må du bruka høgre «Ctrl»-tast for\n"
+"å byta mellom tastaturoppsett."
 
-#: lang.pm:153
+#. -PO: the string "default:LTR" can be translated *ONLY* as "default:LTR"
+#. -PO: or as "default:RTL", depending if your language is written from
+#. -PO: left to right, or from right to left; any other string is wrong.
+#: lang.pm:165
 #, c-format
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: lang.pm:169
-#, c-format
-msgid "Afghanistan"
-msgstr "Afghanistan"
-
-#: lang.pm:170
+#: lang.pm:182
 #, c-format
 msgid "Andorra"
 msgstr "Andorra"
 
-#: lang.pm:171
+#: lang.pm:183
 #, c-format
 msgid "United Arab Emirates"
 msgstr "Dei sameinte arabiske emirata"
 
-#: lang.pm:172
+#: lang.pm:184
+#, c-format
+msgid "Afghanistan"
+msgstr "Afghanistan"
+
+#: lang.pm:185
 #, c-format
 msgid "Antigua and Barbuda"
 msgstr "Antigua og Barbuda"
 
-#: lang.pm:173
+#: lang.pm:186
 #, c-format
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: lang.pm:174
+#: lang.pm:187
 #, c-format
 msgid "Albania"
 msgstr "Albania"
 
-#: lang.pm:175
+#: lang.pm:188
 #, c-format
 msgid "Armenia"
 msgstr "Armenia"
 
-#: lang.pm:176
+#: lang.pm:189
 #, c-format
 msgid "Netherlands Antilles"
 msgstr "Dei nederlandske Antillane"
 
-#: lang.pm:177
+#: lang.pm:190
 #, c-format
 msgid "Angola"
 msgstr "Angola"
 
-#: lang.pm:178
+#: lang.pm:191
 #, c-format
 msgid "Antarctica"
 msgstr "Antarktika"
 
-#: lang.pm:179 standalone/drakxtv:48
+#: lang.pm:192 network/adsl_consts.pm:28 standalone/drakxtv:50
 #, c-format
 msgid "Argentina"
 msgstr "Argentina"
 
-#: lang.pm:180
+#: lang.pm:193
 #, c-format
 msgid "American Samoa"
 msgstr "Amerikansk Samoa"
 
-#: lang.pm:182 standalone/drakxtv:46
+#: lang.pm:195 standalone/drakxtv:48
 #, c-format
 msgid "Australia"
 msgstr "Australia"
 
-#: lang.pm:183
+#: lang.pm:196
 #, c-format
 msgid "Aruba"
 msgstr "Aruba"
 
-#: lang.pm:184
+#: lang.pm:197
 #, c-format
 msgid "Azerbaijan"
 msgstr "Aserbajdsjan"
 
-#: lang.pm:185
+#: lang.pm:198
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnia-Hercegovina"
 
-#: lang.pm:186
+#: lang.pm:199
 #, c-format
 msgid "Barbados"
 msgstr "Barbados"
 
-#: lang.pm:187
+#: lang.pm:200
 #, c-format
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: lang.pm:189
+#: lang.pm:202
 #, c-format
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: lang.pm:190
+#: lang.pm:203 network/adsl_consts.pm:126 network/adsl_consts.pm:134
 #, c-format
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: lang.pm:191
+#: lang.pm:204
 #, c-format
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: lang.pm:192
+#: lang.pm:205
 #, c-format
 msgid "Burundi"
 msgstr "Burundi"
 
-#: lang.pm:193
+#: lang.pm:206
 #, c-format
 msgid "Benin"
 msgstr "Benin"
 
-#: lang.pm:194
+#: lang.pm:207
 #, c-format
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: lang.pm:195
+#: lang.pm:208
 #, c-format
 msgid "Brunei Darussalam"
 msgstr "Brunei"
 
-#: lang.pm:196
+#: lang.pm:209
 #, c-format
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: lang.pm:197
+#: lang.pm:210 network/adsl_consts.pm:92 network/adsl_consts.pm:102
+#: network/adsl_consts.pm:110 network/adsl_consts.pm:118
 #, c-format
 msgid "Brazil"
 msgstr "Brasil"
 
-#: lang.pm:198
+#: lang.pm:211
 #, c-format
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: lang.pm:199
+#: lang.pm:212
 #, c-format
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: lang.pm:200
+#: lang.pm:213
 #, c-format
 msgid "Bouvet Island"
 msgstr "Bouvetøya"
 
-#: lang.pm:201
+#: lang.pm:214
 #, c-format
 msgid "Botswana"
 msgstr "Botswana"
 
-#: lang.pm:202
+#: lang.pm:215
 #, c-format
 msgid "Belarus"
 msgstr "Kviterussland"
 
-#: lang.pm:203
+#: lang.pm:216
 #, c-format
 msgid "Belize"
 msgstr "Belize"
 
-#: lang.pm:204
+#: lang.pm:217
 #, c-format
 msgid "Canada"
 msgstr "Canada"
 
-#: lang.pm:205
+#: lang.pm:218
 #, c-format
 msgid "Cocos (Keeling) Islands"
 msgstr "Kokosøyane"
 
-#: lang.pm:206
+#: lang.pm:219
 #, c-format
 msgid "Congo (Kinshasa)"
 msgstr "Kongo"
 
-#: lang.pm:207
+#: lang.pm:220
 #, c-format
 msgid "Central African Republic"
 msgstr "Den sentralafrikanske republikken"
 
-#: lang.pm:208
+#: lang.pm:221
 #, c-format
 msgid "Congo (Brazzaville)"
 msgstr "Kongo-Brazaville"
 
-#: lang.pm:209
+#: lang.pm:222 network/adsl_consts.pm:568 network/adsl_consts.pm:575
 #, c-format
 msgid "Switzerland"
 msgstr "Sveits"
 
-#: lang.pm:210
+#: lang.pm:223
 #, c-format
 msgid "Cote d'Ivoire"
 msgstr "Elfenbeinskysten"
 
-#: lang.pm:211
+#: lang.pm:224
 #, c-format
 msgid "Cook Islands"
 msgstr "Cookøyane"
 
-#: lang.pm:212
+#: lang.pm:225
 #, c-format
 msgid "Chile"
 msgstr "Chile"
 
-#: lang.pm:213
+#: lang.pm:226
 #, c-format
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: lang.pm:214
+#: lang.pm:227 network/adsl_consts.pm:142 network/adsl_consts.pm:150
+#: network/adsl_consts.pm:158 network/adsl_consts.pm:166
+#: network/adsl_consts.pm:174 network/adsl_consts.pm:182
+#: network/adsl_consts.pm:190 network/adsl_consts.pm:198
+#: network/adsl_consts.pm:206 network/adsl_consts.pm:214
+#: network/adsl_consts.pm:222 network/adsl_consts.pm:230
+#: network/adsl_consts.pm:238 network/adsl_consts.pm:246
+#: network/adsl_consts.pm:254 network/adsl_consts.pm:262
+#: network/adsl_consts.pm:270 network/adsl_consts.pm:278
+#: network/adsl_consts.pm:286 network/adsl_consts.pm:294
 #, c-format
 msgid "China"
 msgstr "Kina"
 
-#: lang.pm:215
+#: lang.pm:228
 #, c-format
 msgid "Colombia"
 msgstr "Colombia"
 
-#: lang.pm:217
+#: lang.pm:230
+#, c-format
+msgid "Serbia & Montenegro"
+msgstr "Serbia og Montenegro"
+
+#: lang.pm:231
 #, c-format
 msgid "Cuba"
 msgstr "Cuba"
 
-#: lang.pm:218
+#: lang.pm:232
 #, c-format
 msgid "Cape Verde"
 msgstr "Kapp Verde"
 
-#: lang.pm:219
+#: lang.pm:233
 #, c-format
 msgid "Christmas Island"
 msgstr "Christmasøya"
 
-#: lang.pm:220
+#: lang.pm:234
 #, c-format
 msgid "Cyprus"
 msgstr "Kypros"
 
-#: lang.pm:223
+#: lang.pm:237
 #, c-format
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: lang.pm:224
+#: lang.pm:238 network/adsl_consts.pm:302
 #, c-format
 msgid "Denmark"
 msgstr "Danmark"
 
-#: lang.pm:225
+#: lang.pm:239
 #, c-format
 msgid "Dominica"
 msgstr "Dominica"
 
-#: lang.pm:226
+#: lang.pm:240
 #, c-format
 msgid "Dominican Republic"
 msgstr "Den dominikanske republikken"
 
-#: lang.pm:227
+#: lang.pm:241
 #, c-format
 msgid "Algeria"
 msgstr "Algerie"
 
-#: lang.pm:228
+#: lang.pm:242
 #, c-format
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: lang.pm:229
+#: lang.pm:243
 #, c-format
 msgid "Estonia"
 msgstr "Estland"
 
-#: lang.pm:230
+#: lang.pm:244
 #, c-format
 msgid "Egypt"
 msgstr "Egypt"
 
-#: lang.pm:231
+#: lang.pm:245
 #, c-format
 msgid "Western Sahara"
 msgstr "Vest-Sahara"
 
-#: lang.pm:232
+#: lang.pm:246
 #, c-format
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: lang.pm:233 network/adsl_consts.pm:202 network/adsl_consts.pm:210
-#: network/adsl_consts.pm:219 network/adsl_consts.pm:230
+#: lang.pm:247 network/adsl_consts.pm:531 network/adsl_consts.pm:540
+#: network/adsl_consts.pm:551
 #, c-format
 msgid "Spain"
 msgstr "Spania"
 
-#: lang.pm:234
+#: lang.pm:248
 #, c-format
 msgid "Ethiopia"
 msgstr "Etiopia"
 
-#: lang.pm:235 network/adsl_consts.pm:127
+#: lang.pm:249 network/adsl_consts.pm:402
 #, c-format
 msgid "Finland"
 msgstr "Finland"
 
-#: lang.pm:236
+#: lang.pm:250
 #, c-format
 msgid "Fiji"
 msgstr "Fiji"
 
-#: lang.pm:237
+#: lang.pm:251
 #, c-format
 msgid "Falkland Islands (Malvinas)"
 msgstr "Falklandsøyane"
 
-#: lang.pm:238
+#: lang.pm:252
 #, c-format
 msgid "Micronesia"
 msgstr "Mikronesiaføderasjonen"
 
-#: lang.pm:239
+#: lang.pm:253
 #, c-format
 msgid "Faroe Islands"
 msgstr "Færøyane"
 
-#: lang.pm:241
+#: lang.pm:255
 #, c-format
 msgid "Gabon"
 msgstr "Gabon"
 
-#: lang.pm:242 network/adsl_consts.pm:247 network/adsl_consts.pm:255
-#: network/netconnect.pm:51
+#: lang.pm:256 network/adsl_consts.pm:593 network/adsl_consts.pm:601
+#: network/netconnect.pm:52
 #, c-format
 msgid "United Kingdom"
 msgstr "Storbritannia"
 
-#: lang.pm:243
+#: lang.pm:257
 #, c-format
 msgid "Grenada"
 msgstr "Grenada"
 
-#: lang.pm:244
+#: lang.pm:258
 #, c-format
 msgid "Georgia"
 msgstr "Georgia"
 
-#: lang.pm:245
+#: lang.pm:259
 #, c-format
 msgid "French Guiana"
 msgstr "Fransk Guyana"
 
-#: lang.pm:246
+#: lang.pm:260
 #, c-format
 msgid "Ghana"
 msgstr "Ghana"
 
-#: lang.pm:247
+#: lang.pm:261
 #, c-format
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: lang.pm:248
+#: lang.pm:262
 #, c-format
 msgid "Greenland"
 msgstr "Grønland"
 
-#: lang.pm:249
+#: lang.pm:263
 #, c-format
 msgid "Gambia"
 msgstr "Gambia"
 
-#: lang.pm:250
+#: lang.pm:264
 #, c-format
 msgid "Guinea"
 msgstr "Guinea"
 
-#: lang.pm:251
+#: lang.pm:265
 #, c-format
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: lang.pm:252
+#: lang.pm:266
 #, c-format
 msgid "Equatorial Guinea"
 msgstr "Ekvatorial-Guinea"
 
-#: lang.pm:254
+#: lang.pm:268
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "Sør-Georgia og dei sørlege Sandwichøyane"
 
-#: lang.pm:255
+#: lang.pm:269
 #, c-format
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: lang.pm:256
+#: lang.pm:270
 #, c-format
 msgid "Guam"
 msgstr "Guam"
 
-#: lang.pm:257
+#: lang.pm:271
 #, c-format
 msgid "Guinea-Bissau"
 msgstr "Guinea-Bissau"
 
-#: lang.pm:258
+#: lang.pm:272
 #, c-format
 msgid "Guyana"
 msgstr "Guyana"
 
-#: lang.pm:259
+#: lang.pm:273
 #, c-format
-msgid "China (Hong Kong)"
+msgid "Hong Kong SAR (China)"
 msgstr "Kina (Hongkong)"
 
-#: lang.pm:260
+#: lang.pm:274
 #, c-format
 msgid "Heard and McDonald Islands"
 msgstr "Heard- og McDonaldøyane"
 
-#: lang.pm:261
+#: lang.pm:275
 #, c-format
 msgid "Honduras"
 msgstr "Honduras"
 
-#: lang.pm:262
+#: lang.pm:276
 #, c-format
 msgid "Croatia"
 msgstr "Kroatia"
 
-#: lang.pm:263
+#: lang.pm:277
 #, c-format
 msgid "Haiti"
 msgstr "Haiti"
 
-#: lang.pm:264 network/adsl_consts.pm:152
+#: lang.pm:278 network/adsl_consts.pm:436
 #, c-format
 msgid "Hungary"
 msgstr "Ungarn"
 
-#: lang.pm:265
+#: lang.pm:279
 #, c-format
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: lang.pm:266 standalone/drakxtv:45
+#: lang.pm:280 network/adsl_consts.pm:444 standalone/drakxtv:47
 #, c-format
 msgid "Ireland"
 msgstr "Irland"
 
-#: lang.pm:267
+#: lang.pm:281
 #, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: lang.pm:268
+#: lang.pm:282
 #, c-format
 msgid "India"
 msgstr "India"
 
-#: lang.pm:269
+#: lang.pm:283
 #, c-format
 msgid "British Indian Ocean Territory"
 msgstr "Det britiske området i Indiahavet"
 
-#: lang.pm:270
+#: lang.pm:284
 #, c-format
 msgid "Iraq"
 msgstr "Irak"
 
-#: lang.pm:271
+#: lang.pm:285
 #, c-format
 msgid "Iran"
 msgstr "Iran"
 
-#: lang.pm:272
+#: lang.pm:286
 #, c-format
 msgid "Iceland"
 msgstr "Island"
 
-#: lang.pm:274
+#: lang.pm:288
 #, c-format
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: lang.pm:275
+#: lang.pm:289
 #, c-format
 msgid "Jordan"
 msgstr "Jordan"
 
-#: lang.pm:276
+#: lang.pm:290
 #, c-format
 msgid "Japan"
 msgstr "Japan"
 
-#: lang.pm:277
+#: lang.pm:291
 #, c-format
 msgid "Kenya"
 msgstr "Kenya"
 
-#: lang.pm:278
+#: lang.pm:292
 #, c-format
 msgid "Kyrgyzstan"
 msgstr "Kirgisistan"
 
-#: lang.pm:279
+#: lang.pm:293
 #, c-format
 msgid "Cambodia"
 msgstr "Kambodsja"
 
-#: lang.pm:280
+#: lang.pm:294
 #, c-format
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: lang.pm:281
+#: lang.pm:295
 #, c-format
 msgid "Comoros"
 msgstr "Komorane"
 
-#: lang.pm:282
+#: lang.pm:296
 #, c-format
 msgid "Saint Kitts and Nevis"
 msgstr "St. Kitts og Nevis"
 
-#: lang.pm:283
+#: lang.pm:297
 #, c-format
 msgid "Korea (North)"
 msgstr "Nord-Korea"
 
-#: lang.pm:284
+#: lang.pm:298
 #, c-format
 msgid "Korea"
 msgstr "Sør-Korea"
 
-#: lang.pm:285
+#: lang.pm:299
 #, c-format
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: lang.pm:286
+#: lang.pm:300
 #, c-format
 msgid "Cayman Islands"
 msgstr "Caymanøyane"
 
-#: lang.pm:287
+#: lang.pm:301
 #, c-format
 msgid "Kazakhstan"
 msgstr "Kasakhstan"
 
-#: lang.pm:288
+#: lang.pm:302
 #, c-format
 msgid "Laos"
 msgstr "Laos"
 
-#: lang.pm:289
+#: lang.pm:303
 #, c-format
 msgid "Lebanon"
 msgstr "Libanon"
 
-#: lang.pm:290
+#: lang.pm:304
 #, c-format
 msgid "Saint Lucia"
 msgstr "St. Lucia"
 
-#: lang.pm:291
+#: lang.pm:305
 #, c-format
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: lang.pm:292
+#: lang.pm:306
 #, c-format
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: lang.pm:293
+#: lang.pm:307
 #, c-format
 msgid "Liberia"
 msgstr "Liberia"
 
-#: lang.pm:294
+#: lang.pm:308
 #, c-format
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: lang.pm:295
+#: lang.pm:309 network/adsl_consts.pm:479
 #, c-format
 msgid "Lithuania"
 msgstr "Litauen"
 
-#: lang.pm:296
+#: lang.pm:310
 #, c-format
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: lang.pm:297
+#: lang.pm:311
 #, c-format
 msgid "Latvia"
 msgstr "Latvia"
 
-#: lang.pm:298
+#: lang.pm:312
 #, c-format
 msgid "Libya"
 msgstr "Libya"
 
-#: lang.pm:299
+#: lang.pm:313 network/adsl_consts.pm:487
 #, c-format
 msgid "Morocco"
 msgstr "Marokko"
 
-#: lang.pm:300
+#: lang.pm:314
 #, c-format
 msgid "Monaco"
 msgstr "Monaco"
 
-#: lang.pm:301
+#: lang.pm:315
 #, c-format
 msgid "Moldova"
 msgstr "Moldova"
 
-#: lang.pm:302
+#: lang.pm:316
 #, c-format
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: lang.pm:303
+#: lang.pm:317
 #, c-format
 msgid "Marshall Islands"
 msgstr "Marshalløyane"
 
-#: lang.pm:304
+#: lang.pm:318
 #, c-format
 msgid "Macedonia"
 msgstr "Makedonia"
 
-#: lang.pm:305
+#: lang.pm:319
 #, c-format
 msgid "Mali"
 msgstr "Mali"
 
-#: lang.pm:306
+#: lang.pm:320
 #, c-format
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: lang.pm:307
+#: lang.pm:321
 #, c-format
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: lang.pm:308
+#: lang.pm:322
 #, c-format
 msgid "Northern Mariana Islands"
 msgstr "Nord-Marianane"
 
-#: lang.pm:309
+#: lang.pm:323
 #, c-format
 msgid "Martinique"
 msgstr "Martinique"
 
-#: lang.pm:310
+#: lang.pm:324
 #, c-format
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: lang.pm:311
+#: lang.pm:325
 #, c-format
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: lang.pm:312
+#: lang.pm:326
 #, c-format
 msgid "Malta"
 msgstr "Malta"
 
-#: lang.pm:313
+#: lang.pm:327
 #, c-format
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: lang.pm:314
+#: lang.pm:328
 #, c-format
 msgid "Maldives"
 msgstr "Maldivane"
 
-#: lang.pm:315
+#: lang.pm:329
 #, c-format
 msgid "Malawi"
 msgstr "Malawi"
 
-#: lang.pm:316
+#: lang.pm:330
 #, c-format
 msgid "Mexico"
 msgstr "Mexico"
 
-#: lang.pm:317
+#: lang.pm:331
 #, c-format
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: lang.pm:318
+#: lang.pm:332
 #, c-format
 msgid "Mozambique"
 msgstr "Mosambik"
 
-#: lang.pm:319
+#: lang.pm:333
 #, c-format
 msgid "Namibia"
 msgstr "Namibia"
 
-#: lang.pm:320
+#: lang.pm:334
 #, c-format
 msgid "New Caledonia"
 msgstr "Ny-Caledonia"
 
-#: lang.pm:321
+#: lang.pm:335
 #, c-format
 msgid "Niger"
 msgstr "Niger"
 
-#: lang.pm:322
+#: lang.pm:336
 #, c-format
 msgid "Norfolk Island"
 msgstr "Norfolkøya"
 
-#: lang.pm:323
+#: lang.pm:337
 #, c-format
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: lang.pm:324
+#: lang.pm:338
 #, c-format
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: lang.pm:327
+#: lang.pm:341
 #, c-format
 msgid "Nepal"
 msgstr "Nepal"
 
-#: lang.pm:328
+#: lang.pm:342
 #, c-format
 msgid "Nauru"
 msgstr "Nauru"
 
-#: lang.pm:329
+#: lang.pm:343
 #, c-format
 msgid "Niue"
 msgstr "Niue"
 
-#: lang.pm:330
+#: lang.pm:344
 #, c-format
 msgid "New Zealand"
 msgstr "New Zealand"
 
-#: lang.pm:331
+#: lang.pm:345
 #, c-format
 msgid "Oman"
 msgstr "Oman"
 
-#: lang.pm:332
+#: lang.pm:346
 #, c-format
 msgid "Panama"
 msgstr "Panama"
 
-#: lang.pm:333
+#: lang.pm:347
 #, c-format
 msgid "Peru"
 msgstr "Peru"
 
-#: lang.pm:334
+#: lang.pm:348
 #, c-format
 msgid "French Polynesia"
 msgstr "Fransk Polynesia"
 
-#: lang.pm:335
+#: lang.pm:349
 #, c-format
 msgid "Papua New Guinea"
 msgstr "Papua Ny-Guinea"
 
-#: lang.pm:336
+#: lang.pm:350
 #, c-format
 msgid "Philippines"
 msgstr "Filippinane"
 
-#: lang.pm:337
+#: lang.pm:351
 #, c-format
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: lang.pm:338 network/adsl_consts.pm:186
+#: lang.pm:352 network/adsl_consts.pm:503
 #, c-format
 msgid "Poland"
 msgstr "Polen"
 
-#: lang.pm:339
+#: lang.pm:353
 #, c-format
 msgid "Saint Pierre and Miquelon"
 msgstr "Saint-Pierre-et-Miquelon"
 
-#: lang.pm:340
+#: lang.pm:354
 #, c-format
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: lang.pm:341
+#: lang.pm:355
 #, c-format
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: lang.pm:342
+#: lang.pm:356
 #, c-format
 msgid "Palestine"
 msgstr "Palestina"
 
-#: lang.pm:343 network/adsl_consts.pm:196
+#: lang.pm:357 network/adsl_consts.pm:513
 #, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: lang.pm:344
+#: lang.pm:358
 #, c-format
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: lang.pm:345
+#: lang.pm:359
 #, c-format
 msgid "Palau"
 msgstr "Palau"
 
-#: lang.pm:346
+#: lang.pm:360
 #, c-format
 msgid "Qatar"
 msgstr "Qatar"
 
-#: lang.pm:347
+#: lang.pm:361
 #, c-format
 msgid "Reunion"
 msgstr "Réunion"
 
-#: lang.pm:348
+#: lang.pm:362
 #, c-format
 msgid "Romania"
 msgstr "Romania"
 
-#: lang.pm:349
+#: lang.pm:363
 #, c-format
 msgid "Russia"
 msgstr "Russland"
 
-#: lang.pm:350
+#: lang.pm:364
 #, c-format
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: lang.pm:351
+#: lang.pm:365
 #, c-format
 msgid "Saudi Arabia"
 msgstr "Saudi-Arabia"
 
-#: lang.pm:352
+#: lang.pm:366
 #, c-format
 msgid "Solomon Islands"
 msgstr "Salomonøyane"
 
-#: lang.pm:353
+#: lang.pm:367
 #, c-format
 msgid "Seychelles"
 msgstr "Seychellane"
 
-#: lang.pm:354
+#: lang.pm:368
 #, c-format
 msgid "Sudan"
 msgstr "Sudan"
 
-#: lang.pm:356
+#: lang.pm:370
 #, c-format
 msgid "Singapore"
 msgstr "Singapore"
 
-#: lang.pm:357
+#: lang.pm:371
 #, c-format
 msgid "Saint Helena"
 msgstr "St. Helena"
 
-#: lang.pm:358
+#: lang.pm:372 network/adsl_consts.pm:520
 #, c-format
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: lang.pm:359
+#: lang.pm:373
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "Svalbard og Jan Mayen"
 
-#: lang.pm:360
+#: lang.pm:374
 #, c-format
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: lang.pm:361
+#: lang.pm:375
 #, c-format
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: lang.pm:362
+#: lang.pm:376
 #, c-format
 msgid "San Marino"
 msgstr "San Marino"
 
-#: lang.pm:363
+#: lang.pm:377
 #, c-format
 msgid "Senegal"
 msgstr "Senegal"
 
-#: lang.pm:364
+#: lang.pm:378
 #, c-format
 msgid "Somalia"
 msgstr "Somalia"
 
-#: lang.pm:365
+#: lang.pm:379
 #, c-format
 msgid "Suriname"
 msgstr "Surinam"
 
-#: lang.pm:366
+#: lang.pm:380
 #, c-format
 msgid "Sao Tome and Principe"
 msgstr "São Tomé og Príncipe"
 
-#: lang.pm:367
+#: lang.pm:381
 #, c-format
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: lang.pm:368
+#: lang.pm:382
 #, c-format
 msgid "Syria"
 msgstr "Syria"
 
-#: lang.pm:369
+#: lang.pm:383
 #, c-format
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: lang.pm:370
+#: lang.pm:384
 #, c-format
 msgid "Turks and Caicos Islands"
 msgstr "Turks- og Caicosøyane"
 
-#: lang.pm:371
+#: lang.pm:385
 #, c-format
 msgid "Chad"
 msgstr "Tsjad"
 
-#: lang.pm:372
+#: lang.pm:386
 #, c-format
 msgid "French Southern Territories"
 msgstr "Franske sørlege territorium"
 
-#: lang.pm:373
+#: lang.pm:387
 #, c-format
 msgid "Togo"
 msgstr "Togo"
 
-#: lang.pm:374
+#: lang.pm:388 network/adsl_consts.pm:585
 #, c-format
 msgid "Thailand"
 msgstr "Thailand"
 
-#: lang.pm:375
+#: lang.pm:389
 #, c-format
 msgid "Tajikistan"
 msgstr "Tadsjikistan"
 
-#: lang.pm:376
+#: lang.pm:390
 #, c-format
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: lang.pm:377
+#: lang.pm:391
 #, c-format
 msgid "East Timor"
 msgstr "Aust-Timor"
 
-#: lang.pm:378
+#: lang.pm:392
 #, c-format
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: lang.pm:379
+#: lang.pm:393
 #, c-format
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: lang.pm:380
+#: lang.pm:394
 #, c-format
 msgid "Tonga"
 msgstr "Tonga"
 
-#: lang.pm:381
+#: lang.pm:395
 #, c-format
 msgid "Turkey"
 msgstr "Turkey"
 
-#: lang.pm:382
+#: lang.pm:396
 #, c-format
 msgid "Trinidad and Tobago"
 msgstr "Trinidad og Tobago"
 
-#: lang.pm:383
+#: lang.pm:397
 #, c-format
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: lang.pm:384
+#: lang.pm:398
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: lang.pm:385
+#: lang.pm:399
 #, c-format
 msgid "Tanzania"
 msgstr "Tanzania"
 
-#: lang.pm:386
+#: lang.pm:400
 #, c-format
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: lang.pm:387
+#: lang.pm:401
 #, c-format
 msgid "Uganda"
 msgstr "Uganda"
 
-#: lang.pm:388
+#: lang.pm:402
 #, c-format
 msgid "United States Minor Outlying Islands"
 msgstr ""
 
-#: lang.pm:390
+#: lang.pm:404
 #, c-format
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: lang.pm:391
+#: lang.pm:405
 #, c-format
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: lang.pm:392
+#: lang.pm:406
 #, c-format
 msgid "Vatican"
 msgstr "Vatikanstaten"
 
-#: lang.pm:393
+#: lang.pm:407
 #, c-format
 msgid "Saint Vincent and the Grenadines"
 msgstr "St. Vincent og Grenadinane"
 
-#: lang.pm:394
+#: lang.pm:408
 #, c-format
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: lang.pm:395
+#: lang.pm:409
 #, c-format
 msgid "Virgin Islands (British)"
 msgstr "Jomfruøyane (Storbritannia)"
 
-#: lang.pm:396
+#: lang.pm:410
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr "Jomfruøyane (USA)"
 
-#: lang.pm:397
+#: lang.pm:411
 #, c-format
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: lang.pm:398
+#: lang.pm:412
 #, c-format
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: lang.pm:399
+#: lang.pm:413
 #, c-format
 msgid "Wallis and Futuna"
 msgstr "Wallis- og Futunaøyane"
 
-#: lang.pm:400
+#: lang.pm:414
 #, c-format
 msgid "Samoa"
 msgstr "Samoa"
 
-#: lang.pm:401
+#: lang.pm:415
 #, c-format
 msgid "Yemen"
 msgstr "Jemen"
 
-#: lang.pm:402
+#: lang.pm:416
 #, c-format
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: lang.pm:403
-#, c-format
-msgid "Serbia & Montenegro"
-msgstr "Serbia og Montenegro"
-
-#: lang.pm:404 standalone/drakxtv:47
+#: lang.pm:417 standalone/drakxtv:49
 #, c-format
 msgid "South Africa"
 msgstr "Sør-Afrika"
 
-#: lang.pm:405
+#: lang.pm:418
 #, c-format
 msgid "Zambia"
 msgstr "Zambia"
 
-#: lang.pm:406
+#: lang.pm:419
 #, c-format
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: lang.pm:1004
+#: lang.pm:1047
+#, c-format
+msgid "You should install the following packages: %s"
+msgstr "Du bør installera desse pakkane: %s"
+
+#. -PO: the following is used to combine packages names. eg: "initscripts, harddrake, yudit"
+#: lang.pm:1050 standalone/scannerdrake:135
+#, c-format
+msgid ", "
+msgstr ", "
+
+#: lang.pm:1101
 #, c-format
 msgid "Welcome to %s"
 msgstr "Velkommen til %s"
 
-#: loopback.pm:32
+#: loopback.pm:31
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "Sirkelmontering %s\n"
 
-#: lvm.pm:115
+#: lvm.pm:116
 #, c-format
 msgid "Remove the logical volumes first\n"
 msgstr "Du må først fjerna det logiske dataområdet.\n"
 
-#: modules/interactive.pm:21 standalone/drakconnect:982
+#: modules/interactive.pm:21 standalone/drakconnect:1033
 #, c-format
 msgid "Parameters"
 msgstr "Parametrar"
 
-#: modules/interactive.pm:21 standalone/draksec:44
+#: modules/interactive.pm:21 standalone/draksec:51
 #, c-format
 msgid "NONE"
 msgstr "INGEN"
@@ -8216,8 +8741,8 @@ msgstr "Du kan velja modulparametrar her."
 
 #: modules/interactive.pm:63
 #, c-format
-msgid "Found %s %s interfaces"
-msgstr "Fann %s %s-grensesnitt"
+msgid "Found %s interfaces"
+msgstr "Fann %s-grensesnitt"
 
 #: modules/interactive.pm:64
 #, c-format
@@ -8234,8 +8759,6 @@ msgstr "Har du fleire %s-grensesnitt?"
 msgid "See hardware info"
 msgstr "Sjå maskinvareinformasjon"
 
-#  -PO: the first %s is the card type (scsi, network, sound,...)
-#  -PO: the second is the vendor+model name
 #. -PO: the first %s is the card type (scsi, network, sound,...)
 #. -PO: the second is the vendor+model name
 #: modules/interactive.pm:87
@@ -8273,14 +8796,13 @@ msgstr ""
 msgid "Module options:"
 msgstr "Modulval:"
 
-#  -PO: the %s is the driver type (scsi, network, sound,...)
 #. -PO: the %s is the driver type (scsi, network, sound,...)
-#: modules/interactive.pm:118
+#: modules/interactive.pm:119
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr "Kva %s-drivar vil du bruka?"
 
-#: modules/interactive.pm:127
+#: modules/interactive.pm:128
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -8297,17 +8819,17 @@ msgstr ""
 "sjølv.\n"
 "Sistnemnte kan av og til krasja maskina, men vil ikkje gjera fysisk skade."
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Autoprobe"
 msgstr "Automatisk søk"
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Specify options"
-msgstr "Endra innstillingar"
+msgstr "Endra oppsett"
 
-#: modules/interactive.pm:143
+#: modules/interactive.pm:144
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -8366,11 +8888,11 @@ msgstr "Generell PS/2-hjulmus"
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: mouse.pm:36 network/modem.pm:42 network/modem.pm:43 network/modem.pm:44
-#: network/modem.pm:58 network/modem.pm:72 network/modem.pm:77
-#: network/modem.pm:108 network/netconnect.pm:586 network/netconnect.pm:591
-#: network/netconnect.pm:603 network/netconnect.pm:608
-#: network/netconnect.pm:624 network/netconnect.pm:626
+#: mouse.pm:36 network/modem.pm:57 network/modem.pm:58 network/modem.pm:59
+#: network/modem.pm:84 network/modem.pm:98 network/modem.pm:103
+#: network/modem.pm:136 network/netconnect.pm:607 network/netconnect.pm:612
+#: network/netconnect.pm:624 network/netconnect.pm:629
+#: network/netconnect.pm:645 network/netconnect.pm:647
 #, c-format
 msgid "Automatic"
 msgstr "Automatisk"
@@ -8515,50 +9037,55 @@ msgstr "Universell"
 msgid "Any PS/2 & USB mice"
 msgstr "Alle PS/2- eller USB-mus"
 
-#: mouse.pm:92 standalone/drakvpn:1140
+#: mouse.pm:89 mouse.pm:359 mouse.pm:368 mouse.pm:420
+#, c-format
+msgid "Synaptics Touchpad"
+msgstr ""
+
+#: mouse.pm:93 standalone/drakconnect:358 standalone/drakvpn:1140
 #, c-format
 msgid "none"
 msgstr "ingen"
 
-#: mouse.pm:94
+#: mouse.pm:95
 #, c-format
 msgid "No mouse"
 msgstr "Inga mus"
 
-#: mouse.pm:514
+#: mouse.pm:546
 #, c-format
 msgid "Please test the mouse"
 msgstr "Test musa"
 
-#: mouse.pm:516
+#: mouse.pm:548
 #, c-format
 msgid "To activate the mouse,"
 msgstr "For å aktivera musa,"
 
-#: mouse.pm:517
+#: mouse.pm:549
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "BRUK HJULERT!"
 
 #: network/adsl.pm:19
 #, c-format
-msgid "use pppoe"
-msgstr "bruk pppoe"
+msgid "use PPPoE"
+msgstr "bruk PPPoE"
 
 #: network/adsl.pm:20
 #, c-format
-msgid "use pptp"
-msgstr "bruk pptp"
+msgid "use PPTP"
+msgstr "bruk PPTP"
 
 #: network/adsl.pm:21
 #, c-format
-msgid "use dhcp"
-msgstr "bruk dhcp"
+msgid "use DHCP"
+msgstr "bruk DHCP"
 
 #: network/adsl.pm:22
 #, c-format
-msgid "Alcatel speedtouch usb"
-msgstr "Alcatel SpeedTouch USB"
+msgid "Alcatel Speedtouch USB"
+msgstr "Alcatel Speedtouch USB"
 
 #: network/adsl.pm:22 network/adsl.pm:23 network/adsl.pm:24
 #, c-format
@@ -8567,36 +9094,36 @@ msgstr " – funnen"
 
 #: network/adsl.pm:23
 #, c-format
-msgid "Sagem (using pppoa) usb"
+msgid "Sagem (using PPPoA) USB"
 msgstr "Sagem-USB (med PPPoA)"
 
 #: network/adsl.pm:24
 #, c-format
-msgid "Sagem (using dhcp) usb"
+msgid "Sagem (using DHCP) USB"
 msgstr "Sagem-USB (med DHCP)"
 
-#: network/adsl.pm:35 network/netconnect.pm:761
+#: network/adsl.pm:35 network/netconnect.pm:799
 #, c-format
 msgid "Connect to the Internet"
 msgstr "Kobla til Internett"
 
-#: network/adsl.pm:36 network/netconnect.pm:762
+#: network/adsl.pm:36 network/netconnect.pm:800
 #, c-format
 msgid ""
 "The most common way to connect with adsl is pppoe.\n"
-"Some connections use pptp, a few use dhcp.\n"
-"If you don't know, choose 'use pppoe'"
+"Some connections use PPTP, a few use DHCP.\n"
+"If you don't know, choose 'use PPPoE'"
 msgstr ""
 "Den vanlegaste måten å kopla til med ADSL er PPPoE,\n"
 "men nokre samband brukar PPTP, og nokre få brukar DHCP.\n"
 "Vel PPPOE om du ikkje veit kva du skal velja."
 
-#: network/adsl.pm:41 network/netconnect.pm:766
+#: network/adsl.pm:41 network/netconnect.pm:804
 #, c-format
-msgid "ADSL connection type :"
+msgid "ADSL connection type:"
 msgstr "ADSL-sambandstype:"
 
-#: network/drakfirewall.pm:12
+#: network/drakfirewall.pm:12 share/compssUsers.pl:84
 #, c-format
 msgid "Web Server"
 msgstr "Vevtenar"
@@ -8649,7 +9176,7 @@ msgstr "Ekkoførespurnad (ping)"
 #: network/drakfirewall.pm:65
 #, c-format
 msgid "BitTorrent"
-msgstr ""
+msgstr "BitTorrent"
 
 #: network/drakfirewall.pm:131
 #, c-format
@@ -8665,6 +9192,11 @@ msgid ""
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
+"Brannmuroppsett\n"
+"\n"
+"Her kan du setja opp ein personleg brannmur for denne maskina.\n"
+"Sjå «MandrakeSecurity Firewall»-distribusjonen om du treng ein\n"
+"kraftigare, særtileigna brannmur."
 
 #: network/drakfirewall.pm:158
 #, c-format
@@ -8674,6 +9206,9 @@ msgid ""
 "Make sure you have configured your Network/Internet access with\n"
 "drakconnect before going any further."
 msgstr ""
+"Brannmuroppsett\n"
+"\n"
+"Sjå til at du har sett opp nettverks- og Internett-sambanda før du held fram."
 
 #: network/drakfirewall.pm:175
 #, c-format
@@ -8700,6 +9235,11 @@ msgid ""
 "\n"
 "You can also give a range of ports (eg: 24300:24350/udp)"
 msgstr ""
+"Ugyldig port: %s.\n"
+"Rett format er «port/tcp» eller «port/udp»,\n"
+"der «port» er mellom 1 og 65535.\n"
+"\n"
+"Du kan òg velja eit portområde (eks.: 24300:24350/udp)"
 
 #: network/drakfirewall.pm:192
 #, c-format
@@ -8711,106 +9251,107 @@ msgstr "Alle (ingen brannmur)"
 msgid "Other ports"
 msgstr "Andre portar"
 
-#: network/isdn.pm:109 network/netconnect.pm:436
+#: network/isdn.pm:125 network/netconnect.pm:456 network/netconnect.pm:564
+#: network/netconnect.pm:567
 #, c-format
 msgid "Unlisted - edit manually"
 msgstr "Annan – legg inn sjølv"
 
-#: network/isdn.pm:151 network/netconnect.pm:385
+#: network/isdn.pm:168 network/netconnect.pm:388
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA/PCMCIA"
 
-#: network/isdn.pm:151 network/netconnect.pm:385
+#: network/isdn.pm:168 network/netconnect.pm:388
 #, c-format
 msgid "I don't know"
 msgstr "Eg veit ikkje"
 
-#: network/isdn.pm:152 network/netconnect.pm:385
+#: network/isdn.pm:169 network/netconnect.pm:388
 #, c-format
 msgid "PCI"
 msgstr "PCI"
 
-#: network/isdn.pm:153 network/netconnect.pm:385
+#: network/isdn.pm:170 network/netconnect.pm:388
 #, c-format
 msgid "USB"
 msgstr "USB"
 
-#: network/modem.pm:42 network/modem.pm:43 network/modem.pm:44
-#: network/netconnect.pm:591 network/netconnect.pm:608
-#: network/netconnect.pm:624
+#: network/modem.pm:57 network/modem.pm:58 network/modem.pm:59
+#: network/netconnect.pm:612 network/netconnect.pm:629
+#: network/netconnect.pm:645
 #, c-format
 msgid "Manual"
 msgstr "Manuelt"
 
-#: network/netconnect.pm:88 network/netconnect.pm:465
-#: network/netconnect.pm:475
+#: network/netconnect.pm:89 network/netconnect.pm:485
+#: network/netconnect.pm:489
 #, c-format
 msgid "Manual choice"
 msgstr "Manuelt val"
 
-#: network/netconnect.pm:88
+#: network/netconnect.pm:89
 #, c-format
 msgid "Internal ISDN card"
 msgstr "Internet ISDN-kort"
 
-#: network/netconnect.pm:97
+#: network/netconnect.pm:98
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad hoc"
 
-#: network/netconnect.pm:98
+#: network/netconnect.pm:99
 #, c-format
 msgid "Managed"
 msgstr "Handtert"
 
-#: network/netconnect.pm:99
+#: network/netconnect.pm:100
 #, c-format
 msgid "Master"
 msgstr "Hovud"
 
-#: network/netconnect.pm:100
+#: network/netconnect.pm:101
 #, c-format
 msgid "Repeater"
 msgstr "Gjentakar"
 
-#: network/netconnect.pm:101
+#: network/netconnect.pm:102
 #, c-format
 msgid "Secondary"
 msgstr "Sekundær"
 
-#: network/netconnect.pm:102
+#: network/netconnect.pm:103
 #, c-format
 msgid "Auto"
 msgstr "Automatisk"
 
-#: network/netconnect.pm:105 printer/printerdrake.pm:1133
-#: standalone/drakups:64
+#: network/netconnect.pm:106 printer/printerdrake.pm:1248
+#: standalone/drakups:75
 #, c-format
 msgid "Manual configuration"
 msgstr "Manuelt oppsett"
 
-#: network/netconnect.pm:106
+#: network/netconnect.pm:107
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "Automatisk IP (BOOTP/DHCP)"
 
-#: network/netconnect.pm:108
+#: network/netconnect.pm:109
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
 msgstr "Automatisk IP (BOOTP/DHCP/Zeroconf)"
 
-#: network/netconnect.pm:111
+#: network/netconnect.pm:112
 #, c-format
 msgid "Protocol for the rest of the world"
 msgstr "Protokoll for resten av verda"
 
-#: network/netconnect.pm:113 standalone/drakconnect:541
+#: network/netconnect.pm:114 standalone/drakconnect:539
 #, c-format
 msgid "European protocol (EDSS1)"
 msgstr "Europeisk protokoll (EDSS1)"
 
-#: network/netconnect.pm:114 standalone/drakconnect:542
+#: network/netconnect.pm:115 standalone/drakconnect:540
 #, c-format
 msgid ""
 "Protocol for the rest of the world\n"
@@ -8819,164 +9360,168 @@ msgstr ""
 "Protokoll for resten av verda.\n"
 "Ingen D-kanal (leigd linje)."
 
-#: network/netconnect.pm:147
+#: network/netconnect.pm:151
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "Alcatel SpeedTouch USB-modem"
 
-#: network/netconnect.pm:148
+#: network/netconnect.pm:152
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Sagem USB-modem"
 
-#: network/netconnect.pm:149
+#: network/netconnect.pm:153
 #, c-format
 msgid "Bewan modem"
 msgstr "Bewan-modem"
 
-#: network/netconnect.pm:150
+#: network/netconnect.pm:154
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr "ECI Hi-Focus-modem"
 
-#: network/netconnect.pm:154
+#: network/netconnect.pm:158
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr "Dynamisk vertsoppsett (DHCP)"
 
-#: network/netconnect.pm:155
+#: network/netconnect.pm:159
 #, c-format
 msgid "Manual TCP/IP configuration"
 msgstr "Manuelt TCP/IP-oppsett"
 
-#: network/netconnect.pm:156
+#: network/netconnect.pm:160
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr "Punkt til punkt-tunnelering (PPTP)"
 
-#: network/netconnect.pm:157
+#: network/netconnect.pm:161
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr "PPP over lokalnett (PPPoE)"
 
-#: network/netconnect.pm:158
+#: network/netconnect.pm:162
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr "PPP over ATM (PPPoA)"
 
-#: network/netconnect.pm:162
+#: network/netconnect.pm:163
+#, c-format
+msgid "DSL over CAPI"
+msgstr ""
+
+#: network/netconnect.pm:167
 #, c-format
 msgid "Bridged Ethernet LLC"
 msgstr "Bru-lokalnett med LLC"
 
-#: network/netconnect.pm:163
+#: network/netconnect.pm:168
 #, c-format
 msgid "Bridged Ethernet VC"
 msgstr "Bru-lokalnett med VC"
 
-#: network/netconnect.pm:164
+#: network/netconnect.pm:169
 #, c-format
 msgid "Routed IP LLC"
 msgstr "Ruta IP LLC"
 
-#: network/netconnect.pm:165
+#: network/netconnect.pm:170
 #, c-format
 msgid "Routed IP VC"
 msgstr "Ruta IP VC"
 
-#: network/netconnect.pm:166
+#: network/netconnect.pm:171
 #, c-format
-msgid "PPPOA LLC"
-msgstr "PPPOA LLC"
+msgid "PPPoA LLC"
+msgstr "PPPoA LLC"
 
-#: network/netconnect.pm:167
+#: network/netconnect.pm:172
 #, c-format
-msgid "PPPOA VC"
-msgstr "PPPOA VC"
+msgid "PPPoA VC"
+msgstr "PPPoA VC"
 
-#: network/netconnect.pm:171 standalone/drakconnect:477
+#: network/netconnect.pm:176 standalone/drakconnect:474
 #, c-format
 msgid "Script-based"
 msgstr "Skriptbasert"
 
-#: network/netconnect.pm:172 standalone/drakconnect:477
+#: network/netconnect.pm:177 standalone/drakconnect:474
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: network/netconnect.pm:173 standalone/drakconnect:477
+#: network/netconnect.pm:178 standalone/drakconnect:474
 #, c-format
 msgid "Terminal-based"
 msgstr "Terminalbasert"
 
-#: network/netconnect.pm:174 standalone/drakconnect:477
+#: network/netconnect.pm:179 standalone/drakconnect:474
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: network/netconnect.pm:175 standalone/drakconnect:477
+#: network/netconnect.pm:180 standalone/drakconnect:474
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
 
-#: network/netconnect.pm:228 standalone/drakconnect:55
+#: network/netconnect.pm:236 standalone/drakconnect:59
 #, c-format
 msgid "Network & Internet Configuration"
 msgstr "Nettverks- og Internett-oppsett"
 
-#: network/netconnect.pm:234
+#: network/netconnect.pm:242
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(funnen på port %s)"
 
-#  -PO: here, "(detected)" string will be appended to eg "ADSL connection"
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:236
+#: network/netconnect.pm:244
 #, c-format
 msgid "(detected %s)"
 msgstr "(funnen «%s»)"
 
-#: network/netconnect.pm:236
+#: network/netconnect.pm:244
 #, c-format
 msgid "(detected)"
 msgstr "(funnen)"
 
-#: network/netconnect.pm:238
+#: network/netconnect.pm:246
 #, c-format
 msgid "Modem connection"
 msgstr "Modem-samband"
 
-#: network/netconnect.pm:239
+#: network/netconnect.pm:247
 #, c-format
 msgid "ISDN connection"
 msgstr "ISDN-samband"
 
-#: network/netconnect.pm:240
+#: network/netconnect.pm:248
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL-samband"
 
-#: network/netconnect.pm:241
+#: network/netconnect.pm:249
 #, c-format
 msgid "Cable connection"
 msgstr "Kabelsamband"
 
-#: network/netconnect.pm:242
+#: network/netconnect.pm:250
 #, c-format
 msgid "LAN connection"
 msgstr "Lokalnettverk"
 
-#: network/netconnect.pm:243 network/netconnect.pm:257
+#: network/netconnect.pm:251 network/netconnect.pm:265
 #, c-format
 msgid "Wireless connection"
 msgstr "Trådlaust samband"
 
-#: network/netconnect.pm:253
+#: network/netconnect.pm:261
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "Vel sambandet du vil setja opp"
 
-#: network/netconnect.pm:270
+#: network/netconnect.pm:279
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -8984,132 +9529,135 @@ msgid ""
 "\n"
 "Press \"%s\" to continue."
 msgstr ""
+"Klar til oppsett av «%s»-sambandet.\n"
+"\n"
+"\n"
+"Trykk «%s» for å helda fram."
 
-#: network/netconnect.pm:278 network/netconnect.pm:788
+#: network/netconnect.pm:287 network/netconnect.pm:839
 #, c-format
 msgid "Connection Configuration"
 msgstr "Sambandsoppsett"
 
-#: network/netconnect.pm:279 network/netconnect.pm:789
+#: network/netconnect.pm:288 network/netconnect.pm:840
 #, c-format
 msgid "Please fill or check the field below"
 msgstr "Fyll inn eller kryss av for feltet under"
 
-#: network/netconnect.pm:286 standalone/drakconnect:532
+#: network/netconnect.pm:295 standalone/drakconnect:530
 #, c-format
 msgid "Card IRQ"
 msgstr "Kort-IRQ"
 
-#: network/netconnect.pm:287 standalone/drakconnect:533
+#: network/netconnect.pm:296 standalone/drakconnect:531
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "Kortminne (DMA)"
 
-#: network/netconnect.pm:288 standalone/drakconnect:534
+#: network/netconnect.pm:297 standalone/drakconnect:532
 #, c-format
 msgid "Card IO"
 msgstr "Kort-IO"
 
-#: network/netconnect.pm:289 standalone/drakconnect:535
+#: network/netconnect.pm:298 standalone/drakconnect:533
 #, c-format
 msgid "Card IO_0"
 msgstr "Kort-IO_0"
 
-#: network/netconnect.pm:290
+#: network/netconnect.pm:299
 #, c-format
 msgid "Card IO_1"
 msgstr "Kort-IO_1"
 
-#: network/netconnect.pm:291
+#: network/netconnect.pm:300
 #, c-format
 msgid "Your personal phone number"
 msgstr "Privat telefonnummer"
 
-#: network/netconnect.pm:292 network/netconnect.pm:792
+#: network/netconnect.pm:301 network/netconnect.pm:843
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr "Leverandørnamn (eks.: «leverandør.no»)"
 
-#: network/netconnect.pm:293 standalone/drakconnect:473
+#: network/netconnect.pm:302 standalone/drakconnect:469
 #, c-format
 msgid "Provider phone number"
 msgstr "Telefonnummer til leverandør"
 
-#: network/netconnect.pm:294
+#: network/netconnect.pm:303
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "DNS 1 til leverandør (valfri)"
 
-#: network/netconnect.pm:295
+#: network/netconnect.pm:304
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "DNS 2 til leverandør (valfri)"
 
-#: network/netconnect.pm:296 standalone/drakconnect:429
+#: network/netconnect.pm:305 standalone/drakconnect:420
 #, c-format
 msgid "Dialing mode"
 msgstr "Ringjemodus"
 
-#: network/netconnect.pm:297 standalone/drakconnect:434
-#: standalone/drakconnect:495
+#: network/netconnect.pm:306 standalone/drakconnect:425
+#: standalone/drakconnect:493
 #, c-format
 msgid "Connection speed"
 msgstr "Sambandsfart"
 
-#: network/netconnect.pm:298 standalone/drakconnect:439
+#: network/netconnect.pm:307 standalone/drakconnect:430
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "Avbrotstid (i sekund)"
 
-#: network/netconnect.pm:301 network/netconnect.pm:795
-#: standalone/drakconnect:471
+#: network/netconnect.pm:310 network/netconnect.pm:846
+#: standalone/drakconnect:467
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Brukarnamn til konto"
 
-#: network/netconnect.pm:302 network/netconnect.pm:796
-#: standalone/drakconnect:472
+#: network/netconnect.pm:311 network/netconnect.pm:847
+#: standalone/drakconnect:468
 #, c-format
 msgid "Account Password"
 msgstr "Passord til konto"
 
-#: network/netconnect.pm:332 network/netconnect.pm:649
-#: network/netconnect.pm:827
+#: network/netconnect.pm:328 network/netconnect.pm:677
+#: network/netconnect.pm:880
 #, c-format
 msgid "Select the network interface to configure:"
 msgstr "Vel nettverksgrensesnittet du vil setja opp:"
 
-#: network/netconnect.pm:334 network/netconnect.pm:375
-#: network/netconnect.pm:650 network/netconnect.pm:829 network/shorewall.pm:84
-#: standalone/drakconnect:656 standalone/drakgw:225 standalone/drakvpn:221
+#: network/netconnect.pm:330 network/netconnect.pm:378
+#: network/netconnect.pm:678 network/netconnect.pm:882 network/shorewall.pm:85
+#: standalone/drakconnect:683 standalone/drakgw:227 standalone/drakvpn:221
 #, c-format
 msgid "Net Device"
 msgstr "Netteining"
 
-#: network/netconnect.pm:335 network/netconnect.pm:343
+#: network/netconnect.pm:331 network/netconnect.pm:339
 #, c-format
 msgid "External ISDN modem"
 msgstr "Ekstern ISDN-modem"
 
-#. -PO: Do not alter the <span ..> and </span> tags
-#: network/netconnect.pm:374 standalone/harddrake2:121
+#: network/netconnect.pm:377 standalone/harddrake2:192
 #, c-format
-msgid "Select a device !"
+msgid "Select a device!"
 msgstr "Vel ei eining."
 
-#: network/netconnect.pm:383 network/netconnect.pm:393
-#: network/netconnect.pm:403 network/netconnect.pm:419
-#: network/netconnect.pm:433
+#: network/netconnect.pm:386 network/netconnect.pm:396
+#: network/netconnect.pm:406 network/netconnect.pm:439
+#: network/netconnect.pm:453
 #, c-format
 msgid "ISDN Configuration"
 msgstr "ISDN-oppsett"
 
-#: network/netconnect.pm:384
+#: network/netconnect.pm:387
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "Kva korttype har du?"
 
-#: network/netconnect.pm:394
+#: network/netconnect.pm:397
 #, c-format
 msgid ""
 "\n"
@@ -9124,34 +9672,48 @@ msgstr ""
 "Har du eit PCMCIA-kort må du sjølv skriva inn IRQ- og IO-nummera til "
 "kortet.\n"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Continue"
 msgstr "Hald fram"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Abort"
 msgstr "Avbryt"
 
-#: network/netconnect.pm:404
+#: network/netconnect.pm:407
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "Kven av desse er ISDN-kortet ditt?"
 
-#: network/netconnect.pm:419
+#: network/netconnect.pm:425
+#, c-format
+msgid ""
+"A CAPI driver is available for this modem. This CAPI driver can offer more "
+"capabilities than the free driver (like sending faxes). Which driver do you "
+"want to use?"
+msgstr ""
+
+#: network/netconnect.pm:427 standalone/drakconnect:116 standalone/drakups:247
+#: standalone/harddrake2:117
+#, c-format
+msgid "Driver"
+msgstr "Drivar"
+
+#: network/netconnect.pm:439
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "Kva protokoll vil du bruka?"
 
-#: network/netconnect.pm:421 standalone/drakconnect:116
-#: standalone/drakconnect:318 standalone/drakconnect:540
+#: network/netconnect.pm:441 standalone/drakconnect:116
+#: standalone/drakconnect:309 standalone/drakconnect:538
 #: standalone/drakvpn:1142
 #, c-format
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: network/netconnect.pm:433
+#: network/netconnect.pm:453
 #, c-format
 msgid ""
 "Select your provider.\n"
@@ -9160,13 +9722,13 @@ msgstr ""
 "Vel leverandør.\n"
 "Vel «Annan» om leverandøren din ikkje står her."
 
-#: network/netconnect.pm:435 network/netconnect.pm:541
-#: network/netconnect.pm:683
+#: network/netconnect.pm:455 network/netconnect.pm:563
+#: network/netconnect.pm:719
 #, c-format
 msgid "Provider:"
 msgstr "Leverandør:"
 
-#: network/netconnect.pm:450
+#: network/netconnect.pm:470
 #, c-format
 msgid ""
 "Your modem isn't supported by the system.\n"
@@ -9175,155 +9737,153 @@ msgstr ""
 "Modemet ditt er ikkje støtta.\n"
 "Sjå http://www.linmodems.org/."
 
-#: network/netconnect.pm:462
+#: network/netconnect.pm:482
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "Vel modemet du vil setja opp:"
 
-#: network/netconnect.pm:469 standalone/drakgw:113 standalone/drakvpn:51
-#, c-format
-msgid "Sorry, we support only 2.4 and above kernels."
-msgstr "Feil: Støttar berre 2.4 og seinare kjerneversjonar."
-
-#: network/netconnect.pm:510
+#: network/netconnect.pm:530
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
-msgstr ""
+msgstr "Vel kva serieport modemet er kopla til."
 
-#: network/netconnect.pm:539
+#: network/netconnect.pm:561
 #, c-format
 msgid "Select your provider:"
 msgstr "Vel leverandør:"
 
-#: network/netconnect.pm:568
+#: network/netconnect.pm:589
 #, c-format
 msgid "Dialup: account options"
-msgstr ""
+msgstr "Oppringt: Kontoval"
 
-#: network/netconnect.pm:571
+#: network/netconnect.pm:592
 #, c-format
 msgid "Connection name"
 msgstr "Sambandsnamn"
 
-#: network/netconnect.pm:572
+#: network/netconnect.pm:593
 #, c-format
 msgid "Phone number"
 msgstr "Telefonnummer"
 
-#: network/netconnect.pm:573
+#: network/netconnect.pm:594
 #, c-format
 msgid "Login ID"
 msgstr "Pålogging-ID"
 
-#: network/netconnect.pm:588 network/netconnect.pm:621
+#: network/netconnect.pm:609 network/netconnect.pm:642
 #, c-format
 msgid "Dialup: IP parameters"
-msgstr ""
+msgstr "Oppringt: IP-parametrar"
 
-#: network/netconnect.pm:591
+#: network/netconnect.pm:612
 #, c-format
 msgid "IP parameters"
 msgstr "IP-parametrar"
 
-#: network/netconnect.pm:592 network/netconnect.pm:919
-#: printer/printerdrake.pm:431 standalone/drakconnect:116
-#: standalone/drakconnect:332 standalone/drakconnect:829
-#: standalone/drakups:266
+#: network/netconnect.pm:613 network/netconnect.pm:976
+#: printer/printerdrake.pm:454 standalone/drakconnect:116
+#: standalone/drakconnect:323 standalone/drakconnect:880
+#: standalone/drakups:282
 #, c-format
 msgid "IP address"
 msgstr "IP-adresse"
 
-#: network/netconnect.pm:593
+#: network/netconnect.pm:614
 #, c-format
 msgid "Subnet mask"
-msgstr ""
+msgstr "Undernettsmaske"
 
-#: network/netconnect.pm:605
+#: network/netconnect.pm:626
 #, c-format
 msgid "Dialup: DNS parameters"
-msgstr ""
+msgstr "Oppringt: DNS-parametrar"
 
-#: network/netconnect.pm:608
+#: network/netconnect.pm:629
 #, c-format
 msgid "DNS"
 msgstr "DNS"
 
-#: network/netconnect.pm:609
+#: network/netconnect.pm:630
 #, c-format
 msgid "Domain name"
 msgstr "Domenenamn"
 
-#: network/netconnect.pm:610 network/netconnect.pm:793
-#: standalone/drakconnect:947
+#: network/netconnect.pm:631 network/netconnect.pm:844
+#: standalone/drakconnect:998
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr "Første DNS-tenar (valfri)"
 
-#: network/netconnect.pm:611 network/netconnect.pm:794
-#: standalone/drakconnect:948
+#: network/netconnect.pm:632 network/netconnect.pm:845
+#: standalone/drakconnect:999
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr "Andre DNS-tenar (valfri)"
 
-#: network/netconnect.pm:612
+#: network/netconnect.pm:633
 #, c-format
 msgid "Set hostname from IP"
 msgstr "Finn vertsnamn frå IP"
 
-#: network/netconnect.pm:624 standalone/drakconnect:343
+#: network/netconnect.pm:645 standalone/drakconnect:334
 #, c-format
 msgid "Gateway"
 msgstr "Portnar"
 
-#: network/netconnect.pm:625
+#: network/netconnect.pm:646
 #, c-format
 msgid "Gateway IP address"
 msgstr "IP-adresse for portnar"
 
-#: network/netconnect.pm:649
+#: network/netconnect.pm:677
 #, c-format
 msgid "ADSL configuration"
 msgstr "ADSL-oppsett"
 
-#: network/netconnect.pm:681
+#: network/netconnect.pm:717
 #, c-format
 msgid "Please choose your ADSL provider"
 msgstr "Vel ADSL-leverandør"
 
-#: network/netconnect.pm:699
+#: network/netconnect.pm:735
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
 "You can provide it now via a floppy or your windows partition,\n"
 "or skip and do it later."
 msgstr ""
+"Du treng Alcatel-mikrokoden.\n"
+"Har du han på diskett eller på Windows-partisjonen, kan du bruka han "
+"direkte. Viss ikkje, kan du gjera det seinare."
 
-#: network/netconnect.pm:703 network/netconnect.pm:708
+#: network/netconnect.pm:739 network/netconnect.pm:744
 #, c-format
 msgid "Use a floppy"
 msgstr "Bruk diskett"
 
-#: network/netconnect.pm:703 network/netconnect.pm:712
+#: network/netconnect.pm:739 network/netconnect.pm:748
 #, c-format
 msgid "Use my Windows partition"
 msgstr "Bruk Windows-partisjon"
 
-#: network/netconnect.pm:703 network/netconnect.pm:715
+#: network/netconnect.pm:739 network/netconnect.pm:751
 #, c-format
 msgid "Do it later"
 msgstr "Gjer det seinare"
 
-#: network/netconnect.pm:722
+#: network/netconnect.pm:758
 #, c-format
 msgid "Firmware copy failed, file %s not found"
-msgstr ""
+msgstr "Klarte ikkje kopiera fastvare. Fann ikkje fila «%s»."
 
-#: network/netconnect.pm:729
+#: network/netconnect.pm:765
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr "Fullført kopiering av fastvare"
 
-#: network/netconnect.pm:744
+#: network/netconnect.pm:780
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -9331,23 +9891,27 @@ msgid ""
 "%s\n"
 "and copy the mgmt.o in /usr/share/speedtouch"
 msgstr ""
+"Du treng Alcatel-mikrokoden.\n"
+"Du kan lasta han ned frå:\n"
+"%s\n"
+"og kopiera «mgmt.o» til «/usr/share/speedtouch/»"
 
-#: network/netconnect.pm:797
+#: network/netconnect.pm:849
 #, c-format
 msgid "Virtual Path ID (VPI):"
-msgstr ""
+msgstr "Virtuell stig-ID (VPI):"
 
-#: network/netconnect.pm:798
+#: network/netconnect.pm:850
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
-msgstr ""
+msgstr "Virtuell krins-ID (VPI):"
 
-#: network/netconnect.pm:800
+#: network/netconnect.pm:853
 #, c-format
-msgid "Encapsulation :"
+msgid "Encapsulation:"
 msgstr "Innkapsling:"
 
-#: network/netconnect.pm:817
+#: network/netconnect.pm:870
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -9355,155 +9919,174 @@ msgid ""
 "\n"
 "You can find a driver on http://eciadsl.flashtux.org/"
 msgstr ""
+"ECI Hi-Focus-modumet er ikkje støtta, grunna "
+"binærdrivardistribusjonsproblem.\n"
+"\n"
+"Du finn ein drivar på: http://eciadsl.flashtux.org/"
 
-#: network/netconnect.pm:829
+#: network/netconnect.pm:882
 #, c-format
 msgid "Manually load a driver"
-msgstr ""
+msgstr "Last inn drivar manuelt"
 
-#: network/netconnect.pm:844
+#: network/netconnect.pm:898
 #, c-format
 msgid ""
 "WARNING: this device has been previously configured to connect to the "
 "Internet.\n"
-"Simply accept to keep this device configured.\n"
-"Modifying the fields below will override this configuration."
+"Modifying the fields below will override this configuration.\n"
+"Do you really want to reconfigure this device?"
 msgstr ""
+"Åtvaring: Denne eininga er tidlegare sett opp til å kopla til Internett.\n"
+"Endrar du nokre av felta nedanfor, vil dette overstyra det gamle oppsett.\n"
+"Er du sikker på at du vil endra oppsettet?"
 
-#: network/netconnect.pm:857 network/netconnect.pm:1228
+#: network/netconnect.pm:912 network/netconnect.pm:1340
 #, c-format
 msgid ""
 "Congratulations, the network and Internet configuration is finished.\n"
 "\n"
 msgstr ""
+"Gratulerer! Nettverks- og Internett-oppsettet er no fullført.\n"
+"\n"
 
-#: network/netconnect.pm:871
+#: network/netconnect.pm:929
 #, c-format
 msgid "Zeroconf hostname resolution"
-msgstr ""
+msgstr "Zeroconf-vertsnamnoppslag"
 
-#: network/netconnect.pm:872 network/netconnect.pm:906
+#: network/netconnect.pm:930 network/netconnect.pm:963
 #, c-format
 msgid "Configuring network device %s (driver %s)"
-msgstr ""
+msgstr "Set opp nettverkseininga %s (drivar: «%s»)"
 
-#: network/netconnect.pm:873
+#: network/netconnect.pm:931
 #, c-format
 msgid ""
 "The following protocols can be used to configure an ethernet connection. "
 "Please choose the one you want to use"
 msgstr ""
+"Du kan bruka desse nettverksprotokollane. Vel kven av dei du vil bruka."
 
-#: network/netconnect.pm:907
+#: network/netconnect.pm:964
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
 "Each item should be entered as an IP address in dotted-decimal\n"
 "notation (for example, 1.2.3.4)."
 msgstr ""
+"Skriv inn IP-oppsettet for maskina.\n"
+"Kvar adresse skal skrivast på formatet «1.2.3.4»."
 
-#: network/netconnect.pm:914
+#: network/netconnect.pm:971
 #, c-format
 msgid "Assign host name from DHCP address"
-msgstr ""
+msgstr "Tildel vertsnamn frå DHCP-adresse"
 
-#: network/netconnect.pm:915
+#: network/netconnect.pm:972
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP-vertsnamn"
 
-#: network/netconnect.pm:920 standalone/drakconnect:337
-#: standalone/drakconnect:830 standalone/drakgw:321
+#: network/netconnect.pm:977 standalone/drakconnect:328
+#: standalone/drakconnect:881 standalone/drakgw:323
 #, c-format
 msgid "Netmask"
-msgstr ""
+msgstr "Nettmaske"
 
-#: network/netconnect.pm:922 standalone/drakconnect:422
+#: network/netconnect.pm:979 standalone/drakconnect:413
 #, c-format
 msgid "Track network card id (useful for laptops)"
-msgstr ""
+msgstr "Spor nettverkskort-ID (nyttig for bærbare maskiner)"
 
-#: network/netconnect.pm:923 standalone/drakconnect:423
+#: network/netconnect.pm:980 standalone/drakconnect:414
 #, c-format
 msgid "Network Hotplugging"
-msgstr ""
+msgstr "Bruk direktekopling"
 
-#: network/netconnect.pm:924 standalone/drakconnect:417
+#: network/netconnect.pm:982 standalone/drakconnect:408
 #, c-format
 msgid "Start at boot"
 msgstr "Start ved oppstart"
 
-#: network/netconnect.pm:926 standalone/drakconnect:833
+#: network/netconnect.pm:985 standalone/drakconnect:884
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP-klient"
 
-#: network/netconnect.pm:936 printer/printerdrake.pm:1383
-#: standalone/drakconnect:621
+#: network/netconnect.pm:995 printer/printerdrake.pm:1498
+#: standalone/drakconnect:648
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
-msgstr ""
+msgstr "IP-adresser må vera på formatet «1.2.3.4»."
+
+#: network/netconnect.pm:999
+#, c-format
+msgid "Warning: IP address %s is usually reserved!"
+msgstr "Åtvaring: IP-adressa «%s» er vanlegvis reservert."
 
-#: network/netconnect.pm:939
+#: network/netconnect.pm:1004 standalone/drakTermServ:1690
+#: standalone/drakTermServ:1691 standalone/drakTermServ:1692
 #, c-format
-msgid "Warning : IP address %s is usually reserved !"
+msgid "%s already in use\n"
 msgstr ""
 
-#: network/netconnect.pm:969 network/netconnect.pm:998
+#: network/netconnect.pm:1030 network/netconnect.pm:1059
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
-msgstr ""
+msgstr "Skriv inn trådlausinnstillingane for kortet."
 
-#: network/netconnect.pm:972 standalone/drakconnect:389
+#: network/netconnect.pm:1033 standalone/drakconnect:380
 #, c-format
 msgid "Operating Mode"
-msgstr ""
+msgstr "Operasjonsmodus"
 
-#: network/netconnect.pm:974 standalone/drakconnect:390
+#: network/netconnect.pm:1035 standalone/drakconnect:381
 #, c-format
 msgid "Network name (ESSID)"
-msgstr ""
+msgstr "Nettverksnamn (ESSID)"
 
-#: network/netconnect.pm:975 standalone/drakconnect:391
+#: network/netconnect.pm:1036 standalone/drakconnect:382
 #, c-format
 msgid "Network ID"
 msgstr "Nettverks-ID"
 
-#: network/netconnect.pm:976 standalone/drakconnect:392
+#: network/netconnect.pm:1037 standalone/drakconnect:383
 #, c-format
 msgid "Operating frequency"
-msgstr ""
+msgstr "Operasjonsfrekvens"
 
-#: network/netconnect.pm:977 standalone/drakconnect:393
+#: network/netconnect.pm:1038 standalone/drakconnect:384
 #, c-format
 msgid "Sensitivity threshold"
-msgstr ""
+msgstr "Følsemdsgrense"
 
-#: network/netconnect.pm:978 standalone/drakconnect:394
+#: network/netconnect.pm:1039 standalone/drakconnect:385
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitrate (i b/s)"
 
-#: network/netconnect.pm:984
+#: network/netconnect.pm:1045
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
 "frequency), or add enough '0' (zeroes)."
 msgstr ""
+"Frekvensen må ha eitt av suffiksa k, M eller G (eks.: 2.46G), eller nok 0-ar."
 
-#: network/netconnect.pm:988
+#: network/netconnect.pm:1049
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
-msgstr ""
+msgstr "Raten må ha eitt av suffiksa k, M eller G (eks.: 11M), eller nok 0-ar."
 
-#: network/netconnect.pm:1001 standalone/drakconnect:405
+#: network/netconnect.pm:1062 standalone/drakconnect:396
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: network/netconnect.pm:1002
+#: network/netconnect.pm:1063
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -9517,33 +10100,33 @@ msgid ""
 "or off."
 msgstr ""
 
-#: network/netconnect.pm:1009 standalone/drakconnect:406
+#: network/netconnect.pm:1070 standalone/drakconnect:397
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentering"
 
-#: network/netconnect.pm:1010 standalone/drakconnect:407
+#: network/netconnect.pm:1071 standalone/drakconnect:398
 #, c-format
 msgid "Iwconfig command extra arguments"
-msgstr ""
+msgstr "Ekstraargument for lwconfig-kommandoen"
 
-#: network/netconnect.pm:1011
+#: network/netconnect.pm:1072
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
 "ap, channel, commit, enc, power, retry, sens, txpower (nick is already set "
 "as the hostname).\n"
 "\n"
-"See iwpconfig(8) man page for further information."
+"See iwconfig(8) man page for further information."
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: network/netconnect.pm:1018 standalone/drakconnect:408
+#: network/netconnect.pm:1079 standalone/drakconnect:399
 #, c-format
 msgid "Iwspy command extra arguments"
-msgstr ""
+msgstr "Ekstraargument for lwspy-kommandoen"
 
-#: network/netconnect.pm:1019
+#: network/netconnect.pm:1080
 #, c-format
 msgid ""
 "Iwspy is used to set a list of addresses in a wireless network\n"
@@ -9555,12 +10138,12 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:1027 standalone/drakconnect:409
+#: network/netconnect.pm:1088 standalone/drakconnect:400
 #, c-format
 msgid "Iwpriv command extra arguments"
-msgstr ""
+msgstr "Ekstraargument for lwpriv-kommandoen"
 
-#: network/netconnect.pm:1028
+#: network/netconnect.pm:1089
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -9578,25 +10161,7 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:1055
-#, c-format
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-
-#: network/netconnect.pm:1059 standalone/drakgw:261 standalone/drakpxe:142
-#, c-format
-msgid "Choose the network interface"
-msgstr ""
-
-#: network/netconnect.pm:1060
-#, c-format
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet."
-msgstr ""
-
-#: network/netconnect.pm:1081
+#: network/netconnect.pm:1163
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -9605,84 +10170,88 @@ msgid ""
 "You may also enter the IP address of the gateway if you have one."
 msgstr ""
 
-#: network/netconnect.pm:1085
+#: network/netconnect.pm:1167
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
-msgstr ""
+msgstr "Du kan òg skriva inn IP-adressene til DNS-tenaren."
 
-#: network/netconnect.pm:1087 standalone/drakconnect:946
+#: network/netconnect.pm:1169 standalone/drakconnect:997
 #, c-format
 msgid "Host name (optional)"
 msgstr "Vertsnamn (valfri)"
 
-#: network/netconnect.pm:1087
+#: network/netconnect.pm:1169
 #, c-format
 msgid "Host name"
 msgstr "Vertsnamn"
 
-#: network/netconnect.pm:1089
+#: network/netconnect.pm:1171
 #, c-format
 msgid "DNS server 1"
 msgstr "DNS-tenar 1"
 
-#: network/netconnect.pm:1090
+#: network/netconnect.pm:1172
 #, c-format
 msgid "DNS server 2"
 msgstr "DNS-tenar 2"
 
-#: network/netconnect.pm:1091
+#: network/netconnect.pm:1173
 #, c-format
 msgid "DNS server 3"
 msgstr "DNS-tenar 3"
 
-#: network/netconnect.pm:1092
+#: network/netconnect.pm:1174
 #, c-format
 msgid "Search domain"
-msgstr ""
+msgstr "Søkjedomene"
 
-#: network/netconnect.pm:1093
+#: network/netconnect.pm:1175
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
+"Vanlegvis blir søkjedomenet automatisk valt frå det fullkvalifiserte "
+"vertsnamnet."
 
-#: network/netconnect.pm:1094
+#: network/netconnect.pm:1176
 #, c-format
 msgid "Gateway (e.g. %s)"
-msgstr ""
+msgstr "Portnar (eks.: %s)"
 
-#: network/netconnect.pm:1096
+#: network/netconnect.pm:1178
 #, c-format
 msgid "Gateway device"
-msgstr ""
+msgstr "Portnar"
 
-#: network/netconnect.pm:1105
+#: network/netconnect.pm:1187
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr ""
 
-#: network/netconnect.pm:1110 standalone/drakconnect:624
+#: network/netconnect.pm:1192 standalone/drakconnect:651
 #, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr ""
 
-#: network/netconnect.pm:1121
+#: network/netconnect.pm:1203
 #, c-format
 msgid ""
-"Enter a Zeroconf host name which will be the one that your machine will get "
-"back to other machines on the network:"
+"If desired, enter a Zeroconf hostname.\n"
+"This is the name your machine will use to advertise any of\n"
+"its shared resources that are not managed by the network.\n"
+"It is not necessary on most networks."
 msgstr ""
 
-#: network/netconnect.pm:1122
+#: network/netconnect.pm:1207
 #, c-format
 msgid "Zeroconf Host name"
-msgstr ""
+msgstr "Zeroconf-vertsnamn"
 
-#: network/netconnect.pm:1125
+#: network/netconnect.pm:1210
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr ""
 
-#: network/netconnect.pm:1135
+#: network/netconnect.pm:1220
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -9690,82 +10259,102 @@ msgid ""
 "\n"
 msgstr ""
 
-#: network/netconnect.pm:1137
+#: network/netconnect.pm:1222
 #, c-format
 msgid "Internet connection"
 msgstr ""
 
-#: network/netconnect.pm:1145
+#: network/netconnect.pm:1230
 #, c-format
-msgid "Configuration is complete, do you want to apply settings ?"
+msgid "Configuration is complete, do you want to apply settings?"
 msgstr ""
 
-#: network/netconnect.pm:1155
+#: network/netconnect.pm:1240
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr ""
 
-#: network/netconnect.pm:1172
+#: network/netconnect.pm:1258
+#, c-format
+msgid "Automatically at boot"
+msgstr "Start ved oppstart"
+
+#: network/netconnect.pm:1260
+#, c-format
+msgid "By using Net Applet in the system tray"
+msgstr ""
+
+#: network/netconnect.pm:1262
+#, c-format
+msgid "Manually (the interface would still be activated at boot)"
+msgstr ""
+
+#: network/netconnect.pm:1271
+#, c-format
+msgid "How do you want to dial this connection?"
+msgstr "Korleis vil du ringja opp dette sambandet?"
+
+#: network/netconnect.pm:1284
 #, c-format
-msgid "The network needs to be restarted. Do you want to restart it ?"
+msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr ""
 
-#: network/netconnect.pm:1179 network/netconnect.pm:1244
+#: network/netconnect.pm:1291 network/netconnect.pm:1356
 #, c-format
 msgid "Network Configuration"
 msgstr "Nettverksoppsett"
 
-#: network/netconnect.pm:1180
+#: network/netconnect.pm:1292
 #, c-format
 msgid ""
-"A problem occured while restarting the network: \n"
+"A problem occurred while restarting the network: \n"
 "\n"
 "%s"
 msgstr ""
 
-#: network/netconnect.pm:1188
+#: network/netconnect.pm:1300
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr ""
 
-#: network/netconnect.pm:1196 standalone/drakconnect:978
+#: network/netconnect.pm:1308 standalone/drakconnect:1029
 #, c-format
 msgid "Testing your connection..."
 msgstr "Testar sambandet ..."
 
-#: network/netconnect.pm:1212
+#: network/netconnect.pm:1324
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr ""
 
-#: network/netconnect.pm:1213
+#: network/netconnect.pm:1325
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr ""
 
-#: network/netconnect.pm:1214
+#: network/netconnect.pm:1326
 #, c-format
 msgid ""
 "The system doesn't seem to be connected to the Internet.\n"
 "Try to reconfigure your connection."
 msgstr ""
 
-#: network/netconnect.pm:1231
+#: network/netconnect.pm:1343
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
 "avoid any hostname-related problems."
 msgstr ""
 
-#: network/netconnect.pm:1232
+#: network/netconnect.pm:1344
 #, c-format
 msgid ""
-"Problems occured during configuration.\n"
+"Problems occurred during configuration.\n"
 "Test your connection via net_monitor or mcc. If your connection doesn't "
 "work, you might want to relaunch the configuration."
 msgstr ""
 
-#: network/netconnect.pm:1245
+#: network/netconnect.pm:1357
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -9774,34 +10363,34 @@ msgid ""
 "Internet & Network connection.\n"
 msgstr ""
 
-#: network/netconnect.pm:1333
+#: network/netconnect.pm:1393
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
 "%s"
 msgstr ""
 
-#: network/network.pm:315
+#: network/network.pm:316
 #, c-format
 msgid "Proxies configuration"
-msgstr ""
+msgstr "Mellomtenaroppsett"
 
-#: network/network.pm:316
+#: network/network.pm:317
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP-mellomtenar"
 
-#: network/network.pm:317
+#: network/network.pm:318
 #, c-format
 msgid "FTP proxy"
 msgstr "FTP-mellomtenar"
 
-#: network/network.pm:320
+#: network/network.pm:321
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "Mellomtenaren skal vera «http://...»"
 
-#: network/network.pm:321
+#: network/network.pm:322
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URI-en skal begynna med «ftp:» eller «http:»"
@@ -9818,7 +10407,7 @@ msgid ""
 "need some manual fixes after installation."
 msgstr ""
 
-#: network/shorewall.pm:77 standalone/drakgw:218 standalone/drakvpn:214
+#: network/shorewall.pm:78 standalone/drakgw:220 standalone/drakvpn:214
 #, c-format
 msgid ""
 "Please enter the name of the interface connected to the internet.\n"
@@ -9829,12 +10418,12 @@ msgid ""
 "\t\tippp+ for a isdn connection.\n"
 msgstr ""
 
-#: network/tools.pm:165
+#: network/tools.pm:197
 #, c-format
 msgid "Insert floppy"
 msgstr "Set inn diskett"
 
-#: network/tools.pm:166
+#: network/tools.pm:198
 #, c-format
 msgid ""
 "Insert a FAT formatted floppy in drive %s with %s in root directory and "
@@ -9843,22 +10432,22 @@ msgstr ""
 "Set inn ein FAT-formatert diskett i stasjon %s med %s i rotmappa, og trykk «%"
 "s»"
 
-#: network/tools.pm:167
+#: network/tools.pm:199
 #, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr ""
 
-#: partition_table.pm:645
+#: partition_table.pm:393
 #, c-format
 msgid "mount failed: "
 msgstr "Feil ved montering: "
 
-#: partition_table.pm:750
+#: partition_table.pm:498
 #, c-format
 msgid "Extended partition not supported on this platform"
 msgstr "Utvida partisjon er ikkje støtta på denne plattforma"
 
-#: partition_table.pm:768
+#: partition_table.pm:516
 #, c-format
 msgid ""
 "You have a hole in your partition table but I can't use it.\n"
@@ -9866,22 +10455,22 @@ msgid ""
 "to the extended partitions."
 msgstr ""
 
-#: partition_table.pm:855
+#: partition_table.pm:602
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Klarte ikkje gjenoppretta frå fila «%s»: %s"
 
-#: partition_table.pm:857
+#: partition_table.pm:604
 #, c-format
 msgid "Bad backup file"
 msgstr "Ugyldig reservekopifil"
 
-#: partition_table.pm:877
+#: partition_table.pm:624
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Klarte ikkje skriva til fila «%s»"
 
-#: partition_table/raw.pm:187
+#: partition_table/raw.pm:238
 #, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -9890,27 +10479,27 @@ msgid ""
 "data."
 msgstr ""
 
-#: pkgs.pm:24
+#: pkgs.pm:23
 #, c-format
 msgid "must have"
 msgstr "må ha"
 
-#: pkgs.pm:25
+#: pkgs.pm:24
 #, c-format
 msgid "important"
 msgstr "viktig"
 
-#: pkgs.pm:26
+#: pkgs.pm:25
 #, c-format
 msgid "very nice"
 msgstr "veldig kjekt å ha"
 
-#: pkgs.pm:27
+#: pkgs.pm:26
 #, c-format
 msgid "nice"
 msgstr "kjekt å ha"
 
-#: pkgs.pm:28
+#: pkgs.pm:27
 #, c-format
 msgid "maybe"
 msgstr "kanskje"
@@ -9925,7 +10514,7 @@ msgstr "(på «%s»)"
 msgid "(on this machine)"
 msgstr "(på denne maskina)"
 
-#: printer/cups.pm:115 standalone/printerdrake:197
+#: printer/cups.pm:115 standalone/printerdrake:203
 #, c-format
 msgid "Configured on other machines"
 msgstr ""
@@ -9935,357 +10524,362 @@ msgstr ""
 msgid "On CUPS server \"%s\""
 msgstr ""
 
-#: printer/cups.pm:117 printer/printerdrake.pm:3989
-#: printer/printerdrake.pm:3998 printer/printerdrake.pm:4139
-#: printer/printerdrake.pm:4150 printer/printerdrake.pm:4362
+#: printer/cups.pm:117 printer/printerdrake.pm:4290
+#: printer/printerdrake.pm:4300 printer/printerdrake.pm:4445
+#: printer/printerdrake.pm:4456 printer/printerdrake.pm:4651
 #, c-format
 msgid " (Default)"
 msgstr " (Standard)"
 
-#: printer/data.pm:22
+#: printer/data.pm:40
 #, c-format
 msgid "PDQ - Print, Don't Queue"
 msgstr ""
 
-#: printer/data.pm:23
+#: printer/data.pm:41
 #, c-format
 msgid "PDQ"
 msgstr ""
 
-#: printer/data.pm:34
+#: printer/data.pm:53
 #, c-format
 msgid "LPD - Line Printer Daemon"
 msgstr ""
 
-#: printer/data.pm:35
+#: printer/data.pm:54
 #, c-format
 msgid "LPD"
 msgstr ""
 
-#: printer/data.pm:56
+#: printer/data.pm:76
 #, c-format
 msgid "LPRng - LPR New Generation"
 msgstr ""
 
-#: printer/data.pm:57
+#: printer/data.pm:77
 #, c-format
 msgid "LPRng"
 msgstr ""
 
-#: printer/data.pm:82
+#: printer/data.pm:103
 #, c-format
 msgid "CUPS - Common Unix Printing System"
 msgstr ""
 
+#: printer/data.pm:132
+#, c-format
+msgid "CUPS - Common Unix Printing System (remote server)"
+msgstr ""
+
+#: printer/data.pm:133
+#, c-format
+msgid "Remote CUPS"
+msgstr "CUPS-tenar på nettverket"
+
 #: printer/detect.pm:149 printer/detect.pm:227 printer/detect.pm:429
-#: printer/detect.pm:466 printer/printerdrake.pm:686
+#: printer/detect.pm:466
 #, c-format
 msgid "Unknown Model"
 msgstr "Ukjend modell"
 
-#: printer/main.pm:29
+#: printer/main.pm:27
 #, c-format
 msgid "Local printer"
 msgstr "Lokal skrivar"
 
-#: printer/main.pm:30
+#: printer/main.pm:28
 #, c-format
 msgid "Remote printer"
 msgstr "Nettverksskrivar"
 
-#: printer/main.pm:31
+#: printer/main.pm:29
 #, c-format
 msgid "Printer on remote CUPS server"
 msgstr ""
 
-#: printer/main.pm:32 printer/printerdrake.pm:1406
+#: printer/main.pm:30 printer/printerdrake.pm:1521
 #, c-format
 msgid "Printer on remote lpd server"
 msgstr ""
 
-#: printer/main.pm:33
+#: printer/main.pm:31
 #, c-format
 msgid "Network printer (TCP/Socket)"
 msgstr ""
 
-#: printer/main.pm:34
+#: printer/main.pm:32
 #, c-format
 msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr ""
 
-#: printer/main.pm:35
+#: printer/main.pm:33
 #, c-format
 msgid "Printer on NetWare server"
 msgstr ""
 
-#: printer/main.pm:36 printer/printerdrake.pm:1410
+#: printer/main.pm:34 printer/printerdrake.pm:1525
 #, c-format
 msgid "Enter a printer device URI"
 msgstr ""
 
-#: printer/main.pm:37
+#: printer/main.pm:35
 #, c-format
 msgid "Pipe job into a command"
 msgstr ""
 
-#: printer/main.pm:307 printer/main.pm:575 printer/main.pm:1545
-#: printer/main.pm:2229 printer/main.pm:2240 printer/printerdrake.pm:1866
-#: printer/printerdrake.pm:4396
+#: printer/main.pm:321 printer/main.pm:604 printer/main.pm:1635
+#: printer/main.pm:2331 printer/main.pm:2340 printer/printerdrake.pm:874
+#: printer/printerdrake.pm:1981 printer/printerdrake.pm:4688
 #, c-format
 msgid "Unknown model"
 msgstr "Ukjend modell"
 
-#: printer/main.pm:332 standalone/printerdrake:196
+#: printer/main.pm:346 standalone/printerdrake:202
 #, c-format
 msgid "Configured on this machine"
 msgstr ""
 
-#: printer/main.pm:338 printer/printerdrake.pm:963
+#: printer/main.pm:352 printer/printerdrake.pm:1069
 #, c-format
 msgid " on parallel port #%s"
 msgstr ""
 
-#: printer/main.pm:341 printer/printerdrake.pm:965
+#: printer/main.pm:355 printer/printerdrake.pm:1072
 #, c-format
 msgid ", USB printer #%s"
 msgstr ""
 
-#: printer/main.pm:343
+#: printer/main.pm:357
 #, c-format
 msgid ", USB printer"
 msgstr ", USB-skrivar"
 
-#: printer/main.pm:348
+#: printer/main.pm:362
 #, c-format
 msgid ", multi-function device on parallel port #%s"
 msgstr ""
 
-#: printer/main.pm:351
+#: printer/main.pm:365
 #, c-format
 msgid ", multi-function device on a parallel port"
 msgstr ""
 
-#: printer/main.pm:353
+#: printer/main.pm:367
 #, c-format
 msgid ", multi-function device on USB"
 msgstr ""
 
-#: printer/main.pm:355
+#: printer/main.pm:369
 #, c-format
 msgid ", multi-function device on HP JetDirect"
 msgstr ""
 
-#: printer/main.pm:357
+#: printer/main.pm:371
 #, c-format
 msgid ", multi-function device"
 msgstr ""
 
-#: printer/main.pm:360
+#: printer/main.pm:375
 #, c-format
 msgid ", printing to %s"
 msgstr ", skriv ut på «%s»"
 
-#: printer/main.pm:362
+#: printer/main.pm:378
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
 msgstr ""
 
-#: printer/main.pm:364
+#: printer/main.pm:381
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
 msgstr ""
 
-#: printer/main.pm:368
+#: printer/main.pm:386
 #, c-format
 msgid " on SMB/Windows server \"%s\", share \"%s\""
 msgstr ""
 
-#: printer/main.pm:372
+#: printer/main.pm:391
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
 msgstr ""
 
-#: printer/main.pm:374
+#: printer/main.pm:394
 #, c-format
 msgid ", using command %s"
 msgstr ""
 
-#: printer/main.pm:389
+#: printer/main.pm:409
 #, c-format
 msgid "Parallel port #%s"
 msgstr ""
 
-#: printer/main.pm:392 printer/printerdrake.pm:979
-#: printer/printerdrake.pm:1002 printer/printerdrake.pm:1020
+#: printer/main.pm:412 printer/printerdrake.pm:1090
+#: printer/printerdrake.pm:1117 printer/printerdrake.pm:1135
 #, c-format
 msgid "USB printer #%s"
 msgstr "USB-skrivar #%s"
 
-#: printer/main.pm:394
+#: printer/main.pm:414
 #, c-format
 msgid "USB printer"
 msgstr "USB-skrivar"
 
-#: printer/main.pm:399
+#: printer/main.pm:419
 #, c-format
 msgid "Multi-function device on parallel port #%s"
 msgstr ""
 
-#: printer/main.pm:402
+#: printer/main.pm:422
 #, c-format
 msgid "Multi-function device on a parallel port"
 msgstr ""
 
-#: printer/main.pm:404
+#: printer/main.pm:424
 #, c-format
 msgid "Multi-function device on USB"
 msgstr ""
 
-#: printer/main.pm:406
+#: printer/main.pm:426
 #, c-format
 msgid "Multi-function device on HP JetDirect"
 msgstr ""
 
-#: printer/main.pm:408
+#: printer/main.pm:428
 #, c-format
 msgid "Multi-function device"
 msgstr ""
 
-#: printer/main.pm:411
+#: printer/main.pm:432
 #, c-format
 msgid "Prints into %s"
 msgstr "Skriv ut i «%s»"
 
-#: printer/main.pm:413
+#: printer/main.pm:435
 #, c-format
 msgid "LPD server \"%s\", printer \"%s\""
 msgstr ""
 
-#: printer/main.pm:415
+#: printer/main.pm:438
 #, c-format
 msgid "TCP/IP host \"%s\", port %s"
 msgstr ""
 
-#: printer/main.pm:419
+#: printer/main.pm:443
 #, c-format
 msgid "SMB/Windows server \"%s\", share \"%s\""
 msgstr ""
 
-#: printer/main.pm:423
+#: printer/main.pm:448
 #, c-format
 msgid "Novell server \"%s\", printer \"%s\""
 msgstr ""
 
-#: printer/main.pm:425
+#: printer/main.pm:451
 #, c-format
 msgid "Uses command %s"
 msgstr ""
 
-#: printer/main.pm:427
+#: printer/main.pm:453
 #, c-format
 msgid "URI: %s"
 msgstr "URI: %s"
 
-#: printer/main.pm:572 printer/printerdrake.pm:732
-#: printer/printerdrake.pm:2463
+#: printer/main.pm:601 printer/printerdrake.pm:820
+#: printer/printerdrake.pm:2584
 #, c-format
 msgid "Raw printer (No driver)"
 msgstr ""
 
-#: printer/main.pm:1086 printer/printerdrake.pm:179
-#: printer/printerdrake.pm:191
+#: printer/main.pm:1147 printer/printerdrake.pm:205
+#: printer/printerdrake.pm:217
 #, c-format
 msgid "Local network(s)"
 msgstr ""
 
-#: printer/main.pm:1088 printer/printerdrake.pm:195
+#: printer/main.pm:1149 printer/printerdrake.pm:221
 #, c-format
 msgid "Interface \"%s\""
 msgstr ""
 
-#: printer/main.pm:1090
+#: printer/main.pm:1151
 #, c-format
 msgid "Network %s"
 msgstr ""
 
-#: printer/main.pm:1092
+#: printer/main.pm:1153
 #, c-format
 msgid "Host %s"
 msgstr ""
 
-#: printer/main.pm:1121
+#: printer/main.pm:1182
 #, c-format
 msgid "%s (Port %s)"
 msgstr ""
 
-#: printer/printerdrake.pm:22
+#: printer/printerdrake.pm:19
 #, c-format
 msgid ""
 "The HP LaserJet 1000 needs its firmware to be uploaded after being turned "
 "on. Download the Windows driver package from the HP web site (the firmware "
 "on the printer's CD does not work) and extract the firmware file from it by "
-"uncompresing the self-extracting '.exe' file with the 'unzip' utility and "
+"decompressing the self-extracting '.exe' file with the 'unzip' utility and "
 "searching for the 'sihp1000.img' file. Copy this file into the '/etc/"
 "printer' directory. There it will be found by the automatic uploader script "
 "and uploaded whenever the printer is connected and turned on.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:62
+#: printer/printerdrake.pm:61
 #, c-format
 msgid "CUPS printer configuration"
 msgstr "CUPS-skrivaroppsett"
 
-#: printer/printerdrake.pm:63
+#: printer/printerdrake.pm:62
 #, c-format
 msgid ""
 "Here you can choose whether the printers connected to this machine should be "
 "accessible by remote machines and by which remote machines."
 msgstr ""
 
-#: printer/printerdrake.pm:64
+#: printer/printerdrake.pm:63
 #, c-format
 msgid ""
 "You can also decide here whether printers on remote machines should be "
 "automatically made available on this machine."
 msgstr ""
 
-#: printer/printerdrake.pm:67
+#: printer/printerdrake.pm:66
 #, c-format
 msgid "The printers on this machine are available to other computers"
 msgstr ""
 
-#: printer/printerdrake.pm:69
+#: printer/printerdrake.pm:71
 #, c-format
 msgid "Automatically find available printers on remote machines"
 msgstr ""
 
-#: printer/printerdrake.pm:71
+#: printer/printerdrake.pm:76
 #, c-format
 msgid "Printer sharing on hosts/networks: "
 msgstr ""
 
-#: printer/printerdrake.pm:73
+#: printer/printerdrake.pm:78
 #, c-format
 msgid "Custom configuration"
 msgstr ""
 
-#: printer/printerdrake.pm:78 standalone/scannerdrake:566
-#: standalone/scannerdrake:583
+#: printer/printerdrake.pm:83 standalone/scannerdrake:562
+#: standalone/scannerdrake:579
 #, c-format
 msgid "No remote machines"
 msgstr "Ingen maskiner på nettverket"
 
-#: printer/printerdrake.pm:88
+#: printer/printerdrake.pm:94
 #, c-format
 msgid "Additional CUPS servers: "
 msgstr ""
 
-#: printer/printerdrake.pm:93
-#, c-format
-msgid "None"
-msgstr "Ingen"
-
-#: printer/printerdrake.pm:95
+#: printer/printerdrake.pm:101
 #, c-format
 msgid ""
 "To get access to printers on remote CUPS servers in your local network you "
@@ -10298,29 +10892,29 @@ msgid ""
 "information from the server(s)."
 msgstr ""
 
-#: printer/printerdrake.pm:100
+#: printer/printerdrake.pm:109
 #, c-format
 msgid "Japanese text printing mode"
 msgstr ""
 
-#: printer/printerdrake.pm:101
+#: printer/printerdrake.pm:110
 #, c-format
 msgid ""
-"Turning on this allows to print plain text files in japanese language. Only "
-"use this function if you really want to print text in japanese, if it is "
+"Turning on this allows to print plain text files in Japanese language. Only "
+"use this function if you really want to print text in Japanese, if it is "
 "activated you cannot print accentuated characters in latin fonts any more "
 "and you will not be able to adjust the margins, the character size, etc. "
 "This setting only affects printers defined on this machine. If you want to "
-"print japanese text on a printer set up on a remote machine, you have to "
+"print Japanese text on a printer set up on a remote machine, you have to "
 "activate this function on that remote machine."
 msgstr ""
 
-#: printer/printerdrake.pm:105
+#: printer/printerdrake.pm:117
 #, c-format
 msgid "Automatic correction of CUPS configuration"
 msgstr ""
 
-#: printer/printerdrake.pm:107
+#: printer/printerdrake.pm:119
 #, c-format
 msgid ""
 "When this option is turned on, on every startup of CUPS it is automatically "
@@ -10337,73 +10931,99 @@ msgid ""
 "but then you have to take care of these points."
 msgstr ""
 
-#: printer/printerdrake.pm:129 printer/printerdrake.pm:205
+#: printer/printerdrake.pm:132 printer/printerdrake.pm:500
+#: printer/printerdrake.pm:3933
+#, c-format
+msgid "Remote CUPS server and no local CUPS daemon"
+msgstr ""
+
+#: printer/printerdrake.pm:135
+#, c-format
+msgid "On"
+msgstr "På"
+
+#: printer/printerdrake.pm:137 printer/printerdrake.pm:492
+#: printer/printerdrake.pm:519
+#, c-format
+msgid "Off"
+msgstr "Av"
+
+#: printer/printerdrake.pm:138 printer/printerdrake.pm:501
+#, c-format
+msgid ""
+"In this mode the local CUPS daemon will be stopped and all printing requests "
+"go directly to the server specified below. Note that it is not possible to "
+"define local print queues then and if the specified server is down it cannot "
+"be printed at all from this machine."
+msgstr ""
+
+#: printer/printerdrake.pm:155 printer/printerdrake.pm:230
 #, c-format
 msgid "Sharing of local printers"
 msgstr ""
 
-#: printer/printerdrake.pm:130
+#: printer/printerdrake.pm:156
 #, c-format
 msgid ""
 "These are the machines and networks on which the locally connected printer"
 "(s) should be available:"
 msgstr ""
 
-#: printer/printerdrake.pm:141
+#: printer/printerdrake.pm:167
 #, c-format
 msgid "Add host/network"
 msgstr "Legg til vert/nettverk"
 
-#: printer/printerdrake.pm:147
+#: printer/printerdrake.pm:173
 #, c-format
 msgid "Edit selected host/network"
 msgstr ""
 
-#: printer/printerdrake.pm:156
+#: printer/printerdrake.pm:182
 #, c-format
 msgid "Remove selected host/network"
 msgstr ""
 
-#: printer/printerdrake.pm:187 printer/printerdrake.pm:197
-#: printer/printerdrake.pm:210 printer/printerdrake.pm:217
-#: printer/printerdrake.pm:248 printer/printerdrake.pm:266
+#: printer/printerdrake.pm:213 printer/printerdrake.pm:223
+#: printer/printerdrake.pm:235 printer/printerdrake.pm:242
+#: printer/printerdrake.pm:273 printer/printerdrake.pm:291
 #, c-format
 msgid "IP address of host/network:"
 msgstr ""
 
-#: printer/printerdrake.pm:206
+#: printer/printerdrake.pm:231
 #, c-format
 msgid ""
 "Choose the network or host on which the local printers should be made "
 "available:"
 msgstr ""
 
-#: printer/printerdrake.pm:213
+#: printer/printerdrake.pm:238
 #, c-format
 msgid "Host/network IP address missing."
 msgstr ""
 
-#: printer/printerdrake.pm:221
+#: printer/printerdrake.pm:246
 #, c-format
 msgid "The entered host/network IP is not correct.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:222 printer/printerdrake.pm:400
+#: printer/printerdrake.pm:247 printer/printerdrake.pm:423
 #, c-format
 msgid "Examples for correct IPs:\n"
 msgstr ""
 
-#: printer/printerdrake.pm:246
+#: printer/printerdrake.pm:271
 #, c-format
 msgid "This host/network is already in the list, it cannot be added again.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:316 printer/printerdrake.pm:387
+#: printer/printerdrake.pm:340 printer/printerdrake.pm:410
 #, c-format
 msgid "Accessing printers on remote CUPS servers"
 msgstr ""
 
-#: printer/printerdrake.pm:317
+#: printer/printerdrake.pm:341
 #, c-format
 msgid ""
 "Add here the CUPS servers whose printers you want to use. You only need to "
@@ -10411,102 +11031,118 @@ msgid ""
 "local network."
 msgstr ""
 
-#: printer/printerdrake.pm:328
+#: printer/printerdrake.pm:352
 #, c-format
 msgid "Add server"
 msgstr ""
 
-#: printer/printerdrake.pm:334
+#: printer/printerdrake.pm:358
 #, c-format
 msgid "Edit selected server"
 msgstr ""
 
-#: printer/printerdrake.pm:343
+#: printer/printerdrake.pm:367
 #, c-format
 msgid "Remove selected server"
 msgstr ""
 
-#: printer/printerdrake.pm:388
+#: printer/printerdrake.pm:411
 #, c-format
 msgid "Enter IP address and port of the host whose printers you want to use."
 msgstr ""
 
-#: printer/printerdrake.pm:389
+#: printer/printerdrake.pm:412
 #, c-format
 msgid "If no port is given, 631 will be taken as default."
 msgstr ""
 
-#: printer/printerdrake.pm:393
+#: printer/printerdrake.pm:416
 #, c-format
 msgid "Server IP missing!"
 msgstr ""
 
-#: printer/printerdrake.pm:399
+#: printer/printerdrake.pm:422
 #, c-format
 msgid "The entered IP is not correct.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:411 printer/printerdrake.pm:1629
+#: printer/printerdrake.pm:434 printer/printerdrake.pm:1744
 #, c-format
 msgid "The port number should be an integer!"
 msgstr ""
 
-#: printer/printerdrake.pm:422
+#: printer/printerdrake.pm:445
 #, c-format
 msgid "This server is already in the list, it cannot be added again.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:433 printer/printerdrake.pm:1650
-#: standalone/drakups:233 standalone/harddrake2:68
+#: printer/printerdrake.pm:456 printer/printerdrake.pm:1765
+#: standalone/drakups:247 standalone/harddrake2:47
 #, c-format
 msgid "Port"
 msgstr "Port"
 
-#: printer/printerdrake.pm:478 printer/printerdrake.pm:545
-#: printer/printerdrake.pm:610 printer/printerdrake.pm:628
-#: printer/printerdrake.pm:711 printer/printerdrake.pm:768
-#: printer/printerdrake.pm:794 printer/printerdrake.pm:1703
-#: printer/printerdrake.pm:1886 printer/printerdrake.pm:1902
-#: printer/printerdrake.pm:1945 printer/printerdrake.pm:1982
-#: printer/printerdrake.pm:2024 printer/printerdrake.pm:2061
-#: printer/printerdrake.pm:2071 printer/printerdrake.pm:2314
-#: printer/printerdrake.pm:2319 printer/printerdrake.pm:2458
-#: printer/printerdrake.pm:2568 printer/printerdrake.pm:3069
-#: printer/printerdrake.pm:3134 printer/printerdrake.pm:3177
-#: printer/printerdrake.pm:3180 printer/printerdrake.pm:3299
-#: printer/printerdrake.pm:3364 printer/printerdrake.pm:3436
-#: printer/printerdrake.pm:3457 printer/printerdrake.pm:3466
-#: printer/printerdrake.pm:3557 printer/printerdrake.pm:3655
-#: printer/printerdrake.pm:3661 printer/printerdrake.pm:3674
-#: printer/printerdrake.pm:3726 printer/printerdrake.pm:3766
-#: printer/printerdrake.pm:3778 printer/printerdrake.pm:3789
-#: printer/printerdrake.pm:3798 printer/printerdrake.pm:3811
-#: printer/printerdrake.pm:3888 printer/printerdrake.pm:3945
-#: printer/printerdrake.pm:4010 printer/printerdrake.pm:4270
-#: printer/printerdrake.pm:4313 printer/printerdrake.pm:4459
-#: printer/printerdrake.pm:4517 printer/printerdrake.pm:4546
-#: standalone/printerdrake:65 standalone/printerdrake:85
-#: standalone/printerdrake:522
+#: printer/printerdrake.pm:489 printer/printerdrake.pm:505
+#: printer/printerdrake.pm:520 printer/printerdrake.pm:524
+#: printer/printerdrake.pm:530
+#, c-format
+msgid "On, Name or IP of remote server:"
+msgstr ""
+
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:3942
+#: printer/printerdrake.pm:4007
+#, c-format
+msgid "CUPS server name or IP address missing."
+msgstr ""
+
+#: printer/printerdrake.pm:560 printer/printerdrake.pm:580
+#: printer/printerdrake.pm:649 printer/printerdrake.pm:714
+#: printer/printerdrake.pm:741 printer/printerdrake.pm:796
+#: printer/printerdrake.pm:838 printer/printerdrake.pm:848
+#: printer/printerdrake.pm:1818 printer/printerdrake.pm:2004
+#: printer/printerdrake.pm:2021 printer/printerdrake.pm:2064
+#: printer/printerdrake.pm:2104 printer/printerdrake.pm:2147
+#: printer/printerdrake.pm:2184 printer/printerdrake.pm:2194
+#: printer/printerdrake.pm:2437 printer/printerdrake.pm:2442
+#: printer/printerdrake.pm:2579 printer/printerdrake.pm:2689
+#: printer/printerdrake.pm:3247 printer/printerdrake.pm:3312
+#: printer/printerdrake.pm:3361 printer/printerdrake.pm:3364
+#: printer/printerdrake.pm:3484 printer/printerdrake.pm:3549
+#: printer/printerdrake.pm:3621 printer/printerdrake.pm:3642
+#: printer/printerdrake.pm:3651 printer/printerdrake.pm:3745
+#: printer/printerdrake.pm:3837 printer/printerdrake.pm:3843
+#: printer/printerdrake.pm:3863 printer/printerdrake.pm:3969
+#: printer/printerdrake.pm:4076 printer/printerdrake.pm:4095
+#: printer/printerdrake.pm:4104 printer/printerdrake.pm:4117
+#: printer/printerdrake.pm:4313 printer/printerdrake.pm:4749
+#: printer/printerdrake.pm:4826 standalone/printerdrake:64
+#: standalone/printerdrake:84 standalone/printerdrake:566
 #, c-format
 msgid "Printerdrake"
 msgstr ""
 
-#: printer/printerdrake.pm:479
+#: printer/printerdrake.pm:561 printer/printerdrake.pm:3550
+#: printer/printerdrake.pm:4077
+#, c-format
+msgid "Reading printer data..."
+msgstr ""
+
+#: printer/printerdrake.pm:581
 #, c-format
 msgid "Restarting CUPS..."
 msgstr ""
 
-#: printer/printerdrake.pm:502
+#: printer/printerdrake.pm:606
 #, c-format
 msgid "Select Printer Connection"
 msgstr ""
 
-#: printer/printerdrake.pm:503
+#: printer/printerdrake.pm:607
 #, c-format
 msgid "How is the printer connected?"
 msgstr ""
 
-#: printer/printerdrake.pm:505
+#: printer/printerdrake.pm:609
 #, c-format
 msgid ""
 "\n"
@@ -10514,7 +11150,7 @@ msgid ""
 "printers will be automatically detected."
 msgstr ""
 
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:4012
+#: printer/printerdrake.pm:612 printer/printerdrake.pm:4315
 #, c-format
 msgid ""
 "\n"
@@ -10522,28 +11158,28 @@ msgid ""
 "detected nor tested!"
 msgstr ""
 
-#: printer/printerdrake.pm:515
+#: printer/printerdrake.pm:619
 #, c-format
 msgid ""
 "Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
 msgstr ""
 
-#: printer/printerdrake.pm:545
+#: printer/printerdrake.pm:649
 #, c-format
 msgid "Checking your system..."
 msgstr ""
 
-#: printer/printerdrake.pm:561
+#: printer/printerdrake.pm:665
 #, c-format
 msgid "and one unknown printer"
 msgstr ""
 
-#: printer/printerdrake.pm:563
+#: printer/printerdrake.pm:667
 #, c-format
 msgid "and %d unknown printers"
 msgstr ""
 
-#: printer/printerdrake.pm:567
+#: printer/printerdrake.pm:671
 #, c-format
 msgid ""
 "The following printers\n"
@@ -10552,7 +11188,7 @@ msgid ""
 "are directly connected to your system"
 msgstr ""
 
-#: printer/printerdrake.pm:569
+#: printer/printerdrake.pm:673
 #, c-format
 msgid ""
 "The following printer\n"
@@ -10561,7 +11197,7 @@ msgid ""
 "are directly connected to your system"
 msgstr ""
 
-#: printer/printerdrake.pm:570
+#: printer/printerdrake.pm:674
 #, c-format
 msgid ""
 "The following printer\n"
@@ -10570,102 +11206,96 @@ msgid ""
 "is directly connected to your system"
 msgstr ""
 
-#: printer/printerdrake.pm:574
+#: printer/printerdrake.pm:678
 #, c-format
 msgid ""
 "\n"
 "There is one unknown printer directly connected to your system"
 msgstr ""
 
-#: printer/printerdrake.pm:575
+#: printer/printerdrake.pm:679
 #, c-format
 msgid ""
 "\n"
 "There are %d unknown printers directly connected to your system"
 msgstr ""
 
-#: printer/printerdrake.pm:578
+#: printer/printerdrake.pm:682
 #, c-format
 msgid ""
 "There are no printers found which are directly connected to your machine"
 msgstr ""
 
-#: printer/printerdrake.pm:581
+#: printer/printerdrake.pm:685
 #, c-format
 msgid " (Make sure that all your printers are connected and turned on).\n"
 msgstr ""
 
-#: printer/printerdrake.pm:594
+#: printer/printerdrake.pm:698
 #, c-format
 msgid ""
 "Do you want to enable printing on the printers mentioned above or on "
 "printers in the local network?\n"
 msgstr ""
 
-#: printer/printerdrake.pm:595
+#: printer/printerdrake.pm:699
 #, c-format
 msgid "Do you want to enable printing on printers in the local network?\n"
 msgstr ""
 
-#: printer/printerdrake.pm:597
+#: printer/printerdrake.pm:701
 #, c-format
 msgid "Do you want to enable printing on the printers mentioned above?\n"
 msgstr ""
 
-#: printer/printerdrake.pm:598
+#: printer/printerdrake.pm:702
 #, c-format
 msgid "Are you sure that you want to set up printing on this machine?\n"
 msgstr ""
 
-#: printer/printerdrake.pm:599
+#: printer/printerdrake.pm:703
 #, c-format
 msgid ""
 "NOTE: Depending on the printer model and the printing system up to %d MB of "
 "additional software will be installed."
 msgstr ""
 
-#: printer/printerdrake.pm:629
+#: printer/printerdrake.pm:742
 #, c-format
 msgid "Searching for new printers..."
 msgstr ""
 
-#: printer/printerdrake.pm:713
-#, c-format
-msgid "Configuring printer ..."
-msgstr ""
-
-#: printer/printerdrake.pm:714 printer/printerdrake.pm:769
-#: printer/printerdrake.pm:3790
+#: printer/printerdrake.pm:797
 #, c-format
-msgid "Configuring printer \"%s\"..."
-msgstr ""
+msgid "Found printer on %s..."
+msgstr "Fann skrivar på «%s» ..."
 
-#: printer/printerdrake.pm:734
+#: printer/printerdrake.pm:822
 #, c-format
 msgid "("
 msgstr "("
 
-#: printer/printerdrake.pm:735
+#: printer/printerdrake.pm:823
 #, c-format
 msgid " on "
 msgstr ""
 
-#: printer/printerdrake.pm:736 standalone/scannerdrake:136
+#: printer/printerdrake.pm:824 standalone/scannerdrake:137
 #, c-format
 msgid ")"
 msgstr ")"
 
-#: printer/printerdrake.pm:741 printer/printerdrake.pm:2470
+#: printer/printerdrake.pm:829 printer/printerdrake.pm:2591
 #, c-format
 msgid "Printer model selection"
 msgstr ""
 
-#: printer/printerdrake.pm:742 printer/printerdrake.pm:2471
+#: printer/printerdrake.pm:830 printer/printerdrake.pm:2592
 #, c-format
 msgid "Which printer model do you have?"
 msgstr ""
 
-#: printer/printerdrake.pm:743
+#: printer/printerdrake.pm:831
 #, c-format
 msgid ""
 "\n"
@@ -10674,28 +11304,31 @@ msgid ""
 "choose the correct model from the list."
 msgstr ""
 
-#: printer/printerdrake.pm:746 printer/printerdrake.pm:2476
+#: printer/printerdrake.pm:834 printer/printerdrake.pm:2597
 #, c-format
 msgid ""
 "If your printer is not listed, choose a compatible (see printer manual) or a "
 "similar one."
 msgstr ""
 
-#: printer/printerdrake.pm:795 printer/printerdrake.pm:3779
-#: printer/printerdrake.pm:3946 printer/printerdrake.pm:4271
-#: printer/printerdrake.pm:4314 printer/printerdrake.pm:4518
+#: printer/printerdrake.pm:839
 #, c-format
-msgid "Configuring applications..."
-msgstr ""
+msgid "Configuring printer on %s..."
+msgstr "Set opp skrivar på «%s» ..."
+
+#: printer/printerdrake.pm:849 printer/printerdrake.pm:4096
+#, c-format
+msgid "Configuring printer \"%s\"..."
+msgstr "Set opp skrivaren «%s» ..."
 
-#: printer/printerdrake.pm:831 printer/printerdrake.pm:843
-#: printer/printerdrake.pm:901 printer/printerdrake.pm:1872
-#: printer/printerdrake.pm:4028 printer/printerdrake.pm:4211
+#: printer/printerdrake.pm:932 printer/printerdrake.pm:944
+#: printer/printerdrake.pm:1002 printer/printerdrake.pm:1987
+#: printer/printerdrake.pm:4332 printer/printerdrake.pm:4501
 #, c-format
 msgid "Add a new printer"
 msgstr ""
 
-#: printer/printerdrake.pm:832
+#: printer/printerdrake.pm:933
 #, c-format
 msgid ""
 "\n"
@@ -10709,7 +11342,7 @@ msgid ""
 "connection types."
 msgstr ""
 
-#: printer/printerdrake.pm:845
+#: printer/printerdrake.pm:946
 #, c-format
 msgid ""
 "\n"
@@ -10731,7 +11364,7 @@ msgid ""
 "to set up your printer(s) now."
 msgstr ""
 
-#: printer/printerdrake.pm:854
+#: printer/printerdrake.pm:955
 #, c-format
 msgid ""
 "\n"
@@ -10747,7 +11380,7 @@ msgid ""
 "to set up your printer(s) now."
 msgstr ""
 
-#: printer/printerdrake.pm:862
+#: printer/printerdrake.pm:963
 #, c-format
 msgid ""
 "\n"
@@ -10768,7 +11401,7 @@ msgid ""
 "to set up your printer(s) now."
 msgstr ""
 
-#: printer/printerdrake.pm:871
+#: printer/printerdrake.pm:972
 #, c-format
 msgid ""
 "\n"
@@ -10784,22 +11417,22 @@ msgid ""
 "to set up your printer(s) now."
 msgstr ""
 
-#: printer/printerdrake.pm:880
+#: printer/printerdrake.pm:981
 #, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr ""
 
-#: printer/printerdrake.pm:883
+#: printer/printerdrake.pm:984
 #, c-format
 msgid "Auto-detect printers connected directly to the local network"
 msgstr ""
 
-#: printer/printerdrake.pm:886
+#: printer/printerdrake.pm:987
 #, c-format
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr ""
 
-#: printer/printerdrake.pm:902
+#: printer/printerdrake.pm:1003
 #, c-format
 msgid ""
 "\n"
@@ -10813,70 +11446,70 @@ msgid ""
 "select \"Printer\" in the \"Hardware\" section of the %s Control Center."
 msgstr ""
 
-#: printer/printerdrake.pm:937 printer/printerdrake.pm:1152
-#: printer/printerdrake.pm:1214 printer/printerdrake.pm:1304
-#: printer/printerdrake.pm:1441 printer/printerdrake.pm:1516
-#: printer/printerdrake.pm:1667 printer/printerdrake.pm:1750
-#: printer/printerdrake.pm:1759 printer/printerdrake.pm:1768
-#: printer/printerdrake.pm:1779 printer/printerdrake.pm:1892
-#: printer/printerdrake.pm:1954 printer/printerdrake.pm:1988
+#: printer/printerdrake.pm:1038 printer/printerdrake.pm:1267
+#: printer/printerdrake.pm:1329 printer/printerdrake.pm:1419
+#: printer/printerdrake.pm:1556 printer/printerdrake.pm:1631
+#: printer/printerdrake.pm:1782 printer/printerdrake.pm:1865
+#: printer/printerdrake.pm:1874 printer/printerdrake.pm:1883
+#: printer/printerdrake.pm:1894 printer/printerdrake.pm:2010
+#: printer/printerdrake.pm:2076 printer/printerdrake.pm:2111
 #, c-format
 msgid "Could not install the %s packages!"
 msgstr ""
 
-#: printer/printerdrake.pm:939
+#: printer/printerdrake.pm:1040
 #, c-format
 msgid "Skipping Windows/SMB server auto-detection"
 msgstr ""
 
-#: printer/printerdrake.pm:945 printer/printerdrake.pm:1075
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:1046 printer/printerdrake.pm:1190
+#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
 #, c-format
 msgid "Printer auto-detection"
 msgstr ""
 
-#: printer/printerdrake.pm:945
+#: printer/printerdrake.pm:1046
 #, c-format
 msgid "Detecting devices..."
 msgstr ""
 
-#: printer/printerdrake.pm:967
+#: printer/printerdrake.pm:1075
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ""
 
-#: printer/printerdrake.pm:969
+#: printer/printerdrake.pm:1078
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ""
 
-#: printer/printerdrake.pm:973
+#: printer/printerdrake.pm:1082
 #, c-format
 msgid "Detected %s"
 msgstr ""
 
-#: printer/printerdrake.pm:977 printer/printerdrake.pm:1000
-#: printer/printerdrake.pm:1017
+#: printer/printerdrake.pm:1087 printer/printerdrake.pm:1114
+#: printer/printerdrake.pm:1132
 #, c-format
 msgid "Printer on parallel port #%s"
 msgstr ""
 
-#: printer/printerdrake.pm:981
+#: printer/printerdrake.pm:1093
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr ""
 
-#: printer/printerdrake.pm:983
+#: printer/printerdrake.pm:1096
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ""
 
-#: printer/printerdrake.pm:1062
+#: printer/printerdrake.pm:1177
 #, c-format
 msgid "Local Printer"
 msgstr ""
 
-#: printer/printerdrake.pm:1063
+#: printer/printerdrake.pm:1178
 #, c-format
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
@@ -10885,64 +11518,64 @@ msgid ""
 "printer: /dev/usb/lp1, ...)."
 msgstr ""
 
-#: printer/printerdrake.pm:1067
+#: printer/printerdrake.pm:1182
 #, c-format
 msgid "You must enter a device or file name!"
 msgstr ""
 
-#: printer/printerdrake.pm:1076
+#: printer/printerdrake.pm:1191
 #, c-format
 msgid "No printer found!"
 msgstr ""
 
-#: printer/printerdrake.pm:1084
+#: printer/printerdrake.pm:1199
 #, c-format
 msgid "Local Printers"
 msgstr ""
 
-#: printer/printerdrake.pm:1085
+#: printer/printerdrake.pm:1200
 #, c-format
 msgid "Available printers"
 msgstr ""
 
-#: printer/printerdrake.pm:1089 printer/printerdrake.pm:1098
+#: printer/printerdrake.pm:1204 printer/printerdrake.pm:1213
 #, c-format
 msgid "The following printer was auto-detected. "
 msgstr ""
 
-#: printer/printerdrake.pm:1091
+#: printer/printerdrake.pm:1206
 #, c-format
 msgid ""
 "If it is not the one you want to configure, enter a device name/file name in "
 "the input line"
 msgstr ""
 
-#: printer/printerdrake.pm:1092
+#: printer/printerdrake.pm:1207
 #, c-format
 msgid ""
 "Alternatively, you can specify a device name/file name in the input line"
 msgstr ""
 
-#: printer/printerdrake.pm:1093 printer/printerdrake.pm:1102
+#: printer/printerdrake.pm:1208 printer/printerdrake.pm:1217
 #, c-format
 msgid "Here is a list of all auto-detected printers. "
 msgstr ""
 
-#: printer/printerdrake.pm:1095
+#: printer/printerdrake.pm:1210
 #, c-format
 msgid ""
 "Please choose the printer you want to set up or enter a device name/file "
 "name in the input line"
 msgstr ""
 
-#: printer/printerdrake.pm:1096
+#: printer/printerdrake.pm:1211
 #, c-format
 msgid ""
 "Please choose the printer to which the print jobs should go or enter a "
 "device name/file name in the input line"
 msgstr ""
 
-#: printer/printerdrake.pm:1100
+#: printer/printerdrake.pm:1215
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
@@ -10950,12 +11583,12 @@ msgid ""
 "configuration, turn on \"Manual configuration\"."
 msgstr ""
 
-#: printer/printerdrake.pm:1101
+#: printer/printerdrake.pm:1216
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr ""
 
-#: printer/printerdrake.pm:1104
+#: printer/printerdrake.pm:1219
 #, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -10964,113 +11597,113 @@ msgid ""
 "\"Manual configuration\"."
 msgstr ""
 
-#: printer/printerdrake.pm:1105
+#: printer/printerdrake.pm:1220
 #, c-format
 msgid "Please choose the printer to which the print jobs should go."
 msgstr ""
 
-#: printer/printerdrake.pm:1107
+#: printer/printerdrake.pm:1222
 #, c-format
 msgid ""
 "Please choose the port that your printer is connected to or enter a device "
 "name/file name in the input line"
 msgstr ""
 
-#: printer/printerdrake.pm:1108
+#: printer/printerdrake.pm:1223
 #, c-format
 msgid "Please choose the port that your printer is connected to."
 msgstr ""
 
-#: printer/printerdrake.pm:1110
+#: printer/printerdrake.pm:1225
 #, c-format
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
 "1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."
 msgstr ""
 
-#: printer/printerdrake.pm:1114
+#: printer/printerdrake.pm:1229
 #, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr ""
 
-#: printer/printerdrake.pm:1154 printer/printerdrake.pm:1216
-#: printer/printerdrake.pm:1306 printer/printerdrake.pm:1443
-#: printer/printerdrake.pm:1518 printer/printerdrake.pm:1669
-#: printer/printerdrake.pm:1752 printer/printerdrake.pm:1761
-#: printer/printerdrake.pm:1770 printer/printerdrake.pm:1781
+#: printer/printerdrake.pm:1269 printer/printerdrake.pm:1331
+#: printer/printerdrake.pm:1421 printer/printerdrake.pm:1558
+#: printer/printerdrake.pm:1633 printer/printerdrake.pm:1784
+#: printer/printerdrake.pm:1867 printer/printerdrake.pm:1876
+#: printer/printerdrake.pm:1885 printer/printerdrake.pm:1896
 #, c-format
 msgid "Aborting"
 msgstr "Avbryter"
 
-#: printer/printerdrake.pm:1189
+#: printer/printerdrake.pm:1304
 #, c-format
 msgid "Remote lpd Printer Options"
 msgstr ""
 
-#: printer/printerdrake.pm:1190
+#: printer/printerdrake.pm:1305
 #, c-format
 msgid ""
 "To use a remote lpd printer, you need to supply the hostname of the printer "
 "server and the printer name on that server."
 msgstr ""
 
-#: printer/printerdrake.pm:1191
+#: printer/printerdrake.pm:1306
 #, c-format
 msgid "Remote host name"
 msgstr ""
 
-#: printer/printerdrake.pm:1192
+#: printer/printerdrake.pm:1307
 #, c-format
 msgid "Remote printer name"
 msgstr ""
 
-#: printer/printerdrake.pm:1195
+#: printer/printerdrake.pm:1310
 #, c-format
 msgid "Remote host name missing!"
 msgstr ""
 
-#: printer/printerdrake.pm:1199
+#: printer/printerdrake.pm:1314
 #, c-format
 msgid "Remote printer name missing!"
 msgstr ""
 
-#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
-#: standalone/drakTermServ:454 standalone/drakTermServ:753
-#: standalone/drakTermServ:769 standalone/drakTermServ:1432
-#: standalone/drakTermServ:1440 standalone/drakTermServ:1451
-#: standalone/drakbackup:512 standalone/drakbackup:618
-#: standalone/drakbackup:653 standalone/drakbackup:771
-#: standalone/harddrake2:166
+#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
+#: standalone/drakTermServ:429 standalone/drakTermServ:726
+#: standalone/drakTermServ:742 standalone/drakTermServ:1405
+#: standalone/drakTermServ:1413 standalone/drakTermServ:1424
+#: standalone/drakbackup:513 standalone/drakbackup:619
+#: standalone/drakbackup:654 standalone/drakbackup:774
+#: standalone/harddrake2:237
 #, c-format
 msgid "Information"
 msgstr "Informasjon"
 
-#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
+#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
 #, c-format
 msgid "Detected model: %s %s"
 msgstr ""
 
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
 #, c-format
 msgid "Scanning network..."
 msgstr ""
 
-#: printer/printerdrake.pm:1321 printer/printerdrake.pm:1342
+#: printer/printerdrake.pm:1436 printer/printerdrake.pm:1457
 #, c-format
 msgid ", printer \"%s\" on server \"%s\""
 msgstr ""
 
-#: printer/printerdrake.pm:1324 printer/printerdrake.pm:1345
+#: printer/printerdrake.pm:1439 printer/printerdrake.pm:1460
 #, c-format
 msgid "Printer \"%s\" on server \"%s\""
 msgstr ""
 
-#: printer/printerdrake.pm:1366
+#: printer/printerdrake.pm:1481
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr ""
 
-#: printer/printerdrake.pm:1367
+#: printer/printerdrake.pm:1482
 #, c-format
 msgid ""
 "To print to a SMB printer, you need to provide the SMB host name (Note! It "
@@ -11079,54 +11712,54 @@ msgid ""
 "access and any applicable user name, password, and workgroup information."
 msgstr ""
 
-#: printer/printerdrake.pm:1368
+#: printer/printerdrake.pm:1483
 #, c-format
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
 "and then add user name, password, and/or workgroup if needed."
 msgstr ""
 
-#: printer/printerdrake.pm:1370
+#: printer/printerdrake.pm:1485
 #, c-format
 msgid "SMB server host"
 msgstr ""
 
-#: printer/printerdrake.pm:1371
+#: printer/printerdrake.pm:1486
 #, c-format
 msgid "SMB server IP"
 msgstr ""
 
-#: printer/printerdrake.pm:1372
+#: printer/printerdrake.pm:1487
 #, c-format
 msgid "Share name"
 msgstr ""
 
-#: printer/printerdrake.pm:1375
+#: printer/printerdrake.pm:1490
 #, c-format
 msgid "Workgroup"
 msgstr "Arbeidsgruppe"
 
-#: printer/printerdrake.pm:1377
+#: printer/printerdrake.pm:1492
 #, c-format
 msgid "Auto-detected"
 msgstr ""
 
-#: printer/printerdrake.pm:1387
+#: printer/printerdrake.pm:1502
 #, c-format
 msgid "Either the server name or the server's IP must be given!"
 msgstr ""
 
-#: printer/printerdrake.pm:1391
+#: printer/printerdrake.pm:1506
 #, c-format
 msgid "Samba share name missing!"
 msgstr ""
 
-#: printer/printerdrake.pm:1397
+#: printer/printerdrake.pm:1512
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr ""
 
-#: printer/printerdrake.pm:1398
+#: printer/printerdrake.pm:1513
 #, c-format
 msgid ""
 "You are about to set up printing to a Windows account with password. Due to "
@@ -11150,7 +11783,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: printer/printerdrake.pm:1408
+#: printer/printerdrake.pm:1523
 #, c-format
 msgid ""
 "Set up your Windows server to make the printer available under the IPP "
@@ -11159,7 +11792,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: printer/printerdrake.pm:1411
+#: printer/printerdrake.pm:1526
 #, c-format
 msgid ""
 "Connect your printer to a Linux server and let your Windows machine(s) "
@@ -11168,12 +11801,12 @@ msgid ""
 "Do you really want to continue setting up this printer as you are doing now?"
 msgstr ""
 
-#: printer/printerdrake.pm:1489
+#: printer/printerdrake.pm:1604
 #, c-format
 msgid "NetWare Printer Options"
 msgstr ""
 
-#: printer/printerdrake.pm:1490
+#: printer/printerdrake.pm:1605
 #, c-format
 msgid ""
 "To print on a NetWare printer, you need to provide the NetWare print server "
@@ -11182,49 +11815,49 @@ msgid ""
 "name and password."
 msgstr ""
 
-#: printer/printerdrake.pm:1491
+#: printer/printerdrake.pm:1606
 #, c-format
 msgid "Printer Server"
 msgstr ""
 
-#: printer/printerdrake.pm:1492
+#: printer/printerdrake.pm:1607
 #, c-format
 msgid "Print Queue Name"
 msgstr ""
 
-#: printer/printerdrake.pm:1497
+#: printer/printerdrake.pm:1612
 #, c-format
 msgid "NCP server name missing!"
 msgstr ""
 
-#: printer/printerdrake.pm:1501
+#: printer/printerdrake.pm:1616
 #, c-format
 msgid "NCP queue name missing!"
 msgstr ""
 
-#: printer/printerdrake.pm:1574 printer/printerdrake.pm:1594
+#: printer/printerdrake.pm:1689 printer/printerdrake.pm:1709
 #, c-format
 msgid ", host \"%s\", port %s"
 msgstr ""
 
-#: printer/printerdrake.pm:1577 printer/printerdrake.pm:1597
+#: printer/printerdrake.pm:1692 printer/printerdrake.pm:1712
 #, c-format
 msgid "Host \"%s\", port %s"
 msgstr ""
 
-#: printer/printerdrake.pm:1618
+#: printer/printerdrake.pm:1733
 #, c-format
 msgid "TCP/Socket Printer Options"
 msgstr ""
 
-#: printer/printerdrake.pm:1620
+#: printer/printerdrake.pm:1735
 #, c-format
 msgid ""
 "Choose one of the auto-detected printers from the list or enter the hostname "
 "or IP and the optional port number (default is 9100) in the input fields."
 msgstr ""
 
-#: printer/printerdrake.pm:1621
+#: printer/printerdrake.pm:1736
 #, c-format
 msgid ""
 "To print to a TCP or socket printer, you need to provide the host name or IP "
@@ -11233,27 +11866,27 @@ msgid ""
 "vary. See the manual of your hardware."
 msgstr ""
 
-#: printer/printerdrake.pm:1625
+#: printer/printerdrake.pm:1740
 #, c-format
 msgid "Printer host name or IP missing!"
 msgstr ""
 
-#: printer/printerdrake.pm:1648
+#: printer/printerdrake.pm:1763
 #, c-format
 msgid "Printer host name or IP"
 msgstr ""
 
-#: printer/printerdrake.pm:1704
+#: printer/printerdrake.pm:1819
 #, c-format
 msgid "Refreshing Device URI list..."
 msgstr ""
 
-#: printer/printerdrake.pm:1707 printer/printerdrake.pm:1709
+#: printer/printerdrake.pm:1822 printer/printerdrake.pm:1824
 #, c-format
 msgid "Printer Device URI"
 msgstr ""
 
-#: printer/printerdrake.pm:1708
+#: printer/printerdrake.pm:1823
 #, c-format
 msgid ""
 "You can specify directly the URI to access the printer. The URI must fulfill "
@@ -11261,34 +11894,34 @@ msgid ""
 "are supported by all the spoolers."
 msgstr ""
 
-#: printer/printerdrake.pm:1731
+#: printer/printerdrake.pm:1846
 #, c-format
 msgid "A valid URI must be entered!"
 msgstr ""
 
-#: printer/printerdrake.pm:1834
+#: printer/printerdrake.pm:1949
 #, c-format
 msgid "Pipe into command"
 msgstr ""
 
-#: printer/printerdrake.pm:1835
+#: printer/printerdrake.pm:1950
 #, c-format
 msgid ""
 "Here you can specify any arbitrary command line into which the job should be "
 "piped instead of being sent directly to a printer."
 msgstr ""
 
-#: printer/printerdrake.pm:1836
+#: printer/printerdrake.pm:1951
 #, c-format
 msgid "Command line"
 msgstr ""
 
-#: printer/printerdrake.pm:1840
+#: printer/printerdrake.pm:1955
 #, c-format
 msgid "A command line must be entered!"
 msgstr ""
 
-#: printer/printerdrake.pm:1873
+#: printer/printerdrake.pm:1988
 #, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
@@ -11296,115 +11929,115 @@ msgid ""
 "an HP PhotoSmart or an HP LaserJet 2200?"
 msgstr ""
 
-#: printer/printerdrake.pm:1887
+#: printer/printerdrake.pm:2005
 #, c-format
 msgid "Installing HPOJ package..."
 msgstr ""
 
-#: printer/printerdrake.pm:1894
+#: printer/printerdrake.pm:2012
 #, c-format
 msgid "Only printing will be possible on the %s."
 msgstr ""
 
-#: printer/printerdrake.pm:1903 printer/printerdrake.pm:2025
+#: printer/printerdrake.pm:2022 printer/printerdrake.pm:2148
 #, c-format
 msgid "Checking device and configuring HPOJ..."
 msgstr ""
 
-#: printer/printerdrake.pm:1946
+#: printer/printerdrake.pm:2065
 #, c-format
 msgid "Installing SANE packages..."
 msgstr ""
 
-#: printer/printerdrake.pm:1956
+#: printer/printerdrake.pm:2078
 #, c-format
 msgid "Scanning on the %s will not be possible."
 msgstr ""
 
-#: printer/printerdrake.pm:1983
+#: printer/printerdrake.pm:2105
 #, c-format
 msgid "Installing mtools packages..."
 msgstr ""
 
-#: printer/printerdrake.pm:1990
+#: printer/printerdrake.pm:2113
 #, c-format
 msgid "Photo memory card access on the %s will not be possible."
 msgstr ""
 
-#: printer/printerdrake.pm:2005
+#: printer/printerdrake.pm:2128
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr ""
 
-#: printer/printerdrake.pm:2013
+#: printer/printerdrake.pm:2136
 #, c-format
 msgid "Photo memory card access on your HP multi-function device"
 msgstr ""
 
-#: printer/printerdrake.pm:2062
+#: printer/printerdrake.pm:2185
 #, c-format
 msgid "Making printer port available for CUPS..."
 msgstr ""
 
-#: printer/printerdrake.pm:2071 printer/printerdrake.pm:2315
-#: printer/printerdrake.pm:2459
+#: printer/printerdrake.pm:2194 printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2580
 #, c-format
 msgid "Reading printer database..."
 msgstr ""
 
-#: printer/printerdrake.pm:2281
+#: printer/printerdrake.pm:2404
 #, c-format
 msgid "Enter Printer Name and Comments"
 msgstr ""
 
-#: printer/printerdrake.pm:2285 printer/printerdrake.pm:3421
+#: printer/printerdrake.pm:2408 printer/printerdrake.pm:3606
 #, c-format
 msgid "Name of printer should contain only letters, numbers and the underscore"
 msgstr ""
 
-#: printer/printerdrake.pm:2291 printer/printerdrake.pm:3426
+#: printer/printerdrake.pm:2414 printer/printerdrake.pm:3611
 #, c-format
 msgid ""
 "The printer \"%s\" already exists,\n"
 "do you really want to overwrite its configuration?"
 msgstr ""
 
-#: printer/printerdrake.pm:2300
+#: printer/printerdrake.pm:2423
 #, c-format
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
 "Location fields do not need to be filled in. They are comments for the users."
 msgstr ""
 
-#: printer/printerdrake.pm:2301
+#: printer/printerdrake.pm:2424
 #, c-format
 msgid "Name of printer"
 msgstr ""
 
-#: printer/printerdrake.pm:2302 standalone/drakconnect:570
-#: standalone/harddrake2:41 standalone/printerdrake:212
-#: standalone/printerdrake:219
+#: printer/printerdrake.pm:2425 standalone/drakconnect:568
+#: standalone/harddrake2:34 standalone/printerdrake:218
+#: standalone/printerdrake:225
 #, c-format
 msgid "Description"
 msgstr "Beskriving"
 
-#: printer/printerdrake.pm:2303 standalone/printerdrake:212
-#: standalone/printerdrake:219
+#: printer/printerdrake.pm:2426 standalone/printerdrake:218
+#: standalone/printerdrake:225
 #, c-format
 msgid "Location"
 msgstr "Plassering"
 
-#: printer/printerdrake.pm:2320
+#: printer/printerdrake.pm:2443
 #, c-format
 msgid "Preparing printer database..."
 msgstr ""
 
-#: printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2559
 #, c-format
 msgid "Your printer model"
 msgstr ""
 
-#: printer/printerdrake.pm:2439
+#: printer/printerdrake.pm:2560
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -11419,18 +12052,18 @@ msgid ""
 "%s"
 msgstr ""
 
-#: printer/printerdrake.pm:2444 printer/printerdrake.pm:2447
+#: printer/printerdrake.pm:2565 printer/printerdrake.pm:2568
 #, c-format
 msgid "The model is correct"
 msgstr ""
 
-#: printer/printerdrake.pm:2445 printer/printerdrake.pm:2446
-#: printer/printerdrake.pm:2449
+#: printer/printerdrake.pm:2566 printer/printerdrake.pm:2567
+#: printer/printerdrake.pm:2570
 #, c-format
 msgid "Select model manually"
 msgstr ""
 
-#: printer/printerdrake.pm:2472
+#: printer/printerdrake.pm:2593
 #, c-format
 msgid ""
 "\n"
@@ -11440,38 +12073,38 @@ msgid ""
 "\"Raw printer\" is highlighted."
 msgstr ""
 
-#: printer/printerdrake.pm:2491
+#: printer/printerdrake.pm:2612
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
 msgstr ""
 
-#: printer/printerdrake.pm:2522
+#: printer/printerdrake.pm:2643
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
 "printer's options and features."
 msgstr ""
 
-#: printer/printerdrake.pm:2523
+#: printer/printerdrake.pm:2644
 #, c-format
 msgid ""
 "This file is usually somewhere on the CD with the Windows and Mac drivers "
 "delivered with the printer."
 msgstr ""
 
-#: printer/printerdrake.pm:2524
+#: printer/printerdrake.pm:2645
 #, c-format
 msgid "You can find the PPD files also on the manufacturer's web sites."
 msgstr ""
 
-#: printer/printerdrake.pm:2525
+#: printer/printerdrake.pm:2646
 #, c-format
 msgid ""
 "If you have Windows installed on your machine, you can find the PPD file on "
 "your Windows partition, too."
 msgstr ""
 
-#: printer/printerdrake.pm:2526
+#: printer/printerdrake.pm:2647
 #, c-format
 msgid ""
 "Installing the printer's PPD file and using it when setting up the printer "
@@ -11479,65 +12112,58 @@ msgid ""
 "printer's hardware"
 msgstr ""
 
-#: printer/printerdrake.pm:2527
+#: printer/printerdrake.pm:2648
 #, c-format
 msgid ""
 "Here you can choose the PPD file to be installed on your machine, it will "
 "then be used for the setup of your printer."
 msgstr ""
 
-#: printer/printerdrake.pm:2529
+#: printer/printerdrake.pm:2650
 #, c-format
 msgid "Install PPD file from"
 msgstr ""
 
-#: printer/printerdrake.pm:2531 printer/printerdrake.pm:2538
-#: standalone/scannerdrake:180 standalone/scannerdrake:188
-#: standalone/scannerdrake:239 standalone/scannerdrake:246
-#, c-format
-msgid "CD-ROM"
-msgstr "CD-ROM"
-
-#: printer/printerdrake.pm:2532 printer/printerdrake.pm:2540
-#: standalone/scannerdrake:181 standalone/scannerdrake:190
-#: standalone/scannerdrake:240 standalone/scannerdrake:248
+#: printer/printerdrake.pm:2653 printer/printerdrake.pm:2661
+#: standalone/scannerdrake:177 standalone/scannerdrake:186
+#: standalone/scannerdrake:236 standalone/scannerdrake:244
 #, c-format
 msgid "Floppy Disk"
 msgstr ""
 
-#: printer/printerdrake.pm:2533 printer/printerdrake.pm:2542
-#: standalone/scannerdrake:182 standalone/scannerdrake:192
-#: standalone/scannerdrake:241 standalone/scannerdrake:250
+#: printer/printerdrake.pm:2654 printer/printerdrake.pm:2663
+#: standalone/scannerdrake:178 standalone/scannerdrake:188
+#: standalone/scannerdrake:237 standalone/scannerdrake:246
 #, c-format
 msgid "Other place"
 msgstr ""
 
-#: printer/printerdrake.pm:2548
+#: printer/printerdrake.pm:2669
 #, c-format
 msgid "Select PPD file"
 msgstr ""
 
-#: printer/printerdrake.pm:2552
+#: printer/printerdrake.pm:2673
 #, c-format
 msgid "The PPD file %s does not exist or is unreadable!"
 msgstr ""
 
-#: printer/printerdrake.pm:2558
+#: printer/printerdrake.pm:2679
 #, c-format
 msgid "The PPD file %s does not conform with the PPD specifications!"
 msgstr ""
 
-#: printer/printerdrake.pm:2569
+#: printer/printerdrake.pm:2690
 #, c-format
 msgid "Installing PPD file..."
 msgstr ""
 
-#: printer/printerdrake.pm:2682
+#: printer/printerdrake.pm:2807
 #, c-format
 msgid "OKI winprinter configuration"
 msgstr ""
 
-#: printer/printerdrake.pm:2683
+#: printer/printerdrake.pm:2808
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -11548,12 +12174,12 @@ msgid ""
 "not work. Your connection type setting will be ignored by the driver."
 msgstr ""
 
-#: printer/printerdrake.pm:2707 printer/printerdrake.pm:2736
+#: printer/printerdrake.pm:2833 printer/printerdrake.pm:2863
 #, c-format
 msgid "Lexmark inkjet configuration"
 msgstr ""
 
-#: printer/printerdrake.pm:2708
+#: printer/printerdrake.pm:2834
 #, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -11562,7 +12188,7 @@ msgid ""
 "to."
 msgstr ""
 
-#: printer/printerdrake.pm:2737
+#: printer/printerdrake.pm:2864
 #, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -11575,12 +12201,12 @@ msgid ""
 "adjust the head alignment settings with this program."
 msgstr ""
 
-#: printer/printerdrake.pm:2746
+#: printer/printerdrake.pm:2874
 #, c-format
 msgid "Lexmark X125 configuration"
 msgstr "Lexmark X125-oppsett"
 
-#: printer/printerdrake.pm:2747
+#: printer/printerdrake.pm:2875
 #, c-format
 msgid ""
 "The driver for this printer only supports printers locally connected via "
@@ -11589,12 +12215,31 @@ msgid ""
 "connected to."
 msgstr ""
 
-#: printer/printerdrake.pm:2765
+#: printer/printerdrake.pm:2897
+#, c-format
+msgid "Samsung ML/QL-85G configuration"
+msgstr "Samsung ML/QL-85G-oppsett"
+
+#: printer/printerdrake.pm:2898 printer/printerdrake.pm:2925
+#, c-format
+msgid ""
+"The driver for this printer only supports printers locally connected on the "
+"first parallel port, no printers on remote machines or print server boxes or "
+"on other parallel ports. Please connect your printer to the first parallel "
+"port or configure it on the machine where it is connected to."
+msgstr ""
+
+#: printer/printerdrake.pm:2924
+#, c-format
+msgid "Canon LBP-460/660 configuration"
+msgstr "Canon LBP-460/660-oppsett"
+
+#: printer/printerdrake.pm:2943
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr ""
 
-#: printer/printerdrake.pm:2878
+#: printer/printerdrake.pm:3056
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -11605,39 +12250,39 @@ msgid ""
 "printout quality/resolution printing can get substantially slower."
 msgstr ""
 
-#: printer/printerdrake.pm:3003
+#: printer/printerdrake.pm:3181
 #, c-format
 msgid "Printer default settings"
 msgstr ""
 
-#: printer/printerdrake.pm:3010
+#: printer/printerdrake.pm:3188
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr ""
 
-#: printer/printerdrake.pm:3014
+#: printer/printerdrake.pm:3192
 #, c-format
 msgid "Option %s must be a number!"
 msgstr ""
 
-#: printer/printerdrake.pm:3018
+#: printer/printerdrake.pm:3196
 #, c-format
 msgid "Option %s out of range!"
 msgstr ""
 
-#: printer/printerdrake.pm:3069
+#: printer/printerdrake.pm:3247
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
 "as the default printer?"
 msgstr ""
 
-#: printer/printerdrake.pm:3084
+#: printer/printerdrake.pm:3262
 #, c-format
 msgid "Test pages"
 msgstr ""
 
-#: printer/printerdrake.pm:3085
+#: printer/printerdrake.pm:3263
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -11646,57 +12291,57 @@ msgid ""
 "it is enough to print the standard test page."
 msgstr ""
 
-#: printer/printerdrake.pm:3089
+#: printer/printerdrake.pm:3267
 #, c-format
 msgid "No test pages"
 msgstr ""
 
-#: printer/printerdrake.pm:3090
+#: printer/printerdrake.pm:3268
 #, c-format
 msgid "Print"
 msgstr "Skriv ut"
 
-#: printer/printerdrake.pm:3115
+#: printer/printerdrake.pm:3293
 #, c-format
 msgid "Standard test page"
 msgstr ""
 
-#: printer/printerdrake.pm:3118
+#: printer/printerdrake.pm:3296
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr ""
 
-#: printer/printerdrake.pm:3121
+#: printer/printerdrake.pm:3299
 #, c-format
 msgid "Alternative test page (A4)"
 msgstr ""
 
-#: printer/printerdrake.pm:3123
+#: printer/printerdrake.pm:3301
 #, c-format
 msgid "Photo test page"
 msgstr ""
 
-#: printer/printerdrake.pm:3127
+#: printer/printerdrake.pm:3305
 #, c-format
 msgid "Do not print any test page"
 msgstr ""
 
-#: printer/printerdrake.pm:3135 printer/printerdrake.pm:3300
+#: printer/printerdrake.pm:3313 printer/printerdrake.pm:3485
 #, c-format
 msgid "Printing test page(s)..."
 msgstr ""
 
-#: printer/printerdrake.pm:3150
+#: printer/printerdrake.pm:3331
 #, c-format
 msgid "Could not install the %s package!"
 msgstr ""
 
-#: printer/printerdrake.pm:3152
+#: printer/printerdrake.pm:3333
 #, c-format
 msgid "Skipping photo test page."
 msgstr ""
 
-#: printer/printerdrake.pm:3169
+#: printer/printerdrake.pm:3350
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -11706,24 +12351,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3173
+#: printer/printerdrake.pm:3354
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
 "It may take some time before the printer starts.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3180
+#: printer/printerdrake.pm:3364
 #, c-format
 msgid "Did it work properly?"
 msgstr ""
 
-#: printer/printerdrake.pm:3201 printer/printerdrake.pm:4397
+#: printer/printerdrake.pm:3386 printer/printerdrake.pm:4689
 #, c-format
 msgid "Raw printer"
 msgstr "Rå skrivar"
 
-#: printer/printerdrake.pm:3231
+#: printer/printerdrake.pm:3416
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) you can either use "
@@ -11732,7 +12377,7 @@ msgid ""
 "to modify the option settings easily.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3233
+#: printer/printerdrake.pm:3418
 #, c-format
 msgid ""
 "These commands you can also use in the \"Printing command\" field of the "
@@ -11740,8 +12385,8 @@ msgid ""
 "because the file to print is provided by the application.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3236 printer/printerdrake.pm:3253
-#: printer/printerdrake.pm:3263
+#: printer/printerdrake.pm:3421 printer/printerdrake.pm:3438
+#: printer/printerdrake.pm:3448
 #, c-format
 msgid ""
 "\n"
@@ -11750,7 +12395,7 @@ msgid ""
 "line, e. g. \"%s <file>\". "
 msgstr ""
 
-#: printer/printerdrake.pm:3239 printer/printerdrake.pm:3279
+#: printer/printerdrake.pm:3424 printer/printerdrake.pm:3464
 #, c-format
 msgid ""
 "To know about the options available for the current printer read either the "
@@ -11758,22 +12403,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3243
+#: printer/printerdrake.pm:3428
 #, c-format
 msgid ""
 "Here is a list of the available printing options for the current printer:\n"
 "\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3248 printer/printerdrake.pm:3258
+#: printer/printerdrake.pm:3433 printer/printerdrake.pm:3443
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
 "<file>\".\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3250 printer/printerdrake.pm:3260
-#: printer/printerdrake.pm:3270
+#: printer/printerdrake.pm:3435 printer/printerdrake.pm:3445
+#: printer/printerdrake.pm:3455
 #, c-format
 msgid ""
 "This command you can also use in the \"Printing command\" field of the "
@@ -11781,21 +12426,21 @@ msgid ""
 "because the file to print is provided by the application.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3255 printer/printerdrake.pm:3265
+#: printer/printerdrake.pm:3440 printer/printerdrake.pm:3450
 #, c-format
 msgid ""
 "To get a list of the options available for the current printer click on the "
 "\"Print option list\" button."
 msgstr ""
 
-#: printer/printerdrake.pm:3268
+#: printer/printerdrake.pm:3453
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
 "<file>\" or \"%s <file>\".\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3272
+#: printer/printerdrake.pm:3457
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -11806,7 +12451,7 @@ msgid ""
 "jams.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3276
+#: printer/printerdrake.pm:3461
 #, c-format
 msgid ""
 "\n"
@@ -11815,42 +12460,32 @@ msgid ""
 "line, e. g. \"%s <file>\".\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3286
+#: printer/printerdrake.pm:3471
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr ""
 
-#: printer/printerdrake.pm:3287
+#: printer/printerdrake.pm:3472
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr ""
 
-#: printer/printerdrake.pm:3289
+#: printer/printerdrake.pm:3474
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr ""
 
-#: printer/printerdrake.pm:3290
+#: printer/printerdrake.pm:3475
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr ""
 
-#: printer/printerdrake.pm:3293 printer/printerdrake.pm:3296
-#: printer/printerdrake.pm:3297 printer/printerdrake.pm:3298
-#: printer/printerdrake.pm:4384 standalone/drakTermServ:313
-#: standalone/drakbackup:4063 standalone/drakbug:177 standalone/drakfont:500
-#: standalone/drakfont:591 standalone/net_monitor:107
-#: standalone/printerdrake:515
-#, c-format
-msgid "Close"
-msgstr "Lukk"
-
-#: printer/printerdrake.pm:3296
+#: printer/printerdrake.pm:3481
 #, c-format
 msgid "Print option list"
 msgstr ""
 
-#: printer/printerdrake.pm:3317
+#: printer/printerdrake.pm:3502
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -11861,10 +12496,12 @@ msgid ""
 "\" menu. Call also \"man scanimage\" on the command line to get more "
 "information.\n"
 "\n"
-"Do not use \"scannerdrake\" for this device!"
+"You do not need to run \"scannerdrake\" for setting up scanning on this "
+"device, you only need to use \"scannerdrake\" if you want to share the "
+"scanner on the network."
 msgstr ""
 
-#: printer/printerdrake.pm:3343
+#: printer/printerdrake.pm:3528
 #, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -11878,18 +12515,13 @@ msgid ""
 "of the file lists."
 msgstr ""
 
-#: printer/printerdrake.pm:3365 printer/printerdrake.pm:3767
-#, c-format
-msgid "Reading printer data..."
-msgstr ""
-
-#: printer/printerdrake.pm:3385 printer/printerdrake.pm:3412
-#: printer/printerdrake.pm:3447
+#: printer/printerdrake.pm:3570 printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3632
 #, c-format
 msgid "Transfer printer configuration"
 msgstr ""
 
-#: printer/printerdrake.pm:3386
+#: printer/printerdrake.pm:3571
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -11899,33 +12531,33 @@ msgid ""
 "Not all queues can be transferred due to the following reasons:\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3389
+#: printer/printerdrake.pm:3574
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
 "data into a free-formed command.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3391
+#: printer/printerdrake.pm:3576
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
 "printers.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3393
+#: printer/printerdrake.pm:3578
 #, c-format
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3395
+#: printer/printerdrake.pm:3580
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
 "cannot be transferred."
 msgstr ""
 
-#: printer/printerdrake.pm:3396
+#: printer/printerdrake.pm:3581
 #, c-format
 msgid ""
 "\n"
@@ -11933,7 +12565,7 @@ msgid ""
 "or with native CUPS drivers cannot be transferred."
 msgstr ""
 
-#: printer/printerdrake.pm:3397
+#: printer/printerdrake.pm:3582
 #, c-format
 msgid ""
 "\n"
@@ -11941,17 +12573,17 @@ msgid ""
 "\"Transfer\"."
 msgstr ""
 
-#: printer/printerdrake.pm:3400
+#: printer/printerdrake.pm:3585
 #, c-format
 msgid "Do not transfer printers"
 msgstr ""
 
-#: printer/printerdrake.pm:3401 printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3586 printer/printerdrake.pm:3602
 #, c-format
 msgid "Transfer"
 msgstr "Overfør"
 
-#: printer/printerdrake.pm:3413
+#: printer/printerdrake.pm:3598
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -11959,45 +12591,45 @@ msgid ""
 "You can also type a new name or skip this printer."
 msgstr ""
 
-#: printer/printerdrake.pm:3434
+#: printer/printerdrake.pm:3619
 #, c-format
 msgid "New printer name"
 msgstr "Nytt skrivarnamn"
 
-#: printer/printerdrake.pm:3437
+#: printer/printerdrake.pm:3622
 #, c-format
 msgid "Transferring %s..."
 msgstr "Overfører «%s» ..."
 
-#: printer/printerdrake.pm:3448
+#: printer/printerdrake.pm:3633
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
 "the default printer under the new printing system %s?"
 msgstr ""
 
-#: printer/printerdrake.pm:3458
+#: printer/printerdrake.pm:3643
 #, c-format
 msgid "Refreshing printer data..."
 msgstr "Oppdaterer skrivardata ..."
 
-#: printer/printerdrake.pm:3467
+#: printer/printerdrake.pm:3652
 #, c-format
 msgid "Starting network..."
 msgstr "Startar nettverk ..."
 
-#: printer/printerdrake.pm:3508 printer/printerdrake.pm:3512
-#: printer/printerdrake.pm:3514
+#: printer/printerdrake.pm:3695 printer/printerdrake.pm:3699
+#: printer/printerdrake.pm:3701
 #, c-format
 msgid "Configure the network now"
 msgstr "Set opp nettverket"
 
-#: printer/printerdrake.pm:3509
+#: printer/printerdrake.pm:3696
 #, c-format
 msgid "Network functionality not configured"
 msgstr ""
 
-#: printer/printerdrake.pm:3510
+#: printer/printerdrake.pm:3697
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -12006,12 +12638,12 @@ msgid ""
 "configuring now. How do you want to proceed?"
 msgstr ""
 
-#: printer/printerdrake.pm:3513
+#: printer/printerdrake.pm:3700
 #, c-format
 msgid "Go on without configuring the network"
 msgstr ""
 
-#: printer/printerdrake.pm:3547
+#: printer/printerdrake.pm:3735
 #, c-format
 msgid ""
 "The network configuration done during the installation cannot be started "
@@ -12021,7 +12653,7 @@ msgid ""
 "also using the %s Control Center, section \"Hardware\"/\"Printer\""
 msgstr ""
 
-#: printer/printerdrake.pm:3548
+#: printer/printerdrake.pm:3736
 #, c-format
 msgid ""
 "The network access was not running and could not be started. Please check "
@@ -12029,27 +12661,27 @@ msgid ""
 "printer again."
 msgstr ""
 
-#: printer/printerdrake.pm:3558
+#: printer/printerdrake.pm:3746
 #, c-format
 msgid "Restarting printing system..."
 msgstr ""
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, c-format
 msgid "high"
 msgstr "høg"
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, c-format
 msgid "paranoid"
 msgstr "paranoid"
 
-#: printer/printerdrake.pm:3598
+#: printer/printerdrake.pm:3778
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr ""
 
-#: printer/printerdrake.pm:3599
+#: printer/printerdrake.pm:3779
 #, c-format
 msgid ""
 "You are about to install the printing system %s on a system running in the %"
@@ -12064,12 +12696,12 @@ msgid ""
 "Do you really want to configure printing on this machine?"
 msgstr ""
 
-#: printer/printerdrake.pm:3633
+#: printer/printerdrake.pm:3814
 #, c-format
 msgid "Starting the printing system at boot time"
 msgstr ""
 
-#: printer/printerdrake.pm:3634
+#: printer/printerdrake.pm:3815
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -12083,67 +12715,150 @@ msgid ""
 "again?"
 msgstr ""
 
-#: printer/printerdrake.pm:3655 printer/printerdrake.pm:3889
+#: printer/printerdrake.pm:3837
 #, c-format
 msgid "Checking installed software..."
 msgstr ""
 
-#: printer/printerdrake.pm:3661
+#: printer/printerdrake.pm:3843
 #, c-format
-msgid "Removing %s ..."
+msgid "Removing %s..."
 msgstr "Fjernar «%s» ..."
 
-#: printer/printerdrake.pm:3665
+#: printer/printerdrake.pm:3847
 #, c-format
 msgid "Could not remove the %s printing system!"
 msgstr ""
 
-#: printer/printerdrake.pm:3674
+#: printer/printerdrake.pm:3863
 #, c-format
-msgid "Installing %s ..."
+msgid "Installing %s..."
 msgstr "Installerer «%s» ..."
 
-#: printer/printerdrake.pm:3678
+#: printer/printerdrake.pm:3867
 #, c-format
 msgid "Could not install the %s printing system!"
 msgstr ""
 
-#: printer/printerdrake.pm:3727
+#: printer/printerdrake.pm:3934
+#, c-format
+msgid ""
+"In this mode there is no local printing system, all printing requests go "
+"directly to the server specified below. Note that it is not possible to "
+"define local print queues then and if the specified server is down it cannot "
+"be printed at all from this machine."
+msgstr ""
+
+#: printer/printerdrake.pm:3936
+#, c-format
+msgid ""
+"Enter the host name or IP of your CUPS server and click OK if you want to "
+"use this mode, click \"Quit\" otherwise."
+msgstr ""
+
+#: printer/printerdrake.pm:3950
+#, c-format
+msgid "Name or IP of remote server:"
+msgstr "Namn eller IP til fjerntliggjande tenar:"
+
+#: printer/printerdrake.pm:3970
 #, c-format
 msgid "Setting Default Printer..."
+msgstr "Set standardskrivar ..."
+
+#: printer/printerdrake.pm:3989
+#, c-format
+msgid "Local CUPS printing system or remote CUPS server?"
+msgstr ""
+
+#: printer/printerdrake.pm:3990
+#, c-format
+msgid "The CUPS printing system can be used in two ways: "
+msgstr ""
+
+#: printer/printerdrake.pm:3992
+#, c-format
+msgid "1. The CUPS printing system can run locally. "
+msgstr ""
+
+#: printer/printerdrake.pm:3993
+#, c-format
+msgid ""
+"Then locally connected printers can be used and remote printers on other "
+"CUPS servers in the same network are automatically discovered. "
+msgstr ""
+
+#: printer/printerdrake.pm:3994
+#, c-format
+msgid ""
+"Disadvantage of this approach is, that more resources on the local machine "
+"are needed: Additional software packages need to be installed, the CUPS "
+"daemon has to run in the background and needs some memory, and the IPP port "
+"(port 631) is opened. "
+msgstr ""
+
+#: printer/printerdrake.pm:3996
+#, c-format
+msgid "2. All printing requests are immediately sent to a remote CUPS server. "
+msgstr ""
+
+#: printer/printerdrake.pm:3997
+#, c-format
+msgid ""
+"Here local resource occupation is reduced to a minimum. No CUPS daemon is "
+"started or port opened, no software infrastructure for setting up local "
+"print queues is installed, so less memory and disk space is used. "
 msgstr ""
 
-#: printer/printerdrake.pm:3747
+#: printer/printerdrake.pm:3998
+#, c-format
+msgid ""
+"Disadvantage is that it is not possible to define local printers then and if "
+"the specified server is down it cannot be printed at all from this machine. "
+msgstr ""
+
+#: printer/printerdrake.pm:4000
+#, c-format
+msgid "How should CUPS be set up on your machine?"
+msgstr ""
+
+#: printer/printerdrake.pm:4004 printer/printerdrake.pm:4019
+#: printer/printerdrake.pm:4023 printer/printerdrake.pm:4029
+#, c-format
+msgid "Remote server, specify Name or IP here:"
+msgstr ""
+
+#: printer/printerdrake.pm:4018
+#, c-format
+msgid "Local CUPS printing system"
+msgstr "Lokalt CUPS-utskriftssystem"
+
+#: printer/printerdrake.pm:4056
 #, c-format
 msgid "Select Printer Spooler"
 msgstr ""
 
-#: printer/printerdrake.pm:3748
+#: printer/printerdrake.pm:4057
 #, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr ""
 
-#: printer/printerdrake.pm:3799
+#: printer/printerdrake.pm:4105
 #, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr ""
 
-#: printer/printerdrake.pm:3812
+#: printer/printerdrake.pm:4118
 #, c-format
 msgid "Installing Foomatic..."
 msgstr "Installerer Foomatic ..."
 
-#: printer/printerdrake.pm:3818
+#: printer/printerdrake.pm:4124
 #, c-format
 msgid "Could not install %s packages, %s cannot be started!"
 msgstr ""
 
-#: printer/printerdrake.pm:3910
-#, c-format
-msgid "Could not install necessary packages, %s cannot be started!"
-msgstr ""
-
-#: printer/printerdrake.pm:4011
+#: printer/printerdrake.pm:4314
 #, c-format
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
@@ -12151,184 +12866,157 @@ msgid ""
 "it. "
 msgstr ""
 
-#: printer/printerdrake.pm:4039
+#: printer/printerdrake.pm:4344
 #, c-format
 msgid "Display all available remote CUPS printers"
 msgstr ""
 
-#: printer/printerdrake.pm:4040
+#: printer/printerdrake.pm:4345
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr ""
 
-#: printer/printerdrake.pm:4050
+#: printer/printerdrake.pm:4356
 #, c-format
 msgid "CUPS configuration"
 msgstr "CUPS-oppsett"
 
-#: printer/printerdrake.pm:4062
+#: printer/printerdrake.pm:4368
 #, c-format
 msgid "Change the printing system"
 msgstr ""
 
-#: printer/printerdrake.pm:4071
+#: printer/printerdrake.pm:4377
 #, c-format
 msgid "Normal Mode"
 msgstr ""
 
-#: printer/printerdrake.pm:4072
+#: printer/printerdrake.pm:4378
 #, c-format
 msgid "Expert Mode"
 msgstr "Ekspertmodus"
 
-#: printer/printerdrake.pm:4343 printer/printerdrake.pm:4398
-#: printer/printerdrake.pm:4479 printer/printerdrake.pm:4489
+#: printer/printerdrake.pm:4632 printer/printerdrake.pm:4690
+#: printer/printerdrake.pm:4768 printer/printerdrake.pm:4777
 #, c-format
 msgid "Printer options"
 msgstr "Skrivar val"
 
-#: printer/printerdrake.pm:4379
+#: printer/printerdrake.pm:4668
 #, c-format
 msgid "Modify printer configuration"
 msgstr ""
 
-#: printer/printerdrake.pm:4381
+#: printer/printerdrake.pm:4670
 #, c-format
 msgid ""
-"Printer %s\n"
+"Printer %s%s\n"
 "What do you want to modify on this printer?"
 msgstr ""
 
-#: printer/printerdrake.pm:4385
+#: printer/printerdrake.pm:4675
+#, c-format
+msgid "This printer is disabled"
+msgstr "Skrivaren er ikkje i bruk"
+
+#: printer/printerdrake.pm:4677
 #, c-format
 msgid "Do it!"
 msgstr "Bruk"
 
-#: printer/printerdrake.pm:4390 printer/printerdrake.pm:4448
+#: printer/printerdrake.pm:4682 printer/printerdrake.pm:4737
 #, c-format
 msgid "Printer connection type"
 msgstr ""
 
-#: printer/printerdrake.pm:4391 printer/printerdrake.pm:4452
+#: printer/printerdrake.pm:4683 printer/printerdrake.pm:4743
 #, c-format
 msgid "Printer name, description, location"
 msgstr ""
 
-#: printer/printerdrake.pm:4393 printer/printerdrake.pm:4471
+#: printer/printerdrake.pm:4685 printer/printerdrake.pm:4761
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr ""
 
-#: printer/printerdrake.pm:4394 printer/printerdrake.pm:4472
+#: printer/printerdrake.pm:4686 printer/printerdrake.pm:4762
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr ""
 
-#: printer/printerdrake.pm:4400 printer/printerdrake.pm:4483
+#: printer/printerdrake.pm:4692 printer/printerdrake.pm:4772
 #, c-format
 msgid "Set this printer as the default"
 msgstr ""
 
-#: printer/printerdrake.pm:4402 printer/printerdrake.pm:4490
+#: printer/printerdrake.pm:4697 printer/printerdrake.pm:4778
+#: printer/printerdrake.pm:4780
 #, c-format
-msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
-msgstr ""
+msgid "Enable Printer"
+msgstr "Set skrivar i bruk"
 
-#: printer/printerdrake.pm:4403 printer/printerdrake.pm:4495
+#: printer/printerdrake.pm:4700 printer/printerdrake.pm:4783
+#: printer/printerdrake.pm:4785
 #, c-format
-msgid "Remove this printer from Star Office/OpenOffice.org/GIMP"
-msgstr ""
+msgid "Disable Printer"
+msgstr "Set skrivar ut av bruk"
 
-#: printer/printerdrake.pm:4404 printer/printerdrake.pm:4500
+#: printer/printerdrake.pm:4701 printer/printerdrake.pm:4788
 #, c-format
 msgid "Print test pages"
 msgstr "Skriv ut testsider"
 
-#: printer/printerdrake.pm:4405 printer/printerdrake.pm:4502
+#: printer/printerdrake.pm:4702 printer/printerdrake.pm:4790
 #, c-format
 msgid "Learn how to use this printer"
 msgstr "Lær meir om skrivaren"
 
-#: printer/printerdrake.pm:4406 printer/printerdrake.pm:4504
+#: printer/printerdrake.pm:4703 printer/printerdrake.pm:4792
 #, c-format
 msgid "Remove printer"
 msgstr "Fjern skrivar"
 
-#: printer/printerdrake.pm:4460
+#: printer/printerdrake.pm:4750
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "Fjerar den gamle skrivaren «%s» ..."
 
-#: printer/printerdrake.pm:4491
+#: printer/printerdrake.pm:4781
 #, c-format
-msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
+msgid "Printer \"%s\" is now enabled."
 msgstr ""
 
-#: printer/printerdrake.pm:4493
+#: printer/printerdrake.pm:4786
 #, c-format
-msgid ""
-"The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
-msgstr ""
-
-#: printer/printerdrake.pm:4494
-#, c-format
-msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
+msgid "Printer \"%s\" is now disabled."
 msgstr ""
 
-#: printer/printerdrake.pm:4496
-#, c-format
-msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
-msgstr ""
-
-#: printer/printerdrake.pm:4498
-#, c-format
-msgid ""
-"The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
-"GIMP."
-msgstr ""
-
-#: printer/printerdrake.pm:4499
-#, c-format
-msgid ""
-"Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
-msgstr ""
-
-#: printer/printerdrake.pm:4543
+#: printer/printerdrake.pm:4823
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "Er du sikker på at du vil fjerna skrivaren «%s»?"
 
-#: printer/printerdrake.pm:4547
+#: printer/printerdrake.pm:4827
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "Fjernar skrivaren «%s» ..."
 
-#: printer/printerdrake.pm:4571
+#: printer/printerdrake.pm:4851
 #, c-format
 msgid "Default printer"
 msgstr "Standardskrivar"
 
-#: printer/printerdrake.pm:4572
+#: printer/printerdrake.pm:4852
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr ""
 
-#: raid.pm:37
+#: raid.pm:36
 #, c-format
-msgid "Can't add a partition to _formatted_ RAID md%d"
+msgid "Can't add a partition to _formatted_ RAID %s"
 msgstr ""
 
-#: raid.pm:139
-#, c-format
-msgid "mkraid failed (maybe raidtools are missing?)"
-msgstr "mislukka mkraid (kanskje raidtools manglar?)"
-
-#: raid.pm:139
-#, c-format
-msgid "mkraid failed"
-msgstr "mislukka mkraid"
-
-#: raid.pm:155
+#: raid.pm:132
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr ""
@@ -12353,16 +13041,16 @@ msgstr ""
 msgid "Could not set permissions of firmware file %s!"
 msgstr ""
 
-#: scanner.pm:200 standalone/scannerdrake:65 standalone/scannerdrake:69
-#: standalone/scannerdrake:77 standalone/scannerdrake:344
-#: standalone/scannerdrake:419 standalone/scannerdrake:463
-#: standalone/scannerdrake:467 standalone/scannerdrake:489
-#: standalone/scannerdrake:554
+#: scanner.pm:200 standalone/scannerdrake:66 standalone/scannerdrake:70
+#: standalone/scannerdrake:78 standalone/scannerdrake:340
+#: standalone/scannerdrake:415 standalone/scannerdrake:459
+#: standalone/scannerdrake:463 standalone/scannerdrake:485
+#: standalone/scannerdrake:550
 #, c-format
 msgid "Scannerdrake"
 msgstr "Skannaroppsett"
 
-#: scanner.pm:201 standalone/scannerdrake:920
+#: scanner.pm:201 standalone/scannerdrake:916
 #, c-format
 msgid "Could not install the packages needed to share your scanner(s)."
 msgstr ""
@@ -12392,7 +13080,8 @@ msgstr ""
 msgid "Allow/Forbid autologin."
 msgstr ""
 
-#: security/help.pm:19
+#. -PO: here "ALL" is a value in a pull-down menu; translate it the same as "ALL" is
+#: security/help.pm:21
 #, c-format
 msgid ""
 "If set to \"ALL\", /etc/issue and /etc/issue.net are allowed to exist.\n"
@@ -12402,29 +13091,38 @@ msgid ""
 "Else only /etc/issue is allowed."
 msgstr ""
 
-#: security/help.pm:25
+#: security/help.pm:27
 #, c-format
 msgid "Allow/Forbid reboot by the console user."
 msgstr ""
 
-#: security/help.pm:27
+#: security/help.pm:29
 #, c-format
 msgid "Allow/Forbid remote root login."
 msgstr ""
 
-#: security/help.pm:29
+#: security/help.pm:31
 #, c-format
 msgid "Allow/Forbid direct root login."
 msgstr ""
 
-#: security/help.pm:31
+#: security/help.pm:33
 #, c-format
 msgid ""
 "Allow/Forbid the list of users on the system on display managers (kdm and "
 "gdm)."
 msgstr ""
 
-#: security/help.pm:33
+#: security/help.pm:35
+#, c-format
+msgid ""
+"Allow/forbid to export display when\n"
+"passing from the root account to the other users.\n"
+"\n"
+"See pam_xauth(8) for more details.'"
+msgstr ""
+
+#: security/help.pm:40
 #, c-format
 msgid ""
 "Allow/Forbid X connections:\n"
@@ -12436,14 +13134,15 @@ msgid ""
 "- NONE (no connection)."
 msgstr ""
 
-#: security/help.pm:41
+#: security/help.pm:48
 #, c-format
 msgid ""
 "The argument specifies if clients are authorized to connect\n"
 "to the X server from the network on the tcp port 6000 or not."
 msgstr ""
 
-#: security/help.pm:44
+#. -PO: here "ALL", "LOCAL" and "NONE" are values in a pull-down menu; translate them the same as they're
+#: security/help.pm:53
 #, c-format
 msgid ""
 "Authorize:\n"
@@ -12459,7 +13158,7 @@ msgid ""
 "(5))."
 msgstr ""
 
-#: security/help.pm:54
+#: security/help.pm:63
 #, c-format
 msgid ""
 "If SERVER_LEVEL (or SECURE_LEVEL if absent)\n"
@@ -12472,7 +13171,7 @@ msgid ""
 "packages."
 msgstr ""
 
-#: security/help.pm:63
+#: security/help.pm:72
 #, c-format
 msgid ""
 "Enable/Disable crontab and at for users.\n"
@@ -12481,100 +13180,105 @@ msgid ""
 "and crontab(1))."
 msgstr ""
 
-#: security/help.pm:68
+#: security/help.pm:77
 #, c-format
 msgid "Enable/Disable syslog reports to console 12"
 msgstr ""
 
-#: security/help.pm:70
+#: security/help.pm:79
 #, c-format
 msgid ""
 "Enable/Disable name resolution spoofing protection.  If\n"
-"\"alert\" is true, also reports to syslog."
+"\"%s\" is true, also reports to syslog."
 msgstr ""
 
-#: security/help.pm:73
+#: security/help.pm:80 standalone/draksec:213
+#, c-format
+msgid "Security Alerts:"
+msgstr "Tryggleiksvarsel:"
+
+#: security/help.pm:82
 #, c-format
 msgid "Enable/Disable IP spoofing protection."
 msgstr ""
 
-#: security/help.pm:75
+#: security/help.pm:84
 #, c-format
 msgid "Enable/Disable libsafe if libsafe is found on the system."
 msgstr ""
 
-#: security/help.pm:77
+#: security/help.pm:86
 #, c-format
 msgid "Enable/Disable the logging of IPv4 strange packets."
 msgstr ""
 
-#: security/help.pm:79
+#: security/help.pm:88
 #, c-format
 msgid "Enable/Disable msec hourly security check."
 msgstr ""
 
-#: security/help.pm:81
+#: security/help.pm:90
 #, c-format
 msgid ""
 " Enabling su only from members of the wheel group or allow su from any user."
 msgstr ""
 
-#: security/help.pm:83
+#: security/help.pm:92
 #, c-format
 msgid "Use password to authenticate users."
 msgstr ""
 
-#: security/help.pm:85
+#: security/help.pm:94
 #, c-format
 msgid "Activate/Disable ethernet cards promiscuity check."
 msgstr ""
 
-#: security/help.pm:87
+#: security/help.pm:96
 #, c-format
 msgid " Activate/Disable daily security check."
 msgstr ""
 
-#: security/help.pm:89
+#: security/help.pm:98
 #, c-format
 msgid " Enable/Disable sulogin(8) in single user level."
 msgstr ""
 
-#: security/help.pm:91
+#: security/help.pm:100
 #, c-format
 msgid "Add the name as an exception to the handling of password aging by msec."
 msgstr ""
 
-#: security/help.pm:93
+#: security/help.pm:102
 #, c-format
 msgid "Set password aging to \"max\" days and delay to change to \"inactive\"."
 msgstr ""
 
-#: security/help.pm:95
+#: security/help.pm:104
 #, c-format
 msgid "Set the password history length to prevent password reuse."
 msgstr ""
 
-#: security/help.pm:97
+#: security/help.pm:106
 #, c-format
 msgid ""
 "Set the password minimum length and minimum number of digit and minimum "
 "number of capitalized letters."
 msgstr ""
 
-#: security/help.pm:99
+#: security/help.pm:108
 #, c-format
 msgid "Set the root umask."
 msgstr ""
 
-#: security/help.pm:100
+#: security/help.pm:109
 #, c-format
 msgid "if set to yes, check open ports."
 msgstr ""
 
-#: security/help.pm:101
+#: security/help.pm:110
 #, c-format
 msgid ""
-"if set to yes, check for :\n"
+"if set to yes, check for:\n"
 "\n"
 "- empty passwords,\n"
 "\n"
@@ -12583,103 +13287,103 @@ msgid ""
 "- for users with the 0 id other than root."
 msgstr ""
 
-#: security/help.pm:108
+#: security/help.pm:117
 #, c-format
 msgid "if set to yes, check permissions of files in the users' home."
 msgstr ""
 
-#: security/help.pm:109
+#: security/help.pm:118
 #, c-format
 msgid "if set to yes, check if the network devices are in promiscuous mode."
 msgstr ""
 
-#: security/help.pm:110
+#: security/help.pm:119
 #, c-format
 msgid "if set to yes, run the daily security checks."
 msgstr ""
 
-#: security/help.pm:111
+#: security/help.pm:120
 #, c-format
 msgid "if set to yes, check additions/removals of sgid files."
 msgstr ""
 
-#: security/help.pm:112
+#: security/help.pm:121
 #, c-format
 msgid "if set to yes, check empty password in /etc/shadow."
 msgstr ""
 
-#: security/help.pm:113
+#: security/help.pm:122
 #, c-format
 msgid "if set to yes, verify checksum of the suid/sgid files."
 msgstr ""
 
-#: security/help.pm:114
+#: security/help.pm:123
 #, c-format
 msgid "if set to yes, check additions/removals of suid root files."
 msgstr ""
 
-#: security/help.pm:115
+#: security/help.pm:124
 #, c-format
 msgid "if set to yes, report unowned files."
 msgstr ""
 
-#: security/help.pm:116
+#: security/help.pm:125
 #, c-format
 msgid "if set to yes, check files/directories writable by everybody."
 msgstr ""
 
-#: security/help.pm:117
+#: security/help.pm:126
 #, c-format
 msgid "if set to yes, run chkrootkit checks."
 msgstr ""
 
-#: security/help.pm:118
+#: security/help.pm:127
 #, c-format
 msgid ""
 "if set, send the mail report to this email address else send it to root."
 msgstr ""
 
-#: security/help.pm:119
+#: security/help.pm:128
 #, c-format
 msgid "if set to yes, report check result by mail."
 msgstr ""
 
-#: security/help.pm:120
+#: security/help.pm:129
 #, c-format
 msgid "Do not send mails if there's nothing to warn about"
 msgstr ""
 
-#: security/help.pm:121
+#: security/help.pm:130
 #, c-format
 msgid "if set to yes, run some checks against the rpm database."
 msgstr ""
 
-#: security/help.pm:122
+#: security/help.pm:131
 #, c-format
 msgid "if set to yes, report check result to syslog."
 msgstr ""
 
-#: security/help.pm:123
+#: security/help.pm:132
 #, c-format
 msgid "if set to yes, reports check result to tty."
 msgstr ""
 
-#: security/help.pm:125
+#: security/help.pm:134
 #, c-format
 msgid "Set shell commands history size. A value of -1 means unlimited."
 msgstr ""
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Set the shell timeout. A value of zero means no timeout."
 msgstr ""
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Timeout unit is second"
 msgstr ""
 
-#: security/help.pm:129
+#: security/help.pm:138
 #, c-format
 msgid "Set the user umask."
 msgstr ""
@@ -12726,210 +13430,215 @@ msgstr ""
 
 #: security/l10n.pm:20
 #, c-format
-msgid "Allow X Window connections"
+msgid "Export display when passing from root to the other users"
 msgstr ""
 
 #: security/l10n.pm:21
 #, c-format
-msgid "Authorize TCP connections to X Window"
+msgid "Allow X Window connections"
 msgstr ""
 
 #: security/l10n.pm:22
 #, c-format
-msgid "Authorize all services controlled by tcp_wrappers"
+msgid "Authorize TCP connections to X Window"
 msgstr ""
 
 #: security/l10n.pm:23
 #, c-format
-msgid "Chkconfig obey msec rules"
+msgid "Authorize all services controlled by tcp_wrappers"
 msgstr ""
 
 #: security/l10n.pm:24
 #, c-format
-msgid "Enable \"crontab\" and \"at\" for users"
+msgid "Chkconfig obey msec rules"
 msgstr ""
 
 #: security/l10n.pm:25
 #, c-format
-msgid "Syslog reports to console 12"
+msgid "Enable \"crontab\" and \"at\" for users"
 msgstr ""
 
 #: security/l10n.pm:26
 #, c-format
-msgid "Name resolution spoofing protection"
+msgid "Syslog reports to console 12"
 msgstr ""
 
 #: security/l10n.pm:27
 #, c-format
-msgid "Enable IP spoofing protection"
+msgid "Name resolution spoofing protection"
 msgstr ""
 
 #: security/l10n.pm:28
 #, c-format
-msgid "Enable libsafe if libsafe is found on the system"
+msgid "Enable IP spoofing protection"
 msgstr ""
 
 #: security/l10n.pm:29
 #, c-format
-msgid "Enable the logging of IPv4 strange packets"
+msgid "Enable libsafe if libsafe is found on the system"
 msgstr ""
 
 #: security/l10n.pm:30
 #, c-format
-msgid "Enable msec hourly security check"
+msgid "Enable the logging of IPv4 strange packets"
 msgstr ""
 
 #: security/l10n.pm:31
 #, c-format
-msgid "Enable su only from the wheel group members or for any user"
+msgid "Enable msec hourly security check"
 msgstr ""
 
 #: security/l10n.pm:32
 #, c-format
-msgid "Use password to authenticate users"
+msgid "Enable su only from the wheel group members or for any user"
 msgstr ""
 
 #: security/l10n.pm:33
 #, c-format
-msgid "Ethernet cards promiscuity check"
+msgid "Use password to authenticate users"
 msgstr ""
 
 #: security/l10n.pm:34
 #, c-format
-msgid "Daily security check"
+msgid "Ethernet cards promiscuity check"
 msgstr ""
 
 #: security/l10n.pm:35
 #, c-format
-msgid "Sulogin(8) in single user level"
+msgid "Daily security check"
 msgstr ""
 
 #: security/l10n.pm:36
 #, c-format
-msgid "No password aging for"
+msgid "Sulogin(8) in single user level"
 msgstr ""
 
 #: security/l10n.pm:37
 #, c-format
-msgid "Set password expiration and account inactivation delays"
+msgid "No password aging for"
 msgstr ""
 
 #: security/l10n.pm:38
 #, c-format
-msgid "Password history length"
+msgid "Set password expiration and account inactivation delays"
 msgstr ""
 
 #: security/l10n.pm:39
 #, c-format
-msgid "Password minimum length and number of digits and upcase letters"
+msgid "Password history length"
 msgstr ""
 
 #: security/l10n.pm:40
 #, c-format
-msgid "Root umask"
+msgid "Password minimum length and number of digits and upcase letters"
 msgstr ""
 
 #: security/l10n.pm:41
 #, c-format
-msgid "Shell history size"
+msgid "Root umask"
 msgstr ""
 
 #: security/l10n.pm:42
 #, c-format
-msgid "Shell timeout"
+msgid "Shell history size"
 msgstr ""
 
 #: security/l10n.pm:43
 #, c-format
-msgid "User umask"
+msgid "Shell timeout"
 msgstr ""
 
 #: security/l10n.pm:44
 #, c-format
+msgid "User umask"
+msgstr ""
+
+#: security/l10n.pm:45
+#, c-format
 msgid "Check open ports"
 msgstr "Sjå etter opne portar"
 
-#: security/l10n.pm:45
+#: security/l10n.pm:46
 #, c-format
 msgid "Check for unsecured accounts"
 msgstr "Sjå etter usikra kontoar"
 
-#: security/l10n.pm:46
+#: security/l10n.pm:47
 #, c-format
 msgid "Check permissions of files in the users' home"
 msgstr "Kontroller løyve på filer i brukarens heimemappe"
 
-#: security/l10n.pm:47
+#: security/l10n.pm:48
 #, c-format
 msgid "Check if the network devices are in promiscuous mode"
 msgstr ""
 
-#: security/l10n.pm:48
+#: security/l10n.pm:49
 #, c-format
 msgid "Run the daily security checks"
 msgstr ""
 
-#: security/l10n.pm:49
+#: security/l10n.pm:50
 #, c-format
 msgid "Check additions/removals of sgid files"
 msgstr ""
 
-#: security/l10n.pm:50
+#: security/l10n.pm:51
 #, c-format
 msgid "Check empty password in /etc/shadow"
 msgstr ""
 
-#: security/l10n.pm:51
+#: security/l10n.pm:52
 #, c-format
 msgid "Verify checksum of the suid/sgid files"
 msgstr ""
 
-#: security/l10n.pm:52
+#: security/l10n.pm:53
 #, c-format
 msgid "Check additions/removals of suid root files"
 msgstr ""
 
-#: security/l10n.pm:53
+#: security/l10n.pm:54
 #, c-format
 msgid "Report unowned files"
 msgstr ""
 
-#: security/l10n.pm:54
+#: security/l10n.pm:55
 #, c-format
 msgid "Check files/directories writable by everybody"
 msgstr ""
 
-#: security/l10n.pm:55
+#: security/l10n.pm:56
 #, c-format
 msgid "Run chkrootkit checks"
 msgstr ""
 
-#: security/l10n.pm:56
+#: security/l10n.pm:57
 #, c-format
 msgid "Do not send mails when unneeded"
 msgstr ""
 
-#: security/l10n.pm:57
+#: security/l10n.pm:58
 #, c-format
 msgid "If set, send the mail report to this email address else send it to root"
 msgstr ""
 
-#: security/l10n.pm:58
+#: security/l10n.pm:59
 #, c-format
 msgid "Report check result by mail"
 msgstr ""
 
-#: security/l10n.pm:59
+#: security/l10n.pm:60
 #, c-format
 msgid "Run some checks against the rpm database"
 msgstr ""
 
-#: security/l10n.pm:60
+#: security/l10n.pm:61
 #, c-format
 msgid "Report check result to syslog"
 msgstr ""
 
-#: security/l10n.pm:61
+#: security/l10n.pm:62
 #, c-format
 msgid "Reports check result to tty"
 msgstr ""
@@ -13199,7 +13908,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Automatically switch on numlock key locker under console\n"
-"and XFree at boot."
+"and Xorg at boot."
 msgstr ""
 
 #: services.pm:66
@@ -13272,7 +13981,7 @@ msgstr ""
 #, c-format
 msgid ""
 "The rwho protocol lets remote users get a list of all of the users\n"
-"logged into a machine running the rwho daemon (similiar to finger)."
+"logged into a machine running the rwho daemon (similar to finger)."
 msgstr ""
 
 #: services.pm:87
@@ -13294,7 +14003,7 @@ msgstr ""
 
 #: services.pm:91
 #, c-format
-msgid "Starts the X Font Server (this is mandatory for XFree to run)."
+msgid "Starts the X Font Server (this is mandatory for Xorg to run)."
 msgstr ""
 
 #: services.pm:117 services.pm:159
@@ -13339,7 +14048,7 @@ msgstr "stoppa"
 
 #: services.pm:215
 #, c-format
-msgid "Services and deamons"
+msgid "Services and daemons"
 msgstr ""
 
 #: services.pm:221
@@ -13349,7 +14058,7 @@ msgid ""
 "about this service, sorry."
 msgstr ""
 
-#: services.pm:226 ugtk2.pm:1176
+#: services.pm:226 ugtk2.pm:1214
 #, c-format
 msgid "Info"
 msgstr "Informasjon"
@@ -13364,723 +14073,1185 @@ msgstr ""
 msgid "On boot"
 msgstr "Ved oppstart"
 
-#: services.pm:244
+#: services.pm:246
 #, c-format
 msgid "Start"
 msgstr "Start"
 
-#: services.pm:244
+#: services.pm:246
 #, c-format
 msgid "Stop"
 msgstr "Stopp"
 
-#: share/advertising/dis-01.pl:13 share/advertising/dwd-01.pl:13
-#: share/advertising/ppp-01.pl:13 share/advertising/pwp-01.pl:13
+#: share/advertising/01.pl:13
+#, c-format
+msgid "<b>What is Mandrakelinux?</b>"
+msgstr "<b>Kva er Mandrakelinux?</b>"
+
+#: share/advertising/01.pl:15
+#, c-format
+msgid "Welcome to <b>Mandrakelinux</b>!"
+msgstr "Velkommen til <b>Mandrakelinux</b>!"
+
+#: share/advertising/01.pl:17
+#, c-format
+msgid ""
+"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"system, called the <b>operating system</b> (based on the Linux kernel) "
+"together with <b>a lot of applications</b> meeting every need you could even "
+"think of."
+msgstr ""
+
+#: share/advertising/01.pl:19
 #, c-format
-msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
+msgid ""
+"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
-#: share/advertising/dis-01.pl:15 share/advertising/dwd-01.pl:15
-#: share/advertising/ppp-01.pl:15 share/advertising/pwp-01.pl:15
+#: share/advertising/02.pl:13
 #, c-format
-msgid "Welcome to the Open Source world!"
+msgid "<b>Open Source</b>"
+msgstr "<b>Open kjeldekode</b>"
+
+#: share/advertising/02.pl:15
+#, c-format
+msgid "Welcome to the <b>world of open source</b>!"
 msgstr ""
 
-#: share/advertising/dis-01.pl:17
+#: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Your new Mandrakelinux operating system and its many applications is the "
-"result of collaborative efforts between MandrakeSoft developers and "
-"Mandrakelinux contributors throughout the world."
+"Mandrakelinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"contributors."
 msgstr ""
 
-#: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19
-#: share/advertising/ppp-01.pl:19
+#: share/advertising/02.pl:19
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of this "
-"latest release."
+"We would like to <b>thank</b> everyone who participated in the development "
+"of this latest release."
 msgstr ""
 
-#: share/advertising/dis-02.pl:13
+#: share/advertising/03.pl:13
+#, c-format
+msgid "<b>The GPL</b>"
+msgstr "<b>GPL-lisensen</b>"
+
+#: share/advertising/03.pl:15
 #, c-format
-msgid "<b>Discovery</b>"
+msgid ""
+"Most of the software included in the distribution and all of the "
+"Mandrakelinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
-#: share/advertising/dis-02.pl:15
+#: share/advertising/03.pl:17
 #, c-format
 msgid ""
-"Discovery is the easiest and most user-friendly Linux distribution. It "
-"includes a hand-picked selection of premium software for Office, Multimedia "
-"and Internet activities."
+"The GPL is at the heart of the open source model; it grants everyone the "
+"<b>freedom</b> to use, study, distribute and improve the software any way "
+"they want, provided they make the results available."
 msgstr ""
 
-#: share/advertising/dis-02.pl:17
+#: share/advertising/03.pl:19
 #, c-format
-msgid "The menu is task-oriented, with a single selected application per task."
+msgid ""
+"The main benefit of this is that the number of developers is virtually "
+"<b>unlimited</b>, resulting in <b>very high quality</b> software."
 msgstr ""
 
-#: share/advertising/dis-03.pl:13
+#: share/advertising/04.pl:13
 #, c-format
-msgid "<b>The KDE Choice</b>"
-msgstr "<b>KDE</b>"
+msgid "<b>Join the Community</b>"
+msgstr ""
 
-#: share/advertising/dis-03.pl:15
+#: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"The powerful Open Source graphical desktop environment KDE is the desktop of "
-"choice for the Discovery Pack."
-msgstr "Det kraftige skrivebordsmiljøet KDE er standard i Discovery-pakken."
+"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"developers. The role of such a community is very wide, ranging from bug "
+"reporting to the development of new applications. The community plays a "
+"<b>key role</b> in the Mandrakelinux world."
+msgstr ""
 
-#: share/advertising/dis-04.pl:13
+#: share/advertising/04.pl:17
 #, c-format
-msgid "<b>OpenOffice.org</b>: The complete Linux office suite."
+msgid ""
+"To <b>learn more</b> about our dynamic community, please visit <b>www."
+"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
 
-#: share/advertising/dis-04.pl:15
+#: share/advertising/05.pl:13
+#, c-format
+msgid "<b>Download Version</b>"
+msgstr ""
+
+#: share/advertising/05.pl:15
 #, c-format
 msgid ""
-"<b>WRITER</b> is a powerful word processor for creating all types of text "
-"documents. Documents may include images, diagrams and tables."
+"You are now installing <b>Mandrakelinux Download</b>. This is the free "
+"version that Mandrakesoft wants to keep <b>available to everyone</b>."
 msgstr ""
-"<b>WRITER</b> er ein kraftig tekstbehandlar for alle typar tekstdokument. "
-"Dokumenta kan innehelda bilete, diagram og tabellar."
 
-#: share/advertising/dis-04.pl:16
+#: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"<b>CALC</b> is a feature-packed spreadsheet which enables you to compute, "
-"analyze and manage all of your data."
+"The Download version <b>cannot include</b> all the software that is not open "
+"source. Therefore, you won't find in the Download version:"
 msgstr ""
 
-#: share/advertising/dis-04.pl:17
+#: share/advertising/05.pl:18
 #, c-format
 msgid ""
-"<b>IMPRESS</b> is the fastest, most powerful way to create effective "
-"multimedia presentations."
+"\t* <b>Proprietary drivers</b> (such as drivers for NVIDIA®, ATI™, etc.)."
 msgstr ""
 
-#: share/advertising/dis-04.pl:18
+#: share/advertising/05.pl:19
 #, c-format
 msgid ""
-"<b>DRAW</b> will produce everything from simple diagrams to dynamic 3D "
-"illustrations."
+"\t* <b>Proprietary software</b> (such as Acrobat® Reader®, RealPlayer®, "
+"Flash™, etc.)."
 msgstr ""
 
-#: share/advertising/dis-05.pl:13 share/advertising/dis-06.pl:13
+#: share/advertising/05.pl:21
 #, c-format
-msgid "<b>Surf The Internet</b>"
-msgstr "<b>Surf på Internett</b>"
+msgid ""
+"You won't have access to the <b>services included</b> in the other "
+"Mandrakesoft products either."
+msgstr ""
+
+#: share/advertising/06.pl:13
+#, c-format
+msgid "<b>Discovery, Your First Linux Desktop</b>"
+msgstr ""
 
-#: share/advertising/dis-05.pl:15
+#: share/advertising/06.pl:15
 #, c-format
-msgid "Discover the new integrated personal information suite KDE Kontact."
+msgid "You are now installing <b>Mandrakelinux Discovery</b>."
 msgstr ""
 
-#: share/advertising/dis-05.pl:17
+#: share/advertising/06.pl:17
 #, c-format
 msgid ""
-"More than just a full-featured email client, <b>Kontact</b> also includes an "
-"address book, a calendar and scheduling program, plus a tool for taking "
-"notes!"
+"Discovery is the <b>easiest</b> and most <b>user-friendly</b> Linux "
+"distribution. It includes a hand-picked selection of <b>premium software</b> "
+"for office, multimedia and Internet activities. Its menu is task-oriented, "
+"with a single application per task."
 msgstr ""
 
-#: share/advertising/dis-06.pl:15
+#: share/advertising/07.pl:13
 #, c-format
-msgid "You can also:"
-msgstr "Du kan òg:"
+msgid "<b>PowerPack, The Ultimate Linux Desktop</b>"
+msgstr ""
 
-#: share/advertising/dis-06.pl:16
+#: share/advertising/07.pl:15
 #, c-format
-msgid "\t- browse the Web"
+msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
 msgstr ""
 
-#: share/advertising/dis-06.pl:17
+#: share/advertising/07.pl:17
 #, c-format
-msgid "\t- chat"
+msgid ""
+"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"includes <b>thousands of applications</b> - everything from the most popular "
+"to the most advanced."
 msgstr ""
 
-#: share/advertising/dis-06.pl:18
+#: share/advertising/08.pl:13
 #, c-format
-msgid "\t- organize a video-conference"
+msgid "<b>PowerPack+, The Linux Solution for Desktops and Servers</b>"
 msgstr ""
 
-#: share/advertising/dis-06.pl:19
+#: share/advertising/08.pl:15
 #, c-format
-msgid "\t- create your own Web site"
+msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
 msgstr ""
 
-#: share/advertising/dis-06.pl:20
+#: share/advertising/08.pl:17
 #, c-format
-msgid "\t- ..."
+msgid ""
+"PowerPack+ is a <b>full-featured Linux solution</b> for small to medium-"
+"sized <b>networks</b>. PowerPack+ includes thousands of <b>desktop "
+"applications</b> and a comprehensive selection of world-class <b>server "
+"applications</b>."
 msgstr ""
 
-#: share/advertising/dis-07.pl:13
+#: share/advertising/09.pl:13
+#, c-format
+msgid "<b>Mandrakesoft Products</b>"
+msgstr "<b>Mandrakesoft-produkt</b>"
+
+#: share/advertising/09.pl:15
 #, c-format
-msgid "<b>Multimedia</b>: Software for every need!"
+msgid ""
+"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"products."
 msgstr ""
 
-#: share/advertising/dis-07.pl:15
+#: share/advertising/09.pl:17
 #, c-format
-msgid "Listen to audio CDs with <b>KsCD</b>."
+msgid "The Mandrakelinux 10.1 products are:"
 msgstr ""
 
-#: share/advertising/dis-07.pl:17
+#: share/advertising/09.pl:18
 #, c-format
-msgid "Listen to music files and watch videos with <b>Totem</b>."
+msgid "\t* <b>Discovery</b>, Your First Linux Desktop."
 msgstr ""
 
-#: share/advertising/dis-07.pl:19
+#: share/advertising/09.pl:19
 #, c-format
-msgid "View and edit images and photos with <b>GQview</b> and <b>The Gimp!</b>"
+msgid "\t* <b>PowerPack</b>, The Ultimate Linux Desktop."
 msgstr ""
 
-#: share/advertising/dis-08.pl:13 share/advertising/ppp-08.pl:13
-#: share/advertising/pwp-07.pl:13
+#: share/advertising/09.pl:20
 #, c-format
-msgid "<b>Mandrake Control Center</b>"
+msgid "\t* <b>PowerPack+</b>, The Linux Solution for Desktops and Servers."
 msgstr ""
 
-#: share/advertising/dis-08.pl:15 share/advertising/ppp-08.pl:15
-#: share/advertising/pwp-07.pl:15
+#: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"The Mandrake Control Center is an essential collection of Mandrake-specific "
-"utilities for simplifying the configuration of your computer."
+"\t* <b>Mandrakelinux 10.1 for x86-64</b>, The Mandrakelinux solution for "
+"making the most of your 64-bit processor."
 msgstr ""
 
-#: share/advertising/dis-08.pl:17 share/advertising/ppp-08.pl:17
-#: share/advertising/pwp-07.pl:17
+#: share/advertising/10.pl:13
 #, c-format
-msgid ""
-"You will immediately appreciate this collection of handy utilities for "
-"easily configuring hardware devices, defining mount points, setting up "
-"Network and Internet, adjusting the security level of your computer, and "
-"just about everything related to the system."
+msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
 msgstr ""
 
-#: share/advertising/dis-09.pl:13 share/advertising/dwd-06.pl:13
-#: share/advertising/ppp-09.pl:13 share/advertising/pwp-08.pl:13
+#: share/advertising/10.pl:15
 #, c-format
-msgid "<b>MandrakeStore</b>"
-msgstr "<b>Mandrakelinux-butikken</b>"
+msgid ""
+"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"<b>on any computer</b> and without any need to actually install it:"
+msgstr ""
 
-#: share/advertising/dis-09.pl:15 share/advertising/ppp-09.pl:15
-#: share/advertising/pwp-08.pl:15
+#: share/advertising/10.pl:16
 #, c-format
 msgid ""
-"Find all MandrakeSoft products and services at <b>MandrakeStore</b> -- our "
-"full service e-commerce platform."
+"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"bootable CD-Rom."
 msgstr ""
-"Du finn alle Mandrakesoft-produkta og -tenestene i <b>Mandrakelinux-"
-"butikken</b>."
 
-#: share/advertising/dis-09.pl:17 share/advertising/dwd-06.pl:19
-#: share/advertising/ppp-09.pl:17 share/advertising/pwp-08.pl:17
+#: share/advertising/10.pl:17
 #, c-format
-msgid "Stop by today at <b>www.mandrakestore.com</b>"
+msgid ""
+"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
-#: share/advertising/dis-10.pl:13 share/advertising/ppp-10.pl:13
-#: share/advertising/pwp-09.pl:13
+#: share/advertising/11.pl:13
 #, c-format
-msgid "Become a <b>MandrakeClub</b> member!"
-msgstr "Bli medlem i <b>Mandrakelinux-klubben</b>!"
+msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgstr ""
 
-#: share/advertising/dis-10.pl:15 share/advertising/dwd-07.pl:15
-#: share/advertising/ppp-10.pl:15 share/advertising/pwp-09.pl:15
+#: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Take advantage of valuable benefits, products and services by joining "
-"MandrakeClub, such as:"
+"Below are the Mandrakesoft products designed to meet the <b>professional "
+"needs</b>:"
 msgstr ""
 
-#: share/advertising/dis-10.pl:16 share/advertising/dwd-07.pl:16
-#: share/advertising/ppp-10.pl:17 share/advertising/pwp-09.pl:16
+#: share/advertising/11.pl:16
 #, c-format
-msgid "\t- Full access to commercial applications"
+msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
 msgstr ""
 
-#: share/advertising/dis-10.pl:17 share/advertising/dwd-07.pl:17
-#: share/advertising/ppp-10.pl:18 share/advertising/pwp-09.pl:17
+#: share/advertising/11.pl:17
 #, c-format
-msgid "\t- Special download mirror list exclusively for MandrakeClub Members"
+msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
 msgstr ""
 
-#: share/advertising/dis-10.pl:18 share/advertising/dwd-07.pl:18
-#: share/advertising/ppp-10.pl:19 share/advertising/pwp-09.pl:18
+#: share/advertising/11.pl:18
 #, c-format
-msgid "\t- Voting for software to put in Mandrakelinux"
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
 msgstr ""
 
-#: share/advertising/dis-10.pl:19 share/advertising/dwd-07.pl:19
-#: share/advertising/ppp-10.pl:20 share/advertising/pwp-09.pl:19
+#: share/advertising/12.pl:13
 #, c-format
-msgid "\t- Special discounts for products and services at MandrakeStore"
+msgid "<b>The KDE Choice</b>"
+msgstr "<b>KDE</b>"
+
+#: share/advertising/12.pl:15
+#, c-format
+msgid ""
+"With your Discovery, you will be introduced to <b>KDE</b>, the most advanced "
+"and user-friendly <b>graphical desktop environment</b> available."
 msgstr ""
 
-#: share/advertising/dis-10.pl:20 share/advertising/dwd-07.pl:20
-#: share/advertising/ppp-04.pl:21 share/advertising/ppp-06.pl:19
-#: share/advertising/ppp-10.pl:21 share/advertising/pwp-04.pl:21
-#: share/advertising/pwp-09.pl:20
+#: share/advertising/12.pl:17
 #, c-format
-msgid "\t- Plus much more"
+msgid ""
+"KDE will make your <b>first steps</b> with Linux so <b>easy</b> that you "
+"won't ever think of running another operating system!"
 msgstr ""
 
-#: share/advertising/dis-10.pl:22 share/advertising/dwd-07.pl:22
-#: share/advertising/ppp-10.pl:23 share/advertising/pwp-09.pl:22
+#: share/advertising/12.pl:19
 #, c-format
-msgid "For more information, please visit <b>www.mandrakeclub.com</b>"
+msgid ""
+"KDE also includes a lot of <b>well integrated applications</b> such as "
+"Konqueror, the web browser and Kontact, the personal information manager."
 msgstr ""
 
-#: share/advertising/dis-11.pl:13
+#: share/advertising/13-a.pl:13 share/advertising/13-b.pl:13
 #, c-format
-msgid "Do you require assistance?"
+msgid "<b>Choose your Favorite Desktop Environment</b>"
+msgstr "<b>Vel grafisk skrivebordsmiljø</b>"
+
+#: share/advertising/13-a.pl:15
+#, c-format
+msgid ""
+"With PowerPack, you will have the choice of the <b>graphical desktop "
+"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
 msgstr ""
 
-#: share/advertising/dis-11.pl:15 share/advertising/dwd-08.pl:16
-#: share/advertising/ppp-11.pl:15 share/advertising/pwp-10.pl:15
+#: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
-msgid "<b>MandrakeExpert</b> is the primary source for technical support."
+msgid ""
+"KDE is one of the <b>most advanced</b> and <b>user-friendly</b> graphical "
+"desktop environment available. It includes a lot of integrated applications."
 msgstr ""
 
-#: share/advertising/dis-11.pl:17 share/advertising/dwd-08.pl:18
-#: share/advertising/ppp-11.pl:17 share/advertising/pwp-10.pl:17
+#: share/advertising/13-a.pl:19 share/advertising/13-b.pl:19
 #, c-format
 msgid ""
-"If you have Linux questions, subscribe to MandrakeExpert at <b>www."
-"mandrakeexpert.com</b>"
+"But we advise you to try all available ones (including <b>GNOME</b>, "
+"<b>IceWM</b>, etc.) and pick your favorite."
 msgstr ""
 
-#: share/advertising/dwd-01.pl:17
+#: share/advertising/13-b.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the Open Source Model and fully respects the "
-"General Public License. This new release is the result of collaboration "
-"between MandrakeSoft's team of developers and the worldwide community of "
-"Mandrakelinux contributors."
+"With PowerPack+, you will have the choice of the <b>graphical desktop "
+"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
 msgstr ""
 
-#: share/advertising/dwd-02.pl:13
+#: share/advertising/14.pl:13
+#, c-format
+msgid "<b>OpenOffice.org</b>"
+msgstr "<b>OpenOffice.org</b>"
+
+#: share/advertising/14.pl:15
 #, c-format
-msgid "<b>Join the Mandrakelinux community!</b>"
+msgid "With Discovery, you will discover <b>OpenOffice.org</b>."
 msgstr ""
 
-#: share/advertising/dwd-02.pl:15
+#: share/advertising/14.pl:17
 #, c-format
 msgid ""
-"If you would like to get involved, please subscribe to the \"Cooker\" "
-"mailing list by visiting <b>mandrake-linux.com/cooker</b>"
+"It is a <b>full-featured office suite</b> that includes word processor, "
+"spreadsheet, presentation and drawing applications."
 msgstr ""
 
-#: share/advertising/dwd-02.pl:17
+#: share/advertising/14.pl:19
 #, c-format
 msgid ""
-"To learn more about our dynamic community, please visit <b>www.mandrake-"
-"linux.com</b>!"
+"OpenOffice.org can read and write most types of <b>Microsoft® Office</b> "
+"documents such as Word, Excel and PowerPoint® files."
 msgstr ""
 
-#: share/advertising/dwd-03.pl:13
+#: share/advertising/15.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Kva er Mandrakelinux?</b>"
+msgid "<b>Kontact</b>"
+msgstr "<b>Kontact</b>"
 
-#: share/advertising/dwd-03.pl:15
+#: share/advertising/15.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux is an Open Source distribution created with thousands of the "
-"choicest applications from the Free Software world. Mandrakelinux is one of "
-"the most widely used Linux distributions worldwide!"
+"Discovery includes <b>Kontact</b>, the new KDE <b>groupware solution</b>."
 msgstr ""
 
-#: share/advertising/dwd-03.pl:17
+#: share/advertising/15.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus the "
-"latest versions of the most popular Open Source applications."
+"More than just a full-featured <b>e-mail client</b>, Kontact also includes "
+"an <b>address book</b>, a <b>calendar</b>, plus a tool for taking <b>notes</"
+"b>!"
 msgstr ""
 
-#: share/advertising/dwd-04.pl:13
+#: share/advertising/15.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is widely known as the most user-friendly and the easiest to "
-"install and easy to use Linux distribution."
+"It is the easiest way to communicate with your contacts and to organize your "
+"time."
 msgstr ""
 
-#: share/advertising/dwd-04.pl:15
+#: share/advertising/16.pl:13
+#, c-format
+msgid "<b>Surf the Internet</b>"
+msgstr "<b>Surf på Internett</b>"
+
+#: share/advertising/16.pl:15
 #, c-format
-msgid "Find out about our <b>Personal Solutions</b>:"
+msgid "Discovery will give you access to <b>every Internet resource</b>:"
 msgstr ""
 
-#: share/advertising/dwd-04.pl:16
+#: share/advertising/16.pl:16
 #, c-format
-msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
+msgid "\t* Browse the <b>Web</b> with Konqueror."
 msgstr ""
 
-#: share/advertising/dwd-04.pl:17
+#: share/advertising/16.pl:17
 #, c-format
-msgid ""
-"\t- If you use Linux mostly for Office, Internet and Multimedia tasks, "
-"<b>Discovery</b> perfectly meets your needs"
+msgid "\t* <b>Chat</b> online with your friends using Kopete."
 msgstr ""
 
-#: share/advertising/dwd-04.pl:18
+#: share/advertising/16.pl:18
 #, c-format
-msgid ""
-"\t- If you appreciate the largest selection of software including powerful "
-"development tools, <b>PowerPack</b> is for you"
+msgid "\t* <b>Transfer</b> files with KBear."
+msgstr "\t* <b>Overfør</b> filer med KBear."
+
+#: share/advertising/16.pl:19 share/advertising/17.pl:19
+#: share/advertising/18.pl:22
+#, c-format
+msgid "\t* ..."
 msgstr ""
 
-#: share/advertising/dwd-04.pl:19
+#: share/advertising/17.pl:13
 #, c-format
-msgid ""
-"\t- If you require a full-featured Linux solution customized for small to "
-"medium-sized networks, choose <b>PowerPack+</b>"
+msgid "<b>Enjoy our Multimedia Features</b>"
 msgstr ""
 
-#: share/advertising/dwd-05.pl:13
+#: share/advertising/17.pl:15
 #, c-format
-msgid "Find out also our <b>Business Solutions</b>!"
+msgid "Discovery will also make <b>multimedia</b> very easy for you:"
 msgstr ""
 
-#: share/advertising/dwd-05.pl:15
+#: share/advertising/17.pl:16
+#, c-format
+msgid "\t* Watch your favorite <b>videos</b> with Kaffeine."
+msgstr ""
+
+#: share/advertising/17.pl:17
+#, c-format
+msgid "\t* Listen to your <b>music files</b> with amaroK."
+msgstr ""
+
+#: share/advertising/17.pl:18
+#, c-format
+msgid "\t* Edit and create <b>images</b> with the GIMP."
+msgstr ""
+
+#: share/advertising/18.pl:13
+#, c-format
+msgid "<b>Enjoy the Wide Range of Applications</b>"
+msgstr ""
+
+#: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"<b>Corporate Server</b>: the ideal solution for entreprises. It is a "
-"complete \"all-in-one\" solution that includes everything needed to rapidly "
-"deploy world-class Linux server applications."
+"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"<b>all of your tasks</b>:"
+msgstr ""
+
+#: share/advertising/18.pl:16
+#, c-format
+msgid "\t* Create, edit and share office documents with <b>OpenOffice.org</b>."
 msgstr ""
 
-#: share/advertising/dwd-05.pl:17
+#: share/advertising/18.pl:17
 #, c-format
 msgid ""
-"<b>Multi Network Firewall</b>: based on Linux 2.4 \"kernel secure\" to "
-"provide multi-VPN as well as multi-DMZ functionalities. It is the perfect "
-"high performance security solution."
+"\t* Manage your personal data with the integrated personal information "
+"suites <b>Kontact</b> and <b>Evolution</b>."
 msgstr ""
 
-#: share/advertising/dwd-05.pl:19
+#: share/advertising/18.pl:18
+#, c-format
+msgid "\t* Browse the web with <b>Mozilla</b> and <b>Konqueror</b>."
+msgstr ""
+
+#: share/advertising/18.pl:19
+#, c-format
+msgid "\t* Participate in online chat with <b>Kopete</b>."
+msgstr ""
+
+#: share/advertising/18.pl:20
 #, c-format
 msgid ""
-"<b>MandrakeClustering</b>: the power and speed of a Linux cluster combined "
-"with the stability and easy-of-use of the world-famous Mandrakelinux "
-"distribution. A unique blend for incomparable HPC performance."
+"\t* Listen to your <b>audio CDs</b> and <b>music files</b>, watch your "
+"<b>videos</b>."
 msgstr ""
 
-#: share/advertising/dwd-06.pl:15
+#: share/advertising/18.pl:21
+#, c-format
+msgid "\t* Edit and create images with the <b>GIMP</b>."
+msgstr ""
+
+#: share/advertising/19.pl:13
+#, c-format
+msgid "<b>Development Environments</b>"
+msgstr "<b>Utviklingsmiljø</b>"
+
+#: share/advertising/19.pl:15 share/advertising/22.pl:15
 #, c-format
 msgid ""
-"Find all MandrakeSoft products at <b>MandrakeStore</b> -- our full service e-"
-"commerce platform."
+"PowerPack gives you the best tools to <b>develop</b> your own applications."
 msgstr ""
 
-#: share/advertising/dwd-06.pl:17
+#: share/advertising/19.pl:17
 #, c-format
 msgid ""
-"Find out also support incidents if you have any problems, from standard to "
-"professional support, from 1 to 50 incidents, take the one which meets "
-"perfectly your needs!"
+"You will enjoy the powerful, integrated development environment from KDE, "
+"<b>KDevelop</b>, which will let you program in a lot of languages."
 msgstr ""
 
-#: share/advertising/dwd-07.pl:13
+#: share/advertising/19.pl:19
 #, c-format
-msgid "<b>Become a MandrakeClub member!</b>"
-msgstr "<b>Bli med i Mandrakelinux-klubben!</b>"
+msgid ""
+"PowerPack also ships with <b>GCC</b>, the leading Linux compiler and <b>GDB</"
+"b>, the associated debugger."
+msgstr ""
 
-#: share/advertising/dwd-08.pl:14 share/advertising/ppp-11.pl:13
-#: share/advertising/pwp-10.pl:13
+#: share/advertising/20.pl:13
 #, c-format
-msgid "<b>Do you require assistance?</b>"
-msgstr "<b>Treng du hjelp?</b>"
+msgid "<b>Development Editors</b>"
+msgstr "<b>Utviklingsverktøy</b>"
 
-#: share/advertising/dwd-09.pl:16
+#: share/advertising/20.pl:15
 #, c-format
-msgid "<b>Note</b>"
-msgstr "<b>Merk</b>"
+msgid "PowerPack will let you choose between those <b>popular editors</b>:"
+msgstr ""
 
-#: share/advertising/dwd-09.pl:18
+#: share/advertising/20.pl:16
 #, c-format
-msgid "This is the Mandrakelinux <b>Download version</b>."
+msgid "\t* <b>Emacs</b>: a customizable and real time display editor."
 msgstr ""
 
-#: share/advertising/dwd-09.pl:20
+#: share/advertising/20.pl:17
 #, c-format
 msgid ""
-"The free download version does not include commercial software, and "
-"therefore may not work with certain modems (such as some ADSL and RTC) and "
-"video cards (such as ATI® and NVIDIA®)."
+"\t* <b>XEmacs</b>: another open source text editor and application "
+"development system."
 msgstr ""
 
-#: share/advertising/ppp-01.pl:17
+#: share/advertising/20.pl:18
 #, c-format
 msgid ""
-"Your new Mandrakelinux distribution and its many applications are the result "
-"of collaborative efforts between MandrakeSoft developers and Mandrakelinux "
-"contributors throughout the world."
+"\t* <b>Vim</b>: an advanced text editor with more features than standard Vi."
 msgstr ""
 
-#: share/advertising/ppp-02.pl:13
+#: share/advertising/21.pl:13
 #, c-format
-msgid "<b>PowerPack+</b>"
-msgstr "<b>PowerPack+</b>"
+msgid "<b>Development Languages</b>"
+msgstr "<b>Programmeringsspråk</b>"
 
-#: share/advertising/ppp-02.pl:15
+#: share/advertising/21.pl:15
 #, c-format
 msgid ""
-"PowerPack+ is a full-featured Linux solution for small to medium-sized "
-"networks. PowerPack+ increases the value of the standard PowerPack by adding "
-"a comprehensive selection of world-class server applications."
+"With all these <b>powerful tools</b>, you will be able to write applications "
+"in <b>dozens of programming languages</b>:"
 msgstr ""
 
-#: share/advertising/ppp-02.pl:17
+#: share/advertising/21.pl:16
 #, c-format
-msgid ""
-"It is the only Mandrakelinux product that includes the groupware solution."
+msgid "\t* The famous <b>C language</b>."
+msgstr ""
+
+#: share/advertising/21.pl:17
+#, c-format
+msgid "\t* Object oriented languages:"
+msgstr ""
+
+#: share/advertising/21.pl:18
+#, c-format
+msgid "\t\t* <b>C++</b>"
+msgstr "\t\t* <b>C++</b>"
+
+#: share/advertising/21.pl:19
+#, c-format
+msgid "\t\t* <b>Java™</b>"
+msgstr "\t\t* <b>Java™</b>"
+
+#: share/advertising/21.pl:20
+#, c-format
+msgid "\t* Scripting languages:"
+msgstr "\t* Skriptspråk:"
+
+#: share/advertising/21.pl:21
+#, c-format
+msgid "\t\t* <b>Perl</b>"
+msgstr "\t\t* <b>Perl</b>"
+
+#: share/advertising/21.pl:22
+#, c-format
+msgid "\t\t* <b>Python</b>"
+msgstr "\t\t* <b>Python</b>"
+
+#: share/advertising/21.pl:23 share/advertising/28.pl:22
+#, c-format
+msgid "\t* And many more."
 msgstr ""
 
-#: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13
+#: share/advertising/22.pl:13
 #, c-format
-msgid "<b>Choose your graphical Desktop environment!</b>"
-msgstr "<b>Vel grafisk skrivebordsmiljø.</b>"
+msgid "<b>Development Tools</b>"
+msgstr "<b>Utviklingsverktøy</b>"
 
-#: share/advertising/ppp-03.pl:15 share/advertising/pwp-03.pl:15
+#: share/advertising/22.pl:17
 #, c-format
 msgid ""
-"When you log into your Mandrakelinux system for the first time, you can "
-"choose between several popular graphical desktops environments, including: "
-"KDE, GNOME, WindowMaker, IceWM, and others."
+"With the powerful integrated development environment <b>KDevelop</b> and the "
+"leading Linux compiler <b>GCC</b>, you will be able to create applications "
+"in <b>many different languages</b> (C, C++, Java™, Perl, Python, etc.)."
 msgstr ""
 
-#: share/advertising/ppp-04.pl:13
+#: share/advertising/23.pl:13
+#, c-format
+msgid "<b>Groupware Server</b>"
+msgstr "<b>Gruppevaretenar</b>"
+
+#: share/advertising/23.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all "
-"tasks:"
+"PowerPack+ will give you access to <b>Kolab</b>, a full-featured "
+"<b>groupware server</b> which will, thanks to the client <b>Kontact</b>, "
+"allow you to:"
 msgstr ""
 
-#: share/advertising/ppp-04.pl:15 share/advertising/pwp-04.pl:15
+#: share/advertising/23.pl:16
 #, c-format
-msgid "\t- Create, edit and share office documents with <b>OpenOffice.org</b>"
+msgid "\t* Send and receive your <b>e-mails</b>."
 msgstr ""
 
-#: share/advertising/ppp-04.pl:16
+#: share/advertising/23.pl:17
+#, c-format
+msgid "\t* Share your <b>agendas</b> and your <b>address books</b>."
+msgstr ""
+
+#: share/advertising/23.pl:18
+#, c-format
+msgid "\t* Manage your <b>memos</b> and <b>task lists</b>."
+msgstr ""
+
+#: share/advertising/24.pl:13
+#, c-format
+msgid "<b>Servers</b>"
+msgstr "<b>Tenarar</b>"
+
+#: share/advertising/24.pl:15
 #, c-format
 msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites: <b>Kontact</b> and <b>Evolution</b>"
+"Empower your business network with <b>premier server solutions</b> including:"
 msgstr ""
 
-#: share/advertising/ppp-04.pl:17
+#: share/advertising/24.pl:16
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla and Konqueror</b>"
+msgid ""
+"\t* <b>Samba</b>: File and print services for Microsoft® Windows® clients."
 msgstr ""
 
-#: share/advertising/ppp-04.pl:18 share/advertising/pwp-04.pl:18
+#: share/advertising/24.pl:17
 #, c-format
-msgid "\t- Participate in online chat with <b>Kopete</b>"
+msgid "\t* <b>Apache</b>: The most widely used web server."
 msgstr ""
 
-#: share/advertising/ppp-04.pl:19
+#: share/advertising/24.pl:18
 #, c-format
 msgid ""
-"\t- Listen to audio CDs and music files with <b>KsCD</b> and <b>Totem</b>"
+"\t* <b>MySQL</b> and <b>PostgreSQL</b>: The world's most popular open source "
+"databases."
 msgstr ""
 
-#: share/advertising/ppp-04.pl:20 share/advertising/pwp-04.pl:20
+#: share/advertising/24.pl:19
 #, c-format
-msgid "\t- Edit images and photos with <b>The Gimp</b>"
+msgid ""
+"\t* <b>CVS</b>: Concurrent Versions System, the dominant open source network-"
+"transparent version control system."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:13
+#: share/advertising/24.pl:20
 #, c-format
 msgid ""
-"PowerPack+ includes everything needed for developing and creating your own "
-"software, including:"
+"\t* <b>ProFTPD</b>: The highly configurable GPL-licensed FTP server software."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:15 share/advertising/pwp-05.pl:16
+#: share/advertising/24.pl:21
 #, c-format
 msgid ""
-"\t- <b>Kdevelop</b>: a full featured, easy to use Integrated Development "
-"Environment for C++ programming"
+"\t* <b>Postfix</b> and <b>Sendmail</b>: The popular and powerful mail "
+"servers."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:16 share/advertising/pwp-05.pl:17
+#: share/advertising/25.pl:13
 #, c-format
-msgid "\t- <b>GCC</b>: the GNU Compiler Collection"
+msgid "<b>Mandrakelinux Control Center</b>"
 msgstr ""
 
-#: share/advertising/ppp-05.pl:17 share/advertising/pwp-05.pl:18
+#: share/advertising/25.pl:15
 #, c-format
-msgid "\t- <b>GDB</b>: the GNU Project debugger"
+msgid ""
+"The <b>Mandrakelinux Control Center</b> is an essential collection of "
+"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"your computer."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:18 share/advertising/pwp-06.pl:16
+#: share/advertising/25.pl:17
 #, c-format
-msgid "\t- <b>Emacs</b>: a customizable and real time display editor"
+msgid ""
+"You will immediately appreciate this collection of <b>more than 60</b> handy "
+"utilities for <b>easily configuring your system</b>: hardware devices, mount "
+"points, network and Internet, security level of your computer, etc."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:19
+#: share/advertising/26.pl:13
+#, c-format
+msgid "<b>The Open Source Model</b>"
+msgstr "<b>Open kjeldekode-modellen</b>"
+
+#: share/advertising/26.pl:15
 #, c-format
 msgid ""
-"\t- <b>Xemacs</b>: open source text editor and application development system"
+"Like all computer programming, open source software <b>requires time and "
+"people</b> for development. In order to respect the open source philosophy, "
+"Mandrakesoft sells added value products and services to <b>keep improving "
+"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"our products or services!"
 msgstr ""
 
-#: share/advertising/ppp-05.pl:20
+#: share/advertising/27.pl:13
 #, c-format
+msgid "<b>Online Store</b>"
+msgstr "<b>Mandrakebutikken</b>"
+
+#: share/advertising/27.pl:15
+#, fuzzy, c-format
 msgid ""
-"\t- <b>Vim</b>: advanced text editor with more features than standard Vi"
+"To learn more about Mandrakesoft products and services, you can visit our "
+"<b>e-commerce platform</b>."
 msgstr ""
+"Du finn alle Mandrakesoft-produkta og -tenestene i <b>Mandrakelinux-"
+"butikken</b>."
 
-#: share/advertising/ppp-06.pl:13
+#: share/advertising/27.pl:17
 #, c-format
-msgid "<b>Discover the full-featured groupware solution!</b>"
+msgid "There you can find all our products, services and third-party products."
 msgstr ""
 
-#: share/advertising/ppp-06.pl:15
+#: share/advertising/27.pl:19
 #, c-format
-msgid "It includes both server and client features for:"
+msgid ""
+"This platform has just been <b>redesigned</b> to improve its efficiency and "
+"usability."
 msgstr ""
 
-#: share/advertising/ppp-06.pl:16
+#: share/advertising/27.pl:21
 #, c-format
-msgid "\t- Sending and receiving emails"
+msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
 msgstr ""
 
-#: share/advertising/ppp-06.pl:17
+#: share/advertising/28.pl:13
+#, c-format
+msgid "<b>Mandrakeclub</b>"
+msgstr "<b>Mandrakeclub</b>"
+
+#: share/advertising/28.pl:15
 #, c-format
 msgid ""
-"\t- Calendar, Task List, Memos, Contacts, Meeting Request (sending and "
-"receiving), Task Requests (sending and receiving)"
+"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"product.."
 msgstr ""
 
-#: share/advertising/ppp-06.pl:18
+#: share/advertising/28.pl:17
 #, c-format
-msgid "\t- Address Book (server and client)"
+msgid ""
+"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
 msgstr ""
 
-#: share/advertising/ppp-07.pl:13
+#: share/advertising/28.pl:18
 #, c-format
 msgid ""
-"Empower your business network with <b>premier server solutions</b> including:"
+"\t* <b>Special discounts</b> on products and services of our online store "
+"<b>store.mandrakesoft.com</b>."
 msgstr ""
 
-#: share/advertising/ppp-07.pl:15
+#: share/advertising/28.pl:19
 #, c-format
-msgid "\t- <b>Samba</b>: File and print services for MS-Windows clients"
+msgid ""
+"\t* Access to <b>commercial applications</b> (for example to NVIDIA® or ATI™ "
+"drivers)."
 msgstr ""
 
-#: share/advertising/ppp-07.pl:16
+#: share/advertising/28.pl:20
 #, c-format
-msgid "\t- <b>Apache</b>: The most widely used Web server"
+msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
 msgstr ""
 
-#: share/advertising/ppp-07.pl:17
+#: share/advertising/28.pl:21
 #, c-format
-msgid "\t- <b>MySQL</b>: The world's most popular Open Source database"
+msgid ""
+"\t* <b>Early and privileged access</b>, before public release, to "
+"Mandrakelinux <b>ISO images</b>."
 msgstr ""
 
-#: share/advertising/ppp-07.pl:18
+#: share/advertising/29.pl:13
+#, c-format
+msgid "<b>Mandrakeonline</b>"
+msgstr "<b>Mandrakeonline</b>"
+
+#: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"\t- <b>CVS</b>: Concurrent Versions System, the dominant open-source network-"
-"transparent version control system"
+"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"offer its customers!"
 msgstr ""
 
-#: share/advertising/ppp-07.pl:19
+#: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"\t- <b>ProFTPD</b>: the highly configurable GPL-licensed FTP server software"
+"Mandrakeonline provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrakelinux systems:"
 msgstr ""
 
-#: share/advertising/ppp-07.pl:20
+#: share/advertising/29.pl:18
 #, c-format
-msgid "\t- And others"
+msgid "\t* <b>Perfect</b> system security (automated software updates)."
 msgstr ""
 
-#: share/advertising/pwp-01.pl:17
+#: share/advertising/29.pl:19
 #, c-format
 msgid ""
-"Your new Mandrakelinux distribution is the result of collaborative efforts "
-"between MandrakeSoft developers and Mandrakelinux contributors throughout "
-"the world."
+"\t* <b>Notification</b> of updates (by e-mail or by an applet on the "
+"desktop)."
+msgstr ""
+
+#: share/advertising/29.pl:20
+#, c-format
+msgid "\t* Flexible <b>scheduled</b> updates."
 msgstr ""
 
-#: share/advertising/pwp-01.pl:19
+#: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of our "
-"latest release."
+"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
 msgstr ""
 
-#: share/advertising/pwp-02.pl:13
+#: share/advertising/30.pl:13
+#, c-format
+msgid "<b>Mandrakeexpert</b>"
+msgstr "<b>Mandrakeexpert</b>"
+
+#: share/advertising/30.pl:15
 #, c-format
-msgid "<b>PowerPack</b>"
+msgid ""
+"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
-#: share/advertising/pwp-02.pl:15
+#: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"PowerPack is MandrakeSoft's premier Linux desktop product. In addition to "
-"being the easiest and the most user-friendly Linux distribution, PowerPack "
-"includes thousands of applications - everything from the most popular to the "
-"most technical."
+"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"a lot of time."
 msgstr ""
 
-#: share/advertising/pwp-04.pl:13
+#: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all of "
-"your tasks:"
+"For any question related to Mandrakelinux, you have the possibility to "
+"purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
-#: share/advertising/pwp-04.pl:16
+#: share/compssUsers.pl:25
+#, c-format
+msgid "Office Workstation"
+msgstr "Kontormaskin"
+
+#: share/compssUsers.pl:27
 #, c-format
 msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites <b>Kontact</b> and <b>Evolution</b>"
+"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
+"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
 msgstr ""
 
-#: share/advertising/pwp-04.pl:17
+#: share/compssUsers.pl:28
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla</b> and <b>Konqueror</b>"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
 
-#: share/advertising/pwp-04.pl:19
+#: share/compssUsers.pl:33
+#, c-format
+msgid "Game station"
+msgstr "Spelmaskin"
+
+#: share/compssUsers.pl:34
 #, c-format
-msgid "\t- Listen to audio CDs and music files with KsCD and <b>Totem</b>"
+msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
-#: share/advertising/pwp-05.pl:13 share/advertising/pwp-06.pl:13
+#: share/compssUsers.pl:37
 #, c-format
-msgid "<b>Development tools</b>"
-msgstr "<b>Utviklingsverktøy</b>"
+msgid "Multimedia station"
+msgstr "Multimediemaskin"
+
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Sound and video playing/editing programs"
+msgstr ""
 
-#: share/advertising/pwp-05.pl:15
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Internet station"
+msgstr "Internett-maskin"
+
+#: share/compssUsers.pl:44
 #, c-format
 msgid ""
-"PowerPack includes everything needed for developing and creating your own "
-"software, including:"
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
+msgstr ""
+
+#: share/compssUsers.pl:49
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Nettverksmaskin (klient)"
+
+#: share/compssUsers.pl:50
+#, c-format
+msgid "Clients for different protocols including ssh"
+msgstr ""
+
+#: share/compssUsers.pl:54
+#, c-format
+msgid "Configuration"
+msgstr "Oppsett"
+
+#: share/compssUsers.pl:55
+#, c-format
+msgid "Tools to ease the configuration of your computer"
+msgstr ""
+
+#: share/compssUsers.pl:59
+#, c-format
+msgid "Console Tools"
+msgstr "Konsollverktøy"
+
+#: share/compssUsers.pl:60
+#, c-format
+msgid "Editors, shells, file tools, terminals"
+msgstr ""
+
+#: share/compssUsers.pl:65 share/compssUsers.pl:165
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr ""
+
+#: share/compssUsers.pl:69 share/compssUsers.pl:169
+#, c-format
+msgid "Documentation"
+msgstr "Hjelpetekst"
+
+#: share/compssUsers.pl:70 share/compssUsers.pl:170
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+#: share/compssUsers.pl:74 share/compssUsers.pl:173
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+#: share/compssUsers.pl:75 share/compssUsers.pl:174
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr ""
+
+#: share/compssUsers.pl:85
+#, fuzzy, c-format
+msgid "Apache"
+msgstr "stig"
+
+#: share/compssUsers.pl:88
+#, fuzzy, c-format
+msgid "Groupware"
+msgstr "Gruppe"
+
+#: share/compssUsers.pl:89
+#, fuzzy, c-format
+msgid "Kolab Server"
+msgstr "Samba-tenar"
+
+#: share/compssUsers.pl:92 share/compssUsers.pl:133
+#, c-format
+msgid "Firewall/Router"
+msgstr "Brannmur/rutar"
+
+#: share/compssUsers.pl:93 share/compssUsers.pl:134
+#, c-format
+msgid "Internet gateway"
+msgstr "Internett-portnar"
+
+#: share/compssUsers.pl:96
+#, fuzzy, c-format
+msgid "Mail/News"
+msgstr "/Fil/_Ny"
+
+#: share/compssUsers.pl:97
+#, fuzzy, c-format
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix-e-posttenar"
+
+#: share/compssUsers.pl:100
+#, fuzzy, c-format
+msgid "Directory Server"
+msgstr "Mappe å gjenoppretta frå"
+
+#: share/compssUsers.pl:104
+#, fuzzy, c-format
+msgid "FTP Server"
+msgstr "NTP-tenar"
+
+#: share/compssUsers.pl:105
+#, c-format
+msgid "ProFTPd"
 msgstr ""
 
-#: share/advertising/pwp-06.pl:15
+#: share/compssUsers.pl:108
+#, fuzzy, c-format
+msgid "DNS/NIS"
+msgstr "DNS"
+
+#: share/compssUsers.pl:109
+#, fuzzy, c-format
+msgid "Domain Name and Network Information Server"
+msgstr "Domeneoppslagstenar"
+
+#: share/compssUsers.pl:112
 #, c-format
-msgid "And of course the editors!"
+msgid "File and Printer Sharing Server"
 msgstr ""
 
-#: share/advertising/pwp-06.pl:17
+#: share/compssUsers.pl:113
+#, fuzzy, c-format
+msgid "NFS Server, Samba server"
+msgstr "Samba-tenar"
+
+#: share/compssUsers.pl:116 share/compssUsers.pl:129
+#, c-format
+msgid "Database"
+msgstr "Database"
+
+#: share/compssUsers.pl:117
+#, fuzzy, c-format
+msgid "PostgreSQL and MySQL Database Server"
+msgstr "PostgreSQL- eller MySQL-databasetenar"
+
+#: share/compssUsers.pl:121
+#, c-format
+msgid "Web/FTP"
+msgstr "Vev/FTP"
+
+#: share/compssUsers.pl:122
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+#: share/compssUsers.pl:125
+#, c-format
+msgid "Mail"
+msgstr "E-post"
+
+#: share/compssUsers.pl:126
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix-e-posttenar"
+
+#: share/compssUsers.pl:130
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL- eller MySQL-databasetenar"
+
+#: share/compssUsers.pl:137
+#, c-format
+msgid "Network Computer server"
+msgstr "Nettverkstenar"
+
+#: share/compssUsers.pl:138
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS-tenar, SMB-tenar, mellomtenar, ssh-tenar"
+
+#: share/compssUsers.pl:146
+#, c-format
+msgid "KDE Workstation"
+msgstr "KDE-arbeidsstasjon"
+
+#: share/compssUsers.pl:147
 #, c-format
 msgid ""
-"\t- <b>Xemacs</b>: another open source text editor and application "
-"development system"
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
 msgstr ""
 
-#: share/advertising/pwp-06.pl:18
+#: share/compssUsers.pl:151
+#, c-format
+msgid "GNOME Workstation"
+msgstr "GNOME-arbeidsstasjon"
+
+#: share/compssUsers.pl:152
 #, c-format
 msgid ""
-"\t- <b>Vim</b>: an advanced text editor with more features than standard Vi"
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
 msgstr ""
 
+#: share/compssUsers.pl:155
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Andre grafiske skrivebord"
+
+#: share/compssUsers.pl:156
+#, c-format
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+#: share/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "Utilities"
+msgstr "Filippinane"
+
+#: share/compssUsers.pl:181 share/compssUsers.pl:182 standalone/logdrake:381
+#, c-format
+msgid "SSH Server"
+msgstr "SSH-tenar"
+
+#: share/compssUsers.pl:186
+#, fuzzy, c-format
+msgid "Webmin"
+msgstr "Vevkamera"
+
+#: share/compssUsers.pl:187
+#, fuzzy, c-format
+msgid "Webmin Remote Configuration Server"
+msgstr "Oppsett av terminaltenar"
+
+#: share/compssUsers.pl:191
+#, fuzzy, c-format
+msgid "Network Utilities/Monitoring"
+msgstr "Nettverksovervaking"
+
+#: share/compssUsers.pl:192
+#, c-format
+msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
+msgstr ""
+
+#: share/compssUsers.pl:196
+#, fuzzy, c-format
+msgid "MandrakeSoft Wizards"
+msgstr "<b>Mandrakesoft-produkt</b>"
+
+#: share/compssUsers.pl:197
+#, fuzzy, c-format
+msgid "Wizards to configure server"
+msgstr "Sett opp tenester"
+
 #: standalone.pm:21
 #, c-format
 msgid ""
@@ -14132,8 +15303,8 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrake tools\n"
-"  --incident        - program should be one of mandrake tools"
+"  --report          - program should be one of mandrakelinux tools\n"
+"  --incident        - program should be one of mandrakelinux tools"
 msgstr ""
 
 #: standalone.pm:63
@@ -14156,7 +15327,7 @@ msgid ""
 "OPTIONS:\n"
 "--windows_import : import from all available windows partitions.\n"
 "--xls_fonts      : show all fonts that already exist from xls\n"
-"--install        : accept any font file and any directry.\n"
+"--install        : accept any font file and any directory.\n"
 "--uninstall      : uninstall any font or any directory of font.\n"
 "--replace        : replace all font if already exist\n"
 "--application    : 0 none application.\n"
@@ -14169,7 +15340,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrake Terminal Server Configurator\n"
+"Mandrakelinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -14239,7 +15410,7 @@ msgid ""
 "       XFdrake resolution"
 msgstr ""
 
-#: standalone.pm:128
+#: standalone.pm:133
 #, c-format
 msgid ""
 "\n"
@@ -14247,106 +15418,100 @@ msgid ""
 "testing] [-v|--version] "
 msgstr ""
 
-#: standalone/XFdrake:87
+#: standalone/XFdrake:85
 #, c-format
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr ""
 
-#: standalone/XFdrake:91
+#: standalone/XFdrake:89
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
 msgstr ""
 
-#: standalone/drakTermServ:79
+#: standalone/drakTermServ:76
 #, c-format
 msgid "Useless without Terminal Server"
 msgstr ""
 
-#: standalone/drakTermServ:116 standalone/drakTermServ:123
+#: standalone/drakTermServ:108 standalone/drakTermServ:114
 #, c-format
 msgid "%s: %s requires a username...\n"
 msgstr ""
 
-#: standalone/drakTermServ:136
+#: standalone/drakTermServ:125
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
 "0/1 for Local Config...\n"
 msgstr ""
 
-#: standalone/drakTermServ:143
+#: standalone/drakTermServ:131
 #, c-format
 msgid "%s: %s requires hostname...\n"
 msgstr ""
 
-#: standalone/drakTermServ:226 standalone/drakTermServ:500
-#: standalone/drakfont:575
-#, c-format
-msgid "OK"
-msgstr "OK"
-
-#: standalone/drakTermServ:237 standalone/drakTermServ:240
+#: standalone/drakTermServ:213 standalone/drakTermServ:216
 #, c-format
 msgid "Terminal Server Configuration"
 msgstr "Oppsett av terminaltenar"
 
-#: standalone/drakTermServ:255
+#: standalone/drakTermServ:231
 #, c-format
 msgid "Enable Server"
 msgstr "Slå på tenar"
 
-#: standalone/drakTermServ:261
+#: standalone/drakTermServ:237
 #, c-format
 msgid "Disable Server"
 msgstr "Slå av tenar"
 
-#: standalone/drakTermServ:269
+#: standalone/drakTermServ:245
 #, c-format
 msgid "Start Server"
 msgstr "Start tenar"
 
-#: standalone/drakTermServ:275
+#: standalone/drakTermServ:251
 #, c-format
 msgid "Stop Server"
 msgstr "Stopp tenar"
 
-#: standalone/drakTermServ:283
+#: standalone/drakTermServ:259
 #, c-format
 msgid "Etherboot Floppy/ISO"
 msgstr ""
 
-#: standalone/drakTermServ:287
+#: standalone/drakTermServ:263
 #, c-format
 msgid "Net Boot Images"
 msgstr ""
 
-#: standalone/drakTermServ:293
+#: standalone/drakTermServ:269
 #, c-format
 msgid "Add/Del Users"
 msgstr "Legg til eller slett brukarar"
 
-#: standalone/drakTermServ:297
+#: standalone/drakTermServ:273
 #, c-format
 msgid "Add/Del Clients"
 msgstr "Legg til eller slett klientar"
 
-#: standalone/drakTermServ:308 standalone/drakbug:54
+#: standalone/drakTermServ:284 standalone/drakbug:47
 #, c-format
 msgid "First Time Wizard"
 msgstr ""
 
-#: standalone/drakTermServ:340 standalone/drakTermServ:341
+#: standalone/drakTermServ:315 standalone/drakTermServ:316
 #, c-format
 msgid "%s defined as dm, adding gdm user to /etc/passwd$$CLIENT$$"
 msgstr ""
 
-#: standalone/drakTermServ:347
+#: standalone/drakTermServ:322
 #, c-format
 msgid ""
 "\n"
 " This wizard routine will:\n"
 " \t1) Ask you to select either 'thin' or 'fat' clients.\n"
-"\t2) Setup dhcp.\n"
+"\t2) Setup DHCP.\n"
 "\t\n"
 "After doing these steps, the wizard will:\n"
 "\t\n"
@@ -14363,22 +15528,22 @@ msgid ""
 "    f) If it's thin clients, ask if you want to restart KDM.\n"
 msgstr ""
 
-#: standalone/drakTermServ:392
+#: standalone/drakTermServ:367
 #, c-format
 msgid "Cancel Wizard"
 msgstr "Avbryt vegvisar"
 
-#: standalone/drakTermServ:404
+#: standalone/drakTermServ:379
 #, c-format
 msgid "Please save dhcpd config!"
 msgstr ""
 
-#: standalone/drakTermServ:432
+#: standalone/drakTermServ:407
 #, c-format
 msgid "Use thin clients."
 msgstr "Bruk tynne klientar."
 
-#: standalone/drakTermServ:434
+#: standalone/drakTermServ:409
 #, c-format
 msgid ""
 "Please select default client type.\n"
@@ -14387,45 +15552,45 @@ msgid ""
 "    'Fat' clients use their own CPU/RAM but the server's filesystem."
 msgstr ""
 
-#: standalone/drakTermServ:446 standalone/drakTermServ:1061
+#: standalone/drakTermServ:421 standalone/drakTermServ:1034
 #, c-format
 msgid "Sync client X keyboard settings with server."
 msgstr ""
 
-#: standalone/drakTermServ:453
+#: standalone/drakTermServ:428
 #, c-format
 msgid "Creating net boot images for all kernels"
 msgstr ""
 
-#: standalone/drakTermServ:454 standalone/drakTermServ:753
-#: standalone/drakTermServ:769
+#: standalone/drakTermServ:429 standalone/drakTermServ:726
+#: standalone/drakTermServ:742
 #, c-format
 msgid "This will take a few minutes."
 msgstr ""
 
-#: standalone/drakTermServ:458 standalone/drakTermServ:478
+#: standalone/drakTermServ:433 standalone/drakTermServ:452
 #, c-format
 msgid "Done!"
 msgstr "Ferdig!"
 
-#: standalone/drakTermServ:464
+#: standalone/drakTermServ:438
 #, c-format
 msgid "Syncing server user list with client list, including root."
 msgstr ""
 
-#: standalone/drakTermServ:484
+#: standalone/drakTermServ:458
 #, c-format
 msgid ""
 "In order to enable changes made for thin clients, the display manager must "
 "be restarted. Restart now?"
 msgstr ""
 
-#: standalone/drakTermServ:519
+#: standalone/drakTermServ:493
 #, c-format
 msgid "Terminal Server Overview"
 msgstr ""
 
-#: standalone/drakTermServ:520
+#: standalone/drakTermServ:494
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -14441,7 +15606,7 @@ msgid ""
 "one full kernel."
 msgstr ""
 
-#: standalone/drakTermServ:526
+#: standalone/drakTermServ:500
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -14461,7 +15626,7 @@ msgid ""
 "like:"
 msgstr ""
 
-#: standalone/drakTermServ:544
+#: standalone/drakTermServ:518
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -14472,14 +15637,14 @@ msgid ""
 "\t\t\t\n"
 "        Note: The '#type' entry is only used by drakTermServ.  Clients can "
 "either be 'thin'\n"
-"        or 'fat'.  Thin clients run most software on the server via xdmcp, "
+"        or 'fat'.  Thin clients run most software on the server via XDMCP, "
 "while fat clients run \n"
 "        most software on the client machine. A special inittab, %s is\n"
 "        written for thin clients. System config files xdm-config, kdmrc, and "
 "gdm.conf are \n"
-"        modified if thin clients are used, to enable xdmcp. Since there are "
+"        modified if thin clients are used, to enable XDMCP. Since there are "
 "security issues in \n"
-"        using xdmcp, hosts.deny and hosts.allow are modified to limit access "
+"        using XDMCP, hosts.deny and hosts.allow are modified to limit access "
 "to the local\n"
 "        subnet.\n"
 "\t\t\t\n"
@@ -14500,7 +15665,7 @@ msgid ""
 "clients."
 msgstr ""
 
-#: standalone/drakTermServ:564
+#: standalone/drakTermServ:538
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -14518,7 +15683,7 @@ msgid ""
 "        \tWith SUBNET/MASK being defined for your network."
 msgstr ""
 
-#: standalone/drakTermServ:576
+#: standalone/drakTermServ:550
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -14529,7 +15694,7 @@ msgid ""
 "file."
 msgstr ""
 
-#: standalone/drakTermServ:580
+#: standalone/drakTermServ:554
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -14540,7 +15705,7 @@ msgid ""
 "        \tdrakTermServ will help create these files."
 msgstr ""
 
-#: standalone/drakTermServ:585
+#: standalone/drakTermServ:559
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -14560,7 +15725,7 @@ msgid ""
 "machine is configured."
 msgstr ""
 
-#: standalone/drakTermServ:594
+#: standalone/drakTermServ:568
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -14570,7 +15735,7 @@ msgid ""
 "the boot image to \n"
 "        \teach diskless client.\n"
 "\n"
-"        \tA typical tftp configuration file looks like:\n"
+"        \tA typical TFTP configuration file looks like:\n"
 "        \t\t\n"
 "        \tservice tftp\n"
 "\t\t\t{\n"
@@ -14590,13 +15755,13 @@ msgid ""
 "        \tputs its images."
 msgstr ""
 
-#: standalone/drakTermServ:615
+#: standalone/drakTermServ:589
 #, c-format
 msgid ""
 "        - Create etherboot floppies/CDs:\n"
 "        \tThe diskless client machines need either ROM images on the NIC, or "
 "a boot floppy\n"
-"        \tor CD to initate the boot sequence.  drakTermServ will help "
+"        \tor CD to initiate the boot sequence.  drakTermServ will help "
 "generate these\n"
 "        \timages, based on the NIC in the client machine.\n"
 "        \t\t\n"
@@ -14608,62 +15773,62 @@ msgid ""
 "        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
 msgstr ""
 
-#: standalone/drakTermServ:650
+#: standalone/drakTermServ:624
 #, c-format
 msgid "Boot Floppy"
 msgstr "Oppstartsdiskett"
 
-#: standalone/drakTermServ:652
+#: standalone/drakTermServ:626
 #, c-format
 msgid "Boot ISO"
 msgstr ""
 
-#: standalone/drakTermServ:654
+#: standalone/drakTermServ:628
 #, c-format
 msgid "PXE Image"
 msgstr "PXE-bilete"
 
-#: standalone/drakTermServ:723
+#: standalone/drakTermServ:696
 #, c-format
 msgid "Default kernel version"
 msgstr "Standard kjerneversjon"
 
-#: standalone/drakTermServ:751
+#: standalone/drakTermServ:724
 #, c-format
 msgid "Build Whole Kernel -->"
 msgstr ""
 
-#: standalone/drakTermServ:758
+#: standalone/drakTermServ:731
 #, c-format
 msgid "No kernel selected!"
 msgstr ""
 
-#: standalone/drakTermServ:761
+#: standalone/drakTermServ:734
 #, c-format
 msgid "Build Single NIC -->"
 msgstr ""
 
-#: standalone/drakTermServ:765
+#: standalone/drakTermServ:738
 #, c-format
 msgid "No NIC selected!"
 msgstr ""
 
-#: standalone/drakTermServ:768
+#: standalone/drakTermServ:741
 #, c-format
 msgid "Build All Kernels -->"
 msgstr ""
 
-#: standalone/drakTermServ:776
+#: standalone/drakTermServ:749
 #, c-format
 msgid "<-- Delete"
 msgstr ""
 
-#: standalone/drakTermServ:783
+#: standalone/drakTermServ:756
 #, c-format
 msgid "Delete All NBIs"
 msgstr "Slett alle NBI-ar"
 
-#: standalone/drakTermServ:870
+#: standalone/drakTermServ:843
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -14671,27 +15836,27 @@ msgid ""
 "Delete/re-add the user to the Terminal Server to enable login."
 msgstr ""
 
-#: standalone/drakTermServ:875
+#: standalone/drakTermServ:848
 #, c-format
 msgid "Add User -->"
 msgstr ""
 
-#: standalone/drakTermServ:881
+#: standalone/drakTermServ:854
 #, c-format
 msgid "<-- Del User"
 msgstr ""
 
-#: standalone/drakTermServ:917
+#: standalone/drakTermServ:890
 #, c-format
 msgid "type: %s"
 msgstr "Type: %s"
 
-#: standalone/drakTermServ:921
+#: standalone/drakTermServ:894
 #, c-format
 msgid "local config: %s"
 msgstr "Lokalt oppsett: %s"
 
-#: standalone/drakTermServ:951
+#: standalone/drakTermServ:924
 #, c-format
 msgid ""
 "Allow local hardware\n"
@@ -14700,144 +15865,144 @@ msgstr ""
 "Goda lokalt\n"
 "maskinvareopsett."
 
-#: standalone/drakTermServ:960
+#: standalone/drakTermServ:933
 #, c-format
 msgid "No net boot images created!"
 msgstr "Ingen nettoppstartsbilete laga."
 
-#: standalone/drakTermServ:978
+#: standalone/drakTermServ:951
 #, c-format
 msgid "Thin Client"
 msgstr "Tynnklient"
 
-#: standalone/drakTermServ:982
+#: standalone/drakTermServ:955
 #, c-format
 msgid "Allow Thin Clients"
 msgstr ""
 
-#: standalone/drakTermServ:983
+#: standalone/drakTermServ:956
 #, c-format
 msgid "Add Client -->"
 msgstr ""
 
-#: standalone/drakTermServ:997
+#: standalone/drakTermServ:970
 #, c-format
 msgid "type: fat"
 msgstr "Type: tjukk"
 
-#: standalone/drakTermServ:998
+#: standalone/drakTermServ:971
 #, c-format
 msgid "type: thin"
 msgstr "Type: tynn"
 
-#: standalone/drakTermServ:1005
+#: standalone/drakTermServ:978
 #, c-format
 msgid "local config: false"
 msgstr ""
 
-#: standalone/drakTermServ:1006
+#: standalone/drakTermServ:979
 #, c-format
 msgid "local config: true"
 msgstr ""
 
-#: standalone/drakTermServ:1014
+#: standalone/drakTermServ:987
 #, c-format
 msgid "<-- Edit Client"
 msgstr ""
 
-#: standalone/drakTermServ:1040
+#: standalone/drakTermServ:1013
 #, c-format
 msgid "Disable Local Config"
 msgstr "Ikkje bruk lokalt oppsett"
 
-#: standalone/drakTermServ:1047
+#: standalone/drakTermServ:1020
 #, c-format
 msgid "Delete Client"
 msgstr "Slett klient"
 
-#: standalone/drakTermServ:1056
+#: standalone/drakTermServ:1029
 #, c-format
 msgid "dhcpd Config..."
 msgstr "dhcpd-oppsett ..."
 
-#: standalone/drakTermServ:1072
+#: standalone/drakTermServ:1045
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
 "(service dm restart - at the console)"
 msgstr ""
 
-#: standalone/drakTermServ:1112
+#: standalone/drakTermServ:1085
 #, c-format
 msgid "Thin clients won't work with autologin. Disable autologin?"
 msgstr ""
 
-#: standalone/drakTermServ:1128
+#: standalone/drakTermServ:1101
 #, c-format
 msgid "All clients will use %s"
 msgstr "Alle klientar bil bruka %s"
 
-#: standalone/drakTermServ:1160
+#: standalone/drakTermServ:1133
 #, c-format
 msgid "Subnet:"
 msgstr ""
 
-#: standalone/drakTermServ:1167
+#: standalone/drakTermServ:1140
 #, c-format
 msgid "Netmask:"
 msgstr "Nettmaske:"
 
-#: standalone/drakTermServ:1174
+#: standalone/drakTermServ:1147
 #, c-format
 msgid "Routers:"
 msgstr "Rutarar:"
 
-#: standalone/drakTermServ:1181
+#: standalone/drakTermServ:1154
 #, c-format
 msgid "Subnet Mask:"
 msgstr ""
 
-#: standalone/drakTermServ:1188
+#: standalone/drakTermServ:1161
 #, c-format
 msgid "Broadcast Address:"
 msgstr ""
 
-#: standalone/drakTermServ:1195
+#: standalone/drakTermServ:1168
 #, c-format
 msgid "Domain Name:"
 msgstr "Domenenamn:"
 
-#: standalone/drakTermServ:1203
+#: standalone/drakTermServ:1176
 #, c-format
 msgid "Name Servers:"
 msgstr "Namnetenarar:"
 
-#: standalone/drakTermServ:1214
+#: standalone/drakTermServ:1187
 #, c-format
 msgid "IP Range Start:"
 msgstr ""
 
-#: standalone/drakTermServ:1215
+#: standalone/drakTermServ:1188
 #, c-format
 msgid "IP Range End:"
 msgstr ""
 
-#: standalone/drakTermServ:1257
+#: standalone/drakTermServ:1230
 #, c-format
 msgid "Append TS Includes To Existing Config"
 msgstr ""
 
-#: standalone/drakTermServ:1259
+#: standalone/drakTermServ:1232
 #, c-format
 msgid "Write Config"
 msgstr "Lagra oppsett"
 
-#: standalone/drakTermServ:1275
+#: standalone/drakTermServ:1248
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr "dhcpd-tenaroppsett"
 
-#: standalone/drakTermServ:1276
+#: standalone/drakTermServ:1249
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -14845,103 +16010,97 @@ msgid ""
 "You can modify as needed."
 msgstr ""
 
-#: standalone/drakTermServ:1279
+#: standalone/drakTermServ:1252
 #, c-format
 msgid "Dynamic IP Address Pool:"
 msgstr ""
 
-#: standalone/drakTermServ:1426
+#: standalone/drakTermServ:1399
 #, c-format
 msgid "Please insert floppy disk:"
 msgstr "Sett inn ein diskett:"
 
-#: standalone/drakTermServ:1430
+#: standalone/drakTermServ:1403
 #, c-format
 msgid "Couldn't access the floppy!"
 msgstr ""
 
-#: standalone/drakTermServ:1432
+#: standalone/drakTermServ:1405
 #, c-format
 msgid "Floppy can be removed now"
 msgstr "Du kan no fjerna disketten"
 
-#: standalone/drakTermServ:1435
+#: standalone/drakTermServ:1408
 #, c-format
 msgid "No floppy drive available!"
 msgstr "Det er ingen diskettstasjon."
 
-#: standalone/drakTermServ:1440
+#: standalone/drakTermServ:1413
 #, c-format
 msgid "PXE image is %s/%s"
 msgstr ""
 
-#: standalone/drakTermServ:1442
+#: standalone/drakTermServ:1415
 #, c-format
 msgid "Error writing %s/%s"
 msgstr "Klarte ikkje skriva %s/%s"
 
-#: standalone/drakTermServ:1451
+#: standalone/drakTermServ:1424
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr ""
 
-#: standalone/drakTermServ:1453
+#: standalone/drakTermServ:1426
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr ""
 
-#: standalone/drakTermServ:1475
+#: standalone/drakTermServ:1447
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr ""
 
-#: standalone/drakTermServ:1634
+#: standalone/drakTermServ:1602
 #, c-format
 msgid "%s passwd bad in Terminal Server - rewriting...\n"
 msgstr ""
 
-#: standalone/drakTermServ:1647
+#: standalone/drakTermServ:1615
 #, c-format
 msgid "%s is not a user..\n"
 msgstr ""
 
-#: standalone/drakTermServ:1648
+#: standalone/drakTermServ:1616
 #, c-format
 msgid "%s is already a Terminal Server user\n"
 msgstr ""
 
-#: standalone/drakTermServ:1650
+#: standalone/drakTermServ:1618
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
 msgstr ""
 
-#: standalone/drakTermServ:1652
+#: standalone/drakTermServ:1620
 #, c-format
 msgid "%s added to Terminal Server\n"
 msgstr ""
 
-#: standalone/drakTermServ:1698
+#: standalone/drakTermServ:1666
 #, c-format
 msgid "Deleted %s...\n"
 msgstr "Sletta «%s» ...\n"
 
-#: standalone/drakTermServ:1700 standalone/drakTermServ:1773
+#: standalone/drakTermServ:1668 standalone/drakTermServ:1741
 #, c-format
 msgid "%s not found...\n"
 msgstr "Fann ikkje «%s» ...\n"
 
-#: standalone/drakTermServ:1722 standalone/drakTermServ:1723
-#: standalone/drakTermServ:1724
-#, c-format
-msgid "%s already in use\n"
-msgstr ""
-
-#: standalone/drakTermServ:1801
+#: standalone/drakTermServ:1769
 #, c-format
 msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
 msgstr ""
 
-#: standalone/drakTermServ:1953
+#: standalone/drakTermServ:1921
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr ""
@@ -15028,8 +16187,8 @@ msgstr ""
 "\n"
 "Vala for autoinstallering finn du i oversikta til venstre"
 
-#: standalone/drakautoinst:252 standalone/drakgw:598 standalone/drakvpn:902
-#: standalone/scannerdrake:379
+#: standalone/drakautoinst:252 standalone/drakgw:600 standalone/drakvpn:902
+#: standalone/scannerdrake:375
 #, c-format
 msgid "Congratulations!"
 msgstr "Gratulerer!"
@@ -15068,26 +16227,21 @@ msgstr "Harddisk"
 msgid "tape"
 msgstr "Band"
 
-#: standalone/drakbackup:112
-#, c-format
-msgid "No devices found"
-msgstr "Fann ingen einingar"
-
-#: standalone/drakbackup:152
+#: standalone/drakbackup:153
 #, c-format
 msgid ""
-"Expect is an extension to the Tcl scripting language that allows interactive "
+"Expect is an extension to the TCL scripting language that allows interactive "
 "sessions without user intervention."
 msgstr ""
 "Expect er ei utviding til Tcl-skriptspråket som gjer det mogleg å køyra "
 "interaktive økter utan manuell brukarstyring."
 
-#: standalone/drakbackup:153
+#: standalone/drakbackup:154
 #, c-format
 msgid "Store the password for this system in drakbackup configuration."
 msgstr "Lagra passordet for systemet i reservekopien."
 
-#: standalone/drakbackup:154
+#: standalone/drakbackup:155
 #, c-format
 msgid ""
 "For a multisession CD, only the first session will erase the cdrw. Otherwise "
@@ -15096,7 +16250,7 @@ msgstr ""
 "Med fleirøktsbrenning blir plata berre sletta før første brenning. Elles "
 "blir plata sletta før kvar brenning."
 
-#: standalone/drakbackup:155
+#: standalone/drakbackup:156
 #, c-format
 msgid ""
 "This option will save files that have changed.  Exact behavior depends on "
@@ -15105,7 +16259,7 @@ msgstr ""
 "Dette vil lagra alle endra og nye filer. Nøyaktig korleis dette går føre seg "
 "kjem an på om du brukar inkremental- eller differensialkopiering."
 
-#: standalone/drakbackup:156
+#: standalone/drakbackup:157
 #, c-format
 msgid ""
 "Incremental backups only save files that have changed or are new since the "
@@ -15114,7 +16268,7 @@ msgstr ""
 "Inkrementalkopiering lagrar berre filer som er endra eller nye frå førre "
 "reservekopi."
 
-#: standalone/drakbackup:157
+#: standalone/drakbackup:158
 #, c-format
 msgid ""
 "Differential backups only save files that have changed or are new since the "
@@ -15123,16 +16277,16 @@ msgstr ""
 "Differensialkopiering lagrar berre filer som er endra eller nye frå første "
 "reservekopi."
 
-#: standalone/drakbackup:158
+#: standalone/drakbackup:159
 #, c-format
 msgid ""
-"This should be a local user or email addresse that you want the backup "
+"This should be a local user or email address that you want the backup "
 "results sent to. You will need to define a functioning mail server."
 msgstr ""
 "Dette bør vera ein lokal brukar eller ei e-postadresse du vil senda "
 "rapporten til. Du må òg velja ein fungerande e-posttenar."
 
-#: standalone/drakbackup:159
+#: standalone/drakbackup:160
 #, c-format
 msgid ""
 "Files or wildcards listed in a .backupignore file at the top of a directory "
@@ -15141,7 +16295,7 @@ msgstr ""
 "Filer eller jokerteikn nemnt i ei «.backupignore»-fil øvst i eit mappetre "
 "blir ikkje tatt med i reservekopien."
 
-#: standalone/drakbackup:160
+#: standalone/drakbackup:161
 #, c-format
 msgid ""
 "For backups to other media, files are still created on the hard drive, then "
@@ -15152,7 +16306,7 @@ msgstr ""
 "og så flytta til media. Med dette valet blir reservekopifilene fjerna frå "
 "harddisken etter kopieringa."
 
-#: standalone/drakbackup:161
+#: standalone/drakbackup:162
 #, c-format
 msgid ""
 "Some protocols, like rsync, may be configured at the server end.  Rather "
@@ -15162,34 +16316,34 @@ msgstr ""
 "Nokre protokollar, som «rsync», kan vera sett opp på tenaren. Her må du då "
 "bruka modulnamnet for tenestestigen."
 
-#: standalone/drakbackup:162
+#: standalone/drakbackup:163
 #, c-format
 msgid ""
 "Custom allows you to specify your own day and time.  The other options use "
 "run-parts in /etc/crontab."
 msgstr ""
 
-#: standalone/drakbackup:326
+#: standalone/drakbackup:327
 #, c-format
 msgid "No media selected for cron operation."
 msgstr "Ingen medium valt for cron-operasjon."
 
-#: standalone/drakbackup:330
+#: standalone/drakbackup:331
 #, c-format
 msgid "No interval selected for cron operation."
 msgstr "Ingen intervall valt for cron-operasjon."
 
-#: standalone/drakbackup:377
+#: standalone/drakbackup:378
 #, c-format
 msgid "Interval cron not available as non-root"
 msgstr ""
 
-#: standalone/drakbackup:462 standalone/logdrake:467
+#: standalone/drakbackup:463 standalone/logdrake:437
 #, c-format
 msgid "\"%s\" neither is a valid email nor is an existing local user!"
 msgstr "«%s» er verken ei gyldig e-postadresse eller ein lokal brukar."
 
-#: standalone/drakbackup:466 standalone/logdrake:472
+#: standalone/drakbackup:467 standalone/logdrake:442
 #, c-format
 msgid ""
 "\"%s\" is a local user, but you did not select a local smtp, so you must use "
@@ -15198,22 +16352,22 @@ msgstr ""
 "«%s» er ein lokal brukar, må du har ikkje valt nokon lokal SMTP, og du må "
 "derfor bruka ei fullstendig e-postadresse."
 
-#: standalone/drakbackup:475
+#: standalone/drakbackup:476
 #, c-format
 msgid "Valid user list changed, rewriting config file."
 msgstr "Liste over gyldige brukarar er endra. Skriv oppsettfil på nytt."
 
-#: standalone/drakbackup:477
+#: standalone/drakbackup:478
 #, c-format
 msgid "Old user list:\n"
 msgstr "Gammal brukarliste:\n"
 
-#: standalone/drakbackup:479
+#: standalone/drakbackup:480
 #, c-format
 msgid "New user list:\n"
 msgstr "Ny brukarliste:\n"
 
-#: standalone/drakbackup:524
+#: standalone/drakbackup:525
 #, c-format
 msgid ""
 "\n"
@@ -15222,7 +16376,7 @@ msgstr ""
 "\n"
 "                      Reservekopirapport \n"
 
-#: standalone/drakbackup:525
+#: standalone/drakbackup:526
 #, c-format
 msgid ""
 "\n"
@@ -15231,7 +16385,7 @@ msgstr ""
 "\n"
 "                      Reservekopinisserapport \n"
 
-#: standalone/drakbackup:531
+#: standalone/drakbackup:532
 #, c-format
 msgid ""
 "\n"
@@ -15244,13 +16398,13 @@ msgstr ""
 "\n"
 "\n"
 
-#: standalone/drakbackup:556 standalone/drakbackup:627
-#: standalone/drakbackup:683
+#: standalone/drakbackup:557 standalone/drakbackup:628
+#: standalone/drakbackup:684
 #, c-format
 msgid "Total progress"
 msgstr "Total framgang"
 
-#: standalone/drakbackup:609
+#: standalone/drakbackup:610
 #, c-format
 msgid ""
 "%s exists, delete?\n"
@@ -15263,42 +16417,42 @@ msgstr ""
 "Viss du allerei har gjort dette, må du truleg fjerna oppføringa frå "
 "«authorized_keys» på tenaren."
 
-#: standalone/drakbackup:618
+#: standalone/drakbackup:619
 #, c-format
 msgid "This may take a moment to generate the keys."
 msgstr "Det kan ta ein augneblink å laga nøklane."
 
-#: standalone/drakbackup:625
+#: standalone/drakbackup:626
 #, c-format
 msgid "Cannot spawn %s."
 msgstr "Kan ikkje laga «%s»."
 
-#: standalone/drakbackup:642
+#: standalone/drakbackup:643
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr "Ingen passordspørsmål på «%s» på port «%s»"
 
-#: standalone/drakbackup:643
+#: standalone/drakbackup:644
 #, c-format
 msgid "Bad password on %s"
 msgstr "Ugyldig passord på «%s»"
 
-#: standalone/drakbackup:644
+#: standalone/drakbackup:645
 #, c-format
 msgid "Permission denied transferring %s to %s"
 msgstr "Nekta overføring av «%s» til «%s»"
 
-#: standalone/drakbackup:645
+#: standalone/drakbackup:646
 #, c-format
 msgid "Can't find %s on %s"
 msgstr "Finn ikkje «%s» på «%s»"
 
-#: standalone/drakbackup:649
+#: standalone/drakbackup:650
 #, c-format
 msgid "%s not responding"
 msgstr "«%s» svarar ikkje"
 
-#: standalone/drakbackup:653
+#: standalone/drakbackup:654
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -15315,47 +16469,47 @@ msgstr ""
 "\n"
 "utan å bli spurd etter passord."
 
-#: standalone/drakbackup:697
+#: standalone/drakbackup:698
 #, c-format
 msgid "WebDAV remote site already in sync!"
 msgstr "WebDAV-tenaren er alt synkronsiert."
 
-#: standalone/drakbackup:701
+#: standalone/drakbackup:702
 #, c-format
 msgid "WebDAV transfer failed!"
 msgstr "Feil ved WebDAV-overføring."
 
-#: standalone/drakbackup:722
+#: standalone/drakbackup:723
 #, c-format
 msgid "No CD-R/DVD-R in drive!"
 msgstr "Det står ingen CD-R eller DVD-R i stasjonen."
 
-#: standalone/drakbackup:726
+#: standalone/drakbackup:727
 #, c-format
 msgid "Does not appear to be recordable media!"
 msgstr "Ikkje skrivbart medium."
 
-#: standalone/drakbackup:730
+#: standalone/drakbackup:732
 #, c-format
 msgid "Not erasable media!"
 msgstr "Ikkje overskrivbart medium."
 
-#: standalone/drakbackup:771
+#: standalone/drakbackup:774
 #, c-format
 msgid "This may take a moment to erase the media."
 msgstr "Det kan ta ei stund å sletta mediet."
 
-#: standalone/drakbackup:829
+#: standalone/drakbackup:832
 #, c-format
 msgid "Permission problem accessing CD."
 msgstr "Ikkje løyve til å lesa CD-en."
 
-#: standalone/drakbackup:856
+#: standalone/drakbackup:859
 #, c-format
 msgid "No tape in %s!"
 msgstr "Ingen band i «%s»."
 
-#: standalone/drakbackup:956
+#: standalone/drakbackup:966
 #, c-format
 msgid ""
 "Backup quota exceeded!\n"
@@ -15364,37 +16518,37 @@ msgstr ""
 "Reservekopikvoten er overskriven.\n"
 "Har brukt %d MiB av %d MiB tilgjengeleg."
 
-#: standalone/drakbackup:975 standalone/drakbackup:1008
+#: standalone/drakbackup:985 standalone/drakbackup:1018
 #, c-format
 msgid "Backup system files..."
 msgstr "Kopierer systemfiler ..."
 
-#: standalone/drakbackup:1009 standalone/drakbackup:1050
+#: standalone/drakbackup:1019 standalone/drakbackup:1060
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr ""
 
-#: standalone/drakbackup:1049
+#: standalone/drakbackup:1059
 #, c-format
 msgid "Backup User files..."
 msgstr "Kopierer brukarfiler ..."
 
-#: standalone/drakbackup:1084
+#: standalone/drakbackup:1094
 #, c-format
 msgid "Backup Other files..."
 msgstr "Kopierer andre filer ..."
 
-#: standalone/drakbackup:1085
+#: standalone/drakbackup:1095
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr "Framgang for harddiskreservekopiering ..."
 
-#: standalone/drakbackup:1090
+#: standalone/drakbackup:1100
 #, c-format
 msgid "No changes to backup!"
 msgstr "Det er ingen endringar frå førre kopi."
 
-#: standalone/drakbackup:1108 standalone/drakbackup:1132
+#: standalone/drakbackup:1118 standalone/drakbackup:1142
 #, c-format
 msgid ""
 "\n"
@@ -15405,7 +16559,7 @@ msgstr ""
 "Reservekopiaktivitetar via %s:\n"
 "\n"
 
-#: standalone/drakbackup:1117
+#: standalone/drakbackup:1127
 #, c-format
 msgid ""
 "\n"
@@ -15413,18 +16567,18 @@ msgid ""
 "FTP.\n"
 msgstr ""
 
-#: standalone/drakbackup:1118
+#: standalone/drakbackup:1128
 #, c-format
 msgid ""
 "Error during sending file via FTP. Please correct your FTP configuration."
 msgstr ""
 
-#: standalone/drakbackup:1120
+#: standalone/drakbackup:1130
 #, c-format
 msgid "file list sent by FTP: %s\n"
 msgstr "Filliste sendt via FTP: %s\n"
 
-#: standalone/drakbackup:1137
+#: standalone/drakbackup:1147
 #, c-format
 msgid ""
 "\n"
@@ -15435,7 +16589,7 @@ msgstr ""
 "Reservekopiaktivitetar via CD:\n"
 "\n"
 
-#: standalone/drakbackup:1142
+#: standalone/drakbackup:1152
 #, c-format
 msgid ""
 "\n"
@@ -15446,22 +16600,22 @@ msgstr ""
 "Reservekopiaktivitetar via band:\n"
 "\n"
 
-#: standalone/drakbackup:1151
+#: standalone/drakbackup:1161
 #, c-format
 msgid "Error sending mail. Your report mail was not sent."
 msgstr "Klarte ikkje senda e-post."
 
-#: standalone/drakbackup:1152
+#: standalone/drakbackup:1162
 #, c-format
 msgid " Error while sending mail. \n"
 msgstr "Feil ved sending av e-post.\n"
 
-#: standalone/drakbackup:1180
+#: standalone/drakbackup:1192
 #, c-format
 msgid "Can't create catalog!"
 msgstr "Klarte ikkje laga mappe."
 
-#: standalone/drakbackup:1393
+#: standalone/drakbackup:1414
 #, c-format
 msgid ""
 "\n"
@@ -15470,41 +16624,41 @@ msgstr ""
 "\n"
 "Kryss av for vala du treng.\n"
 
-#: standalone/drakbackup:1394
+#: standalone/drakbackup:1415
 #, c-format
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
 msgstr "Her kan du ta kopi av og gjenoppretta alle filer i «/etc»-mappa.\n"
 
-#: standalone/drakbackup:1395
+#: standalone/drakbackup:1416
 #, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr "Ta kopi av systemfiler («/etc»-mappa)"
 
-#: standalone/drakbackup:1396 standalone/drakbackup:1460
-#: standalone/drakbackup:1526
+#: standalone/drakbackup:1417 standalone/drakbackup:1481
+#: standalone/drakbackup:1547
 #, c-format
 msgid "Use Incremental/Differential Backups  (do not replace old backups)"
 msgstr "Berre kopier endra og nye filer"
 
-#: standalone/drakbackup:1398 standalone/drakbackup:1462
-#: standalone/drakbackup:1528
+#: standalone/drakbackup:1419 standalone/drakbackup:1483
+#: standalone/drakbackup:1549
 #, c-format
 msgid "Use Incremental Backups"
 msgstr "Bruk inkrementalkopiering"
 
-#: standalone/drakbackup:1398 standalone/drakbackup:1462
-#: standalone/drakbackup:1528
+#: standalone/drakbackup:1419 standalone/drakbackup:1483
+#: standalone/drakbackup:1549
 #, c-format
 msgid "Use Differential Backups"
 msgstr "Bruk differensialkopiering"
 
-#: standalone/drakbackup:1400
+#: standalone/drakbackup:1421
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr "Ikkje kopier kritiske filer («passwd», «group» og «fstab»)"
 
-#: standalone/drakbackup:1401
+#: standalone/drakbackup:1422
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
@@ -15513,177 +16667,177 @@ msgstr ""
 "Med dette kan du gjenoppretta alle versjonar av\n"
 "«/etc»-mappa."
 
-#: standalone/drakbackup:1432
+#: standalone/drakbackup:1453
 #, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr "Vel kva brukarar du ta reservekopi av."
 
-#: standalone/drakbackup:1459
+#: standalone/drakbackup:1480
 #, c-format
 msgid "Do not include the browser cache"
 msgstr "Ta ikkje kopi av mellomlageret til nettlesaren"
 
-#: standalone/drakbackup:1513
+#: standalone/drakbackup:1534
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr "Vel filer og mapper, og trykk så «OK»"
 
-#: standalone/drakbackup:1514 standalone/drakfont:656
+#: standalone/drakbackup:1535 standalone/drakfont:660
 #, c-format
 msgid "Remove Selected"
 msgstr "Fjern valde"
 
-#: standalone/drakbackup:1577
+#: standalone/drakbackup:1598
 #, c-format
 msgid "Users"
 msgstr "Brukarar"
 
-#: standalone/drakbackup:1597
+#: standalone/drakbackup:1618
 #, c-format
 msgid "Use network connection to backup"
 msgstr "Bruk nettverk for reservekopiering"
 
-#: standalone/drakbackup:1599
+#: standalone/drakbackup:1620
 #, c-format
 msgid "Net Method:"
 msgstr "Nettmetode:"
 
-#: standalone/drakbackup:1603
+#: standalone/drakbackup:1624
 #, c-format
 msgid "Use Expect for SSH"
 msgstr "Bruk Expect for SSH"
 
-#: standalone/drakbackup:1604
+#: standalone/drakbackup:1625
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr "Lag/overfør kopinøklar for SSH"
 
-#: standalone/drakbackup:1606
+#: standalone/drakbackup:1627
 #, c-format
 msgid "Transfer Now"
 msgstr "Overfør no"
 
-#: standalone/drakbackup:1608
+#: standalone/drakbackup:1629
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr "Det finst allereie (andre) nøklar"
 
-#: standalone/drakbackup:1611
+#: standalone/drakbackup:1632
 #, c-format
 msgid "Host name or IP."
 msgstr "Vertsnamn eller IP-adresse:"
 
-#: standalone/drakbackup:1616
+#: standalone/drakbackup:1637
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
 msgstr "Mappa (eller modulen) du vil lagra reservekopien:"
 
-#: standalone/drakbackup:1621
-#, c-format
-msgid "Login name"
-msgstr "Brukarnamn:"
-
-#: standalone/drakbackup:1628
+#: standalone/drakbackup:1649
 #, c-format
 msgid "Remember this password"
 msgstr "Hugs dette passordet"
 
-#: standalone/drakbackup:1644
+#: standalone/drakbackup:1665
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr "Treng vertsnamn, brukarnamn og passord."
 
-#: standalone/drakbackup:1742
+#: standalone/drakbackup:1756
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr "Bruk CD-R eller DVD-R for reservekopiering"
 
-#: standalone/drakbackup:1745
+#: standalone/drakbackup:1759
 #, c-format
 msgid "Choose your CD/DVD device"
 msgstr "CD- eller DVD-eining:"
 
-#: standalone/drakbackup:1750
+#: standalone/drakbackup:1764
 #, c-format
 msgid "Choose your CD/DVD media size"
 msgstr "CD- eller DVD-mediestorleik:"
 
-#: standalone/drakbackup:1757
+#: standalone/drakbackup:1771
 #, c-format
 msgid "Multisession CD"
 msgstr "Fleirøktsbrenning"
 
-#: standalone/drakbackup:1759
+#: standalone/drakbackup:1773
 #, c-format
 msgid "CDRW media"
 msgstr "CD-RW-medium"
 
-#: standalone/drakbackup:1765
+#: standalone/drakbackup:1779
 #, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr "Slett overskrivbart medium (første økt) "
 
-#: standalone/drakbackup:1766
+#: standalone/drakbackup:1780
 #, c-format
 msgid " Erase Now "
 msgstr "Slett no"
 
-#: standalone/drakbackup:1772
+#: standalone/drakbackup:1786
 #, c-format
 msgid "DVD+RW media"
 msgstr "DVD+RW"
 
-#: standalone/drakbackup:1774
+#: standalone/drakbackup:1788
 #, c-format
 msgid "DVD-R media"
 msgstr "DVD-R"
 
-#: standalone/drakbackup:1776
+#: standalone/drakbackup:1790
 #, c-format
 msgid "DVDRAM device"
 msgstr "DVDRAM"
 
-#: standalone/drakbackup:1807
+#: standalone/drakbackup:1821
 #, c-format
 msgid "No CD device defined!"
 msgstr "Ingen CD-eining valt."
 
-#: standalone/drakbackup:1854
+#: standalone/drakbackup:1863
 #, c-format
 msgid "Use tape to backup"
 msgstr "Bruk band for reservekopiering"
 
-#: standalone/drakbackup:1857
+#: standalone/drakbackup:1866
 #, c-format
 msgid "Device name to use for backup"
 msgstr "Reservekopieining:"
 
-#: standalone/drakbackup:1863
+#: standalone/drakbackup:1872
+#, c-format
+msgid "Backup directly to tape"
+msgstr ""
+
+#: standalone/drakbackup:1878
 #, c-format
 msgid "Don't rewind tape after backup"
 msgstr "Ikkje spol bandet tilbake etter kopiering"
 
-#: standalone/drakbackup:1869
+#: standalone/drakbackup:1884
 #, c-format
 msgid "Erase tape before backup"
 msgstr "Slett band før kopiering"
 
-#: standalone/drakbackup:1875
+#: standalone/drakbackup:1890
 #, c-format
 msgid "Eject tape after the backup"
 msgstr "Løys ut band etter kopiering"
 
-#: standalone/drakbackup:1942
+#: standalone/drakbackup:1962
 #, c-format
 msgid "Enter the directory to save to:"
 msgstr "Lagringsmappe:"
 
-#: standalone/drakbackup:1946
+#: standalone/drakbackup:1966
 #, c-format
 msgid "Directory to save to"
 msgstr "Lagringsmappe:"
 
-#: standalone/drakbackup:1951
+#: standalone/drakbackup:1971
 #, c-format
 msgid ""
 "Maximum size\n"
@@ -15692,308 +16846,308 @@ msgstr ""
 "Maksstorleik for\n"
 "reservekopi (i MiB):"
 
-#: standalone/drakbackup:2015
+#: standalone/drakbackup:2035
 #, c-format
 msgid "CD-R / DVD-R"
 msgstr "CD-R eller DVD-R"
 
-#: standalone/drakbackup:2020
+#: standalone/drakbackup:2040
 #, c-format
 msgid "HardDrive / NFS"
 msgstr "Harddisk/NFS"
 
-#: standalone/drakbackup:2036 standalone/drakbackup:2041
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2056
+#: standalone/drakbackup:2061
 #, c-format
 msgid "hourly"
 msgstr "time"
 
-#: standalone/drakbackup:2037 standalone/drakbackup:2042
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2057
+#: standalone/drakbackup:2062
 #, c-format
 msgid "daily"
 msgstr "dag"
 
-#: standalone/drakbackup:2038 standalone/drakbackup:2043
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2058
+#: standalone/drakbackup:2063
 #, c-format
 msgid "weekly"
 msgstr "veke"
 
-#: standalone/drakbackup:2039 standalone/drakbackup:2044
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2059
+#: standalone/drakbackup:2064
 #, c-format
 msgid "monthly"
 msgstr "månad"
 
-#: standalone/drakbackup:2040 standalone/drakbackup:2045
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2060
+#: standalone/drakbackup:2065
 #, c-format
 msgid "custom"
 msgstr "eigedefinert"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "January"
 msgstr "januar"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "February"
 msgstr "februar"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "March"
 msgstr "mars"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "April"
 msgstr "april"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "May"
 msgstr "mai"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "June"
 msgstr "juni"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "July"
 msgstr "juli"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "August"
 msgstr "august"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "September"
 msgstr "september"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "October"
 msgstr "oktober"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "November"
 msgstr "november"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "December"
 msgstr "desember"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Sunday"
 msgstr "søndag"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Monday"
 msgstr "måndag"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Tuesday"
 msgstr "tysdag"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Wednesday"
 msgstr "onsdag"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Thursday"
 msgstr "torsdag"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Friday"
 msgstr "fredag"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Saturday"
 msgstr "laurdag"
 
-#: standalone/drakbackup:2094
+#: standalone/drakbackup:2107
 #, c-format
 msgid "Use daemon"
 msgstr "Ta automatisk reservekopiar"
 
-#: standalone/drakbackup:2099
+#: standalone/drakbackup:2112
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr "Reservekopier filene kvar:"
 
-#: standalone/drakbackup:2105
+#: standalone/drakbackup:2118
 #, c-format
 msgid "Custom setup/crontab entry:"
 msgstr "Eigendefinert oppsett/crontab-oppføring:"
 
-#: standalone/drakbackup:2110
+#: standalone/drakbackup:2123
 #, c-format
 msgid "Minute"
 msgstr "minutt"
 
-#: standalone/drakbackup:2114
+#: standalone/drakbackup:2127
 #, c-format
 msgid "Hour"
 msgstr "time"
 
-#: standalone/drakbackup:2118
+#: standalone/drakbackup:2131
 #, c-format
 msgid "Day"
 msgstr "dag"
 
-#: standalone/drakbackup:2122
+#: standalone/drakbackup:2135
 #, c-format
 msgid "Month"
 msgstr "månad"
 
-#: standalone/drakbackup:2126
+#: standalone/drakbackup:2139
 #, c-format
 msgid "Weekday"
 msgstr "vekedag"
 
-#: standalone/drakbackup:2132
+#: standalone/drakbackup:2145
 #, c-format
 msgid "Please choose the media for backup."
 msgstr "Medium for reservekopiering:"
 
-#: standalone/drakbackup:2139
+#: standalone/drakbackup:2152
 #, c-format
 msgid "Please be sure that the cron daemon is included in your services."
 msgstr "Hugs å sjekka at at cron-nissen blir starta automatisk."
 
-#: standalone/drakbackup:2140
+#: standalone/drakbackup:2153
 #, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
 msgstr "Merk at alle nettmedium òg brukar harddisken."
 
-#: standalone/drakbackup:2190
+#: standalone/drakbackup:2201
 #, c-format
 msgid "Please choose the compression type"
 msgstr "Vel komprimeringstype"
 
-#: standalone/drakbackup:2194
+#: standalone/drakbackup:2205
 #, c-format
 msgid "Use .backupignore files"
 msgstr "Bruk «.backupignore»-filer"
 
-#: standalone/drakbackup:2196
+#: standalone/drakbackup:2207
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr "Send rapport på e-post til:"
 
-#: standalone/drakbackup:2202
+#: standalone/drakbackup:2213
 #, c-format
 msgid "SMTP server for mail:"
 msgstr "SMTP-tenar for e-post:"
 
-#: standalone/drakbackup:2207
+#: standalone/drakbackup:2218
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr ""
 "Slett reservekopifilene frå harddisken etter kopiering til andre medium"
 
-#: standalone/drakbackup:2247
+#: standalone/drakbackup:2258
 #, c-format
 msgid "What"
 msgstr "Kva"
 
-#: standalone/drakbackup:2252
+#: standalone/drakbackup:2263
 #, c-format
 msgid "Where"
 msgstr "Kor"
 
-#: standalone/drakbackup:2257
+#: standalone/drakbackup:2268
 #, c-format
 msgid "When"
 msgstr "Når"
 
-#: standalone/drakbackup:2262
+#: standalone/drakbackup:2273
 #, c-format
 msgid "More Options"
 msgstr "Fleire val"
 
-#: standalone/drakbackup:2275
+#: standalone/drakbackup:2286
 #, c-format
 msgid "Backup destination not configured..."
 msgstr "Reservekopiplassering ikkje valt ..."
 
-#: standalone/drakbackup:2293 standalone/drakbackup:4208
+#: standalone/drakbackup:2306 standalone/drakbackup:4229
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr "Oppsett:"
 
-#: standalone/drakbackup:2309
+#: standalone/drakbackup:2322
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr "Kor vil du lagra reservekopien?"
 
-#: standalone/drakbackup:2311
+#: standalone/drakbackup:2325
 #, c-format
 msgid "Hard Drive used to prepare backups for all media"
 msgstr "Harddisk brukt til å klargjera reservekopi for alle medium"
 
-#: standalone/drakbackup:2319
+#: standalone/drakbackup:2325
 #, c-format
 msgid "Across Network"
 msgstr "Over nettverk"
 
-#: standalone/drakbackup:2327
+#: standalone/drakbackup:2325
 #, c-format
 msgid "On CD-R"
 msgstr "På brennbar CD"
 
-#: standalone/drakbackup:2335
+#: standalone/drakbackup:2325
 #, c-format
 msgid "On Tape Device"
 msgstr "På band"
 
-#: standalone/drakbackup:2374
+#: standalone/drakbackup:2371
 #, c-format
 msgid "Backup Users"
 msgstr "Brukarfiler"
 
-#: standalone/drakbackup:2375
+#: standalone/drakbackup:2372
 #, c-format
 msgid " (Default is all users)"
 msgstr " (standard er alle brukarar)"
 
-#: standalone/drakbackup:2387
+#: standalone/drakbackup:2384
 #, c-format
 msgid "Please choose what you want to backup"
 msgstr "Kva vil du ta reservekopi av?"
 
-#: standalone/drakbackup:2388
+#: standalone/drakbackup:2385
 #, c-format
 msgid "Backup System"
 msgstr "Systemfiler"
 
-#: standalone/drakbackup:2390
+#: standalone/drakbackup:2387
 #, c-format
 msgid "Select user manually"
 msgstr "Vel brukarar"
 
-#: standalone/drakbackup:2419
+#: standalone/drakbackup:2416
 #, c-format
 msgid "Please select data to backup..."
 msgstr "Vel data å ta reservekopi av ..."
 
-#: standalone/drakbackup:2491
+#: standalone/drakbackup:2488
 #, c-format
 msgid ""
 "\n"
@@ -16002,7 +17156,7 @@ msgstr ""
 "\n"
 "Kjelder: \n"
 
-#: standalone/drakbackup:2492
+#: standalone/drakbackup:2489
 #, c-format
 msgid ""
 "\n"
@@ -16011,7 +17165,7 @@ msgstr ""
 "\n"
 "– Systemfiler:\n"
 
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2491
 #, c-format
 msgid ""
 "\n"
@@ -16020,7 +17174,7 @@ msgstr ""
 "\n"
 "– Brukarfiler:\n"
 
-#: standalone/drakbackup:2496
+#: standalone/drakbackup:2493
 #, c-format
 msgid ""
 "\n"
@@ -16029,7 +17183,7 @@ msgstr ""
 "\n"
 "– Andre filer:\n"
 
-#: standalone/drakbackup:2498
+#: standalone/drakbackup:2495
 #, c-format
 msgid ""
 "\n"
@@ -16038,12 +17192,12 @@ msgstr ""
 "\n"
 "– Blir lagra på harddisken i mappa «%s»\n"
 
-#: standalone/drakbackup:2499
+#: standalone/drakbackup:2496
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr "\tIkkje bruk meir enn %s MiB\n"
 
-#: standalone/drakbackup:2502
+#: standalone/drakbackup:2499
 #, c-format
 msgid ""
 "\n"
@@ -16052,17 +17206,7 @@ msgstr ""
 "\n"
 "– Slett reservekopifilene frå harddisken etter kopiering\n"
 
-#: standalone/drakbackup:2506
-#, c-format
-msgid "NO"
-msgstr "Nei"
-
-#: standalone/drakbackup:2507
-#, c-format
-msgid "YES"
-msgstr "Ja"
-
-#: standalone/drakbackup:2508
+#: standalone/drakbackup:2504
 #, c-format
 msgid ""
 "\n"
@@ -16071,22 +17215,22 @@ msgstr ""
 "\n"
 "– Brenn på CD"
 
-#: standalone/drakbackup:2509
+#: standalone/drakbackup:2505
 #, c-format
 msgid "RW"
 msgstr "RW"
 
-#: standalone/drakbackup:2510
+#: standalone/drakbackup:2506
 #, c-format
 msgid " on device: %s"
 msgstr " på eininga: %s"
 
-#: standalone/drakbackup:2511
+#: standalone/drakbackup:2507
 #, c-format
 msgid " (multi-session)"
 msgstr " (fleirøkts)"
 
-#: standalone/drakbackup:2512
+#: standalone/drakbackup:2508
 #, c-format
 msgid ""
 "\n"
@@ -16095,12 +17239,17 @@ msgstr ""
 "\n"
 "– Blir lagra på bandeininga: %s"
 
-#: standalone/drakbackup:2513
+#: standalone/drakbackup:2509
 #, c-format
 msgid "\t\tErase=%s"
 msgstr "\t\tSlett=%s"
 
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2511
+#, c-format
+msgid "\tBackup directly to Tape\n"
+msgstr ""
+
+#: standalone/drakbackup:2513
 #, c-format
 msgid ""
 "\n"
@@ -16109,7 +17258,7 @@ msgstr ""
 "\n"
 "– Blir lagra via «%s» på verten: %s\n"
 
-#: standalone/drakbackup:2517
+#: standalone/drakbackup:2514
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -16118,7 +17267,7 @@ msgstr ""
 "\t\t brukarnamn: %s\n"
 "\t\t stig: %s \n"
 
-#: standalone/drakbackup:2518
+#: standalone/drakbackup:2515
 #, c-format
 msgid ""
 "\n"
@@ -16127,42 +17276,42 @@ msgstr ""
 "\n"
 "– Val:\n"
 
-#: standalone/drakbackup:2519
+#: standalone/drakbackup:2516
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr "\tIkkje kopier systemfiler\n"
 
-#: standalone/drakbackup:2521
+#: standalone/drakbackup:2518
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
 msgstr "\tBruk tar og bzip2\n"
 
-#: standalone/drakbackup:2522
+#: standalone/drakbackup:2519
 #, c-format
 msgid "\tBackups use tar and gzip\n"
 msgstr "\tBruk tar og gzip\n"
 
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2520
 #, c-format
 msgid "\tBackups use tar only\n"
 msgstr "\tBerre bruk tar\n"
 
-#: standalone/drakbackup:2525
+#: standalone/drakbackup:2522
 #, c-format
 msgid "\tUse .backupignore files\n"
 msgstr "\tBruk «.backupignore»-filer\n"
 
-#: standalone/drakbackup:2526
+#: standalone/drakbackup:2523
 #, c-format
 msgid "\tSend mail to %s\n"
 msgstr "\tSend e-post til %s\n"
 
-#: standalone/drakbackup:2527
+#: standalone/drakbackup:2524
 #, c-format
 msgid "\tUsing SMTP server %s\n"
 msgstr "\tBruk SMTP-tenaren «%s»\n"
 
-#: standalone/drakbackup:2529
+#: standalone/drakbackup:2526
 #, c-format
 msgid ""
 "\n"
@@ -16171,467 +17320,467 @@ msgstr ""
 "\n"
 "– Nissen «%s» via:\n"
 
-#: standalone/drakbackup:2530
+#: standalone/drakbackup:2527
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr "\t–Harddisk.\n"
 
-#: standalone/drakbackup:2531
+#: standalone/drakbackup:2528
 #, c-format
 msgid "\t-CD-R.\n"
 msgstr "\t–CD-R\n"
 
-#: standalone/drakbackup:2532
+#: standalone/drakbackup:2529
 #, c-format
 msgid "\t-Tape \n"
 msgstr "\t–Band \n"
 
-#: standalone/drakbackup:2533
+#: standalone/drakbackup:2530
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr "\t–Nettverk via FTP\n"
 
-#: standalone/drakbackup:2534
+#: standalone/drakbackup:2531
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr "\t–Nettverk via SSH\n"
 
-#: standalone/drakbackup:2535
+#: standalone/drakbackup:2532
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr "\t–Nettverk via rsync\n"
 
-#: standalone/drakbackup:2536
+#: standalone/drakbackup:2533
 #, c-format
 msgid "\t-Network by webdav.\n"
 msgstr "\t–Nettverk via webdav\n"
 
-#: standalone/drakbackup:2538
+#: standalone/drakbackup:2535
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
 msgstr "Det finst ikkje noko oppsett. Vel «Vegvisar» eller «Avansert».\n"
 
-#: standalone/drakbackup:2543
+#: standalone/drakbackup:2540
 #, c-format
 msgid ""
 "List of data to restore:\n"
 "\n"
 msgstr ""
 
-#: standalone/drakbackup:2545
+#: standalone/drakbackup:2542
 #, c-format
 msgid "- Restore System Files.\n"
 msgstr ""
 
-#: standalone/drakbackup:2547 standalone/drakbackup:2557
+#: standalone/drakbackup:2544 standalone/drakbackup:2554
 #, c-format
 msgid "   - from date: %s %s\n"
 msgstr ""
 
-#: standalone/drakbackup:2550
+#: standalone/drakbackup:2547
 #, c-format
 msgid "- Restore User Files: \n"
 msgstr ""
 
-#: standalone/drakbackup:2555
+#: standalone/drakbackup:2552
 #, c-format
 msgid "- Restore Other Files: \n"
 msgstr ""
 
-#: standalone/drakbackup:2736
+#: standalone/drakbackup:2731
 #, c-format
 msgid ""
 "List of data corrupted:\n"
 "\n"
 msgstr ""
 
-#: standalone/drakbackup:2738
+#: standalone/drakbackup:2733
 #, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr ""
 
-#: standalone/drakbackup:2748
+#: standalone/drakbackup:2743
 #, c-format
 msgid "Backup files are corrupted"
 msgstr ""
 
-#: standalone/drakbackup:2769
+#: standalone/drakbackup:2764
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr ""
 
-#: standalone/drakbackup:2770
+#: standalone/drakbackup:2765
 #, c-format
-msgid "          Successfuly Restored on %s       "
+msgid "          Successfully Restored on %s       "
 msgstr ""
 
-#: standalone/drakbackup:2889
+#: standalone/drakbackup:2885
 #, c-format
 msgid "         Restore Configuration       "
 msgstr ""
 
-#: standalone/drakbackup:2917
+#: standalone/drakbackup:2913
 #, c-format
 msgid "OK to restore the other files."
 msgstr ""
 
-#: standalone/drakbackup:2933
+#: standalone/drakbackup:2929
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr ""
 
-#: standalone/drakbackup:3000
+#: standalone/drakbackup:2994
 #, c-format
 msgid "Please choose the date to restore:"
 msgstr "Vel datoen å gjenoppretta frå:"
 
-#: standalone/drakbackup:3037
+#: standalone/drakbackup:3031
 #, c-format
 msgid "Restore from Hard Disk."
 msgstr ""
 
-#: standalone/drakbackup:3039
+#: standalone/drakbackup:3033
 #, c-format
 msgid "Enter the directory where backups are stored"
 msgstr ""
 
-#: standalone/drakbackup:3043
+#: standalone/drakbackup:3037
 #, c-format
 msgid "Directory with backups"
 msgstr ""
 
-#: standalone/drakbackup:3097
+#: standalone/drakbackup:3091
 #, c-format
 msgid "Select another media to restore from"
 msgstr ""
 
-#: standalone/drakbackup:3099
+#: standalone/drakbackup:3093
 #, c-format
 msgid "Other Media"
 msgstr "Anna medium"
 
-#: standalone/drakbackup:3104
+#: standalone/drakbackup:3098
 #, c-format
 msgid "Restore system"
 msgstr "Gjenopprett system"
 
-#: standalone/drakbackup:3105
+#: standalone/drakbackup:3099
 #, c-format
 msgid "Restore Users"
 msgstr "Gjenopprett brukarar"
 
-#: standalone/drakbackup:3106
+#: standalone/drakbackup:3100
 #, c-format
 msgid "Restore Other"
 msgstr "Gjenopprett anna"
 
-#: standalone/drakbackup:3108
+#: standalone/drakbackup:3102
 #, c-format
 msgid "Select path to restore (instead of /)"
 msgstr "Vel stigen å gjennoppretta (i staden for «/»)"
 
-#: standalone/drakbackup:3112 standalone/drakbackup:3394
+#: standalone/drakbackup:3106 standalone/drakbackup:3388
 #, c-format
 msgid "Path To Restore To"
 msgstr ""
 
-#: standalone/drakbackup:3115
+#: standalone/drakbackup:3109
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr ""
 
-#: standalone/drakbackup:3117
+#: standalone/drakbackup:3111
 #, c-format
 msgid "Remove user directories before restore."
 msgstr ""
 
-#: standalone/drakbackup:3201
+#: standalone/drakbackup:3196
 #, c-format
 msgid "Filename text substring to search for (empty string matches all):"
 msgstr ""
 
-#: standalone/drakbackup:3204
+#: standalone/drakbackup:3199
 #, c-format
 msgid "Search Backups"
 msgstr ""
 
-#: standalone/drakbackup:3223
+#: standalone/drakbackup:3217
 #, c-format
 msgid "No matches found..."
 msgstr "Ingen treff ..."
 
-#: standalone/drakbackup:3227
+#: standalone/drakbackup:3221
 #, c-format
 msgid "Restore Selected"
 msgstr "Gjenoppretting valt"
 
-#: standalone/drakbackup:3362
+#: standalone/drakbackup:3356
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
 "Ctrl-Click files to select multiple files."
 msgstr ""
 
-#: standalone/drakbackup:3368
+#: standalone/drakbackup:3362
 #, c-format
 msgid ""
 "Restore Selected\n"
 "Catalog Entry"
 msgstr ""
 
-#: standalone/drakbackup:3377
+#: standalone/drakbackup:3371
 #, c-format
 msgid ""
 "Restore Selected\n"
 "Files"
 msgstr ""
 
-#: standalone/drakbackup:3454
+#: standalone/drakbackup:3448
 #, c-format
 msgid "Backup files not found at %s."
 msgstr ""
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid "Restore From CD"
 msgstr "Gjenopprett frå CD"
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
 " in the CD drive under mount point /mnt/cdrom"
 msgstr ""
 
-#: standalone/drakbackup:3469
+#: standalone/drakbackup:3463
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr ""
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid "Restore From Tape"
 msgstr ""
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
 " in the tape drive device %s"
 msgstr ""
 
-#: standalone/drakbackup:3481
+#: standalone/drakbackup:3475
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr ""
 
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore Via Network"
 msgstr "Gjenopprett via nettverk"
 
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr "Restore via nettverksprotokoll: %s"
 
-#: standalone/drakbackup:3493
+#: standalone/drakbackup:3487
 #, c-format
 msgid "Host Name"
 msgstr "Vertsnamn"
 
-#: standalone/drakbackup:3494
+#: standalone/drakbackup:3488
 #, c-format
 msgid "Host Path or Module"
 msgstr ""
 
-#: standalone/drakbackup:3501
+#: standalone/drakbackup:3495
 #, c-format
 msgid "Password required"
 msgstr "Krev passord"
 
-#: standalone/drakbackup:3507
+#: standalone/drakbackup:3501
 #, c-format
 msgid "Username required"
 msgstr "Krev brukarnamn"
 
-#: standalone/drakbackup:3510
+#: standalone/drakbackup:3504
 #, c-format
 msgid "Hostname required"
 msgstr "Krev vertsnamn"
 
-#: standalone/drakbackup:3515
+#: standalone/drakbackup:3509
 #, c-format
 msgid "Path or Module required"
 msgstr ""
 
-#: standalone/drakbackup:3528
+#: standalone/drakbackup:3522
 #, c-format
 msgid "Files Restored..."
 msgstr "Filer gjenoppretta ..."
 
-#: standalone/drakbackup:3531
+#: standalone/drakbackup:3525
 #, c-format
 msgid "Restore Failed..."
 msgstr "Klarte ikkje gjenoppretta ..."
 
-#: standalone/drakbackup:3549
+#: standalone/drakbackup:3543
 #, c-format
 msgid "%s not retrieved..."
 msgstr ""
 
-#: standalone/drakbackup:3748 standalone/drakbackup:3817
+#: standalone/drakbackup:3765 standalone/drakbackup:3834
 #, c-format
 msgid "Search for files to restore"
 msgstr ""
 
-#: standalone/drakbackup:3752
+#: standalone/drakbackup:3769
 #, c-format
 msgid "Restore all backups"
 msgstr ""
 
-#: standalone/drakbackup:3760
+#: standalone/drakbackup:3777
 #, c-format
 msgid "Custom Restore"
 msgstr ""
 
-#: standalone/drakbackup:3764 standalone/drakbackup:3813
+#: standalone/drakbackup:3781 standalone/drakbackup:3830
 #, c-format
 msgid "Restore From Catalog"
 msgstr "Gjenoppretta frå mappe"
 
-#: standalone/drakbackup:3785
+#: standalone/drakbackup:3802
 #, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr ""
 
-#: standalone/drakbackup:3786
+#: standalone/drakbackup:3803
 #, c-format
 msgid "Verify that %s is the correct path"
 msgstr ""
 
-#: standalone/drakbackup:3787
+#: standalone/drakbackup:3804
 #, c-format
 msgid " and the CD is in the drive"
 msgstr ""
 
-#: standalone/drakbackup:3789
+#: standalone/drakbackup:3806
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr ""
 
-#: standalone/drakbackup:3805
+#: standalone/drakbackup:3822
 #, c-format
 msgid "CD in place - continue."
 msgstr ""
 
-#: standalone/drakbackup:3810
+#: standalone/drakbackup:3827
 #, c-format
 msgid "Browse to new restore repository."
 msgstr ""
 
-#: standalone/drakbackup:3811
+#: standalone/drakbackup:3828
 #, c-format
 msgid "Directory To Restore From"
 msgstr "Mappe å gjenoppretta frå"
 
-#: standalone/drakbackup:3847
+#: standalone/drakbackup:3864
 #, c-format
 msgid "Restore Progress"
 msgstr "Gjenopprettingsframgang"
 
-#: standalone/drakbackup:3898 standalone/drakbackup:3971
-#: standalone/logdrake:174
+#: standalone/drakbackup:3919 standalone/drakbackup:3992
+#: standalone/logdrake:173
 #, c-format
 msgid "Save"
 msgstr "Lagra"
 
-#: standalone/drakbackup:3954
+#: standalone/drakbackup:3975
 #, c-format
 msgid "Build Backup"
 msgstr "Lag reservekopi"
 
-#: standalone/drakbackup:3987 standalone/drakbackup:4307
+#: standalone/drakbackup:4008 standalone/drakbackup:4328
 #, c-format
 msgid "Restore"
 msgstr "Gjenopprett"
 
-#: standalone/drakbackup:4075
+#: standalone/drakbackup:4096
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr ""
 
-#: standalone/drakbackup:4102
+#: standalone/drakbackup:4123
 #, c-format
 msgid "Please select data to restore..."
 msgstr ""
 
-#: standalone/drakbackup:4142
+#: standalone/drakbackup:4163
 #, c-format
 msgid "Backup system files"
 msgstr "Kopierer systemfiler"
 
-#: standalone/drakbackup:4145
+#: standalone/drakbackup:4166
 #, c-format
 msgid "Backup user files"
 msgstr "Kopierer brukarfiler"
 
-#: standalone/drakbackup:4148
+#: standalone/drakbackup:4169
 #, c-format
 msgid "Backup other files"
 msgstr "Kopierer andre filer"
 
-#: standalone/drakbackup:4151 standalone/drakbackup:4185
+#: standalone/drakbackup:4172 standalone/drakbackup:4206
 #, c-format
 msgid "Total Progress"
 msgstr "Total framgang"
 
-#: standalone/drakbackup:4177
+#: standalone/drakbackup:4198
 #, c-format
 msgid "Sending files by FTP"
 msgstr "Sender filer over FTP"
 
-#: standalone/drakbackup:4180
+#: standalone/drakbackup:4201
 #, c-format
 msgid "Sending files..."
 msgstr "Sender filer ..."
 
-#: standalone/drakbackup:4250
+#: standalone/drakbackup:4271
 #, c-format
 msgid "Backup Now from configuration file"
 msgstr "Ta reservekopi etter oppsett"
 
-#: standalone/drakbackup:4255
+#: standalone/drakbackup:4276
 #, c-format
 msgid "View Backup Configuration."
 msgstr "Vis oppsett"
 
-#: standalone/drakbackup:4281
+#: standalone/drakbackup:4302
 #, c-format
 msgid "Wizard Configuration"
 msgstr "Vegvisar"
 
-#: standalone/drakbackup:4286
+#: standalone/drakbackup:4307
 #, c-format
 msgid "Advanced Configuration"
 msgstr "Avansert"
 
-#: standalone/drakbackup:4291
+#: standalone/drakbackup:4312
 #, c-format
 msgid "View Configuration"
 msgstr "Vis oppsett"
 
-#: standalone/drakbackup:4295
+#: standalone/drakbackup:4316
 #, c-format
 msgid "View Last Log"
 msgstr "Vis siste logg"
 
-#: standalone/drakbackup:4300
+#: standalone/drakbackup:4321
 #, c-format
 msgid "Backup Now"
 msgstr "Ta reservekopi"
 
-#: standalone/drakbackup:4304
+#: standalone/drakbackup:4325
 #, c-format
 msgid ""
 "No configuration file found \n"
@@ -16640,68 +17789,73 @@ msgstr ""
 "Det finst ikkje noko oppsett.\n"
 "Vel «Vegvisar» eller «Avansert»."
 
-#: standalone/drakbackup:4324 standalone/drakbackup:4327
+#: standalone/drakbackup:4345 standalone/drakbackup:4348
 #, c-format
 msgid "Drakbackup"
 msgstr "Reservekopiering"
 
-#: standalone/drakboot:58
+#: standalone/drakboot:64
 #, c-format
 msgid "Graphical boot theme selection"
 msgstr "Val av grafisk oppstartstema"
 
-#: standalone/drakboot:58
+#: standalone/drakboot:64
 #, c-format
 msgid "System mode"
 msgstr "Systemmodus"
 
-#: standalone/drakboot:68 standalone/drakfloppy:46 standalone/harddrake2:103
-#: standalone/harddrake2:104 standalone/logdrake:71
-#: standalone/printerdrake:150 standalone/printerdrake:151
-#: standalone/printerdrake:152
+#: standalone/drakboot:74 standalone/drakfloppy:47 standalone/harddrake2:171
+#: standalone/harddrake2:172 standalone/logdrake:70
+#: standalone/printerdrake:156 standalone/printerdrake:157
+#: standalone/printerdrake:158
 #, c-format
 msgid "/_File"
 msgstr "/_Fil"
 
-#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/logdrake:77
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/logdrake:76
 #, c-format
 msgid "/File/_Quit"
 msgstr "/Fil/_Avslutt"
 
-#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/harddrake2:104
-#: standalone/logdrake:77 standalone/printerdrake:152
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/harddrake2:172
+#: standalone/logdrake:76 standalone/printerdrake:158
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: standalone/drakboot:139
+#: standalone/drakboot:148
 #, c-format
 msgid "Install themes"
 msgstr "Installer tema"
 
-#: standalone/drakboot:140
+#: standalone/drakboot:149
 #, c-format
 msgid "Create new theme"
 msgstr "Lag nytt tema"
 
-#: standalone/drakboot:152
+#: standalone/drakboot:161
 #, c-format
 msgid "Use graphical boot"
 msgstr "Bruk grafisk oppstart"
 
-#: standalone/drakboot:157
+#: standalone/drakboot:166
 #, c-format
 msgid ""
 "Your system bootloader is not in framebuffer mode. To activate graphical "
 "boot, select a graphic video mode from the bootloader configuration tool."
 msgstr ""
 
-#: standalone/drakboot:164
+#: standalone/drakboot:167
+#, c-format
+msgid "Do you want to configure it now?"
+msgstr "Vil du setja det opp no?"
+
+#: standalone/drakboot:177
 #, c-format
 msgid "Theme"
 msgstr "Tema"
 
-#: standalone/drakboot:167
+#: standalone/drakboot:180
 #, c-format
 msgid ""
 "Display theme\n"
@@ -16710,147 +17864,131 @@ msgstr ""
 "Vis tema\n"
 "under konsoll"
 
-#: standalone/drakboot:176
+#: standalone/drakboot:189
 #, c-format
 msgid "Launch the graphical environment when your system starts"
 msgstr "Start det grafiske miljøet ved oppstart"
 
-#: standalone/drakboot:184
+#: standalone/drakboot:197
 #, c-format
 msgid "No, I don't want autologin"
 msgstr "Ikkje logg inn automatisk"
 
-#: standalone/drakboot:185
+#: standalone/drakboot:198
 #, c-format
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "Logg inn automatisk med følgjande brukar og skrivebord"
 
-#: standalone/drakboot:191
+#: standalone/drakboot:201
 #, c-format
 msgid "Default user"
 msgstr "Brukar:"
 
-#: standalone/drakboot:192
+#: standalone/drakboot:202
 #, c-format
 msgid "Default desktop"
 msgstr "Skrivebord:"
 
-#: standalone/drakboot:256
-#, c-format
-msgid "Installation of %s failed. The following error occured:"
-msgstr "Klarte ikkje installera «%s». Det oppstod ein feil:"
-
-#: standalone/drakbug:40
+#: standalone/drakboot:310
 #, c-format
 msgid ""
-"To submit a bug report, click on the button report.\n"
-"This will open  a web browser window on %s\n"
-" where you'll find a form to fill in.  The information displayed above will "
-"be \n"
-"transferred to that server."
+"Please choose a video mode, it will be applied to each of the boot entries "
+"selected below.\n"
+"Be sure your video card supports the mode you choose."
 msgstr ""
 
-#: standalone/drakbug:48
+#: standalone/drakbug:41
 #, c-format
-msgid "Mandrake Bug Report Tool"
-msgstr "Feilrapporteringsverktøy"
+msgid "Mandrakelinux Bug Report Tool"
+msgstr "Feilrapporteringsverktøy for Mandrakelinux"
 
-#: standalone/drakbug:53
+#: standalone/drakbug:46
 #, c-format
-msgid "Mandrake Control Center"
+msgid "Mandrakelinux Control Center"
 msgstr "Kontrollsenter"
 
-#: standalone/drakbug:55
+#: standalone/drakbug:48
 #, c-format
 msgid "Synchronization tool"
 msgstr "Synkroniseringsverktøy"
 
-#: standalone/drakbug:56 standalone/drakbug:70 standalone/drakbug:204
-#: standalone/drakbug:206 standalone/drakbug:210
+#: standalone/drakbug:49 standalone/drakbug:63 standalone/drakbug:176
+#: standalone/drakbug:178 standalone/drakbug:182
 #, c-format
 msgid "Standalone Tools"
 msgstr ""
 
-#: standalone/drakbug:57
+#: standalone/drakbug:50
 #, c-format
 msgid "HardDrake"
 msgstr "Maskinvareoppsett"
 
-#: standalone/drakbug:58
+#: standalone/drakbug:51
 #, c-format
-msgid "Mandrake Online"
-msgstr "Mandrake Online"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: standalone/drakbug:59
+#: standalone/drakbug:52
 #, c-format
 msgid "Menudrake"
 msgstr "Menyoppsett"
 
-#: standalone/drakbug:60
+#: standalone/drakbug:53
 #, c-format
 msgid "Msec"
 msgstr ""
 
-#: standalone/drakbug:61
+#: standalone/drakbug:54
 #, c-format
 msgid "Remote Control"
 msgstr "Fjernkontroll"
 
-#: standalone/drakbug:62
+#: standalone/drakbug:55
 #, c-format
 msgid "Software Manager"
 msgstr "Programhandtering"
 
-#: standalone/drakbug:63
+#: standalone/drakbug:56
 #, c-format
 msgid "Urpmi"
 msgstr "Urpmi"
 
-#: standalone/drakbug:64
+#: standalone/drakbug:57
 #, c-format
 msgid "Windows Migration tool"
 msgstr "Windows-migreringsverktøy"
 
-#: standalone/drakbug:65
+#: standalone/drakbug:58
 #, c-format
 msgid "Userdrake"
 msgstr "Brukaroppsett"
 
-#: standalone/drakbug:66
+#: standalone/drakbug:59
 #, c-format
 msgid "Configuration Wizards"
 msgstr "Oppsettvegvisarar"
 
-#: standalone/drakbug:84
-#, c-format
-msgid ""
-"To submit a bug report, click the report button, which will open your "
-"default browser\n"
-"to Anthill where you will be able to upload the above information as a bug "
-"report."
-msgstr ""
-
-#: standalone/drakbug:102
+#: standalone/drakbug:83
 #, c-format
 msgid "Application:"
 msgstr "Program:"
 
-#: standalone/drakbug:103 standalone/drakbug:115
+#: standalone/drakbug:84 standalone/drakbug:96
 #, c-format
 msgid "Package: "
 msgstr "Pakke: "
 
-#: standalone/drakbug:104
+#: standalone/drakbug:85
 #, c-format
 msgid "Kernel:"
 msgstr "Kjerne:"
 
-#: standalone/drakbug:105 standalone/drakbug:116
+#: standalone/drakbug:86 standalone/drakbug:97
 #, c-format
 msgid "Release: "
 msgstr "Utgåve: "
 
-#: standalone/drakbug:110
+#: standalone/drakbug:91
 #, c-format
 msgid ""
 "Application Name\n"
@@ -16859,163 +17997,178 @@ msgstr ""
 "Programnamn\n"
 "eller full stig:"
 
-#: standalone/drakbug:113
+#: standalone/drakbug:94
 #, c-format
 msgid "Find Package"
 msgstr "Finn pakke"
 
-#: standalone/drakbug:117
+#: standalone/drakbug:98
 #, c-format
 msgid "Summary: "
 msgstr "Samandrag: "
 
-#: standalone/drakbug:129
-#, c-format
-msgid "YOUR TEXT HERE"
-msgstr "TEKSTEN DIN HER"
-
-#: standalone/drakbug:132
+#: standalone/drakbug:104
 #, c-format
 msgid "Bug Description/System Information"
 msgstr "Feilbeskriving/systeminformasjon"
 
-#: standalone/drakbug:136
+#: standalone/drakbug:105
+#, c-format
+msgid "YOUR TEXT HERE"
+msgstr "TEKSTEN DIN HER"
+
+#: standalone/drakbug:108
 #, c-format
 msgid "Submit kernel version"
 msgstr "Send kjerneversjon"
 
-#: standalone/drakbug:137
+#: standalone/drakbug:109
 #, c-format
 msgid "Submit cpuinfo"
 msgstr "Send prosessorinformasjon"
 
-#: standalone/drakbug:138
+#: standalone/drakbug:110
 #, c-format
 msgid "Submit lspci"
 msgstr ""
 
-#: standalone/drakbug:159
+#: standalone/drakbug:124
+#, c-format
+msgid ""
+"To submit a bug report, click on the report button.\n"
+"This will open  a web browser window on %s\n"
+" where you'll find a form to fill in.  The information displayed above will "
+"be \n"
+"transferred to that server."
+msgstr ""
+
+#: standalone/drakbug:130
 #, c-format
 msgid "Report"
 msgstr "Rapporter"
 
-#: standalone/drakbug:219
+#: standalone/drakbug:191
 #, c-format
 msgid "Not installed"
 msgstr "Ikkje installert"
 
-#: standalone/drakbug:231
+#: standalone/drakbug:203
 #, c-format
 msgid "Package not installed"
 msgstr "Pakke ikkje installert"
 
-#: standalone/drakbug:248
+#: standalone/drakbug:220
 #, c-format
 msgid "NOT FOUND"
 msgstr "IKKJE FUNNEN"
 
-#: standalone/drakbug:259
+#: standalone/drakbug:227
 #, c-format
-msgid "connecting to %s ..."
+msgid "connecting to %s..."
 msgstr "Koplar til «%s» ..."
 
-#: standalone/drakbug:267
+#: standalone/drakbug:235
 #, c-format
 msgid "No browser available! Please install one"
 msgstr ""
 
-#: standalone/drakbug:286
+#: standalone/drakbug:254
 #, c-format
 msgid "Please enter a package name."
 msgstr "Skriv inn pakkenamn."
 
-#: standalone/drakbug:292
+#: standalone/drakbug:260
 #, c-format
 msgid "Please enter summary text."
 msgstr "Skriv inn samandragstekst."
 
-#: standalone/drakclock:29
+#: standalone/drakclock:30
 #, c-format
 msgid "DrakClock"
 msgstr ""
 
-#: standalone/drakclock:39
+#: standalone/drakclock:40
 #, c-format
 msgid "not defined"
 msgstr "ikkje definert"
 
-#: standalone/drakclock:41
+#: standalone/drakclock:42
 #, c-format
 msgid "Change Time Zone"
 msgstr "Endra tidssone"
 
-#: standalone/drakclock:45
+#: standalone/drakclock:46
 #, c-format
 msgid "Timezone - DrakClock"
 msgstr ""
 
-#: standalone/drakclock:47
+#: standalone/drakclock:48
 #, c-format
 msgid "GMT - DrakClock"
 msgstr ""
 
-#: standalone/drakclock:47
+#: standalone/drakclock:48
 #, c-format
 msgid "Is your hardware clock set to GMT?"
 msgstr "Brukar maskinvareklokka GMT?"
 
-#: standalone/drakclock:79
+#: standalone/drakclock:76
 #, c-format
 msgid "Network Time Protocol"
 msgstr ""
 
-#: standalone/drakclock:81
+#: standalone/drakclock:78
 #, c-format
 msgid ""
 "Your computer can synchronize its clock\n"
 " with a remote time server using NTP"
 msgstr ""
 
-#: standalone/drakclock:82
+#: standalone/drakclock:79
 #, c-format
 msgid "Enable Network Time Protocol"
 msgstr ""
 
-#: standalone/drakclock:90
+#: standalone/drakclock:87
 #, c-format
 msgid "Server:"
 msgstr "Tenar:"
 
-#: standalone/drakclock:137 standalone/drakclock:149
+#: standalone/drakclock:125
+#, c-format
+msgid "Could not synchronize with %s."
+msgstr ""
+
+#: standalone/drakclock:147 standalone/drakclock:157
 #, c-format
 msgid "Reset"
 msgstr "Nullstill"
 
-#: standalone/drakclock:214
+#: standalone/drakclock:225
 #, c-format
 msgid ""
 "We need to install ntp package\n"
 " to enable Network Time Protocol\n"
 "\n"
-"Do you want to install ntp ?"
+"Do you want to install ntp?"
 msgstr ""
 
-#: standalone/drakconnect:81
+#: standalone/drakconnect:85
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr ""
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Gateway:"
 msgstr "Portnar:"
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Interface:"
 msgstr "Grensesnitt:"
 
-#: standalone/drakconnect:96 standalone/net_monitor:106
+#: standalone/drakconnect:100 standalone/net_monitor:122
 #, c-format
 msgid "Wait please"
 msgstr "Vent litt"
@@ -17025,12 +18178,8 @@ msgstr "Vent litt"
 msgid "Interface"
 msgstr "Grensesnitt"
 
-#: standalone/drakconnect:116 standalone/drakups:233
-#, c-format
-msgid "Driver"
-msgstr "Drivar"
-
-#: standalone/drakconnect:116
+#: standalone/drakconnect:116 standalone/printerdrake:218
+#: standalone/printerdrake:225
 #, c-format
 msgid "State"
 msgstr "Status"
@@ -17045,7 +18194,7 @@ msgstr "Vertsnamn: "
 msgid "Configure hostname..."
 msgstr "Set opp vertsnamn ..."
 
-#: standalone/drakconnect:149 standalone/drakconnect:792
+#: standalone/drakconnect:149 standalone/drakconnect:843
 #, c-format
 msgid "LAN configuration"
 msgstr "LAN-oppsett"
@@ -17053,10 +18202,10 @@ msgstr "LAN-oppsett"
 #: standalone/drakconnect:154
 #, c-format
 msgid "Configure Local Area Network..."
-msgstr ""
+msgstr "Set opp lokalnett ..."
 
-#: standalone/drakconnect:162 standalone/drakconnect:240
-#: standalone/drakconnect:244
+#: standalone/drakconnect:162 standalone/drakconnect:246
+#: standalone/drakconnect:250
 #, c-format
 msgid "Apply"
 msgstr "Bruk"
@@ -17064,274 +18213,309 @@ msgstr "Bruk"
 #: standalone/drakconnect:197
 #, c-format
 msgid "Manage connections"
-msgstr ""
+msgstr "Sambandshandtering"
 
-#: standalone/drakconnect:218
+#: standalone/drakconnect:224
 #, c-format
 msgid "Device selected"
 msgstr "Valt eining"
 
-#: standalone/drakconnect:314
+#: standalone/drakconnect:305
 #, c-format
 msgid "IP configuration"
 msgstr "IP-oppsett"
 
-#: standalone/drakconnect:351
+#: standalone/drakconnect:342
 #, c-format
 msgid "DNS servers"
 msgstr "DND-tenarar"
 
-#: standalone/drakconnect:359
+#: standalone/drakconnect:350
 #, c-format
 msgid "Search Domain"
 msgstr "Søk i domene"
 
-#: standalone/drakconnect:367
+#: standalone/drakconnect:358
 #, c-format
 msgid "static"
 msgstr "statisk"
 
-#: standalone/drakconnect:367
+#: standalone/drakconnect:358
 #, c-format
 msgid "DHCP"
 msgstr "DHCP"
 
-#: standalone/drakconnect:493
+#: standalone/drakconnect:436
+#, c-format
+msgid "Metric"
+msgstr "Matrisk"
+
+#: standalone/drakconnect:491
 #, c-format
 msgid "Flow control"
 msgstr "Flytkontroll"
 
-#: standalone/drakconnect:494
+#: standalone/drakconnect:492
 #, c-format
 msgid "Line termination"
 msgstr "Linjeavbrot"
 
-#: standalone/drakconnect:505
+#: standalone/drakconnect:503
 #, c-format
 msgid "Modem timeout"
 msgstr "4"
 
-#: standalone/drakconnect:509
+#: standalone/drakconnect:507
 #, c-format
 msgid "Use lock file"
 msgstr "Bruk låsfil"
 
-#: standalone/drakconnect:511
+#: standalone/drakconnect:509
 #, c-format
 msgid "Wait for dialup tone before dialing"
-msgstr ""
+msgstr "Vent på summetone før oppringing"
 
-#: standalone/drakconnect:514
+#: standalone/drakconnect:512
 #, c-format
 msgid "Busy wait"
-msgstr ""
+msgstr "Opptatt. Vent."
 
-#: standalone/drakconnect:519
+#: standalone/drakconnect:517
 #, c-format
 msgid "Modem sound"
 msgstr "Modemlyd"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
 #, c-format
 msgid "Enable"
 msgstr "Bruk"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
 #, c-format
 msgid "Disable"
 msgstr "Ikkje bruk"
 
-#: standalone/drakconnect:571 standalone/harddrake2:62
+#: standalone/drakconnect:569 standalone/harddrake2:45
 #, c-format
 msgid "Media class"
 msgstr "Medieklasse"
 
-#: standalone/drakconnect:572 standalone/drakfloppy:141
+#: standalone/drakconnect:570 standalone/drakfloppy:136
 #, c-format
 msgid "Module name"
 msgstr "Modulnamn"
 
-#: standalone/drakconnect:573
+#: standalone/drakconnect:571
 #, c-format
 msgid "Mac Address"
 msgstr "Mac-adresse"
 
-#: standalone/drakconnect:574 standalone/harddrake2:21
+#: standalone/drakconnect:572 standalone/harddrake2:23
+#: standalone/harddrake2:104
 #, c-format
 msgid "Bus"
 msgstr "Buss"
 
-#: standalone/drakconnect:575 standalone/harddrake2:29
+#: standalone/drakconnect:573 standalone/harddrake2:29
 #, c-format
 msgid "Location on the bus"
 msgstr "Plassering på bussen"
 
-#: standalone/drakconnect:645 standalone/drakgw:248 standalone/drakpxe:138
+#: standalone/drakconnect:670 standalone/drakgw:250 standalone/drakpxe:138
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
 msgstr ""
+"Fann ikkje noko nettverkskort. Prøv å køyra maskinvareoppsettverktøyet."
 
-#: standalone/drakconnect:651
+#: standalone/drakconnect:678
 #, c-format
 msgid "Remove a network interface"
 msgstr "Fjern nettverksgrensesnitt"
 
-#: standalone/drakconnect:655
+#: standalone/drakconnect:682
 #, c-format
 msgid "Select the network interface to remove:"
-msgstr ""
+msgstr "Vel nettverksgrensesnittet du vil fjerna:"
 
-#: standalone/drakconnect:679
+#: standalone/drakconnect:713
 #, c-format
 msgid ""
-"An error occured while deleting the \"%s\" network interface:\n"
+"An error occurred while deleting the \"%s\" network interface:\n"
 "\n"
 "%s"
 msgstr ""
+"Det oppstod ein feil ved fjerning nettverksgrensesnittet «%s»:\n"
+"\n"
+"%s"
 
-#: standalone/drakconnect:681
+#: standalone/drakconnect:715
 #, c-format
 msgid ""
-"Congratulations, the \"%s\" network interface has been succesfully deleted"
-msgstr ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Nettverksgrensesnittet «%s» er no fjerna."
 
-#: standalone/drakconnect:698
+#: standalone/drakconnect:732
 #, c-format
-msgid "No Ip"
+msgid "No IP"
 msgstr "Ingen IP"
 
-#: standalone/drakconnect:699
+#: standalone/drakconnect:733
 #, c-format
 msgid "No Mask"
 msgstr "Inga maske"
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
 #, c-format
 msgid "up"
 msgstr "opp"
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
 #, c-format
 msgid "down"
 msgstr "ned"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Connected"
 msgstr "Kopla til"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Not connected"
 msgstr "Ikkje kopla til"
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Disconnect..."
 msgstr "Koplar frå ..."
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Connect..."
 msgstr "Koplar til ..."
 
-#: standalone/drakconnect:772
+#: standalone/drakconnect:808
 #, c-format
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
 "network"
 msgstr ""
+"Åtvaring: Fann eit anna Internett-samband som kanskje brukar nettverket ditt."
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, c-format
 msgid "Deactivate now"
 msgstr "Slå av no"
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, c-format
 msgid "Activate now"
 msgstr "Slå på no"
 
-#: standalone/drakconnect:796
+#: standalone/drakconnect:847
 #, c-format
 msgid ""
 "You don't have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
 msgstr ""
 
-#: standalone/drakconnect:810
+#: standalone/drakconnect:861
 #, c-format
 msgid "LAN Configuration"
 msgstr "LAN-oppsett"
 
-#: standalone/drakconnect:822
+#: standalone/drakconnect:873
 #, c-format
 msgid "Adapter %s: %s"
-msgstr ""
+msgstr "Kort %s: %s"
 
-#: standalone/drakconnect:831
+#: standalone/drakconnect:882
 #, c-format
 msgid "Boot Protocol"
 msgstr "Oppstartsprotokoll"
 
-#: standalone/drakconnect:832
+#: standalone/drakconnect:883
 #, c-format
 msgid "Started on boot"
 msgstr "Starta ved oppstart"
 
-#: standalone/drakconnect:868
+#: standalone/drakconnect:919
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrake Control Center"
+"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
 msgstr ""
+"Grensesnittet er ikkje sett opp enno.\n"
+"Køyr «Legg til grensesnitt»-vegvisaren i kontrollsenteret."
 
-#. -PO: here "Internet access" should be translated the same was as in control-center
-#: standalone/drakconnect:923
-#, c-format
+#. -PO: here "Add Connection" should be translated the same was as in control-center
+#: standalone/drakconnect:974 standalone/net_applet:46
+#, fuzzy, c-format
 msgid ""
 "You don't have any configured Internet connection.\n"
-"Please run \"Internet access\" in control center."
+"Run the \"Add Connection\" assistant from the Mandrakelinux Control Center"
 msgstr ""
+"Grensesnittet er ikkje sett opp enno.\n"
+"Køyr «Legg til grensesnitt»-vegvisaren i kontrollsenteret."
 
-#: standalone/drakconnect:931
+#: standalone/drakconnect:982
 #, c-format
 msgid "Internet connection configuration"
 msgstr "Internett-oppsett"
 
-#: standalone/drakconnect:949
+#: standalone/drakconnect:1000
 #, c-format
 msgid "Third DNS server (optional)"
-msgstr ""
+msgstr "Tredje DNS-tenar (valfri)"
 
-#: standalone/drakconnect:971
+#: standalone/drakconnect:1022
 #, c-format
 msgid "Internet Connection Configuration"
-msgstr ""
+msgstr "Internett-oppsett"
 
-#: standalone/drakconnect:972
+#: standalone/drakconnect:1023
 #, c-format
 msgid "Internet access"
 msgstr "Internett-tilgang"
 
-#: standalone/drakconnect:974 standalone/net_monitor:88
+#: standalone/drakconnect:1025 standalone/net_monitor:101
 #, c-format
 msgid "Connection type: "
 msgstr "Sambandstype: "
 
-#: standalone/drakconnect:977
+#: standalone/drakconnect:1028
 #, c-format
 msgid "Status:"
 msgstr "Status:"
 
-#: standalone/drakedm:53
+#: standalone/drakedm:34
+#, c-format
+msgid "GDM (GNOME Display Manager)"
+msgstr ""
+
+#: standalone/drakedm:35
+#, c-format
+msgid "KDM (KDE Display Manager)"
+msgstr ""
+
+#: standalone/drakedm:36
+#, c-format
+msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgstr ""
+
+#: standalone/drakedm:37
+#, c-format
+msgid "XDM (X Display Manager)"
+msgstr "XDM (X-innloggingsveljar)"
+
+#: standalone/drakedm:55
 #, c-format
 msgid "Choosing a display manager"
 msgstr "Vel innloggingsveljar"
 
-#: standalone/drakedm:54
+#: standalone/drakedm:56
 #, c-format
 msgid ""
 "X11 Display Manager allows you to graphically log\n"
@@ -17339,114 +18523,122 @@ msgid ""
 "several different X sessions on your local machine at the same time."
 msgstr ""
 
-#: standalone/drakedm:77
+#: standalone/drakedm:79
 #, c-format
-msgid "The change is done, do you want to restart the dm service ?"
+msgid "The change is done, do you want to restart the dm service?"
 msgstr ""
 
-#: standalone/drakfloppy:40
+#: standalone/drakedm:80
+#, c-format
+msgid ""
+"You are going to close all running programs and lose your current session. "
+"Are you really sure that you want to restart the dm service?"
+msgstr ""
+
+#: standalone/drakfloppy:41
 #, c-format
 msgid "drakfloppy"
 msgstr ""
 
-#: standalone/drakfloppy:83
+#: standalone/drakfloppy:78
 #, c-format
 msgid "Boot disk creation"
 msgstr ""
 
-#: standalone/drakfloppy:84
+#: standalone/drakfloppy:79
 #, c-format
 msgid "General"
 msgstr "Generelt"
 
-#: standalone/drakfloppy:87
+#: standalone/drakfloppy:82 standalone/harddrake2:131
 #, c-format
 msgid "Device"
 msgstr "Eining"
 
-#: standalone/drakfloppy:93
+#: standalone/drakfloppy:88
 #, c-format
 msgid "Kernel version"
 msgstr "Kjerneversjon"
 
-#: standalone/drakfloppy:108
+#: standalone/drakfloppy:103
 #, c-format
 msgid "Preferences"
 msgstr "Innstillingar"
 
-#: standalone/drakfloppy:122
+#: standalone/drakfloppy:117
 #, c-format
 msgid "Advanced preferences"
 msgstr "Avanserte innstillingar"
 
-#: standalone/drakfloppy:141
+#: standalone/drakfloppy:136
 #, c-format
 msgid "Size"
 msgstr "Storleik"
 
-#: standalone/drakfloppy:144
+#: standalone/drakfloppy:139
 #, c-format
 msgid "Mkinitrd optional arguments"
 msgstr ""
 
-#: standalone/drakfloppy:146
+#: standalone/drakfloppy:141
 #, c-format
 msgid "force"
 msgstr "tving"
 
-#: standalone/drakfloppy:147
+#: standalone/drakfloppy:142
 #, c-format
 msgid "omit raid modules"
 msgstr ""
 
-#: standalone/drakfloppy:148
+#: standalone/drakfloppy:143
 #, c-format
 msgid "if needed"
 msgstr "om nødvendig"
 
-#: standalone/drakfloppy:149
+#: standalone/drakfloppy:144
 #, c-format
 msgid "omit scsi modules"
 msgstr ""
 
-#: standalone/drakfloppy:152
+#: standalone/drakfloppy:147
 #, c-format
 msgid "Add a module"
 msgstr "Legg til modul"
 
-#: standalone/drakfloppy:161
+#: standalone/drakfloppy:156
 #, c-format
 msgid "Remove a module"
 msgstr "Fjern modul"
 
-#: standalone/drakfloppy:296
+#: standalone/drakfloppy:291
 #, c-format
 msgid "Be sure a media is present for the device %s"
 msgstr ""
 
-#: standalone/drakfloppy:302
+#: standalone/drakfloppy:297
 #, c-format
 msgid ""
 "There is no medium or it is write-protected for device %s.\n"
 "Please insert one."
 msgstr ""
 
-#: standalone/drakfloppy:306
+#: standalone/drakfloppy:301
 #, c-format
 msgid "Unable to fork: %s"
 msgstr ""
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, c-format
 msgid "Floppy creation completed"
 msgstr "Diskett ferdiglaga"
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, c-format
 msgid "The creation of the boot floppy has been successfully completed \n"
 msgstr ""
 
-#: standalone/drakfloppy:312
+#. -PO: Do not alter the <span ..> and </span> tags
+#: standalone/drakfloppy:309
 #, c-format
 msgid ""
 "Unable to properly close mkbootdisk:\n"
@@ -17467,7 +18659,7 @@ msgstr ""
 #: standalone/drakfont:208
 #, c-format
 msgid "parse all fonts"
-msgstr ""
+msgstr "Les alle skrifter"
 
 #: standalone/drakfont:210
 #, c-format
@@ -17484,12 +18676,12 @@ msgstr "ferdig"
 #: standalone/drakfont:223
 #, c-format
 msgid "Could not find any font in your mounted partitions"
-msgstr ""
+msgstr "Fann ikkje nokon skrifter på dei monterte partisjonane"
 
 #: standalone/drakfont:256
 #, c-format
 msgid "Reselect correct fonts"
-msgstr ""
+msgstr "Vel dei rette skriftene på nytt"
 
 #: standalone/drakfont:259
 #, c-format
@@ -17581,7 +18773,7 @@ msgstr "Skriftliste"
 msgid "About"
 msgstr "Om"
 
-#: standalone/drakfont:495 standalone/drakfont:687 standalone/drakfont:725
+#: standalone/drakfont:495 standalone/drakfont:691 standalone/drakfont:729
 #, c-format
 msgid "Uninstall"
 msgstr "Avinstaller"
@@ -17591,10 +18783,11 @@ msgstr "Avinstaller"
 msgid "Import"
 msgstr "Importer"
 
-#: standalone/drakfont:512
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: standalone/drakfont:514
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by MandrakeSoft \n"
+"Copyright (C) 2001-2002 by Mandrakesoft \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -17604,7 +18797,7 @@ msgid ""
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
 
-#: standalone/drakfont:521
+#: standalone/drakfont:523
 #, c-format
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
@@ -17624,7 +18817,7 @@ msgid ""
 " Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: standalone/drakfont:537
+#: standalone/drakfont:539
 #, c-format
 msgid ""
 "Thanks:\n"
@@ -17642,12 +18835,12 @@ msgid ""
 "             Convert ttf font files to afm and pfb fonts\n"
 msgstr ""
 
-#: standalone/drakfont:556
+#: standalone/drakfont:558
 #, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr ""
 
-#: standalone/drakfont:557
+#: standalone/drakfont:559
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -17657,122 +18850,127 @@ msgid ""
 "hang up your X Server."
 msgstr ""
 
-#: standalone/drakfont:567
+#: standalone/drakfont:569
 #, c-format
 msgid "Ghostscript"
 msgstr "Ghostscript"
 
-#: standalone/drakfont:568
+#: standalone/drakfont:570
 #, c-format
 msgid "StarOffice"
 msgstr "StarOffice"
 
-#: standalone/drakfont:569
+#: standalone/drakfont:571
 #, c-format
 msgid "Abiword"
 msgstr "Abiword"
 
-#: standalone/drakfont:570
+#: standalone/drakfont:572
 #, c-format
 msgid "Generic Printers"
 msgstr "Generelle skrivarar"
 
-#: standalone/drakfont:586
+#: standalone/drakfont:588
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
 msgstr ""
 
-#: standalone/drakfont:587
+#: standalone/drakfont:589
 #, c-format
 msgid "File Selection"
 msgstr "Filval"
 
-#: standalone/drakfont:600
+#: standalone/drakfont:604
 #, c-format
 msgid "You've not selected any font"
 msgstr "Du har ikkje valt noko skrift"
 
-#: standalone/drakfont:652
+#: standalone/drakfont:656
 #, c-format
 msgid "Import fonts"
 msgstr "Importer skrifter"
 
-#: standalone/drakfont:657
+#: standalone/drakfont:661
 #, c-format
 msgid "Install fonts"
 msgstr "Installer skrifter"
 
-#: standalone/drakfont:692
+#: standalone/drakfont:696
 #, c-format
 msgid "click here if you are sure."
 msgstr ""
 
-#: standalone/drakfont:694
+#: standalone/drakfont:698
 #, c-format
 msgid "here if no."
 msgstr ""
 
-#: standalone/drakfont:733
+#: standalone/drakfont:737
 #, c-format
 msgid "Unselected All"
 msgstr ""
 
-#: standalone/drakfont:736
+#: standalone/drakfont:740
 #, c-format
 msgid "Selected All"
 msgstr ""
 
-#: standalone/drakfont:739
+#: standalone/drakfont:743
 #, c-format
 msgid "Remove List"
 msgstr "Fjern liste"
 
-#: standalone/drakfont:750 standalone/drakfont:769
+#: standalone/drakfont:754 standalone/drakfont:773
 #, c-format
 msgid "Importing fonts"
 msgstr "Importerer skrifter"
 
-#: standalone/drakfont:754 standalone/drakfont:774
+#: standalone/drakfont:758 standalone/drakfont:778
 #, c-format
 msgid "Initial tests"
 msgstr ""
 
-#: standalone/drakfont:755
+#: standalone/drakfont:759
 #, c-format
 msgid "Copy fonts on your system"
 msgstr "Kopier skrifter på systemet"
 
-#: standalone/drakfont:756
+#: standalone/drakfont:760
 #, c-format
 msgid "Install & convert Fonts"
 msgstr "Installer og konverter skrifter"
 
-#: standalone/drakfont:757
+#: standalone/drakfont:761
 #, c-format
 msgid "Post Install"
 msgstr "Etterinstallering"
 
-#: standalone/drakfont:775
+#: standalone/drakfont:779
 #, c-format
 msgid "Remove fonts on your system"
 msgstr ""
 
-#: standalone/drakfont:776
+#: standalone/drakfont:780
 #, c-format
 msgid "Post Uninstall"
 msgstr "Etteravinstallering"
 
-#: standalone/drakgw:58 standalone/drakgw:193
+#: standalone/drakgw:58 standalone/drakgw:194
 #, c-format
 msgid "Internet Connection Sharing"
 msgstr "Deling av Internett-samband"
 
-#: standalone/drakgw:124
+#: standalone/drakgw:114 standalone/drakvpn:51
+#, c-format
+msgid "Sorry, we support only 2.4 and above kernels."
+msgstr "Feil: Støttar berre 2.4 og seinare kjerneversjonar."
+
+#: standalone/drakgw:125
 #, c-format
 msgid "Internet Connection Sharing currently disabled"
 msgstr ""
 
-#: standalone/drakgw:125
+#: standalone/drakgw:126
 #, c-format
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
@@ -17781,39 +18979,39 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: standalone/drakgw:129 standalone/drakvpn:127
+#: standalone/drakgw:130 standalone/drakvpn:127
 #, c-format
 msgid "enable"
 msgstr ""
 
-#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:130 standalone/drakgw:157 standalone/drakvpn:101
 #: standalone/drakvpn:127
 #, c-format
 msgid "reconfigure"
 msgstr "set opp på nytt"
 
-#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:130 standalone/drakgw:157 standalone/drakvpn:101
 #: standalone/drakvpn:127 standalone/drakvpn:376 standalone/drakvpn:735
 #, c-format
 msgid "dismiss"
 msgstr ""
 
-#: standalone/drakgw:136
+#: standalone/drakgw:137
 #, c-format
 msgid "Enabling servers..."
 msgstr ""
 
-#: standalone/drakgw:148
+#: standalone/drakgw:149
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr ""
 
-#: standalone/drakgw:151
+#: standalone/drakgw:152
 #, c-format
 msgid "Internet Connection Sharing currently enabled"
 msgstr ""
 
-#: standalone/drakgw:152
+#: standalone/drakgw:153
 #, c-format
 msgid ""
 "The setup of Internet Connection Sharing has already been done.\n"
@@ -17822,22 +19020,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:157 standalone/drakvpn:101
 #, c-format
 msgid "disable"
 msgstr ""
 
-#: standalone/drakgw:159
+#: standalone/drakgw:160
 #, c-format
 msgid "Disabling servers..."
 msgstr ""
 
-#: standalone/drakgw:174
+#: standalone/drakgw:175
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr ""
 
-#: standalone/drakgw:194
+#: standalone/drakgw:195
 #, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -17851,27 +19049,27 @@ msgid ""
 "(LAN)."
 msgstr ""
 
-#: standalone/drakgw:237
+#: standalone/drakgw:239
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr ""
 
-#: standalone/drakgw:238
+#: standalone/drakgw:240
 #, c-format
 msgid "Interface %s"
 msgstr ""
 
-#: standalone/drakgw:247 standalone/drakpxe:137
+#: standalone/drakgw:249 standalone/drakpxe:137
 #, c-format
 msgid "No network adapter on your system!"
 msgstr ""
 
-#: standalone/drakgw:254
+#: standalone/drakgw:256
 #, c-format
 msgid "Network interface"
 msgstr "Nettverksgrensesnitt"
 
-#: standalone/drakgw:255
+#: standalone/drakgw:257
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -17881,19 +19079,24 @@ msgid ""
 "I am about to setup your Local Area Network with that adapter."
 msgstr ""
 
-#: standalone/drakgw:262
+#: standalone/drakgw:263 standalone/drakpxe:142
+#, c-format
+msgid "Choose the network interface"
+msgstr "Vel nettverksgrensesnitt"
+
+#: standalone/drakgw:264
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr ""
 
-#: standalone/drakgw:291
+#: standalone/drakgw:293
 #, c-format
 msgid "Network interface already configured"
 msgstr ""
 
-#: standalone/drakgw:292
+#: standalone/drakgw:294
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -17903,27 +19106,27 @@ msgid ""
 "You can do it manually but you need to know what you're doing."
 msgstr ""
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "Automatic reconfiguration"
 msgstr ""
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "No (experts only)"
 msgstr "Ingen (berre for ekspertar)"
 
-#: standalone/drakgw:298
+#: standalone/drakgw:300
 #, c-format
 msgid "Show current interface configuration"
 msgstr ""
 
-#: standalone/drakgw:299
+#: standalone/drakgw:301
 #, c-format
 msgid "Current interface configuration"
 msgstr ""
 
-#: standalone/drakgw:300
+#: standalone/drakgw:302
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -17934,7 +19137,7 @@ msgid ""
 "Driver: %s"
 msgstr ""
 
-#: standalone/drakgw:313
+#: standalone/drakgw:315
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
@@ -17950,12 +19153,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakgw:320
+#: standalone/drakgw:322
 #, c-format
 msgid "Local Network adress"
 msgstr ""
 
-#: standalone/drakgw:324
+#: standalone/drakgw:326
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -17964,72 +19167,72 @@ msgid ""
 "If you don't know the meaning of an option, simply leave it as it is."
 msgstr ""
 
-#: standalone/drakgw:328
+#: standalone/drakgw:330
 #, c-format
 msgid "(This) DHCP Server IP"
 msgstr ""
 
-#: standalone/drakgw:329
+#: standalone/drakgw:331
 #, c-format
 msgid "The DNS Server IP"
 msgstr "IP for DNS-tenar"
 
-#: standalone/drakgw:330
+#: standalone/drakgw:332
 #, c-format
 msgid "The internal domain name"
 msgstr ""
 
-#: standalone/drakgw:331
+#: standalone/drakgw:333
 #, c-format
 msgid "The DHCP start range"
 msgstr ""
 
-#: standalone/drakgw:332
+#: standalone/drakgw:334
 #, c-format
 msgid "The DHCP end range"
 msgstr ""
 
-#: standalone/drakgw:333
+#: standalone/drakgw:335
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr ""
 
-#: standalone/drakgw:334
+#: standalone/drakgw:336
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr ""
 
-#: standalone/drakgw:335
+#: standalone/drakgw:337
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr ""
 
-#: standalone/drakgw:342
+#: standalone/drakgw:344
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr ""
 
-#: standalone/drakgw:352
+#: standalone/drakgw:354
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr ""
 
-#: standalone/drakgw:362
+#: standalone/drakgw:364
 #, c-format
 msgid "Configuring..."
 msgstr ""
 
-#: standalone/drakgw:363
+#: standalone/drakgw:365
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr ""
 
-#: standalone/drakgw:403 standalone/drakpxe:231 standalone/drakvpn:278
+#: standalone/drakgw:405 standalone/drakpxe:231 standalone/drakvpn:278
 #, c-format
 msgid "Problems installing package %s"
 msgstr ""
 
-#: standalone/drakgw:599
+#: standalone/drakgw:601
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -18042,7 +19245,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 MandrakeSoft.\n"
+"Copyright (C) 2003-2004 Mandrakesoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -18067,56 +19270,63 @@ msgid ""
 "frontend)\n"
 msgstr ""
 
-#: standalone/drakhelp:35
+#: standalone/drakhelp:36
+#, c-format
+msgid "Mandrakelinux Help Center"
+msgstr "Mandrakelinux-hjelpesenter"
+
+#: standalone/drakhelp:36
 #, c-format
 msgid ""
 "%s cannot be displayed \n"
 ". No Help entry of this type\n"
 msgstr ""
 
-#: standalone/drakhelp:41
+#: standalone/drakhelp:42
 #, c-format
 msgid ""
 "No browser is installed on your system, Please install one if you want to "
 "browse the help system"
 msgstr ""
+"Du har nokon nettlesar installert på maskina di. Du er nøydd til å "
+"installera ein før du kan lesa hjelpetekstane."
 
-#: standalone/drakperm:21
+#: standalone/drakperm:22
 #, c-format
 msgid "System settings"
 msgstr ""
 
-#: standalone/drakperm:22
+#: standalone/drakperm:23
 #, c-format
 msgid "Custom settings"
 msgstr ""
 
-#: standalone/drakperm:23
+#: standalone/drakperm:24
 #, c-format
 msgid "Custom & system settings"
 msgstr ""
 
-#: standalone/drakperm:43
+#: standalone/drakperm:44
 #, c-format
 msgid "Editable"
 msgstr "Redigerbar"
 
-#: standalone/drakperm:48 standalone/drakperm:318
+#: standalone/drakperm:49 standalone/drakperm:321
 #, c-format
 msgid "Path"
 msgstr "Stig"
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, c-format
 msgid "User"
 msgstr "Brukar"
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, c-format
 msgid "Group"
 msgstr "Gruppe"
 
-#: standalone/drakperm:48 standalone/drakperm:330
+#: standalone/drakperm:49 standalone/drakperm:333
 #, c-format
 msgid "Permissions"
 msgstr "Løyve"
@@ -18172,9 +19382,9 @@ msgid "Delete selected rule"
 msgstr ""
 
 #. -PO: "Edit" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/drakperm:125 standalone/drakups:281 standalone/drakups:330
-#: standalone/drakups:350 standalone/drakvpn:333 standalone/drakvpn:694
-#: standalone/printerdrake:233
+#: standalone/drakperm:125 standalone/drakups:298 standalone/drakups:358
+#: standalone/drakups:378 standalone/drakvpn:333 standalone/drakvpn:694
+#: standalone/printerdrake:239
 #, c-format
 msgid "Edit"
 msgstr "Rediger"
@@ -18184,99 +19394,117 @@ msgstr "Rediger"
 msgid "Edit current rule"
 msgstr "Rediger gjeldande regel"
 
-#: standalone/drakperm:246
+#: standalone/drakperm:242
 #, c-format
 msgid "browse"
 msgstr ""
 
-#: standalone/drakperm:256
+#: standalone/drakperm:247
+#, c-format
+msgid "user"
+msgstr "brukar"
+
+#: standalone/drakperm:247
+#, c-format
+msgid "group"
+msgstr "gruppe"
+
+#: standalone/drakperm:247
+#, c-format
+msgid "other"
+msgstr "andre"
+
+#: standalone/drakperm:252
 #, c-format
 msgid "Read"
 msgstr "Les"
 
-#: standalone/drakperm:257
+#. -PO: here %s will be either "user", "group" or "other"
+#: standalone/drakperm:255
 #, c-format
 msgid "Enable \"%s\" to read the file"
 msgstr ""
 
-#: standalone/drakperm:260
+#: standalone/drakperm:259
 #, c-format
 msgid "Write"
 msgstr "Skriv"
 
-#: standalone/drakperm:261
+#. -PO: here %s will be either "user", "group" or "other"
+#: standalone/drakperm:262
 #, c-format
 msgid "Enable \"%s\" to write the file"
 msgstr ""
 
-#: standalone/drakperm:264
+#: standalone/drakperm:266
 #, c-format
 msgid "Execute"
 msgstr "Køyr"
 
-#: standalone/drakperm:265
+#. -PO: here %s will be either "user", "group" or "other"
+#: standalone/drakperm:269
 #, c-format
 msgid "Enable \"%s\" to execute the file"
 msgstr ""
 
-#: standalone/drakperm:267
+#: standalone/drakperm:272
 #, c-format
 msgid "Sticky-bit"
 msgstr ""
 
-#: standalone/drakperm:267
+#: standalone/drakperm:272
 #, c-format
 msgid ""
 "Used for directory:\n"
 " only owner of directory or file in this directory can delete it"
 msgstr ""
 
-#: standalone/drakperm:268
+#: standalone/drakperm:273
 #, c-format
 msgid "Set-UID"
 msgstr ""
 
-#: standalone/drakperm:268
+#: standalone/drakperm:273
 #, c-format
 msgid "Use owner id for execution"
 msgstr ""
 
-#: standalone/drakperm:269
+#: standalone/drakperm:274
 #, c-format
 msgid "Set-GID"
 msgstr ""
 
-#: standalone/drakperm:269
+#: standalone/drakperm:274
 #, c-format
 msgid "Use group id for execution"
 msgstr ""
 
-#: standalone/drakperm:287 standalone/drakxtv:87
+#: standalone/drakperm:290 standalone/drakxtv:89
 #, c-format
-msgid "User :"
+msgid "User:"
 msgstr "Brukar:"
 
-#: standalone/drakperm:289
+#: standalone/drakperm:292
 #, c-format
-msgid "Group :"
+msgid "Group:"
 msgstr "Gruppe:"
 
-#: standalone/drakperm:293
+#: standalone/drakperm:296
 #, c-format
 msgid "Current user"
 msgstr "Gjeldande brukar"
 
-#: standalone/drakperm:294
+#: standalone/drakperm:297
 #, c-format
 msgid "When checked, owner and group won't be changed"
 msgstr ""
 
-#: standalone/drakperm:304
+#: standalone/drakperm:307
 #, c-format
 msgid "Path selection"
 msgstr ""
 
-#: standalone/drakperm:324
+#: standalone/drakperm:327
 #, c-format
 msgid "Property"
 msgstr "Eigenskap"
@@ -18377,54 +19605,42 @@ msgstr ""
 msgid "Location of auto_install.cfg file"
 msgstr ""
 
-#: standalone/draksec:44
+#: standalone/draksec:49
 #, c-format
 msgid "ALL"
 msgstr "ALLE"
 
-#: standalone/draksec:44
+#: standalone/draksec:50
 #, c-format
 msgid "LOCAL"
 msgstr "LOKALT"
 
-#: standalone/draksec:44 standalone/drakvpn:1146
-#, c-format
-msgid "default"
-msgstr "standard"
-
-#: standalone/draksec:44
-#, c-format
-msgid "ignore"
-msgstr "ignorer"
-
-#: standalone/draksec:44
-#, c-format
-msgid "no"
-msgstr "nei"
-
-#: standalone/draksec:44
+#: standalone/draksec:53
 #, c-format
-msgid "yes"
-msgstr "ja"
+msgid "Ignore"
+msgstr "Ignorer"
 
-#. -PO: Do not alter the <span ..> and </span> tags
-#. -PO: Translate the security levels (Poor, Standard, High, Higher and Paranoid) in the same way, you translated these individuals words
-#: standalone/draksec:81
+#. -PO: Do not alter the <span ..> and </span> tags.
+#. -PO: Translate the security levels (Poor, Standard, High, Higher and Paranoid) in the same way, you translated these individuals words.
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX.
+#: standalone/draksec:101
 #, c-format
 msgid ""
 "Here, you can setup the security level and administrator of your machine.\n"
 "\n"
 "\n"
-"The Security Administrator is the one who will receive security alerts if "
-"the\n"
-"'Security Alerts' option is set. It can be a username or an email.\n"
+"The '<span weight=\"bold\">Security Administrator</span>' is the one who "
+"will receive security alerts if the\n"
+"'<span weight=\"bold\">Security Alerts</span>' option is set. It can be a "
+"username or an email.\n"
 "\n"
 "\n"
-"The Security Level menu allows you to select one of the six preconfigured "
-"security levels\n"
-"provided with msec. These levels range from poor security and ease of use, "
-"to\n"
-"paranoid config, suitable for very sensitive server applications:\n"
+"The '<span weight=\"bold\">Security Level</span>' menu allows you to select "
+"one of the six preconfigured security levels\n"
+"provided with msec. These levels range from '<span weight=\"bold\">poor</"
+"span>' security and ease of use, to\n"
+"'<span weight=\"bold\">paranoid</span>' config, suitable for very sensitive "
+"server applications:\n"
 "\n"
 "\n"
 "<span foreground=\"royalblue3\">Poor</span>: This is a totally unsafe but "
@@ -18459,59 +19675,56 @@ msgid ""
 "maximum"
 msgstr ""
 
-#: standalone/draksec:129
+#: standalone/draksec:154 standalone/harddrake2:184
+#, c-format
+msgid ""
+"Description of the fields:\n"
+"\n"
+msgstr ""
+"Feltbeskriving:\n"
+"\n"
+
+#: standalone/draksec:168
 #, c-format
 msgid "(default value: %s)"
 msgstr ""
 
-#: standalone/draksec:170
+#: standalone/draksec:210
 #, c-format
 msgid "Security Level:"
 msgstr "Tryggleiksnivå:"
 
-#: standalone/draksec:173
-#, c-format
-msgid "Security Alerts:"
-msgstr "Tryggleiksvarsel:"
-
-#: standalone/draksec:177
+#: standalone/draksec:217
 #, c-format
 msgid "Security Administrator:"
 msgstr "Tryggleiksansvarleg:"
 
-#: standalone/draksec:179
+#: standalone/draksec:219
 #, c-format
 msgid "Basic options"
 msgstr "Grunnleggjande val"
 
-#: standalone/draksec:192
-#, c-format
-msgid ""
-"The following options can be set to customize your\n"
-"system security. If you need an explanation, look at the help tooltip.\n"
-msgstr ""
-
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "Network Options"
 msgstr "Nettverksval"
 
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "System Options"
 msgstr "Systemval"
 
-#: standalone/draksec:240
+#: standalone/draksec:268
 #, c-format
 msgid "Periodic Checks"
 msgstr "Regelmessige kontrollar"
 
-#: standalone/draksec:258
+#: standalone/draksec:299
 #, c-format
 msgid "Please wait, setting security level..."
 msgstr ""
 
-#: standalone/draksec:264
+#: standalone/draksec:305
 #, c-format
 msgid "Please wait, setting security options..."
 msgstr ""
@@ -18521,7 +19734,8 @@ msgstr ""
 msgid "No Sound Card detected!"
 msgstr ""
 
-#: standalone/draksound:48
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: standalone/draksound:50
 #, c-format
 msgid ""
 "No Sound Card has been detected on your machine. Please verify that a Linux-"
@@ -18534,7 +19748,7 @@ msgid ""
 "http://www.linux-mandrake.com/en/hardware.php3"
 msgstr ""
 
-#: standalone/draksound:55
+#: standalone/draksound:57
 #, c-format
 msgid ""
 "\n"
@@ -18659,15 +19873,15 @@ msgstr "Vis logo på konsoll"
 msgid "Make kernel message quiet by default"
 msgstr ""
 
-#: standalone/draksplash:161 standalone/draksplash:319
-#: standalone/draksplash:464
+#: standalone/draksplash:161 standalone/draksplash:309
+#: standalone/draksplash:454
 #, c-format
 msgid "Notice"
 msgstr "Merknad"
 
-#: standalone/draksplash:161 standalone/draksplash:319
+#: standalone/draksplash:161 standalone/draksplash:309
 #, c-format
-msgid "This theme does not yet have a bootsplash in %s !"
+msgid "This theme does not yet have a bootsplash in %s!"
 msgstr ""
 
 #: standalone/draksplash:167
@@ -18680,183 +19894,193 @@ msgstr "vel bilete"
 msgid "saving Bootsplash theme..."
 msgstr "vel oppstartstema ..."
 
-#: standalone/draksplash:445
+#: standalone/draksplash:435
 #, c-format
 msgid "ProgressBar color selection"
 msgstr ""
 
-#: standalone/draksplash:464
+#: standalone/draksplash:454
 #, c-format
 msgid "You must choose an image file first!"
 msgstr ""
 
-#: standalone/draksplash:469
+#: standalone/draksplash:459
 #, c-format
-msgid "Generating preview ..."
+msgid "Generating preview..."
 msgstr "Gjer klar førehandsvising ..."
 
 #. -PO:  First %s is theme name, second %s (in parenthesis) is resolution
-#: standalone/draksplash:515
+#: standalone/draksplash:497
 #, c-format
 msgid "%s BootSplash (%s) preview"
 msgstr ""
 
-#: standalone/drakups:63
+#. -PO: Do not alter the <span ..> and </span> tags
+#: standalone/draksplash:503
+#, c-format
+msgid ""
+"The image \"%s\" cannot be load due to the following issue:\n"
+"\n"
+"<span foreground=\"Red\">%s</span>"
+msgstr ""
+
+#: standalone/drakups:74
 #, c-format
 msgid "Connected through a serial port or an usb cable"
 msgstr ""
 
-#: standalone/drakups:69
+#: standalone/drakups:80
 #, c-format
 msgid "Add an UPS device"
 msgstr "Legg til UPS-eining"
 
-#: standalone/drakups:72
+#: standalone/drakups:83
 #, c-format
 msgid ""
 "Welcome to the UPS configuration utility.\n"
 "\n"
-"Here, you'll be add a new UPS to your system.\n"
+"Here, you'll add a new UPS to your system.\n"
 msgstr ""
 
-#: standalone/drakups:79
+#: standalone/drakups:90
 #, c-format
 msgid ""
 "We're going to add an UPS device.\n"
 "\n"
-"Do you prefer autodetect UPS devices connected to this machine or  ?"
+"Do you want to autodetect UPS devices connected to this machine or to "
+"manually select them?"
 msgstr ""
 
-#: standalone/drakups:82
+#: standalone/drakups:93
 #, c-format
 msgid "Autodetection"
 msgstr "Oppdag automatisk"
 
-#: standalone/drakups:90 standalone/harddrake2:140
+#: standalone/drakups:101 standalone/harddrake2:211
 #, c-format
 msgid "Detection in progress"
 msgstr ""
 
-#: standalone/drakups:108 standalone/drakups:144 standalone/logdrake:479
-#: standalone/logdrake:485
+#: standalone/drakups:120 standalone/drakups:156 standalone/logdrake:449
+#: standalone/logdrake:455
 #, c-format
 msgid "Congratulations"
 msgstr "Gratulerer"
 
-#: standalone/drakups:109
+#: standalone/drakups:121
 #, c-format
 msgid "The wizard successfully added the following UPS devices:"
 msgstr ""
 
-#: standalone/drakups:111
+#: standalone/drakups:123
 #, c-format
 msgid "No new UPS devices was found"
 msgstr "Fann ingen nye UPS-einingar"
 
-#: standalone/drakups:116 standalone/drakups:128
+#: standalone/drakups:128 standalone/drakups:140
 #, c-format
 msgid "UPS driver configuration"
 msgstr "UPS-drivaroppsett"
 
-#: standalone/drakups:116
+#: standalone/drakups:128
 #, c-format
 msgid "Please select your UPS model."
 msgstr "Vel UPS-modell."
 
-#: standalone/drakups:117
+#: standalone/drakups:129
 #, c-format
 msgid "Manufacturer / Model:"
 msgstr ""
 
-#: standalone/drakups:128
+#: standalone/drakups:140
 #, c-format
 msgid ""
 "We are configuring the \"%s\" UPS from \"%s\".\n"
 "Please fill in its name, its driver and its port."
 msgstr ""
 
-#: standalone/drakups:133
+#: standalone/drakups:145
 #, c-format
 msgid "Name:"
 msgstr "Namn:"
 
-#: standalone/drakups:133
+#: standalone/drakups:145
 #, c-format
 msgid "The name of your ups"
 msgstr "NAmnet på UPS-en"
 
-#: standalone/drakups:134
+#: standalone/drakups:146
 #, c-format
-msgid "The driver that manage your ups"
+msgid "The driver that manages your ups"
 msgstr ""
 
-#: standalone/drakups:135
+#: standalone/drakups:147
 #, c-format
 msgid "Port:"
 msgstr "Port:"
 
-#: standalone/drakups:137
+#: standalone/drakups:149
 #, c-format
 msgid "The port on which is connected your ups"
 msgstr ""
 
-#: standalone/drakups:144
+#: standalone/drakups:156
 #, c-format
 msgid "The wizard successfully configured the new \"%s\" UPS device."
 msgstr ""
 
-#: standalone/drakups:232
+#: standalone/drakups:246
 #, c-format
 msgid "UPS devices"
 msgstr "UPS-einingar"
 
-#: standalone/drakups:233 standalone/drakups:251 standalone/drakups:266
-#: standalone/harddrake2:67
+#: standalone/drakups:247 standalone/drakups:266 standalone/drakups:282
+#: standalone/harddrake2:80 standalone/harddrake2:102
 #, c-format
 msgid "Name"
 msgstr "Namn"
 
-#: standalone/drakups:250
+#: standalone/drakups:265
 #, c-format
 msgid "UPS users"
 msgstr "UPS-brukarar"
 
-#: standalone/drakups:265
+#: standalone/drakups:281
 #, c-format
 msgid "Access Control Lists"
 msgstr "Tilgangskontrollister"
 
-#: standalone/drakups:266
+#: standalone/drakups:282
 #, c-format
 msgid "IP mask"
 msgstr "IP-maske"
 
-#: standalone/drakups:277
+#: standalone/drakups:294
 #, c-format
 msgid "Rules"
 msgstr "Reglar"
 
-#: standalone/drakups:278
+#: standalone/drakups:295
 #, c-format
 msgid "Action"
 msgstr "Handling"
 
-#: standalone/drakups:278 standalone/drakvpn:1146 standalone/harddrake2:61
+#: standalone/drakups:295 standalone/drakvpn:1146 standalone/harddrake2:77
 #, c-format
 msgid "Level"
 msgstr "Nivå"
 
-#: standalone/drakups:278
+#: standalone/drakups:295
 #, c-format
 msgid "ACL name"
 msgstr "ACL-namn?"
 
-#: standalone/drakups:297 standalone/drakups:301 standalone/drakups:310
+#: standalone/drakups:325 standalone/drakups:329 standalone/drakups:338
 #, c-format
 msgid "DrakUPS"
 msgstr "DrakUPS"
 
-#: standalone/drakups:307
+#: standalone/drakups:335
 #, c-format
 msgid "Welcome to the UPS configuration tools"
 msgstr "Velkommen til UPS-oppsettverktøya"
@@ -18878,7 +20102,7 @@ msgid ""
 "\n"
 "It's currently enabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 
 #: standalone/drakvpn:105
@@ -18903,7 +20127,7 @@ msgid ""
 "\n"
 "It's currently disabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 
 #: standalone/drakvpn:135
@@ -18961,7 +20185,7 @@ msgstr ""
 #: standalone/drakvpn:197
 #, c-format
 msgid ""
-"The kernel need to have ipsec support.\n"
+"The kernel needs to have ipsec support.\n"
 "\n"
 "You're running a %s kernel version.\n"
 "\n"
@@ -18986,13 +20210,13 @@ msgstr "Oppsettsfil"
 #: standalone/drakvpn:296
 #, c-format
 msgid ""
-"Configuration step !\n"
+"Configuration step!\n"
 "\n"
 "You need to define the Security Policies and then to \n"
 "configure the automatic key exchange (IKE) daemon. \n"
 "The KAME IKE daemon we're using is called 'racoon'.\n"
 "\n"
-"What would you like to configure ?\n"
+"What would you like to configure?\n"
 msgstr ""
 
 #: standalone/drakvpn:307
@@ -19015,12 +20239,12 @@ msgid ""
 "The %s file contents\n"
 "is divided into sections.\n"
 "\n"
-"You can now :\n"
+"You can now:\n"
 "\n"
 "  - display, add, edit, or remove sections, then\n"
 "  - commit the changes\n"
 "\n"
-"What would you like to do ?\n"
+"What would you like to do?\n"
 msgstr ""
 
 #: standalone/drakvpn:333 standalone/drakvpn:694
@@ -19063,7 +20287,7 @@ msgstr "ipsec.conf-oppføringar"
 msgid ""
 "The %s file contains different sections.\n"
 "\n"
-"Here is its skeleton :\t'config setup' \n"
+"Here is its skeleton:\t'config setup' \n"
 "\t\t\t\t\t'conn default' \n"
 "\t\t\t\t\t'normal1'\n"
 "\t\t\t\t\t'normal2' \n"
@@ -19090,7 +20314,7 @@ msgstr ""
 
 #: standalone/drakvpn:382 standalone/drakvpn:423 standalone/drakvpn:510
 #, c-format
-msgid "Exists !"
+msgid "Exists!"
 msgstr "Finst allereie."
 
 #: standalone/drakvpn:383 standalone/drakvpn:424
@@ -19294,7 +20518,7 @@ msgstr "Avsnittsnamn"
 
 #: standalone/drakvpn:590
 #, c-format
-msgid "Can't edit !"
+msgid "Can't edit!"
 msgstr "Kan ikkje redigera."
 
 #: standalone/drakvpn:591
@@ -19302,10 +20526,10 @@ msgstr "Kan ikkje redigera."
 msgid ""
 "You cannot edit this section.\n"
 "\n"
-"This section is mandatory for Freswan 2.X.\n"
+"This section is mandatory for Freeswan 2.X.\n"
 "One has to specify version 2.0 on the top\n"
 "of the %s file, and eventually, disable or\n"
-"enable the oportunistic encryption.\n"
+"enable the opportunistic encryption.\n"
 msgstr ""
 
 #: standalone/drakvpn:600
@@ -19341,7 +20565,7 @@ msgstr ""
 msgid ""
 "Edit a Security Policy.\n"
 "\n"
-"You can now add a Security Policy.\n"
+"You can now edit a Security Policy.\n"
 "\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
@@ -19366,7 +20590,7 @@ msgid ""
 "The racoon.conf file configuration.\n"
 "\n"
 "The contents of this file is divided into sections.\n"
-"You can now :\n"
+"You can now:\n"
 "  - display \t\t (display the file contents)\n"
 "  - add\t\t\t (add one section)\n"
 "  - edit \t\t\t (modify parameters of an existing section)\n"
@@ -19394,7 +20618,7 @@ msgstr ""
 msgid ""
 "The 'add' sections step.\n"
 "\n"
-"Here below is the racoon.conf file skeleton :\n"
+"Here below is the racoon.conf file skeleton:\n"
 "\t'path'\n"
 "\t'remote'\n"
 "\t'sainfo' \n"
@@ -19435,23 +20659,23 @@ msgstr "stigtype"
 #: standalone/drakvpn:750
 #, c-format
 msgid ""
-"path include path : specifies a path to include\n"
+"path include path: specifies a path to include\n"
 "a file. See File Inclusion.\n"
 "\tExample: path include '/etc/racoon'\n"
 "\n"
-"path pre_shared_key file : specifies a file containing\n"
+"path pre_shared_key file: specifies a file containing\n"
 "pre-shared key(s) for various ID(s). See Pre-shared key File.\n"
 "\tExample: path pre_shared_key '/etc/racoon/psk.txt' ;\n"
 "\n"
-"path certificate path : racoon(8) will search this directory\n"
+"path certificate path: racoon(8) will search this directory\n"
 "if a certificate or certificate request is received.\n"
 "\tExample: path certificate '/etc/cert' ;\n"
 "\n"
-"File Inclusion : include file \n"
+"File Inclusion: include file \n"
 "other configuration files can be included.\n"
 "\tExample: include \"remote.conf\" ;\n"
 "\n"
-"Pre-shared key File : Pre-shared key file defines a pair\n"
+"Pre-shared key File: Pre-shared key file defines a pair\n"
 "of the identifier and the shared secret key which are used at\n"
 "Pre-shared key authentication method in phase 1."
 msgstr ""
@@ -19558,7 +20782,7 @@ msgid ""
 "\n"
 "\taddress address [/ prefix] [[port]] ul_proto\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "sainfo anonymous (accepts connections from anywhere)\n"
 "\tleave blank this entry if you want anonymous\n"
@@ -19586,7 +20810,7 @@ msgid ""
 "\n"
 "\taddress address [/ prefix] [[port]] ul_proto\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "sainfo anonymous (accepts connections from anywhere)\n"
 "\tleave blank this entry if you want anonymous\n"
@@ -19611,7 +20835,7 @@ msgid ""
 "\n"
 "\taddress address [/ prefix] [[port]] ul_proto\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "sainfo anonymous (accepts connections from anywhere)\n"
 "\tleave blank this entry if you want anonymous\n"
@@ -19639,7 +20863,7 @@ msgid ""
 "\n"
 "\taddress address [/ prefix] [[port]] ul_proto\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "sainfo anonymous (accepts connections from anywhere)\n"
 "\tleave blank this entry if you want anonymous\n"
@@ -19659,7 +20883,7 @@ msgid ""
 "define the group of Diffie-Hellman exponentiations.\n"
 "If you do not require PFS then you can omit this directive.\n"
 "Any proposal will be accepted if you do not specify one.\n"
-"group is one of following: modp768, modp1024, modp1536.\n"
+"group is one of the following: modp768, modp1024, modp1536.\n"
 "Or you can define 1, 2, or 5 as the DH group number."
 msgstr ""
 
@@ -19673,11 +20897,11 @@ msgstr "Levetidsnummer"
 msgid ""
 "define a lifetime of a certain time which will be pro-\n"
 "posed in the phase 1 negotiations.  Any proposal will be\n"
-"accepted, and the attribute(s) will be not proposed to\n"
+"accepted, and the attribute(s) will not be proposed to\n"
 "the peer if you do not specify it(them).  They can be\n"
 "individually specified in each proposal.\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "        lifetime time 1 min;    # sec,min,hour\n"
 "        lifetime time 1 min;    # sec,min,hour\n"
@@ -19699,18 +20923,18 @@ msgstr "Levetidseining"
 msgid ""
 "define a lifetime of a certain time which will be pro-\n"
 "posed in the phase 1 negotiations.  Any proposal will be\n"
-"accepted, and the attribute(s) will be not proposed to\n"
+"accepted, and the attribute(s) will not be proposed to\n"
 "the peer if you do not specify it(them).  They can be\n"
 "individually specified in each proposal.\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "        lifetime time 1 min;    # sec,min,hour\n"
 "        lifetime time 1 min;    # sec,min,hour\n"
 "        lifetime time 30 sec;\n"
 "        lifetime time 30 sec;\n"
 "        lifetime time 60 sec;\n"
-"\tlifetime time 12 hour ;\n"
+"\tlifetime time 12 hour;\n"
 "\n"
 "So, here, the lifetime units are 'min', 'min', 'sec', 'sec', 'sec' and "
 "'hour'.\n"
@@ -19750,7 +20974,7 @@ msgid ""
 "ments apply to all peers which do not match any other remote\n"
 "directive.\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "remote anonymous\n"
 "remote ::1 [8000]"
@@ -19875,7 +21099,7 @@ msgstr "Min identifikator"
 #, c-format
 msgid ""
 "specifies the identifier sent to the remote host and the\n"
-"type to use in the phase 1 negotiation.  address, fqdn,\n"
+"type to use in the phase 1 negotiation.  address, FQDN,\n"
 "user_fqdn, keyid and asn1dn can be used as an idtype.\n"
 "they are used like:\n"
 "\tmy_identifier address [address];\n"
@@ -19884,7 +21108,7 @@ msgid ""
 "\tmy_identifier user_fqdn string;\n"
 "\t\tthe type is a USER_FQDN (user fully-qualified\n"
 "\t\tdomain name).\n"
-"\tmy_identifier fqdn string;\n"
+"\tmy_identifier FQDN string;\n"
 "\t\tthe type is a FQDN (fully-qualified domain name).\n"
 "\tmy_identifier keyid file;\n"
 "\t\tthe type is a KEY_ID.\n"
@@ -19893,7 +21117,7 @@ msgid ""
 "\t\tstring is omitted, racoon(8) will get DN from\n"
 "\t\tSubject field in the certificate.\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "my_identifier user_fqdn \"myemail@mydomain.com\""
 msgstr ""
@@ -19913,9 +21137,9 @@ msgstr "Forslag"
 msgid ""
 "specify the encryption algorithm used for the\n"
 "phase 1 negotiation. This directive must be defined. \n"
-"algorithm is one of following: \n"
+"algorithm is one of the following: \n"
 "\n"
-"des, 3des, blowfish, cast128 for oakley.\n"
+"DES, 3DES, blowfish, cast128 for oakley.\n"
 "\n"
 "For other transforms, this statement should not be used."
 msgstr ""
@@ -20012,6 +21236,11 @@ msgstr "treng"
 
 #: standalone/drakvpn:1146
 #, c-format
+msgid "default"
+msgstr "standard"
+
+#: standalone/drakvpn:1146
+#, c-format
 msgid "use"
 msgstr "bruk"
 
@@ -20020,114 +21249,115 @@ msgstr "bruk"
 msgid "unique"
 msgstr "unik"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (broadcast)"
 msgstr "USA (kringkasting)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable)"
 msgstr "USA (kabel)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable-hrc)"
 msgstr ""
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "Canada (cable)"
 msgstr "Canada (kabel)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (broadcast)"
 msgstr "Japan (kringkasting)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (cable)"
 msgstr "Japan (kabel)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "China (broadcast)"
 msgstr "Kina (kringkasting)"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "West Europe"
 msgstr "Vest-Europa"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "East Europe"
 msgstr "Aust-Europa"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "France [SECAM]"
 msgstr "Frankrike [SECAM]"
 
-#: standalone/drakxtv:46
+#: standalone/drakxtv:48
 #, c-format
 msgid "Newzealand"
 msgstr "New Zealand"
 
-#: standalone/drakxtv:49
+#: standalone/drakxtv:51
 #, c-format
 msgid "Australian Optus cable TV"
 msgstr ""
 
-#: standalone/drakxtv:83
+#: standalone/drakxtv:85
 #, c-format
 msgid ""
 "Please,\n"
 "type in your tv norm and country"
 msgstr ""
 
-#: standalone/drakxtv:85
+#: standalone/drakxtv:87
 #, c-format
 msgid "TV norm:"
 msgstr "TV-standard:"
 
-#: standalone/drakxtv:86
+#: standalone/drakxtv:88
 #, c-format
 msgid "Area:"
 msgstr "Område:"
 
-#: standalone/drakxtv:91
+#: standalone/drakxtv:93
 #, c-format
-msgid "Scanning for TV channels in progress ..."
+msgid "Scanning for TV channels in progress..."
 msgstr "Søkjer etter fjernsynskanalar ..."
 
-#: standalone/drakxtv:101
+#: standalone/drakxtv:103
 #, c-format
 msgid "Scanning for TV channels"
 msgstr "Søkjer etter fjernsynskanalar"
 
-#: standalone/drakxtv:105
+#: standalone/drakxtv:107
 #, c-format
 msgid "There was an error while scanning for TV channels"
 msgstr "Det oppstod ein feil ved søk etter fjernsynskanalar"
 
-#: standalone/drakxtv:108
+#: standalone/drakxtv:110
 #, c-format
 msgid "Have a nice day!"
 msgstr "Ha ein flott dag!"
 
-#: standalone/drakxtv:109
+#: standalone/drakxtv:111
 #, c-format
 msgid "Now, you can run xawtv (under X Window!) !\n"
 msgstr "No kan du køyra xawtv (under X).\n"
 
-#: standalone/drakxtv:132
+#: standalone/drakxtv:134
 #, c-format
 msgid "No TV Card detected!"
 msgstr "Fann ikkje noko fjernsynskort."
 
-#: standalone/drakxtv:133
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: standalone/drakxtv:136
 #, c-format
 msgid ""
 "No TV Card has been detected on your machine. Please verify that a Linux-"
@@ -20140,46 +21370,23 @@ msgid ""
 "http://www.linux-mandrake.com/en/hardware.php3"
 msgstr ""
 
-#: standalone/harddrake2:18
+#: standalone/harddrake2:20
 #, c-format
 msgid "Alternative drivers"
 msgstr "Alternative drivarar"
 
-#: standalone/harddrake2:19
+#: standalone/harddrake2:21
 #, c-format
 msgid "the list of alternative drivers for this sound card"
 msgstr "oversikta over alternative drivarar for lydkortet"
 
-#: standalone/harddrake2:22
-#, c-format
-msgid ""
-"this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
-msgstr ""
-
-#: standalone/harddrake2:23
-#, c-format
-msgid "Channel"
-msgstr "Kanal"
-
-#: standalone/harddrake2:23
-#, c-format
-msgid "EIDE/SCSI channel"
-msgstr "EIDE/SCSI-kanal"
-
-#: standalone/harddrake2:24
-#, c-format
-msgid "Bogomips"
-msgstr ""
-
 #: standalone/harddrake2:24
 #, c-format
 msgid ""
-"the GNU/Linux kernel needs to run a calculation loop at boot time to "
-"initialize a timer counter.  Its result is stored as bogomips as a way to "
-"\"benchmark\" the cpu."
+"this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
 msgstr ""
 
-#: standalone/harddrake2:26
+#: standalone/harddrake2:26 standalone/harddrake2:130
 #, c-format
 msgid "Bus identification"
 msgstr "Bussidentifisering"
@@ -20201,611 +21408,828 @@ msgstr ""
 
 #: standalone/harddrake2:33
 #, c-format
-msgid "Cache size"
-msgstr ""
+msgid "Drive capacity"
+msgstr "Diskkapasitet"
 
 #: standalone/harddrake2:33
 #, c-format
-msgid "size of the (second level) cpu cache"
+msgid "special capacities of the driver (burning ability and or DVD support)"
 msgstr ""
 
 #: standalone/harddrake2:34
 #, c-format
-msgid "Drive capacity"
-msgstr "Diskkapasitet"
+msgid "this field describes the device"
+msgstr ""
 
-#: standalone/harddrake2:34
+#: standalone/harddrake2:35
 #, c-format
-msgid "special capacities of the driver (burning ability and or DVD support)"
-msgstr ""
+msgid "Old device file"
+msgstr "Gammal einingsfil"
 
-#. -PO: here "comas" is the medical coma, not the lexical coma!!
-#: standalone/harddrake2:37
+#: standalone/harddrake2:36
 #, c-format
-msgid "Coma bug"
+msgid "old static device name used in dev package"
 msgstr ""
 
 #: standalone/harddrake2:37
 #, c-format
-msgid "whether this cpu has the Cyrix 6x86 Coma bug"
-msgstr ""
+msgid "New devfs device"
+msgstr "Ny devfs-eining"
 
 #: standalone/harddrake2:38
 #, c-format
-msgid "Cpuid family"
+msgid "new dynamic device name generated by core kernel devfs"
 msgstr ""
 
-#: standalone/harddrake2:38
+#. -PO: here "module" is the "jargon term" for a kernel driver
+#: standalone/harddrake2:41
 #, c-format
-msgid "family of the cpu (eg: 6 for i686 class)"
-msgstr ""
+msgid "Module"
+msgstr "Modul"
 
-#: standalone/harddrake2:39
+#: standalone/harddrake2:41
 #, c-format
-msgid "Cpuid level"
+msgid "the module of the GNU/Linux kernel that handles the device"
 msgstr ""
 
-#: standalone/harddrake2:39
+#: standalone/harddrake2:42
 #, c-format
-msgid "information level that can be obtained through the cpuid instruction"
-msgstr ""
+msgid "Extended partitions"
+msgstr "Utvida partisjonar"
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:42
 #, c-format
-msgid "Frequency (MHz)"
-msgstr "Frekvens (MHz)"
+msgid "the number of extended partitions"
+msgstr "talet på utvida partisjonar"
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:43
 #, c-format
-msgid ""
-"the CPU frequency in MHz (Megahertz which in first approximation may be "
-"coarsely assimilated to number of instructions the cpu is able to execute "
-"per second)"
-msgstr ""
+msgid "Geometry"
+msgstr "Geometri"
 
-#: standalone/harddrake2:41
+#: standalone/harddrake2:43
 #, c-format
-msgid "this field describes the device"
+msgid "Cylinder/head/sectors geometry of the disk"
 msgstr ""
 
-#: standalone/harddrake2:42
-#, c-format
-msgid "Old device file"
-msgstr "Gammal einingsfil"
-
-#: standalone/harddrake2:43
+#: standalone/harddrake2:44
 #, c-format
-msgid "old static device name used in dev package"
-msgstr ""
+msgid "Disk controller"
+msgstr "Diskkontrollar"
 
 #: standalone/harddrake2:44
 #, c-format
-msgid "New devfs device"
-msgstr "Ny devfs-eining"
+msgid "the disk controller on the host side"
+msgstr ""
 
 #: standalone/harddrake2:45
 #, c-format
-msgid "new dynamic device name generated by core kernel devfs"
+msgid "class of hardware device"
 msgstr ""
 
-#. -PO: here "module" is the "jargon term" for a kernel driver
-#: standalone/harddrake2:48
+#: standalone/harddrake2:46 standalone/harddrake2:78
+#: standalone/printerdrake:218
 #, c-format
-msgid "Module"
-msgstr "Modul"
+msgid "Model"
+msgstr "Modell"
+
+#: standalone/harddrake2:46
+#, c-format
+msgid "hard disk model"
+msgstr "Harddiskmodell"
+
+#: standalone/harddrake2:47
+#, c-format
+msgid "network printer port"
+msgstr "Nettverksskrivarport"
 
 #: standalone/harddrake2:48
 #, c-format
-msgid "the module of the GNU/Linux kernel that handles the device"
-msgstr ""
+msgid "Primary partitions"
+msgstr "Primærpartisjonar"
 
-#: standalone/harddrake2:49
+#: standalone/harddrake2:48
 #, c-format
-msgid "Extended partitions"
-msgstr "Utvida partisjonar"
+msgid "the number of the primary partitions"
+msgstr "talet på primærpartisjonar"
 
 #: standalone/harddrake2:49
 #, c-format
-msgid "the number of extended partitions"
-msgstr "talet på utvida partisjonar"
+msgid "the vendor name of the device"
+msgstr ""
 
 #: standalone/harddrake2:50
 #, c-format
-msgid "Flags"
-msgstr "Flagg"
+msgid "Bus PCI #"
+msgstr ""
 
 #: standalone/harddrake2:50
 #, c-format
-msgid "CPU flags reported by the kernel"
+msgid "the PCI bus on which the device is plugged"
 msgstr ""
 
 #: standalone/harddrake2:51
 #, c-format
-msgid "Fdiv bug"
-msgstr ""
+msgid "PCI device #"
+msgstr "PSCI-eining"
+
+#: standalone/harddrake2:51
+#, c-format
+msgid "PCI device number"
+msgstr "PCI-einingsnummer"
 
 #: standalone/harddrake2:52
 #, c-format
-msgid ""
-"Early Intel Pentium chips manufactured have a bug in their floating point "
-"processor which did not achieve the required precision when performing a "
-"Floating point DIVision (FDIV)"
+msgid "PCI function #"
 msgstr ""
 
+#: standalone/harddrake2:52
+#, c-format
+msgid "PCI function number"
+msgstr "PCI-funksjonsnummer"
+
 #: standalone/harddrake2:53
 #, c-format
-msgid "Is FPU present"
-msgstr "Finst FPU"
+msgid "Vendor ID"
+msgstr "Produsent-ID"
 
 #: standalone/harddrake2:53
 #, c-format
-msgid "yes means the processor has an arithmetic coprocessor"
+msgid "this is the standard numerical identifier of the vendor"
 msgstr ""
 
 #: standalone/harddrake2:54
 #, c-format
-msgid "Whether the FPU has an irq vector"
-msgstr ""
+msgid "Device ID"
+msgstr "Einings-ID"
 
 #: standalone/harddrake2:54
 #, c-format
-msgid "yes means the arithmetic coprocessor has an exception vector attached"
+msgid "this is the numerical identifier of the device"
 msgstr ""
 
 #: standalone/harddrake2:55
 #, c-format
-msgid "F00f bug"
-msgstr "F00f-feil"
+msgid "Sub vendor ID"
+msgstr ""
 
 #: standalone/harddrake2:55
 #, c-format
-msgid "early pentiums were buggy and freezed when decoding the F00F bytecode"
+msgid "this is the minor numerical identifier of the vendor"
 msgstr ""
 
 #: standalone/harddrake2:56
 #, c-format
-msgid "Geometry"
-msgstr "Geometri"
+msgid "Sub device ID"
+msgstr "Undereinings-ID"
 
 #: standalone/harddrake2:56
 #, c-format
-msgid "Cylinder/head/sectors geometry of the disk"
+msgid "this is the minor numerical identifier of the device"
 msgstr ""
 
 #: standalone/harddrake2:57
 #, c-format
-msgid "Halt bug"
-msgstr ""
+msgid "Device USB ID"
+msgstr "USB-ID til eining"
 
-#: standalone/harddrake2:58
+#: standalone/harddrake2:57
 #, c-format
-msgid ""
-"Some of the early i486DX-100 chips cannot reliably return to operating mode "
-"after the \"halt\" instruction is used"
+msgid ".."
 msgstr ""
 
-#: standalone/harddrake2:60
-#, c-format
-msgid "Floppy format"
-msgstr "Diskettformat"
-
-#: standalone/harddrake2:60
+#: standalone/harddrake2:61
 #, c-format
-msgid "format of floppies supported by the drive"
+msgid "Bogomips"
 msgstr ""
 
 #: standalone/harddrake2:61
 #, c-format
-msgid "sub generation of the cpu"
+msgid ""
+"the GNU/Linux kernel needs to run a calculation loop at boot time to "
+"initialize a timer counter.  Its result is stored as bogomips as a way to "
+"\"benchmark\" the cpu."
 msgstr ""
 
 #: standalone/harddrake2:62
 #, c-format
-msgid "class of hardware device"
+msgid "Cache size"
 msgstr ""
 
-#: standalone/harddrake2:63 standalone/harddrake2:64
-#: standalone/printerdrake:212
-#, c-format
-msgid "Model"
-msgstr "Modell"
-
-#: standalone/harddrake2:63
-#, c-format
-msgid "hard disk model"
-msgstr "Harddiskmodell"
-
-#: standalone/harddrake2:64
+#: standalone/harddrake2:62
 #, c-format
-msgid "generation of the cpu (eg: 8 for PentiumIII, ...)"
+msgid "size of the (second level) cpu cache"
 msgstr ""
 
+#. -PO: here "comas" is the medical coma, not the lexical coma!!
 #: standalone/harddrake2:65
 #, c-format
-msgid "Model name"
-msgstr "Modellnamn"
+msgid "Coma bug"
+msgstr ""
 
 #: standalone/harddrake2:65
 #, c-format
-msgid "official vendor name of the cpu"
-msgstr "Offisiell prosessorprodusent"
+msgid "whether this cpu has the Cyrix 6x86 Coma bug"
+msgstr ""
 
 #: standalone/harddrake2:66
 #, c-format
-msgid "Number of buttons"
-msgstr "Talet på knappar"
+msgid "Cpuid family"
+msgstr ""
 
 #: standalone/harddrake2:66
 #, c-format
-msgid "the number of buttons the mouse has"
-msgstr "talet på knappar på musa"
+msgid "family of the cpu (eg: 6 for i686 class)"
+msgstr ""
 
 #: standalone/harddrake2:67
 #, c-format
-msgid "the name of the CPU"
-msgstr "Namnet på prosessoren"
+msgid "Cpuid level"
+msgstr ""
+
+#: standalone/harddrake2:67
+#, c-format
+msgid "information level that can be obtained through the cpuid instruction"
+msgstr ""
 
 #: standalone/harddrake2:68
 #, c-format
-msgid "network printer port"
-msgstr "Nettverksskrivarport"
+msgid "Frequency (MHz)"
+msgstr "Frekvens (MHz)"
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:68
 #, c-format
-msgid "Processor ID"
-msgstr "Prosessor-ID"
+msgid ""
+"the CPU frequency in MHz (Megahertz which in first approximation may be "
+"coarsely assimilated to number of instructions the cpu is able to execute "
+"per second)"
+msgstr ""
 
 #: standalone/harddrake2:69
 #, c-format
-msgid "the number of the processor"
-msgstr ""
+msgid "Flags"
+msgstr "Flagg"
 
-#: standalone/harddrake2:70
+#: standalone/harddrake2:69
 #, c-format
-msgid "Primary partitions"
-msgstr "Primærpartisjonar"
+msgid "CPU flags reported by the kernel"
+msgstr ""
 
 #: standalone/harddrake2:70
 #, c-format
-msgid "the number of the primary partitions"
-msgstr "talet på primærpartisjonar"
+msgid "Fdiv bug"
+msgstr ""
 
 #: standalone/harddrake2:71
 #, c-format
-msgid "Model stepping"
+msgid ""
+"Early Intel Pentium chips manufactured have a bug in their floating point "
+"processor which did not achieve the required precision when performing a "
+"Floating point DIVision (FDIV)"
 msgstr ""
 
-#: standalone/harddrake2:71
+#: standalone/harddrake2:72
 #, c-format
-msgid "stepping of the cpu (sub model (generation) number)"
-msgstr ""
+msgid "Is FPU present"
+msgstr "Finst FPU"
 
 #: standalone/harddrake2:72
 #, c-format
-msgid "the type of bus on which the mouse is connected"
+msgid "yes means the processor has an arithmetic coprocessor"
 msgstr ""
 
 #: standalone/harddrake2:73
 #, c-format
-msgid "the vendor name of the device"
+msgid "Whether the FPU has an irq vector"
+msgstr ""
+
+#: standalone/harddrake2:73
+#, c-format
+msgid "yes means the arithmetic coprocessor has an exception vector attached"
 msgstr ""
 
 #: standalone/harddrake2:74
 #, c-format
-msgid "the vendor name of the processor"
+msgid "F00f bug"
+msgstr "F00f-feil"
+
+#: standalone/harddrake2:74
+#, c-format
+msgid "early pentiums were buggy and freezed when decoding the F00F bytecode"
 msgstr ""
 
 #: standalone/harddrake2:75
 #, c-format
+msgid "Halt bug"
+msgstr ""
+
+#: standalone/harddrake2:76
+#, c-format
+msgid ""
+"Some of the early i486DX-100 chips cannot reliably return to operating mode "
+"after the \"halt\" instruction is used"
+msgstr ""
+
+#: standalone/harddrake2:77
+#, c-format
+msgid "sub generation of the cpu"
+msgstr ""
+
+#: standalone/harddrake2:78
+#, c-format
+msgid "generation of the cpu (eg: 8 for Pentium III, ...)"
+msgstr ""
+
+#: standalone/harddrake2:79
+#, c-format
+msgid "Model name"
+msgstr "Modellnamn"
+
+#: standalone/harddrake2:79
+#, c-format
+msgid "official vendor name of the cpu"
+msgstr "Offisiell prosessorprodusent"
+
+#: standalone/harddrake2:80
+#, c-format
+msgid "the name of the CPU"
+msgstr "Namnet på prosessoren"
+
+#: standalone/harddrake2:81
+#, c-format
+msgid "Processor ID"
+msgstr "Prosessor-ID"
+
+#: standalone/harddrake2:81
+#, c-format
+msgid "the number of the processor"
+msgstr ""
+
+#: standalone/harddrake2:82
+#, c-format
+msgid "Model stepping"
+msgstr ""
+
+#: standalone/harddrake2:82
+#, c-format
+msgid "stepping of the cpu (sub model (generation) number)"
+msgstr ""
+
+#: standalone/harddrake2:83
+#, c-format
+msgid "the vendor name of the processor"
+msgstr ""
+
+#: standalone/harddrake2:84
+#, c-format
 msgid "Write protection"
 msgstr "Skrivevern"
 
-#: standalone/harddrake2:75
+#: standalone/harddrake2:84
 #, c-format
 msgid ""
-"the WP flag in the CR0 register of the cpu enforce write proctection at the "
+"the WP flag in the CR0 register of the cpu enforce write protection at the "
 "memory page level, thus enabling the processor to prevent unchecked kernel "
 "accesses to user memory (aka this is a bug guard)"
 msgstr ""
 
-#. -PO: please keep all "/" charaters !!!
-#: standalone/harddrake2:90 standalone/logdrake:78 standalone/printerdrake:146
-#: standalone/printerdrake:159
+#: standalone/harddrake2:88
+#, c-format
+msgid "Floppy format"
+msgstr "Diskettformat"
+
+#: standalone/harddrake2:88
+#, c-format
+msgid "format of floppies supported by the drive"
+msgstr ""
+
+#: standalone/harddrake2:92
+#, c-format
+msgid "Channel"
+msgstr "Kanal"
+
+#: standalone/harddrake2:92
+#, c-format
+msgid "EIDE/SCSI channel"
+msgstr "EIDE/SCSI-kanal"
+
+#: standalone/harddrake2:93
+#, c-format
+msgid "Disk identifier"
+msgstr "Diskidentifikator"
+
+#: standalone/harddrake2:93
+#, c-format
+msgid "usually the disk serial number"
+msgstr ""
+
+#: standalone/harddrake2:94
+#, c-format
+msgid "Logical unit number"
+msgstr "Logisk einingsnummer"
+
+#: standalone/harddrake2:94
+#, c-format
+msgid ""
+"the SCSI target number (LUN). SCSI devices connected to a host are uniquely "
+"identified by a\n"
+"channel number, a target id and a logical unit number"
+msgstr ""
+
+#: standalone/harddrake2:99
+#, c-format
+msgid "Device file"
+msgstr "Einingsfil"
+
+#: standalone/harddrake2:99
+#, c-format
+msgid ""
+"the device file used to communicate with the kernel driver for the mouse"
+msgstr ""
+
+#: standalone/harddrake2:100
+#, c-format
+msgid "Emulated wheel"
+msgstr ""
+
+#: standalone/harddrake2:100
+#, c-format
+msgid "whether the wheel is emulated or not"
+msgstr "om hjulemulering er påslått"
+
+#: standalone/harddrake2:101
+#, c-format
+msgid "the type of the mouse"
+msgstr "mustype"
+
+#: standalone/harddrake2:102
+#, c-format
+msgid "the name of the mouse"
+msgstr "namnet på musa"
+
+#: standalone/harddrake2:103
+#, c-format
+msgid "Number of buttons"
+msgstr "Talet på knappar"
+
+#: standalone/harddrake2:103
+#, c-format
+msgid "the number of buttons the mouse has"
+msgstr "talet på knappar på musa"
+
+#: standalone/harddrake2:104
+#, c-format
+msgid "the type of bus on which the mouse is connected"
+msgstr ""
+
+#: standalone/harddrake2:105
+#, c-format
+msgid "Mouse protocol used by X11"
+msgstr ""
+
+#: standalone/harddrake2:105
+#, c-format
+msgid "the protocol that the graphical desktop use with the mouse"
+msgstr ""
+
+#: standalone/harddrake2:112 standalone/harddrake2:121
+#: standalone/harddrake2:128 standalone/harddrake2:136
+#: standalone/harddrake2:309
+#, c-format
+msgid "Identification"
+msgstr "Identifisering"
+
+#: standalone/harddrake2:113 standalone/harddrake2:129
+#, c-format
+msgid "Connection"
+msgstr "Samband"
+
+#: standalone/harddrake2:122
+#, c-format
+msgid "Performances"
+msgstr "Yting"
+
+#: standalone/harddrake2:123
+#, c-format
+msgid "Bugs"
+msgstr "Feil"
+
+#: standalone/harddrake2:124
+#, c-format
+msgid "FPU"
+msgstr ""
+
+#: standalone/harddrake2:132
+#, c-format
+msgid "Partitions"
+msgstr "Partisjonar"
+
+#: standalone/harddrake2:137
+#, c-format
+msgid "Features"
+msgstr "Funksjonar"
+
+#. -PO: please keep all "/" characters !!!
+#: standalone/harddrake2:158 standalone/logdrake:77
+#: standalone/printerdrake:152 standalone/printerdrake:165
 #, c-format
 msgid "/_Options"
 msgstr "/_Val"
 
-#: standalone/harddrake2:91 standalone/harddrake2:112 standalone/logdrake:80
-#: standalone/printerdrake:171 standalone/printerdrake:172
-#: standalone/printerdrake:173 standalone/printerdrake:174
+#: standalone/harddrake2:159 standalone/harddrake2:180 standalone/logdrake:79
+#: standalone/printerdrake:177 standalone/printerdrake:178
+#: standalone/printerdrake:179 standalone/printerdrake:180
 #, c-format
 msgid "/_Help"
 msgstr "/_Hjelp"
 
-#: standalone/harddrake2:95
+#: standalone/harddrake2:163
 #, c-format
 msgid "/Autodetect _printers"
 msgstr ""
 
-#: standalone/harddrake2:96
+#: standalone/harddrake2:164
 #, c-format
 msgid "/Autodetect _modems"
 msgstr ""
 
-#: standalone/harddrake2:97
+#: standalone/harddrake2:165
 #, c-format
 msgid "/Autodetect _jaz drives"
 msgstr ""
 
-#: standalone/harddrake2:104 standalone/printerdrake:152
+#: standalone/harddrake2:172 standalone/printerdrake:158
 #, c-format
 msgid "/_Quit"
 msgstr "/_Avslutt"
 
-#: standalone/harddrake2:113
+#: standalone/harddrake2:181
 #, c-format
 msgid "/_Fields description"
 msgstr ""
 
-#: standalone/harddrake2:115
+#: standalone/harddrake2:183
 #, c-format
 msgid "Harddrake help"
 msgstr "Hjelp"
 
-#: standalone/harddrake2:116
-#, c-format
-msgid ""
-"Description of the fields:\n"
-"\n"
-msgstr ""
-"Feltbeskriving:\n"
-"\n"
-
-#: standalone/harddrake2:121
+#: standalone/harddrake2:192
 #, c-format
 msgid ""
 "Once you've selected a device, you'll be able to see the device information "
 "in fields displayed on the right frame (\"Information\")"
 msgstr ""
 
-#: standalone/harddrake2:126 standalone/printerdrake:173
+#: standalone/harddrake2:197 standalone/printerdrake:179
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Rapporter feil"
 
-#: standalone/harddrake2:127 standalone/printerdrake:174
+#: standalone/harddrake2:198 standalone/printerdrake:180
 #, c-format
 msgid "/_About..."
 msgstr "/_Om ..."
 
-#: standalone/harddrake2:128
+#: standalone/harddrake2:199
 #, c-format
 msgid "About Harddrake"
 msgstr ""
 
 #. -PO: Do not alter the <span ..> and </span> tags
-#: standalone/harddrake2:130
+#: standalone/harddrake2:201
 #, c-format
 msgid ""
-"This is HardDrake, a Mandrake hardware configuration tool.\n"
+"This is HardDrake, a Mandrakelinux hardware configuration tool.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 msgstr ""
 
-#: standalone/harddrake2:147
+#: standalone/harddrake2:218
 #, c-format
-msgid "Harddrake2 version %s"
-msgstr ""
+msgid "Harddrake2"
+msgstr "Harddrake2"
 
-#: standalone/harddrake2:163
+#: standalone/harddrake2:234
 #, c-format
 msgid "Detected hardware"
 msgstr "Funne maskinvare"
 
-#: standalone/harddrake2:168
+#: standalone/harddrake2:239
 #, c-format
 msgid "Configure module"
 msgstr "Set opp modul"
 
-#: standalone/harddrake2:175
+#: standalone/harddrake2:246
 #, c-format
 msgid "Run config tool"
 msgstr "Køyr oppsettverktøy"
 
-#: standalone/harddrake2:222
+#: standalone/harddrake2:296 standalone/net_monitor:108
+#: standalone/net_monitor:109 standalone/net_monitor:114
 #, c-format
 msgid "unknown"
 msgstr "ukjend"
 
-#: standalone/harddrake2:223
+#: standalone/harddrake2:297 standalone/printerdrake:308
+#: standalone/printerdrake:346
 #, c-format
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: standalone/harddrake2:241
+#: standalone/harddrake2:317
+#, c-format
+msgid "Misc"
+msgstr "Ymse"
+
+#: standalone/harddrake2:332
 #, c-format
 msgid ""
 "Click on a device in the left tree in order to display its information here."
 msgstr ""
 
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
 #, c-format
 msgid "secondary"
 msgstr "sekundær"
 
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
 #, c-format
 msgid "primary"
 msgstr "primær"
 
-#: standalone/harddrake2:303
+#: standalone/harddrake2:388
 #, c-format
 msgid "burner"
 msgstr "brennar"
 
-#: standalone/harddrake2:303
+#: standalone/harddrake2:388
 #, c-format
 msgid "DVD"
 msgstr "DVD"
 
-#: standalone/keyboarddrake:24
+#: standalone/keyboarddrake:25
 #, c-format
 msgid "Please, choose your keyboard layout."
 msgstr "Vel tastaturoppsett."
 
-#: standalone/keyboarddrake:33
+#: standalone/keyboarddrake:34
 #, c-format
 msgid "Do you want the BackSpace to return Delete in console?"
 msgstr ""
 
-#: standalone/localedrake:60
+#: standalone/localedrake:38
+#, c-format
+msgid "LocaleDrake"
+msgstr "LocaleDrake"
+
+#: standalone/localedrake:67
 #, c-format
 msgid "The change is done, but to be effective you must logout"
 msgstr ""
 
-#: standalone/logdrake:51
+#: standalone/logdrake:50
 #, c-format
-msgid "Mandrake Tools Logs"
-msgstr "Loggar for Mandrake-verktøy"
+msgid "Mandrakelinux Tools Logs"
+msgstr "Loggverktøy for Mandrakelinux"
 
-#: standalone/logdrake:52
+#: standalone/logdrake:51
 #, c-format
 msgid "Logdrake"
 msgstr "Loggar"
 
-#: standalone/logdrake:65
+#: standalone/logdrake:64
 #, c-format
 msgid "Show only for the selected day"
 msgstr "Vis berre for valt dag"
 
-#: standalone/logdrake:72
+#: standalone/logdrake:71
 #, c-format
 msgid "/File/_New"
 msgstr "/Fil/_Ny"
 
-#: standalone/logdrake:72
+#: standalone/logdrake:71
 #, c-format
 msgid "<control>N"
 msgstr "<control>N"
 
-#: standalone/logdrake:73
+#: standalone/logdrake:72
 #, c-format
 msgid "/File/_Open"
 msgstr "/Fil/_Opna"
 
-#: standalone/logdrake:73
+#: standalone/logdrake:72
 #, c-format
 msgid "<control>O"
 msgstr "<control>O"
 
-#: standalone/logdrake:74
+#: standalone/logdrake:73
 #, c-format
 msgid "/File/_Save"
 msgstr "/Fil/_Lagra"
 
-#: standalone/logdrake:74
+#: standalone/logdrake:73
 #, c-format
 msgid "<control>S"
 msgstr "<control>S"
 
-#: standalone/logdrake:75
+#: standalone/logdrake:74
 #, c-format
 msgid "/File/Save _As"
 msgstr "/Fil/Lagra _som"
 
-#: standalone/logdrake:76
+#: standalone/logdrake:75
 #, c-format
 msgid "/File/-"
 msgstr "/Fil/–"
 
-#: standalone/logdrake:79
+#: standalone/logdrake:78
 #, c-format
 msgid "/Options/Test"
 msgstr "/Val/Test"
 
-#: standalone/logdrake:81
+#: standalone/logdrake:80
 #, c-format
 msgid "/Help/_About..."
 msgstr "/Hjelp/_Om ..."
 
-#: standalone/logdrake:110
+#: standalone/logdrake:109
 #, c-format
 msgid ""
 "_:this is the auth.log log file\n"
 "Authentication"
 msgstr "Autentisering"
 
-#: standalone/logdrake:111
+#: standalone/logdrake:110
 #, c-format
 msgid ""
 "_:this is the user.log log file\n"
 "User"
 msgstr "Brukar"
 
-#: standalone/logdrake:112
+#: standalone/logdrake:111
 #, c-format
 msgid ""
 "_:this is the /var/log/messages log file\n"
 "Messages"
 msgstr "Meldingar"
 
-#: standalone/logdrake:113
+#: standalone/logdrake:112
 #, c-format
 msgid ""
 "_:this is the /var/log/syslog log file\n"
 "Syslog"
 msgstr "Systemlogg"
 
-#: standalone/logdrake:117
+#: standalone/logdrake:116
 #, c-format
 msgid "search"
 msgstr "søk"
 
-#: standalone/logdrake:129
+#: standalone/logdrake:128
 #, c-format
 msgid "A tool to monitor your logs"
 msgstr ""
 
-#: standalone/logdrake:130 standalone/net_monitor:86
+#: standalone/logdrake:129 standalone/net_monitor:99
 #, c-format
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: standalone/logdrake:135
+#: standalone/logdrake:134
 #, c-format
 msgid "Matching"
 msgstr ""
 
-#: standalone/logdrake:136
+#: standalone/logdrake:135
 #, c-format
 msgid "but not matching"
 msgstr ""
 
-#: standalone/logdrake:140
+#: standalone/logdrake:139
 #, c-format
 msgid "Choose file"
 msgstr "Vel fil"
 
-#: standalone/logdrake:149
+#: standalone/logdrake:148
 #, c-format
 msgid "Calendar"
 msgstr "Kalender"
 
-#: standalone/logdrake:159
+#: standalone/logdrake:158
 #, c-format
 msgid "Content of the file"
 msgstr "Innhald i fila"
 
-#: standalone/logdrake:163 standalone/logdrake:429
+#: standalone/logdrake:162 standalone/logdrake:399
 #, c-format
 msgid "Mail alert"
 msgstr "E-postvarsling"
 
-#: standalone/logdrake:170
+#: standalone/logdrake:169
 #, c-format
-msgid "The alert wizard had unexpectly failled:"
+msgid "The alert wizard has failed unexpectedly:"
 msgstr ""
 
 #: standalone/logdrake:221
@@ -20813,62 +22237,57 @@ msgstr ""
 msgid "please wait, parsing file: %s"
 msgstr ""
 
-#: standalone/logdrake:406
+#: standalone/logdrake:376
 #, c-format
 msgid "Apache World Wide Web Server"
 msgstr ""
 
-#: standalone/logdrake:407
+#: standalone/logdrake:377
 #, c-format
 msgid "Domain Name Resolver"
 msgstr "Domenenamnoppslagsteneste"
 
-#: standalone/logdrake:408
+#: standalone/logdrake:378
 #, c-format
 msgid "Ftp Server"
 msgstr "FTP-tenar"
 
-#: standalone/logdrake:409
+#: standalone/logdrake:379
 #, c-format
 msgid "Postfix Mail Server"
 msgstr ""
 
-#: standalone/logdrake:410
+#: standalone/logdrake:380
 #, c-format
 msgid "Samba Server"
 msgstr "Samba-tenar"
 
-#: standalone/logdrake:411
-#, c-format
-msgid "SSH Server"
-msgstr "SSH-tenar"
-
-#: standalone/logdrake:412
+#: standalone/logdrake:382
 #, c-format
 msgid "Webmin Service"
 msgstr "Webmin-teneste"
 
-#: standalone/logdrake:413
+#: standalone/logdrake:383
 #, c-format
 msgid "Xinetd Service"
 msgstr "Xinetd-teneste"
 
-#: standalone/logdrake:424
+#: standalone/logdrake:394
 #, c-format
 msgid "Configure the mail alert system"
 msgstr "Sett opp e-postvarslingstenesta"
 
-#: standalone/logdrake:425
+#: standalone/logdrake:395
 #, c-format
 msgid "Stop the mail alert system"
 msgstr "Stopp e-postvarslingstenesta"
 
-#: standalone/logdrake:432
+#: standalone/logdrake:402
 #, c-format
 msgid "Mail alert configuration"
 msgstr "Set opp e-postvarsling"
 
-#: standalone/logdrake:433
+#: standalone/logdrake:403
 #, c-format
 msgid ""
 "Welcome to the mail configuration utility.\n"
@@ -20876,66 +22295,66 @@ msgid ""
 "Here, you'll be able to set up the alert system.\n"
 msgstr ""
 
-#: standalone/logdrake:436
+#: standalone/logdrake:406
 #, c-format
 msgid "What do you want to do?"
 msgstr "Kva vil du gjera?"
 
-#: standalone/logdrake:443
+#: standalone/logdrake:413
 #, c-format
 msgid "Services settings"
-msgstr "Tenesteinnstillingar"
+msgstr "Tenesteoppsett"
 
-#: standalone/logdrake:444
+#: standalone/logdrake:414
 #, c-format
 msgid ""
 "You will receive an alert if one of the selected services is no longer "
 "running"
 msgstr ""
 
-#: standalone/logdrake:451
+#: standalone/logdrake:421
 #, c-format
 msgid "Load setting"
-msgstr "Last inn oppsett"
+msgstr "Lastoppsett"
 
-#: standalone/logdrake:452
+#: standalone/logdrake:422
 #, c-format
 msgid "You will receive an alert if the load is higher than this value"
 msgstr ""
 
-#: standalone/logdrake:453
+#: standalone/logdrake:423
 #, c-format
 msgid ""
 "_: load here is a noun, the load of the system\n"
 "Load"
-msgstr ""
+msgstr "Last"
 
-#: standalone/logdrake:458
+#: standalone/logdrake:428
 #, c-format
 msgid "Alert configuration"
 msgstr "Varseloppsett"
 
-#: standalone/logdrake:459
+#: standalone/logdrake:429
 #, c-format
 msgid "Please enter your email address below "
 msgstr "Skriv inn e-postadresse"
 
-#: standalone/logdrake:460
+#: standalone/logdrake:430
 #, c-format
-msgid "and enter the name (or the IP) of the SMTP server you whish to use"
+msgid "and enter the name (or the IP) of the SMTP server you wish to use"
 msgstr ""
 
-#: standalone/logdrake:479
+#: standalone/logdrake:449
 #, c-format
 msgid "The wizard successfully configured the mail alert."
 msgstr ""
 
-#: standalone/logdrake:485
+#: standalone/logdrake:455
 #, c-format
 msgid "The wizard successfully disabled the mail alert."
 msgstr ""
 
-#: standalone/logdrake:544
+#: standalone/logdrake:514
 #, c-format
 msgid "Save as.."
 msgstr "Lagra som ..."
@@ -20948,7 +22367,7 @@ msgstr "Vel musetype."
 #: standalone/mousedrake:44
 #, c-format
 msgid "Emulate third button?"
-msgstr "Emulering av tredjeknapp?"
+msgstr "Vil du slå på emulering av tredje museknapp?"
 
 #: standalone/mousedrake:61
 #, c-format
@@ -20960,293 +22379,330 @@ msgstr "Musetest"
 msgid "Please test your mouse:"
 msgstr "Test musa:"
 
-#: standalone/net_monitor:52 standalone/net_monitor:57
+#: standalone/net_applet:30
+#, c-format
+msgid "Network is up on interface %s"
+msgstr "Nettverket køyrer på grensesnittet %s"
+
+#. -PO: keep the "Configure Network" substring synced with the "Configure Network" message below
+#: standalone/net_applet:38
+#, fuzzy, c-format
+msgid "Network is down on interface %s. Click on \"Configure Network\""
+msgstr "Nettverket køyrer på grensesnittet %s"
+
+#: standalone/net_applet:53 standalone/net_monitor:471
+#, c-format
+msgid "Connect %s"
+msgstr "Kopla til «%s»"
+
+#: standalone/net_applet:54 standalone/net_monitor:471
+#, c-format
+msgid "Disconnect %s"
+msgstr "Kopla frå «%s»"
+
+#: standalone/net_applet:55
+#, c-format
+msgid "Monitor Network"
+msgstr "Overvak nettverk"
+
+#: standalone/net_applet:56
+#, c-format
+msgid "Configure Network"
+msgstr "Set opp nettverk"
+
+#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
+#: standalone/net_applet:57 standalone/printerdrake:245
+#, c-format
+msgid "Refresh"
+msgstr "Oppdater"
+
+#: standalone/net_applet:58
+#, c-format
+msgid "Get Online Help"
+msgstr ""
+
+#: standalone/net_applet:158
+#, c-format
+msgid "Always launch on startup"
+msgstr "Start alltid ved oppstart"
+
+#: standalone/net_monitor:61 standalone/net_monitor:66
 #, c-format
 msgid "Network Monitoring"
 msgstr "Nettverksovervaking"
 
-#: standalone/net_monitor:92
+#: standalone/net_monitor:104
 #, c-format
 msgid "Global statistics"
 msgstr "Global statistikk"
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Instantaneous"
 msgstr ""
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Average"
 msgstr "Gjennomsnitt"
 
-#: standalone/net_monitor:96
+#: standalone/net_monitor:108
 #, c-format
 msgid ""
 "Sending\n"
 "speed:"
 msgstr ""
 
-#: standalone/net_monitor:97
+#: standalone/net_monitor:109
 #, c-format
 msgid ""
 "Receiving\n"
 "speed:"
 msgstr ""
 
-#: standalone/net_monitor:100
+#: standalone/net_monitor:113
 #, c-format
 msgid ""
 "Connection\n"
 "time: "
 msgstr ""
 
-#: standalone/net_monitor:122
+#: standalone/net_monitor:120
+#, c-format
+msgid "Use same scale for received and transmitted"
+msgstr ""
+
+#: standalone/net_monitor:139
 #, c-format
 msgid "Wait please, testing your connection..."
 msgstr "Vent litt. Testar samband ..."
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, c-format
 msgid "Disconnecting from Internet "
 msgstr "Koplar frå Internett "
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, c-format
 msgid "Connecting to Internet "
 msgstr "Koplar til Internett "
 
-#: standalone/net_monitor:194
+#: standalone/net_monitor:232
 #, c-format
 msgid "Disconnection from Internet failed."
 msgstr "Klarte ikkje kopla frå Internett."
 
-#: standalone/net_monitor:195
+#: standalone/net_monitor:233
 #, c-format
 msgid "Disconnection from Internet complete."
 msgstr "Har kopla frå Internett."
 
-#: standalone/net_monitor:197
+#: standalone/net_monitor:235
 #, c-format
 msgid "Connection complete."
 msgstr "Har kopla til."
 
-#: standalone/net_monitor:198
+#: standalone/net_monitor:236
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
+"Verify your configuration in the Mandrakelinux Control Center."
 msgstr ""
 
-#: standalone/net_monitor:299
+#: standalone/net_monitor:341
 #, c-format
 msgid "Color configuration"
 msgstr "Fargeoppsett"
 
-#: standalone/net_monitor:347 standalone/net_monitor:367
+#: standalone/net_monitor:389 standalone/net_monitor:409
 #, c-format
 msgid "sent: "
 msgstr "sent: "
 
-#: standalone/net_monitor:354 standalone/net_monitor:371
+#: standalone/net_monitor:396 standalone/net_monitor:413
 #, c-format
 msgid "received: "
 msgstr "motteken: "
 
-#: standalone/net_monitor:361
+#: standalone/net_monitor:403
 #, c-format
 msgid "average"
 msgstr "gjennomsnitt"
 
-#: standalone/net_monitor:364
+#: standalone/net_monitor:406
 #, c-format
 msgid "Local measure"
 msgstr "Lokalmål"
 
-#: standalone/net_monitor:396
-#, c-format
-msgid "transmitted"
-msgstr "overført"
-
-#: standalone/net_monitor:397
-#, c-format
-msgid "received"
-msgstr "motteken"
-
-#: standalone/net_monitor:415
+#: standalone/net_monitor:464
 #, c-format
 msgid ""
 "Warning, another internet connection has been detected, maybe using your "
 "network"
 msgstr ""
 
-#: standalone/net_monitor:421
-#, c-format
-msgid "Disconnect %s"
-msgstr "Kopla frå «%s»"
-
-#: standalone/net_monitor:421
-#, c-format
-msgid "Connect %s"
-msgstr "Kopla til «%s»"
-
-#: standalone/net_monitor:426
+#: standalone/net_monitor:475
 #, c-format
 msgid "No internet connection configured"
 msgstr ""
 
-#: standalone/printerdrake:70
+#: standalone/printerdrake:69
 #, c-format
 msgid "Loading printer configuration... Please wait"
 msgstr ""
 
-#: standalone/printerdrake:86
+#: standalone/printerdrake:85
 #, c-format
 msgid "Reading data of installed printers..."
 msgstr ""
 
-#: standalone/printerdrake:129
+#: standalone/printerdrake:134
 #, c-format
 msgid "%s Printer Management Tool"
 msgstr ""
 
-#: standalone/printerdrake:143 standalone/printerdrake:144
-#: standalone/printerdrake:145 standalone/printerdrake:153
-#: standalone/printerdrake:154 standalone/printerdrake:158
+#: standalone/printerdrake:148 standalone/printerdrake:149
+#: standalone/printerdrake:150 standalone/printerdrake:151
+#: standalone/printerdrake:159 standalone/printerdrake:160
+#: standalone/printerdrake:164
 #, c-format
 msgid "/_Actions"
 msgstr "/_Handlingar"
 
-#: standalone/printerdrake:143
+#: standalone/printerdrake:148 standalone/printerdrake:160
+#, c-format
+msgid "/_Add Printer"
+msgstr "/_Legg til skrivar"
+
+#: standalone/printerdrake:149
 #, c-format
 msgid "/Set as _Default"
 msgstr "/Bruk som _standard"
 
-#: standalone/printerdrake:144
+#: standalone/printerdrake:150
 #, c-format
 msgid "/_Edit"
 msgstr "/_Rediger"
 
-#: standalone/printerdrake:145
+#: standalone/printerdrake:151
 #, c-format
 msgid "/_Delete"
 msgstr "/_Slett"
 
-#: standalone/printerdrake:146
+#: standalone/printerdrake:152
 #, c-format
 msgid "/_Expert mode"
 msgstr "/_Ekspertmodus"
 
-#: standalone/printerdrake:151
+#: standalone/printerdrake:157
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Oppdater"
 
-#: standalone/printerdrake:154
-#, c-format
-msgid "/_Add Printer"
-msgstr "/_Legg til skrivar"
-
-#: standalone/printerdrake:158
+#: standalone/printerdrake:164
 #, c-format
 msgid "/_Configure CUPS"
 msgstr "/S_et opp CUPS"
 
-#: standalone/printerdrake:191
+#: standalone/printerdrake:197
 #, c-format
 msgid "Search:"
 msgstr "Søk:"
 
-#: standalone/printerdrake:194
+#: standalone/printerdrake:200
 #, c-format
 msgid "Apply filter"
 msgstr "Bruk filter"
 
-#: standalone/printerdrake:212 standalone/printerdrake:219
+#: standalone/printerdrake:218 standalone/printerdrake:225
 #, c-format
 msgid "Def."
 msgstr "Def."
 
-#: standalone/printerdrake:212 standalone/printerdrake:219
+#: standalone/printerdrake:218 standalone/printerdrake:225
 #, c-format
 msgid "Printer Name"
 msgstr "Skrivarnamn"
 
-#: standalone/printerdrake:212
+#: standalone/printerdrake:218
 #, c-format
 msgid "Connection Type"
 msgstr "Sambandstype"
 
-#: standalone/printerdrake:219
+#: standalone/printerdrake:225
 #, c-format
 msgid "Server Name"
 msgstr "Tenarnamn"
 
 #. -PO: "Add Printer" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:227
+#: standalone/printerdrake:233
 #, c-format
 msgid "Add Printer"
 msgstr "Legg til skrivar"
 
-#: standalone/printerdrake:227
+#: standalone/printerdrake:233
 #, c-format
 msgid "Add a new printer to the system"
 msgstr "Legg ny skrivar til systemet"
 
 #. -PO: "Set as default" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:230
+#: standalone/printerdrake:236
 #, c-format
 msgid "Set as default"
 msgstr "Bruk som standard"
 
-#: standalone/printerdrake:230
+#: standalone/printerdrake:236
 #, c-format
 msgid "Set selected printer as the default printer"
 msgstr "Bruk valt skrivar som standardskrivar"
 
-#: standalone/printerdrake:233
+#: standalone/printerdrake:239
 #, c-format
 msgid "Edit selected printer"
 msgstr "Rediger valt skrivar"
 
-#: standalone/printerdrake:236
+#: standalone/printerdrake:242
 #, c-format
 msgid "Delete selected printer"
 msgstr "Slett valt skrivar"
 
-#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:239
-#, c-format
-msgid "Refresh"
-msgstr "Oppdater"
-
-#: standalone/printerdrake:239
+#: standalone/printerdrake:245
 #, c-format
 msgid "Refresh the list"
 msgstr "Oppdater lista"
 
 #. -PO: "Configure CUPS" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:242
+#: standalone/printerdrake:248
 #, c-format
 msgid "Configure CUPS"
 msgstr "Set opp CUPS"
 
-#: standalone/printerdrake:242
+#: standalone/printerdrake:248
 #, c-format
 msgid "Configure CUPS printing system"
 msgstr "Set opp CUPS-utskriftssystemet"
 
-#: standalone/printerdrake:528
+#: standalone/printerdrake:309 standalone/printerdrake:347
+#, c-format
+msgid "Enabled"
+msgstr "Slått på"
+
+#: standalone/printerdrake:310 standalone/printerdrake:348
+#, c-format
+msgid "Disabled"
+msgstr "Slå av"
+
+#: standalone/printerdrake:572
 #, c-format
 msgid "Authors: "
 msgstr "Forfattarar: "
 
-#: standalone/printerdrake:534
+#: standalone/printerdrake:578
 #, c-format
 msgid "Printer Management \n"
 msgstr ""
 
-#: standalone/scannerdrake:50
+#: standalone/scannerdrake:51
 #, c-format
 msgid ""
 "SANE packages need to be installed to use scanners.\n"
@@ -21254,209 +22710,198 @@ msgid ""
 "Do you want to install the SANE packages?"
 msgstr ""
 
-#: standalone/scannerdrake:54
+#: standalone/scannerdrake:55
 #, c-format
 msgid "Aborting Scannerdrake."
 msgstr ""
 
-#: standalone/scannerdrake:59
+#: standalone/scannerdrake:60
 #, c-format
 msgid ""
 "Could not install the packages needed to set up a scanner with Scannerdrake."
 msgstr ""
 
-#: standalone/scannerdrake:60
+#: standalone/scannerdrake:61
 #, c-format
 msgid "Scannerdrake will not be started now."
 msgstr ""
 
-#: standalone/scannerdrake:66 standalone/scannerdrake:464
+#: standalone/scannerdrake:67 standalone/scannerdrake:460
 #, c-format
-msgid "Searching for configured scanners ..."
+msgid "Searching for configured scanners..."
 msgstr ""
 
-#: standalone/scannerdrake:70 standalone/scannerdrake:468
+#: standalone/scannerdrake:71 standalone/scannerdrake:464
 #, c-format
-msgid "Searching for new scanners ..."
+msgid "Searching for new scanners..."
 msgstr ""
 
-#: standalone/scannerdrake:78 standalone/scannerdrake:490
+#: standalone/scannerdrake:79 standalone/scannerdrake:486
 #, c-format
-msgid "Re-generating list of configured scanners ..."
+msgid "Re-generating list of configured scanners..."
 msgstr ""
 
-#: standalone/scannerdrake:100 standalone/scannerdrake:141
-#: standalone/scannerdrake:155
+#: standalone/scannerdrake:101 standalone/scannerdrake:142
 #, c-format
 msgid "The %s is not supported by this version of %s."
 msgstr ""
 
-#: standalone/scannerdrake:103
+#: standalone/scannerdrake:104
 #, c-format
 msgid "%s found on %s, configure it automatically?"
 msgstr ""
 
-#: standalone/scannerdrake:115
+#: standalone/scannerdrake:116
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
 msgstr ""
 
-#: standalone/scannerdrake:130
+#: standalone/scannerdrake:131
 #, c-format
 msgid "Select a scanner model"
 msgstr "Vel skannarmodell"
 
-#: standalone/scannerdrake:131
+#: standalone/scannerdrake:132
 #, c-format
 msgid " ("
 msgstr " ("
 
-#: standalone/scannerdrake:132
+#: standalone/scannerdrake:133
 #, c-format
 msgid "Detected model: %s"
 msgstr "Modell funnen: %s"
 
-#: standalone/scannerdrake:134
-#, c-format
-msgid ", "
-msgstr ", "
-
-#: standalone/scannerdrake:135
+#: standalone/scannerdrake:136
 #, c-format
 msgid "Port: %s"
 msgstr "Port: %s"
 
-#: standalone/scannerdrake:161
-#, c-format
-msgid "The %s is not known by this version of Scannerdrake."
-msgstr ""
-
-#: standalone/scannerdrake:169 standalone/scannerdrake:183
+#: standalone/scannerdrake:165 standalone/scannerdrake:179
 #, c-format
 msgid "Do not install firmware file"
 msgstr "Ikkje installer fastvarefil"
 
-#: standalone/scannerdrake:173 standalone/scannerdrake:225
+#: standalone/scannerdrake:169 standalone/scannerdrake:221
 #, c-format
 msgid ""
 "It is possible that your %s needs its firmware to be uploaded everytime when "
 "it is turned on."
 msgstr ""
 
-#: standalone/scannerdrake:174 standalone/scannerdrake:226
+#: standalone/scannerdrake:170 standalone/scannerdrake:222
 #, c-format
 msgid "If this is the case, you can make this be done automatically."
 msgstr ""
 
-#: standalone/scannerdrake:175 standalone/scannerdrake:229
+#: standalone/scannerdrake:171 standalone/scannerdrake:225
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware file for your scanner so that it "
 "can be installed."
 msgstr ""
 
-#: standalone/scannerdrake:176 standalone/scannerdrake:230
+#: standalone/scannerdrake:172 standalone/scannerdrake:226
 #, c-format
 msgid ""
 "You find the file on the CD or floppy coming with the scanner, on the "
 "manufacturer's home page, or on your Windows partition."
 msgstr ""
 
-#: standalone/scannerdrake:178 standalone/scannerdrake:237
+#: standalone/scannerdrake:174 standalone/scannerdrake:233
 #, c-format
 msgid "Install firmware file from"
 msgstr "Installer fastvarefil frå"
 
-#: standalone/scannerdrake:198
+#: standalone/scannerdrake:194
 #, c-format
 msgid "Select firmware file"
 msgstr "Vel fastvarefil"
 
-#: standalone/scannerdrake:201 standalone/scannerdrake:260
+#: standalone/scannerdrake:197 standalone/scannerdrake:256
 #, c-format
 msgid "The firmware file %s does not exist or is unreadable!"
 msgstr ""
 
-#: standalone/scannerdrake:224
+#: standalone/scannerdrake:220
 #, c-format
 msgid ""
 "It is possible that your scanners need their firmware to be uploaded "
 "everytime when they are turned on."
 msgstr ""
 
-#: standalone/scannerdrake:228
+#: standalone/scannerdrake:224
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware files for your scanners so that it "
 "can be installed."
 msgstr ""
 
-#: standalone/scannerdrake:231
+#: standalone/scannerdrake:227
 #, c-format
 msgid ""
 "If you have already installed your scanner's firmware you can update the "
 "firmware here by supplying the new firmware file."
 msgstr ""
 
-#: standalone/scannerdrake:233
+#: standalone/scannerdrake:229
 #, c-format
 msgid "Install firmware for the"
 msgstr "Installer fastvare for"
 
-#: standalone/scannerdrake:256
+#: standalone/scannerdrake:252
 #, c-format
 msgid "Select firmware file for the %s"
 msgstr "Vel fastvarefil for «%s»"
 
-#: standalone/scannerdrake:274
+#: standalone/scannerdrake:270
 #, c-format
 msgid "Could not install the firmware file for the %s!"
 msgstr "Klarte ikkje installera fastvarefila for «%s»."
 
-#: standalone/scannerdrake:287
+#: standalone/scannerdrake:283
 #, c-format
 msgid "The firmware file for your %s was successfully installed."
 msgstr "Fastvarefila for «%s» er no installert."
 
-#: standalone/scannerdrake:297
+#: standalone/scannerdrake:293
 #, c-format
 msgid "The %s is unsupported"
 msgstr "«%s» er ikkje støtta"
 
-#: standalone/scannerdrake:302
+#: standalone/scannerdrake:298
 #, c-format
 msgid ""
 "The %s must be configured by printerdrake.\n"
 "You can launch printerdrake from the %s Control Center in Hardware section."
 msgstr ""
 
-#: standalone/scannerdrake:306 standalone/scannerdrake:313
-#: standalone/scannerdrake:343
+#: standalone/scannerdrake:302 standalone/scannerdrake:309
+#: standalone/scannerdrake:339
 #, c-format
 msgid "Auto-detect available ports"
 msgstr ""
 
-#: standalone/scannerdrake:308 standalone/scannerdrake:354
+#: standalone/scannerdrake:304 standalone/scannerdrake:350
 #, c-format
 msgid "Please select the device where your %s is attached"
 msgstr ""
 
-#: standalone/scannerdrake:309
+#: standalone/scannerdrake:305
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
 msgstr ""
 
-#: standalone/scannerdrake:311 standalone/scannerdrake:356
+#: standalone/scannerdrake:307 standalone/scannerdrake:352
 #, c-format
 msgid "choose device"
 msgstr "vel eining"
 
-#: standalone/scannerdrake:345
+#: standalone/scannerdrake:341
 #, c-format
-msgid "Searching for scanners ..."
-msgstr "Søk etter skannarar ..."
+msgid "Searching for scanners..."
+msgstr "Søkjer etter skannarar ..."
 
-#: standalone/scannerdrake:380
+#: standalone/scannerdrake:376
 #, c-format
 msgid ""
 "Your %s has been configured.\n"
@@ -21464,7 +22909,7 @@ msgid ""
 "Graphics in the applications menu."
 msgstr ""
 
-#: standalone/scannerdrake:404
+#: standalone/scannerdrake:400
 #, c-format
 msgid ""
 "The following scanners\n"
@@ -21473,7 +22918,7 @@ msgid ""
 "are available on your system.\n"
 msgstr ""
 
-#: standalone/scannerdrake:405
+#: standalone/scannerdrake:401
 #, c-format
 msgid ""
 "The following scanner\n"
@@ -21482,137 +22927,137 @@ msgid ""
 "is available on your system.\n"
 msgstr ""
 
-#: standalone/scannerdrake:408 standalone/scannerdrake:411
+#: standalone/scannerdrake:404 standalone/scannerdrake:407
 #, c-format
 msgid "There are no scanners found which are available on your system.\n"
 msgstr ""
 
-#: standalone/scannerdrake:425
+#: standalone/scannerdrake:421
 #, c-format
 msgid "Search for new scanners"
 msgstr "Søk etter nye skannarar"
 
-#: standalone/scannerdrake:431
+#: standalone/scannerdrake:427
 #, c-format
 msgid "Add a scanner manually"
 msgstr "Legg til skannar manuelt"
 
-#: standalone/scannerdrake:438
+#: standalone/scannerdrake:434
 #, c-format
 msgid "Install/Update firmware files"
-msgstr ""
+msgstr "Installer/oppdater fastvarefiler"
 
-#: standalone/scannerdrake:444
+#: standalone/scannerdrake:440
 #, c-format
 msgid "Scanner sharing"
 msgstr "Skannardeling"
 
-#: standalone/scannerdrake:503 standalone/scannerdrake:668
+#: standalone/scannerdrake:499 standalone/scannerdrake:664
 #, c-format
 msgid "All remote machines"
 msgstr "Alle fjerne maskiner"
 
-#: standalone/scannerdrake:515 standalone/scannerdrake:818
+#: standalone/scannerdrake:511 standalone/scannerdrake:814
 #, c-format
 msgid "This machine"
 msgstr "Denne maskina"
 
-#: standalone/scannerdrake:555
+#: standalone/scannerdrake:551
 #, c-format
 msgid ""
 "Here you can choose whether the scanners connected to this machine should be "
 "accessible by remote machines and by which remote machines."
 msgstr ""
 
-#: standalone/scannerdrake:556
+#: standalone/scannerdrake:552
 #, c-format
 msgid ""
 "You can also decide here whether scanners on remote machines should be made "
 "available on this machine."
 msgstr ""
 
-#: standalone/scannerdrake:559
+#: standalone/scannerdrake:555
 #, c-format
 msgid "The scanners on this machine are available to other computers"
 msgstr ""
 
-#: standalone/scannerdrake:561
+#: standalone/scannerdrake:557
 #, c-format
 msgid "Scanner sharing to hosts: "
 msgstr ""
 
-#: standalone/scannerdrake:575
+#: standalone/scannerdrake:571
 #, c-format
 msgid "Use scanners on remote computers"
-msgstr ""
+msgstr "Bruk skannarar på fjerntliggjande maskiner"
 
-#: standalone/scannerdrake:578
+#: standalone/scannerdrake:574
 #, c-format
 msgid "Use the scanners on hosts: "
-msgstr ""
+msgstr "Bruk skannarane på desse vertane: "
 
-#: standalone/scannerdrake:605 standalone/scannerdrake:677
-#: standalone/scannerdrake:827
+#: standalone/scannerdrake:601 standalone/scannerdrake:673
+#: standalone/scannerdrake:823
 #, c-format
 msgid "Sharing of local scanners"
-msgstr ""
+msgstr "Deling av lokale skannarar"
 
-#: standalone/scannerdrake:606
+#: standalone/scannerdrake:602
 #, c-format
 msgid ""
 "These are the machines on which the locally connected scanner(s) should be "
 "available:"
 msgstr ""
 
-#: standalone/scannerdrake:617 standalone/scannerdrake:767
+#: standalone/scannerdrake:613 standalone/scannerdrake:763
 #, c-format
 msgid "Add host"
-msgstr "Rediger vert"
+msgstr "Legg til vert"
 
-#: standalone/scannerdrake:623 standalone/scannerdrake:773
+#: standalone/scannerdrake:619 standalone/scannerdrake:769
 #, c-format
 msgid "Edit selected host"
 msgstr "Rediger valt vert"
 
-#: standalone/scannerdrake:632 standalone/scannerdrake:782
+#: standalone/scannerdrake:628 standalone/scannerdrake:778
 #, c-format
 msgid "Remove selected host"
 msgstr "Fjern valt vert"
 
-#: standalone/scannerdrake:656 standalone/scannerdrake:664
-#: standalone/scannerdrake:669 standalone/scannerdrake:715
-#: standalone/scannerdrake:806 standalone/scannerdrake:814
-#: standalone/scannerdrake:819 standalone/scannerdrake:865
+#: standalone/scannerdrake:652 standalone/scannerdrake:660
+#: standalone/scannerdrake:665 standalone/scannerdrake:711
+#: standalone/scannerdrake:802 standalone/scannerdrake:810
+#: standalone/scannerdrake:815 standalone/scannerdrake:861
 #, c-format
 msgid "Name/IP address of host:"
-msgstr ""
+msgstr "Namn/IP-adresse til vert:"
 
-#: standalone/scannerdrake:678 standalone/scannerdrake:828
+#: standalone/scannerdrake:674 standalone/scannerdrake:824
 #, c-format
 msgid "Choose the host on which the local scanners should be made available:"
 msgstr ""
 
-#: standalone/scannerdrake:689 standalone/scannerdrake:839
+#: standalone/scannerdrake:685 standalone/scannerdrake:835
 #, c-format
 msgid "You must enter a host name or an IP address.\n"
 msgstr ""
 
-#: standalone/scannerdrake:700 standalone/scannerdrake:850
+#: standalone/scannerdrake:696 standalone/scannerdrake:846
 #, c-format
 msgid "This host is already in the list, it cannot be added again.\n"
 msgstr ""
 
-#: standalone/scannerdrake:755
+#: standalone/scannerdrake:751
 #, c-format
 msgid "Usage of remote scanners"
-msgstr ""
+msgstr "Bruk av fjernskannarar"
 
-#: standalone/scannerdrake:756
+#: standalone/scannerdrake:752
 #, c-format
 msgid "These are the machines from which the scanners should be used:"
 msgstr ""
 
-#: standalone/scannerdrake:913
+#: standalone/scannerdrake:909
 #, c-format
 msgid ""
 "saned needs to be installed to share the local scanner(s).\n"
@@ -21620,35 +23065,35 @@ msgid ""
 "Do you want to install the saned package?"
 msgstr ""
 
-#: standalone/scannerdrake:917 standalone/scannerdrake:921
+#: standalone/scannerdrake:913 standalone/scannerdrake:917
 #, c-format
 msgid "Your scanner(s) will not be available on the network."
 msgstr ""
 
-#: standalone/service_harddrake:62
+#: standalone/service_harddrake:104
 #, c-format
 msgid "Some devices in the \"%s\" hardware class were removed:\n"
 msgstr ""
 
-#: standalone/service_harddrake:63
+#: standalone/service_harddrake:105
 #, c-format
 msgid "- %s was removed\n"
 msgstr ""
 
-#: standalone/service_harddrake:66
+#: standalone/service_harddrake:108
 #, c-format
 msgid "Some devices were added: %s\n"
 msgstr ""
 
-#: standalone/service_harddrake:67
+#: standalone/service_harddrake:109
 #, c-format
 msgid "- %s was added\n"
 msgstr ""
 
-#: standalone/service_harddrake:126
+#: standalone/service_harddrake:199
 #, c-format
 msgid "Hardware probing in progress"
-msgstr ""
+msgstr "Søkjer etter maskinvare"
 
 #: standalone/service_harddrake_confirm:7
 #, c-format
@@ -21657,7 +23102,7 @@ msgstr ""
 
 #: standalone/service_harddrake_confirm:8
 #, c-format
-msgid "Do you want to run the appropriate config tool ?"
+msgid "Do you want to run the appropriate config tool?"
 msgstr "Vil du køyra det nødvendige oppsettverktøyet?"
 
 #: steps.pm:14
@@ -21668,12 +23113,12 @@ msgstr "Språk"
 #: steps.pm:15
 #, c-format
 msgid "License"
-msgstr "Lisens"
+msgstr "Lisensvilkår"
 
 #: steps.pm:16
 #, c-format
 msgid "Configure mouse"
-msgstr ""
+msgstr "Set opp mus"
 
 #: steps.pm:17
 #, c-format
@@ -21683,42 +23128,42 @@ msgstr ""
 #: steps.pm:18
 #, c-format
 msgid "Select installation class"
-msgstr ""
+msgstr "Vel installasjonstype"
 
 #: steps.pm:19
 #, c-format
 msgid "Choose your keyboard"
-msgstr ""
+msgstr "Vel tastatur"
 
 #: steps.pm:21
 #, c-format
 msgid "Partitioning"
-msgstr ""
+msgstr "Partisjonering"
 
 #: steps.pm:22
 #, c-format
 msgid "Format partitions"
-msgstr ""
+msgstr "Formater partisjonar"
 
 #: steps.pm:23
 #, c-format
 msgid "Choose packages to install"
-msgstr ""
+msgstr "Vel pakkane du vil installera"
 
 #: steps.pm:24
 #, c-format
 msgid "Install system"
-msgstr ""
+msgstr "Installer systemet"
 
 #: steps.pm:25
 #, c-format
 msgid "Root password"
-msgstr ""
+msgstr "Root-passord"
 
 #: steps.pm:26
 #, c-format
 msgid "Add a user"
-msgstr ""
+msgstr "Legg til brukar"
 
 #: steps.pm:27
 #, c-format
@@ -21728,17 +23173,17 @@ msgstr ""
 #: steps.pm:28
 #, c-format
 msgid "Install bootloader"
-msgstr ""
+msgstr "Installer oppstartslastar"
 
 #: steps.pm:29
 #, c-format
 msgid "Configure X"
-msgstr ""
+msgstr "Set opp X"
 
 #: steps.pm:31
 #, c-format
 msgid "Configure services"
-msgstr ""
+msgstr "Sett opp tenester"
 
 #: steps.pm:32
 #, c-format
@@ -21750,22 +23195,22 @@ msgstr ""
 msgid "Exit install"
 msgstr ""
 
-#: ugtk2.pm:1084
+#: ugtk2.pm:1122
 #, c-format
 msgid "Is this correct?"
 msgstr ""
 
-#: ugtk2.pm:1212
+#: ugtk2.pm:1250
 #, c-format
 msgid "Expand Tree"
-msgstr ""
+msgstr "Utvid tre"
 
-#: ugtk2.pm:1213
+#: ugtk2.pm:1251
 #, c-format
 msgid "Collapse Tree"
-msgstr ""
+msgstr "Fald saman tre"
 
-#: ugtk2.pm:1214
+#: ugtk2.pm:1252
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr ""
@@ -21782,154 +23227,299 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Feil ved installering."
 
-#: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr ""
+#~ msgid "Use Anonymous Bind"
+#~ msgstr "Bruk anonym BIND "
 
-#: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
+#~ msgid "OK"
+#~ msgstr "OK"
 
-#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr ""
+#~ msgid "NO"
+#~ msgstr "Nei"
 
-#: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr ""
+#~ msgid "YES"
+#~ msgstr "Ja"
 
-#: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr ""
+#~ msgid "Hide Release Notes"
+#~ msgstr "Skjul versjonsnotat"
 
-#: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr ""
+#~ msgid "Czech (QWERTZ)"
+#~ msgstr "Tsjekkisk (QWERTZ)"
 
-#: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr ""
+#~ msgid "German"
+#~ msgstr "Tysk"
 
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
-"Web"
-msgstr ""
+#~ msgid "Dvorak"
+#~ msgstr "Dvorak"
 
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr ""
+#~ msgid "Spanish"
+#~ msgstr "Spansk"
 
-#: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr ""
+#~ msgid "Finnish"
+#~ msgstr "Finsk"
 
-#: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Oppsett"
+#~ msgid "French"
+#~ msgstr "Fransk"
 
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr ""
+#~ msgid "Norwegian"
+#~ msgstr "Norsk"
 
-#: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr ""
+#~ msgid "Polish"
+#~ msgstr "Polsk"
 
-#: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr ""
+#~ msgid "Russian"
+#~ msgstr "Russisk"
 
-#: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr ""
+#~ msgid "Swedish"
+#~ msgstr "Svensk"
 
-#: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
+#~ msgid "Albanian"
+#~ msgstr "Albansk"
 
-#: ../../share/compssUsers:999
-msgid "GNOME Workstation"
-msgstr ""
+#~ msgid "Armenian (old)"
+#~ msgstr "Armensk (gammal)"
 
-#: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
+#~ msgid "Armenian (typewriter)"
+#~ msgstr "Armensk (skrivemaskin)"
 
-#: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr ""
+#~ msgid "Armenian (phonetic)"
+#~ msgstr "Armensk (fonetisk)"
 
-#: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr ""
+#~ msgid "Arabic"
+#~ msgstr "Arabisk"
 
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr ""
+#~ msgid "Azerbaidjani (latin)"
+#~ msgstr "Aserbajdsjansk (latinsk)"
 
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Hjelpetekst"
+#~ msgid "Belgian"
+#~ msgstr "Belgisk"
 
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr ""
+#~ msgid "Bengali"
+#~ msgstr "Bengali"
 
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr ""
+#~ msgid "Bulgarian (phonetic)"
+#~ msgstr "Bulgarsk (fonetisk)"
 
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
+#~ msgid "Bulgarian (BDS)"
+#~ msgstr "Bulgarsk (BDS)"
 
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr ""
+#~ msgid "Brazilian (ABNT-2)"
+#~ msgstr "Bulgarsk (ABNT-2)"
 
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr ""
+#~ msgid "Bosnian"
+#~ msgstr "Bosnisk"
 
-#: ../../share/compssUsers:999
-msgid "Mail"
-msgstr "E-post"
+#~ msgid "Belarusian"
+#~ msgstr "Kviterussisk"
 
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr ""
+#~ msgid "Swiss (German layout)"
+#~ msgstr "Sveitsisk (tysk oppsett)"
 
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Database"
+#~ msgid "Swiss (French layout)"
+#~ msgstr "Sveitsisk (fransk oppsett)"
 
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr ""
+#~ msgid "Czech (QWERTY)"
+#~ msgstr "Tsjekkisk (QWERTY)"
 
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr ""
+#~ msgid "German (no dead keys)"
+#~ msgstr "Tysk (utan dødtastar)"
 
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr ""
+#~ msgid "Devanagari"
+#~ msgstr "Devanagari"
 
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr ""
+#~ msgid "Danish"
+#~ msgstr "Dansk"
 
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr ""
+#~ msgid "Dvorak (US)"
+#~ msgstr "Dvorak (USA)"
 
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
+#~ msgid "Dvorak (Esperanto)"
+#~ msgstr "Dvorak (esperanto)"
+
+#~ msgid "Dvorak (Norwegian)"
+#~ msgstr "Dvorak (norsk)"
+
+#~ msgid "Dvorak (Swedish)"
+#~ msgstr "Dvorak (svensk)"
+
+#~ msgid "Estonian"
+#~ msgstr "Estisk"
+
+#~ msgid "Georgian (\"Russian\" layout)"
+#~ msgstr "Georgisk («russisk» oppsett)"
+
+#~ msgid "Georgian (\"Latin\" layout)"
+#~ msgstr "Georgisk («latinsk» oppsett)"
+
+#~ msgid "Greek"
+#~ msgstr "Gresk"
+
+#~ msgid "Greek (polytonic)"
+#~ msgstr "Gresk (polytonal)"
+
+#~ msgid "Gujarati"
+#~ msgstr "Gujarati"
+
+#~ msgid "Gurmukhi"
+#~ msgstr "Gurmukhi"
+
+#~ msgid "Hungarian"
+#~ msgstr "Ungarsk"
+
+#~ msgid "Croatian"
+#~ msgstr "Kroatisk"
+
+#~ msgid "Irish"
+#~ msgstr "Irsk"
+
+#~ msgid "Israeli"
+#~ msgstr "Israelsk"
+
+#~ msgid "Israeli (Phonetic)"
+#~ msgstr "Israelsk (fonetisk)"
+
+#~ msgid "Iranian"
+#~ msgstr "Iransk"
+
+#~ msgid "Icelandic"
+#~ msgstr "Islandsk"
+
+#~ msgid "Italian"
+#~ msgstr "Italiensk"
+
+#~ msgid "Inuktitut"
+#~ msgstr "Inuittisk"
+
+#~ msgid "Japanese 106 keys"
+#~ msgstr "Japansk – 106-tastars"
+
+#~ msgid "Kannada"
+#~ msgstr "Kannada"
+
+#~ msgid "Korean keyboard"
+#~ msgstr "Koreansk tastatur"
+
+#~ msgid "Kyrgyz keyboard"
+#~ msgstr "Kirgisisk tastatur"
+
+#~ msgid "Latin American"
+#~ msgstr "Latin-Amerika"
+
+#~ msgid "Laotian"
+#~ msgstr "Laotisk"
+
+#~ msgid "Lithuanian AZERTY (old)"
+#~ msgstr "Litauisk AZERTY (gammalt)"
+
+#~ msgid "Lithuanian AZERTY (new)"
+#~ msgstr "Litauisk AZERTY (nytt)"
+
+#~ msgid "Lithuanian \"number row\" QWERTY"
+#~ msgstr "Litauisk talrad-QWERTY"
+
+#~ msgid "Lithuanian \"phonetic\" QWERTY"
+#~ msgstr "Litauisk fonetisk QWERTY"
+
+#~ msgid "Latvian"
+#~ msgstr "Latvisk"
+
+#~ msgid "Malayalam"
+#~ msgstr "Malayalam"
+
+#~ msgid "Macedonian"
+#~ msgstr "Makedonsk"
+
+#~ msgid "Myanmar (Burmese)"
+#~ msgstr "Burmesisk"
+
+#~ msgid "Mongolian (cyrillic)"
+#~ msgstr "Mongolsk (kyrillisk)"
+
+#~ msgid "Maltese (UK)"
+#~ msgstr "Maltesisk (Storbritannia)"
+
+#~ msgid "Maltese (US)"
+#~ msgstr "Maltesisk (USA)"
+
+#~ msgid "Dutch"
+#~ msgstr "Nederlandsk"
+
+#~ msgid "Oriya"
+#~ msgstr "Oriya"
+
+#~ msgid "Polish (qwerty layout)"
+#~ msgstr "Polsk (QWERTY-oppsett)"
+
+#~ msgid "Polish (qwertz layout)"
+#~ msgstr "Polsk (QWERTZ-oppsett)"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portugisisk"
+
+#~ msgid "Canadian (Quebec)"
+#~ msgstr "Kanadisk (Quebec)"
+
+#~ msgid "Romanian (qwertz)"
+#~ msgstr "Rumensk (QWERTZ)"
+
+#~ msgid "Romanian (qwerty)"
+#~ msgstr "Romansk (QWERTZY)"
+
+#~ msgid "Russian (Phonetic)"
+#~ msgstr "Russisk (fonetisk)"
+
+#~ msgid "Saami (norwegian)"
+#~ msgstr "Samisk (norsk)"
+
+#~ msgid "Saami (swedish/finnish)"
+#~ msgstr "Samisk (finsk/svensk)"
+
+#~ msgid "Slovenian"
+#~ msgstr "Slovensk"
+
+#~ msgid "Slovakian (QWERTZ)"
+#~ msgstr "Slovensk (QWERTZ)"
+
+#~ msgid "Slovakian (QWERTY)"
+#~ msgstr "Slovensk (QWERTY)"
+
+#~ msgid "Serbian (cyrillic)"
+#~ msgstr "Serbisk (kyrillisk)"
+
+#~ msgid "Syriac"
+#~ msgstr "Syrisk"
+
+#~ msgid "Syriac (phonetic)"
+#~ msgstr "Syrisk (fonetisk)"
+
+#~ msgid "Telugu"
+#~ msgstr "Telugu"
+
+#~ msgid "Tamil (ISCII-layout)"
+#~ msgstr "Tamil (ISCII-oppsett)"
+
+#~ msgid "Tamil (Typewriter-layout)"
+#~ msgstr "Tamil (skrivemaskin-oppsett)"
+
+#~ msgid "Thai keyboard"
+#~ msgstr "Thai-tastatur"
+
+#~ msgid "Tajik keyboard"
+#~ msgstr "Tadsjikisk tastatur"
+
+#~ msgid "Turkish (traditional \"F\" model)"
+#~ msgstr "Tyrkisk (tradisjonell F-modell)"
+
+#~ msgid "Turkish (modern \"Q\" model)"
+#~ msgstr "Tyrkisk (moderne Q-modell)"
+
+#~ msgid "Ukrainian"
+#~ msgstr "Ukrainsk"
+
+#~ msgid "Uzbek (cyrillic)"
+#~ msgstr "Usbekisk (kyrillisk)"
+
+#~ msgid "Vietnamese \"numeric row\" QWERTY"
+#~ msgstr "Vietnamesisk talrad-QWERTY"
+
+#~ msgid "Yugoslavian (latin)"
+#~ msgstr "Serbisk (latinsk alfabet)"
author	Pablo Saratxaga <pablo@mandriva.com>	2004-10-07 13:40:59 +0000
committer	Pablo Saratxaga <pablo@mandriva.com>	2004-10-07 13:40:59 +0000
commit	79ecddfe11c0aa12f6ebefb6542b7c286b66400d (patch)
tree	8a2aeb882e59d623794d2b734b74d7bd5035461a /perl-install/share/po/nn.po
parent	54f5f51c6dcfc30abb2d64781404ba7bdbead24e (diff)
download	drakx-backup-do-not-use-79ecddfe11c0aa12f6ebefb6542b7c286b66400d.tar drakx-backup-do-not-use-79ecddfe11c0aa12f6ebefb6542b7c286b66400d.tar.gz drakx-backup-do-not-use-79ecddfe11c0aa12f6ebefb6542b7c286b66400d.tar.bz2 drakx-backup-do-not-use-79ecddfe11c0aa12f6ebefb6542b7c286b66400d.tar.xz drakx-backup-do-not-use-79ecddfe11c0aa12f6ebefb6542b7c286b66400d.zip