updated Spanish and Bokmål files

2 files changed, 13116 insertions, 11432 deletions

diff --git a/perl-install/share/po/es.po b/perl-install/share/po/es.po
index 90342bb1f..35a9725fc 100644
--- a/perl-install/share/po/es.po
+++ b/perl-install/share/po/es.po
@@ -1,22 +1,93 @@
-# translation of es.po to Español
+# translation of DrakX-es.po to Español
 # spanish translation of DrakX
-# Copyright (C) 2000, 2001,2002 MandrakeSoft S.A.
+# Copyright (C) 2000, 2001,2002 Mandrakesoft S.A.
 # Fabian Mandelbaum <fabman@mandrakesoft.com>, 2000, 2001, 2002,2003, 2004.
 # Fabian Mandelbaum <fmandelbaum@hotmail.com>, 2003, 2004.
+# Pablo Saratxaga <pablo@mandrakesoft.com>, 2004.
+# Jaime Crespo <505201@unizar.es>, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: es\n"
-"POT-Creation-Date: 2004-06-14 15:48+0200\n"
-"PO-Revision-Date: 2004-07-12 09:56-0300\n"
-"Last-Translator: Fabian Mandelbaum <fmandelbaum@hotmail.com>\n"
+"Project-Id-Version: DrakX-es\n"
+"POT-Creation-Date: 2004-10-07 21:57+0200\n"
+"PO-Revision-Date: 2004-10-10 12:09+0200\n"
+"Last-Translator: Jaime Crespo <505201@unizar.es>\n"
 "Language-Team: Español <es@li.org>\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"
+"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 "¿Qué llave USB desea formatear?"
+
+#: ../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 ""
+"Está a punto de formatear un dispositivo USB \"%s\". Esto borrará todos los "
+"datos en el mismo.\n"
+"Debe asegurarse que el dispositivo seleccionado es la llave USB que desea "
+"formatear.\n"
+"Le aconsejamos desconectar todos los otros dispositivos USB de "
+"almacenamiento mientras realiza esta operación."
+
+#: ../move/move.pm:448 ../move/move.pm:460
+#, c-format
+msgid "Key isn't writable"
+msgstr "La llave no se puede escribir"
+
+#: ../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 ""
+"La llave USB parece tener habilitada la protección contra escritura.\n"
+"Por favor desconéctela, quite dicha protección, y vuelva a conectarla."
+
+#: ../move/move.pm:452
+#, c-format
+msgid "Retry"
+msgstr "Reintentar"
+
+#: ../move/move.pm:453 ../move/move.pm:497
+#, c-format
+msgid "Continue without USB key"
+msgstr "Continuar sin llave USB"
+
+#: ../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 ""
+"La llave USB parece tener habilitada la protección contra escritura, pero "
+"ahora\n"
+"no se puede desconectar de manera segura.\n"
+"\n"
+"\n"
+"Haga clic sobre el botón para reiniciar la máquina, desconéctela, quite\n"
+"dicha protección, vuelva a conectarla y lance Mandrake Move otra vez."
+
+#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1353
+#, c-format
+msgid "Reboot"
+msgstr "Reiniciar"
+
+#: ../move/move.pm:473
 #, c-format
 msgid ""
 "Your USB key doesn't have any valid Windows (FAT) partitions.\n"
@@ -39,9 +110,9 @@ msgstr ""
 "\n"
 "También puede continuar sin una llave USB - todavía podrá\n"
 "utilizar Mandrake Move como un Sistema Operativo\n"
-"Mandrake \"live\" normal."
+"Mandrakelinux \"en vivo\" normal."
 
-#: ../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,152 +136,106 @@ msgstr ""
 "\n"
 "\n"
 "También puede continuar sin una llave USB - todavía podrá\n"
-"utilizar Mandrake Move como un Sistema Operativo Mandrake \"live\" normal."
+"utilizar Mandrake Move como un Sistema Operativo Mandrakelinux \"en vivo\" "
+"normal."
 
-#: ../move/move.pm:423
+#: ../move/move.pm:494
 #, c-format
 msgid "Need a key to save your data"
 msgstr "Necesita una llave para guardar sus datos"
 
-#: ../move/move.pm:425
+#: ../move/move.pm:496
 #, c-format
 msgid "Detect USB key again"
 msgstr "Volver a detectar llave USB"
 
-#: ../move/move.pm:426 ../move/move.pm:456
-#, c-format
-msgid "Continue without USB key"
-msgstr "Continuar sin llave USB"
-
-#: ../move/move.pm:437 ../move/move.pm:451
-#, c-format
-msgid "Key isn't writable"
-msgstr "La llave no se puede escribir"
-
-#: ../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 ""
-"La llave USB parece tener habilitada la protección contra escritura, pero "
-"ahora\n"
-"no se puede desconectar de manera segura.\n"
-"\n"
-"\n"
-"Haga clic sobre el botón para reiniciar la máquina, desconéctela, quite\n"
-"dicha protección, vuelva a conectarla y lance Mandrake Move otra vez."
-
-#: ../move/move.pm:445 help.pm:418 install_steps_interactive.pm:1306
-#, c-format
-msgid "Reboot"
-msgstr "Reiniciar"
-
-#: ../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 ""
-"La llave USB parece tener habilitada la protección contra escritura.\n"
-"Por favor desconéctela, quite dicha protección, y vuelva a conectarla."
-
-#: ../move/move.pm:455
-#, c-format
-msgid "Retry"
-msgstr "Reintentar"
-
-#: ../move/move.pm:466
+#: ../move/move.pm:517
 #, c-format
 msgid "Setting up USB key"
 msgstr "Configurando una llave USB"
 
-#: ../move/move.pm:466
+#: ../move/move.pm:517
 #, c-format
 msgid "Please wait, setting up system configuration files on USB key..."
 msgstr ""
 "Por favor espere, ajustando archivos de configuración del sistema en la "
 "llave USB..."
 
-#: ../move/move.pm:488
+#: ../move/move.pm:546
 #, c-format
 msgid "Enter your user information, password will be used for screensaver"
 msgstr ""
 "Ingrese la información de su usuario, la contraseña se utilizará para el "
 "protector de pantalla"
 
-#: ../move/move.pm:498
+#: ../move/move.pm:556
 #, c-format
 msgid "Auto configuration"
 msgstr "Configuración automática"
 
-#: ../move/move.pm:498
+#: ../move/move.pm:556
 #, c-format
 msgid "Please wait, detecting and configuring devices..."
 msgstr "Por favor espere, detectando y configurando dispositivos..."
 
-#: ../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 "Error"
 
-#: ../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"
@@ -219,12 +244,12 @@ msgstr ""
 "Ocurrió un error y no se puede gestionar de forma adecuada.\n"
 "Continúe bajo su propio riesgo."
 
-#: ../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 "Ocurrió un error"
 
-#: ../move/move.pm:607
+#: ../move/move.pm:666
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -259,32 +284,39 @@ msgstr ""
 "un vistazo a los archivos de registro en las consolas #3 y #4\n"
 "para intentar dilucidar qué está ocurriendo."
 
-#: ../move/move.pm:622
+#: ../move/move.pm:681
 #, c-format
 msgid "Remove system config files"
 msgstr "Quitar archivos de configuración del sistema"
 
-#: ../move/move.pm:623
+#: ../move/move.pm:682
 #, c-format
 msgid "Simply reboot"
 msgstr "Simplemente reiniciar"
 
-#: ../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 "Sólo puede correr sin soporte para CDROM"
 
-#: ../move/tree/mdk_totem:81
+#: ../move/tree/mdk_totem:71
 #, c-format
 msgid "Kill those programs"
 msgstr "Terminar dichos programas"
 
-#: ../move/tree/mdk_totem:82
+#: ../move/tree/mdk_totem:72
 #, c-format
 msgid "No CDROM support"
 msgstr "Sin soporte para CDROM"
 
-#: ../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 "¡Lea con cuidado!"
+
+#: ../move/tree/mdk_totem:77
 #, c-format
 msgid ""
 "You can't use another CDROM when the following programs are running: \n"
@@ -343,22 +375,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB o más"
 
-#: Xconfig/card.pm:151
+#: Xconfig/card.pm:155
 #, c-format
 msgid "X server"
 msgstr "Servidor X"
 
-#: Xconfig/card.pm:152
+#: Xconfig/card.pm:156
 #, c-format
 msgid "Choose an X server"
 msgstr "Seleccione un servidor X"
 
-#: Xconfig/card.pm:184
+#: Xconfig/card.pm:188
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Configuración multi-monitor"
 
-#: Xconfig/card.pm:185
+#: Xconfig/card.pm:189
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -367,80 +399,80 @@ msgstr ""
 "Su sistema soporta configuración multi-monitor.\n"
 "¿Qué desea hacer?"
 
-#: Xconfig/card.pm:251
+#: Xconfig/card.pm:255
 #, c-format
-msgid "Can't install XFree package: %s"
-msgstr "No se puede instalar paquete XFree: %s"
+msgid "Can't install Xorg package: %s"
+msgstr "No se puede instalar paquete Xorg: %s"
 
-#: Xconfig/card.pm:261
+#: Xconfig/card.pm:265
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Seleccione la cantidad de memoria de su tarjeta gráfica"
 
-#: Xconfig/card.pm:332
+#: Xconfig/card.pm:352
 #, c-format
-msgid "XFree configuration"
-msgstr "Configuración de XFree"
+msgid "Xorg configuration"
+msgstr "Configuración de Xorg"
 
-#: Xconfig/card.pm:334
+#: Xconfig/card.pm:354
 #, c-format
-msgid "Which configuration of XFree do you want to have?"
-msgstr "¿Qué tipo de configuración de XFree desea tener?"
+msgid "Which configuration of Xorg do you want to have?"
+msgstr "¿Qué tipo de configuración de Xorg desea tener?"
 
-#: Xconfig/card.pm:367
+#: Xconfig/card.pm:387
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Configurar los monitores independientemente"
 
-#: Xconfig/card.pm:368
+#: Xconfig/card.pm:388
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Usar extensión Xinerama"
 
-#: Xconfig/card.pm:373
+#: Xconfig/card.pm:393
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Configurar sólo la tarjeta \"%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 con aceleración 3D por hardware"
+msgid "Xorg %s with 3D hardware acceleration"
+msgstr "Xorg %s con aceleración 3D por hardware"
 
-#: Xconfig/card.pm:394
+#: Xconfig/card.pm:414
 #, c-format
-msgid "Your card can have 3D hardware acceleration support with XFree %s."
-msgstr "Su tarjeta puede admitir aceleración 3D por hardware con XFree %s."
+msgid "Your card can have 3D hardware acceleration support with Xorg %s."
+msgstr "Su tarjeta puede admitir aceleración 3D por hardware con Xorg %s."
 
-#: Xconfig/card.pm:400
+#: Xconfig/card.pm:420
 #, c-format
-msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
-msgstr "XFree %s con aceleración 3D EXPERIMENTAL por hardware"
+msgid "Xorg %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "Xorg %s con aceleración 3D EXPERIMENTAL por hardware"
 
-#: 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 ""
-"Su tarjeta puede admitir aceleración 3D por hardware con XFree %s,\n"
+"Su tarjeta puede admitir aceleración 3D por hardware con Xorg %s,\n"
 "ADVIERTA QUE ESTO ES EXPERIMENTAL Y PUEDE COLGAR SU ORDENADOR."
 
-#: 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 "Personalizada"
 
-#: 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 "Salir"
@@ -450,12 +482,12 @@ msgstr "Salir"
 msgid "Graphic Card"
 msgstr "Tarjeta gráfica"
 
-#: Xconfig/main.pm:120 Xconfig/monitor.pm:106
+#: Xconfig/main.pm:120 Xconfig/monitor.pm:110
 #, c-format
 msgid "Monitor"
 msgstr "Monitor"
 
-#: 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 "Resolución"
@@ -465,14 +497,19 @@ msgstr "Resolución"
 msgid "Test"
 msgstr "Probar"
 
-#: 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 "Opciones"
 
-#: Xconfig/main.pm:177
+#: Xconfig/main.pm:167
+#, c-format
+msgid "Your Xorg configuration file is broken, we will ignore it."
+msgstr "Su fichero de configuración Xorg está dañado, será ignorado."
+
+#: Xconfig/main.pm:184
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -485,38 +522,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: Xconfig/monitor.pm:107
+#: Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Elija un monitor para cabeza #%d"
 
-#: Xconfig/monitor.pm:107
+#: Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Elija un monitor"
 
-#: Xconfig/monitor.pm:113
+#: Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: Xconfig/monitor.pm:114 mouse.pm:49
+#: Xconfig/monitor.pm:118 mouse.pm:49
 #, c-format
 msgid "Generic"
 msgstr "Genérico"
 
-#: 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 "Fabricante"
 
-#: Xconfig/monitor.pm:125
+#: Xconfig/monitor.pm:129
 #, c-format
 msgid "Plug'n Play probing failed. Please select the correct monitor"
 msgstr "Falló la prueba Plug'n Play. Por favor, elija un monitor específico"
 
-#: Xconfig/monitor.pm:130
+#: Xconfig/monitor.pm:134
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -541,12 +578,12 @@ msgstr ""
 "puede dañar su monitor.\n"
 " En caso de duda, elija una configuración conservadora."
 
-#: Xconfig/monitor.pm:137
+#: Xconfig/monitor.pm:141
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Frecuencia de barrido horizontal"
 
-#: Xconfig/monitor.pm:138
+#: Xconfig/monitor.pm:142
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Frecuencia de barrido vertical"
@@ -571,58 +608,60 @@ msgstr "65 mil colores (16 bits)"
 msgid "16 million colors (24 bits)"
 msgstr "16 millones de colores (24 bits)"
 
-#: Xconfig/resolution_and_depth.pm:130
+#: Xconfig/resolution_and_depth.pm:135
 #, c-format
 msgid "Resolutions"
 msgstr "Resoluciones"
 
-#: Xconfig/resolution_and_depth.pm:264
+#: Xconfig/resolution_and_depth.pm:270
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Elija la resolución y la profundidad de colores"
 
-#: Xconfig/resolution_and_depth.pm:265
+#: Xconfig/resolution_and_depth.pm:271
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Tarjeta gráfica: %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 "Aceptar"
 
-#: 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 "Cancelar"
 
-#: 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 "Ayuda"
@@ -715,8 +754,8 @@ msgstr "Resolución: %s\n"
 
 #: Xconfig/various.pm:43
 #, c-format
-msgid "XFree86 driver: %s\n"
-msgstr "Controlador XFree86: %s\n"
+msgid "Xorg driver: %s\n"
+msgstr "Controlador Xorg: %s\n"
 
 #: Xconfig/various.pm:72
 #, c-format
@@ -727,8 +766,8 @@ msgstr "X al arrancar"
 #, 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 ""
 "Puede configurar su computadora para que inicie X automáticamente\n"
 "al arrancar. ¿Desea que se lance X cuando reinicie?"
@@ -759,20 +798,61 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr "¿Qué norma está utilizando su TV?"
 
-#: 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 "Espere, por favor"
 
-#: any.pm:103
+#: any.pm:116
 #, c-format
 msgid "Bootloader installation in progress"
 msgstr "Instalación del cargador de arranque en progreso"
 
-#: 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 ""
+"LILO desea asignar un nuevo ID de Volumen a la unidad %s.  Sin embargo,\n"
+"cambiar el ID de Volumen de un disco de arranque de Windows NT, 2000,\n"
+"o XP es un error fatal de Windows.\n"
+"Esta advertencia no se aplica a Windows 95 o 98, o a discos de datos de NT.\n"
+"\n"
+"¿Asignar un nuevo ID de Volumen?"
+
+#: any.pm:138
+#, c-format
+msgid "Installation of bootloader failed. The following error occurred:"
+msgstr ""
+"Falló la instalación del cargador de arranque. Ocurrió el siguiente error:"
+
+#: 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 ""
+"Puede necesitar cambiar el dispositivo de arranque de Open Firmware para\n"
+" activar el cargador de arranque. Si no ve el prompt del cargador de\n"
+" arranque al reiniciar, mantenga presionado Command-Option-O-F al\n"
+" reiniciar e introduzca:\n"
+" setenv boot-device %s, \\\\:tbxi\n"
+" Luego escriba: shut-down\n"
+"La próxima vez que arranque debería ver el prompt del cargador de arranque."
+
+#: any.pm:181
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -787,275 +867,261 @@ msgstr ""
 "\n"
 "¿Desde qué disco arranca?"
 
-#: any.pm:165 any.pm:197 help.pm:800
+#: any.pm:204 help.pm:739
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr "Primer sector del disco (MBR)"
 
-#: any.pm:166
+#: any.pm:205
 #, c-format
 msgid "First sector of the root partition"
 msgstr "Primer sector de la partición raíz"
 
-#: any.pm:168
+#: any.pm:207
 #, c-format
 msgid "On Floppy"
 msgstr "En disquete"
 
-#: 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 "Omitir"
 
-#: any.pm:175
-#, c-format
-msgid "SILO Installation"
-msgstr "Instalación de SILO"
-
-#: any.pm:175
+#: any.pm:213
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "Instalación de LILO/grub"
 
-#: any.pm:176
+#: any.pm:214
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "¿Dónde quiere instalar el cargador de arranque?"
 
-#: any.pm:197
-#, c-format
-msgid "First sector of boot partition"
-msgstr "Primer sector de la partición de arranque"
-
-#: any.pm:209
+#: any.pm:239 standalone/drakboot:307
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "Configuración del estilo de arranque"
 
-#: any.pm:211 any.pm:248
+#: any.pm:241 any.pm:275
 #, c-format
 msgid "Bootloader main options"
 msgstr "Opciones principales del cargador de arranque"
 
-#: any.pm:215
+#: any.pm:245
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "Proporcione el tamaño de la RAM en MB"
 
-#: any.pm:217
+#: any.pm:247
 #, c-format
-msgid "Option ``Restrict command line options'' is of no use without a password"
+msgid ""
+"Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "La opción \"Restringir las opciones de la línea de comandos\"\n"
 "no tiene sentido sin contraseña"
 
-#: 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 "Las contraseñas no coinciden"
 
-#: 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 "Vuelva a intentarlo, por favor"
 
-#: any.pm:223 any.pm:251 help.pm:768
+#: any.pm:253 any.pm:278
 #, c-format
 msgid "Bootloader to use"
 msgstr "Cargador de arranque a usar"
 
-#: any.pm:225
-#, c-format
-msgid "Bootloader installation"
-msgstr "Instalación del cargador de arranque"
-
-#: any.pm:227 any.pm:253 help.pm:768
+#: any.pm:255 any.pm:280
 #, c-format
 msgid "Boot device"
 msgstr "Dispositivo de arranque"
 
-#: any.pm:229
+#: any.pm:257
 #, c-format
 msgid "Delay before booting default image"
 msgstr "Demora antes de arrancar la imagen predeterminada"
 
-#: any.pm:230 help.pm:768
+#: any.pm:258
 #, c-format
 msgid "Enable ACPI"
 msgstr "Habilitar ACPI"
 
-#: any.pm:232 help.pm:768
+#: any.pm:260
 #, c-format
 msgid "Force no APIC"
 msgstr "Forzar sin APIC"
 
-#: any.pm:234
+#: any.pm:262
 #, c-format
 msgid "Force No Local APIC"
 msgstr "Forzar sin APIC local"
 
-#: 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 "Contraseña"
 
-#: 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 "Contraseña (de nuevo)"
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "Restrict command line options"
 msgstr "Restringir las opciones de la línea de comandos"
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "restrict"
 msgstr "restringir"
 
-#: any.pm:240
+#: any.pm:268
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "Limpiar /tmp en cada inicio del equipo"
 
-#: any.pm:241
+#: any.pm:269
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Precise el tamaño de la RAM si es necesario (se encontraron %d MB)"
 
-#: any.pm:243
-#, c-format
-msgid "Enable multiple profiles"
-msgstr "Activar perfiles múltiples"
-
-#: any.pm:252
+#: any.pm:279
 #, c-format
 msgid "Init Message"
 msgstr "Mensaje de inicio"
 
-#: any.pm:254
+#: any.pm:281
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "Demora de Open firmware"
 
-#: any.pm:255
+#: any.pm:282
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "Tiempo de espera de arranque del núcleo"
 
-#: any.pm:256
+#: any.pm:283
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "¿Habilitar el arranque desde CD?"
 
-#: any.pm:257
+#: any.pm:284
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "¿Habilitar el arranque de OF?"
 
-#: any.pm:258
+#: any.pm:285
 #, c-format
 msgid "Default OS?"
 msgstr "¿SO predeterminado?"
 
-#: any.pm:302
+#: any.pm:338
 #, c-format
 msgid "Image"
 msgstr "Imagen"
 
-#: any.pm:303 any.pm:312
+#: any.pm:339 any.pm:349
 #, c-format
 msgid "Root"
 msgstr "Raíz"
 
-#: any.pm:304 any.pm:325
+#: any.pm:340 any.pm:362
 #, c-format
 msgid "Append"
 msgstr "Añadir"
 
-#: any.pm:306
+#: any.pm:342 standalone/drakboot:309 standalone/drakboot:313
 #, c-format
 msgid "Video mode"
 msgstr "Modo de vídeo"
 
-#: 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 "Perfil de red"
+
+#: any.pm:354 any.pm:359 any.pm:361
 #, c-format
 msgid "Label"
 msgstr "Etiqueta"
 
-#: 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 "Por defecto"
 
-#: any.pm:326
+#: any.pm:363
 #, c-format
 msgid "Initrd-size"
 msgstr "Tamaño de initrd"
 
-#: any.pm:328
+#: any.pm:365
 #, c-format
 msgid "NoVideo"
 msgstr "Sin vídeo"
 
-#: any.pm:339
+#: any.pm:376
 #, c-format
 msgid "Empty label not allowed"
 msgstr "No se admite una etiqueta vacía"
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "Debe especificar una imagen del núcleo"
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a root partition"
 msgstr "Debe especificar una partición raíz"
 
-#: any.pm:341
+#: any.pm:378
 #, c-format
 msgid "This label is already used"
 msgstr "Esta etiqueta ya está en uso"
 
-#: any.pm:354
+#: any.pm:392
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "¿Qué tipo de entrada desea añadir?"
 
-#: 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 "Otro SO (SunOS...)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "Otro SO (MacOS...)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "Otro SO (Windows...)"
 
-#: any.pm:384
+#: any.pm:422
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -1064,72 +1130,74 @@ msgstr ""
 "Aquí están las diferentes entradas.\n"
 "Puede añadir otras o cambiar las que ya existen."
 
-#: any.pm:516
+#: any.pm:572
 #, c-format
 msgid "access to X programs"
 msgstr "acceso a programas X"
 
-#: any.pm:517
+#: any.pm:573
 #, c-format
 msgid "access to rpm tools"
 msgstr "acceso a herramientas rpm"
 
-#: any.pm:518
+#: any.pm:574
 #, c-format
 msgid "allow \"su\""
 msgstr "permitir \"su\""
 
-#: any.pm:519
+#: any.pm:575
 #, c-format
 msgid "access to administrative files"
 msgstr "acceso a archivos administrativos"
 
-#: any.pm:520
+#: any.pm:576
 #, c-format
 msgid "access to network tools"
 msgstr "acceso a herramientas de red"
 
-#: any.pm:521
+#: any.pm:577
 #, c-format
 msgid "access to compilation tools"
 msgstr "acceso a herramientas de compilación"
 
-#: any.pm:527
+#: any.pm:582
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s ya fue añadido)"
 
-#: any.pm:532
+#: any.pm:587
 #, c-format
 msgid "This password is too simple"
 msgstr "Esta contraseña es demasiado sencilla"
 
-#: any.pm:533
+#: any.pm:588
 #, c-format
 msgid "Please give a user name"
 msgstr "Introduzca el nombre de usuario"
 
-#: any.pm:534
+#: any.pm:589
 #, c-format
-msgid "The user name must contain only lower cased letters, numbers, `-' and `_'"
-msgstr "El nombre de usuario (login) sólo debe contener letras, números, `-' y `_'"
+msgid ""
+"The user name must contain only lower cased letters, numbers, `-' and `_'"
+msgstr ""
+"El nombre de usuario (login) sólo debe contener letras, números, `-' y `_'"
 
-#: any.pm:535
+#: any.pm:590
 #, c-format
 msgid "The user name is too long"
 msgstr "El nombre de usuario es muy largo"
 
-#: any.pm:536
+#: any.pm:591
 #, c-format
 msgid "This user name has already been added"
 msgstr "Este nombre de usuario ya fue añadido"
 
-#: any.pm:540
+#: any.pm:595
 #, c-format
 msgid "Add user"
 msgstr "Añadir un usuario"
 
-#: any.pm:541
+#: any.pm:596
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -1138,75 +1206,79 @@ msgstr ""
 "Introduzca un usuario\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 "Hecho"
 
-#: any.pm:545 help.pm:52
+#: any.pm:600 help.pm:51
 #, c-format
 msgid "Accept user"
 msgstr "Aceptar el usuario"
 
-#: any.pm:556
+#: any.pm:611
 #, c-format
 msgid "Real name"
 msgstr "Nombre y apellidos"
 
-#: 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 "Nombre del usuario"
+msgid "Login name"
+msgstr "Nombre de conexión"
 
-#: any.pm:560
+#: any.pm:615
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: any.pm:562
+#: any.pm:617
 #, c-format
 msgid "Icon"
 msgstr "Icono"
 
-#: any.pm:603 security/l10n.pm:14
+#: any.pm:664 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "Conexión automática"
 
-#: any.pm:604
+#: any.pm:665
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr ""
 "Puedo configurar su computadora para que entre automáticamente con un "
 "usuario."
 
-#: any.pm:605 help.pm:52
+#: any.pm:666 help.pm:51
 #, c-format
 msgid "Do you want to use this feature?"
 msgstr "¿Desea usar esta característica?"
 
-#: any.pm:606
+#: any.pm:667
 #, c-format
 msgid "Choose the default user:"
 msgstr "Elija el usuario predeterminado:"
 
-#: any.pm:607
+#: any.pm:668
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "Elija el gestor de ventanas a ejecutar:"
 
-#: any.pm:619
+#: any.pm:680
 #, c-format
 msgid "Please choose a language to use."
 msgstr "Por favor, elija el idioma a usar."
 
-#: any.pm:640
+#: any.pm:681
+#, c-format
+msgid "Language choice"
+msgstr "Selección del idioma"
+
+#: any.pm:707
 #, c-format
 msgid ""
 "Mandrakelinux can support multiple languages. Select\n"
@@ -1217,48 +1289,57 @@ msgstr ""
 "los que desea instalar. Los mismos estarán disponibles cuando\n"
 "su instalación esté completa y Usted reinicie su sistema."
 
-#: any.pm:658 help.pm:660
+#: any.pm:725 help.pm:647
 #, c-format
 msgid "Use Unicode by default"
 msgstr "Usar Unicode predeterminadamente"
 
-#: any.pm:659 help.pm:660
+#: any.pm:726 help.pm:647
 #, c-format
 msgid "All languages"
 msgstr "Todos los idiomas"
 
-#: 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 "País / Región"
 
-#: any.pm:699
+#: any.pm:766
 #, c-format
 msgid "Please choose your country."
 msgstr "Seleccione su país, por favor."
 
-#: any.pm:701
+#: any.pm:768
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "Aquí tiene la lista completa de países disponibles"
 
-#: 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 "Más"
+msgid "Other Countries"
+msgstr "Otros países"
+
+#: any.pm:777
+#, c-format
+msgid "Input method:"
+msgstr "Método de entrada:"
+
+#: any.pm:778 install_any.pm:420 printer/printerdrake.pm:99
+#, c-format
+msgid "None"
+msgstr "Ninguno"
 
-#: any.pm:833
+#: any.pm:912
 #, c-format
 msgid "No sharing"
 msgstr "No compartir"
 
-#: any.pm:833
+#: any.pm:912
 #, c-format
 msgid "Allow all users"
 msgstr "Permitir a todos los usuarios"
 
-#: any.pm:837
+#: any.pm:916
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1273,7 +1354,7 @@ msgstr ""
 "\n"
 "\"Personalizar\" permite una granularidad por usuario.\n"
 
-#: any.pm:849
+#: any.pm:928
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
@@ -1282,26 +1363,37 @@ msgstr ""
 "NFS: el sistema tradicional Unix para compartir archivos, con menos soporte "
 "en Mac y 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 "
 "systems."
 msgstr ""
-"SMB: un sistema para compartir archivos usado por Windows, Mac OS X y "
-"muchos sistemas Linux modernos."
+"SMB: un sistema para compartir archivos usado por Windows, Mac OS X y muchos "
+"sistemas Linux modernos."
 
-#: any.pm:860
+#: any.pm:939
 #, c-format
-msgid "You can export using NFS or SMB. Please select which you would like to use."
+msgid ""
+"You can export using NFS or SMB. Please select which you would like to use."
 msgstr "Puede exportar usando NFS o SMB. ¿Cuál elige?"
 
-#: any.pm:883
+#: any.pm:964
 #, c-format
 msgid "Launch userdrake"
 msgstr "Lanzar UserDrake"
 
-#: 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 "Cerrar"
+
+#: any.pm:966
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -1310,92 +1402,200 @@ msgstr ""
 "La compartición por usuario utiliza el grupo \"fileshare\". \n"
 "Puede utilizar UserDrake para añadir un usuario a este grupo."
 
-#: authentication.pm:12
+#: authentication.pm:16
 #, c-format
-msgid "Local files"
-msgstr "Archivos locales"
+msgid "Local file"
+msgstr "Archivo local"
 
-#: 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 "Dominio Windows"
 
-#: authentication.pm:12
+#: authentication.pm:20
+#, c-format
+msgid "Active Directory with SFU"
+msgstr "Active Directory con SFU"
+
+#: authentication.pm:21
+#, c-format
+msgid "Active Directory with Winbind"
+msgstr "Active Directory con Winbind"
+
+#: authentication.pm:30
+#, c-format
+msgid "Local file:"
+msgstr "Archivo local:"
+
+#: authentication.pm:30
+#, c-format
+msgid ""
+"Use local for all authentication and information user tell in local file"
+msgstr ""
+"Usar local para toda autenticación y la información que el usuario brinda en "
+"archivo local"
+
+#: authentication.pm:31
+#, c-format
+msgid "LDAP:"
+msgstr "LDAP:"
+
+#: authentication.pm:31
 #, c-format
-msgid "Active Directory"
-msgstr "Active Directory"
+msgid ""
+"Tells your computer to use LDAP for some or all authentication. LDAP "
+"consolidates certain types of information within your organization."
+msgstr ""
+"Le dice a la computadora que use LDAP para alguna o toda la autenticación. "
+"LDAP consolida ciertos tipos de información dentro de su organización."
+
+#: 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 ""
+"Le permite correr un grupo de computadoras en el mismo dominio NIS con "
+"archivos comunes de grupo y contraseñas."
+
+#: authentication.pm:33
+#, c-format
+msgid "Windows Domain:"
+msgstr "Dominio Windows:"
+
+#: authentication.pm:33
+#, c-format
+msgid ""
+"Winbind allows the system to retrieve information and authenticate users in "
+"a Windows domain."
+msgstr ""
+"Winbind permite que el sistema obtenga información y autentique a los "
+"usuarios en un dominio Windows."
+
+#: authentication.pm:34
+#, c-format
+msgid "Active Directory with SFU:"
+msgstr "Active Directory con SFU:"
+
+#: authentication.pm:34 authentication.pm:35
+#, c-format
+msgid ""
+"Kerberos is a secure system for providing network authentication services."
+msgstr ""
+"Kerberos es un sistema seguro para brindar servicios de autenticación de red."
+
+#: authentication.pm:35
+#, c-format
+msgid "Active Directory with Winbind:"
+msgstr "Active Directory con Winbind:"
 
-#: authentication.pm:38
+#: authentication.pm:60
 #, c-format
 msgid "Authentication LDAP"
 msgstr "Autentificación LDAP"
 
-#: authentication.pm:39
+#: authentication.pm:61
 #, c-format
 msgid "LDAP Base dn"
 msgstr "LDAP Base dn"
 
-#: authentication.pm:40
+#: authentication.pm:62 share/compssUsers.pl:101
 #, c-format
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
-#: authentication.pm:50
+#: authentication.pm:75 fsedit.pm:21
+#, c-format
+msgid "simple"
+msgstr "simple"
+
+#: 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 "esquema de seguridad (SASL/Kerberos)"
+
+#: authentication.pm:85 authentication.pm:123
 #, c-format
 msgid "Authentication Active Directory"
 msgstr "Autenticación 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 "Dominio"
 
-#: 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 "Servidor"
 
-#: authentication.pm:53
+#: authentication.pm:89
 #, c-format
 msgid "LDAP users database"
 msgstr "Base de datos de usuarios LDAP"
 
-#: authentication.pm:54
+#: authentication.pm:90
+#, c-format
+msgid "Use Anonymous BIND "
+msgstr "Usar BIND anónimo"
+
+#: authentication.pm:91
 #, c-format
 msgid "LDAP user allowed to browse the Active Directory"
 msgstr "Usuario LDAP que puede examinar el Active Directory"
 
-#: authentication.pm:55
+#: authentication.pm:92
 #, c-format
 msgid "Password for user"
 msgstr "Contraseña para el usuario"
 
-#: authentication.pm:62
+#: authentication.pm:93
+#, c-format
+msgid "Encryption"
+msgstr "Cifrado"
+
+#: authentication.pm:104
 #, c-format
 msgid "Authentication NIS"
 msgstr "Autentificación NIS"
 
-#: authentication.pm:63
+#: authentication.pm:105
 #, c-format
 msgid "NIS Domain"
 msgstr "Dominio NIS"
 
-#: authentication.pm:64
+#: authentication.pm:106
 #, c-format
 msgid "NIS Server"
 msgstr "Servidor NIS"
 
-#: 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 "
@@ -1424,28 +1624,38 @@ msgstr ""
 "del arranque del sistema.\n"
 "El comando 'wbinfo -t' probará si sus secretos de autenticación son buenos."
 
-#: authentication.pm:71
+#: authentication.pm:123
 #, c-format
 msgid "Authentication Windows Domain"
 msgstr "Dominio de Autenticación de Windows"
 
-#: authentication.pm:73
+#: authentication.pm:128
 #, c-format
 msgid "Domain Admin User Name"
 msgstr "Nombre de usuario del Administrador del Dominio"
 
-#: authentication.pm:74
+#: authentication.pm:129
 #, c-format
 msgid "Domain Admin Password"
 msgstr "Contraseña del Administrador del Dominio"
 
-#: authentication.pm:149
+#: authentication.pm:130
+#, c-format
+msgid "Use Idmap for store UID/SID "
+msgstr "Use ldmap para almacenar UID/SID "
+
+#: authentication.pm:131
+#, c-format
+msgid "Default Idmap "
+msgstr "ldmap predeterminado "
+
+#: authentication.pm:231
 #, c-format
 msgid "Can't use broadcast with no NIS domain"
 msgstr "No se puede usar difusión sin un dominio NIS"
 
 #. -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"
@@ -1460,42 +1670,37 @@ msgstr ""
 "a que arranque el sistema predeterminado.\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 con menú gráfico"
 
-#: bootloader.pm:666 help.pm:768
+#: bootloader.pm:788
 #, c-format
 msgid "LILO with text menu"
 msgstr "LILO con menú de texto"
 
-#: 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 "no hay espacio suficiente en /boot"
 
-#: bootloader.pm:1170
+#: bootloader.pm:1266
 #, c-format
 msgid "You can't install the bootloader on a %s partition\n"
 msgstr "No puede instalar el cargador de arranque en una partición %s\n"
 
-#: bootloader.pm:1214
+#: bootloader.pm:1311
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
@@ -1504,7 +1709,7 @@ msgstr ""
 "Se debe actualizar la configuración de su cargador de arranque debido a que "
 "cambió el número de la partición"
 
-#: bootloader.pm:1221
+#: bootloader.pm:1326
 #, c-format
 msgid ""
 "The bootloader can't be installed correctly. You have to boot rescue and "
@@ -1513,7 +1718,7 @@ msgstr ""
 "No se puede instalar correctamente el cargador de arranque. Debe arrancar "
 "con rescate y elegir \"%s\""
 
-#: bootloader.pm:1222
+#: bootloader.pm:1327
 #, c-format
 msgid "Re-install Boot Loader"
 msgstr "Volver a instalar cargador de arranque"
@@ -1575,76 +1780,79 @@ msgstr "no se encuentra kdesu"
 msgid "consolehelper missing"
 msgstr "falta \"consolehelper\""
 
-#: 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 "Francia"
 
-#: 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 "Bélgica"
 
-#: crypto.pm:17 crypto.pm:30 lang.pm:221
+#: crypto.pm:17 crypto.pm:30 lang.pm:235
 #, c-format
 msgid "Czech Republic"
 msgstr "República Checa"
 
-#: 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 "Alemania"
 
-#: 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 "Grecia"
 
-#: crypto.pm:20 crypto.pm:33 lang.pm:326
+#: crypto.pm:20 crypto.pm:33 lang.pm:340
 #, c-format
 msgid "Norway"
 msgstr "Noruega"
 
-#: 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 "Suecia"
 
-#: 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 "Holanda"
 
-#: 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 "Austria"
 
-#: 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 "Estados Unidos"
 
-#: 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"
@@ -1658,66 +1866,60 @@ msgstr ""
 "el servidor web está configurado como servidor WebDAV). Si desea añadir\n"
 "puntos de montaje WebDAV, seleccione \"Nuevo\"."
 
-#: diskdrake/dav.pm:27
+#: diskdrake/dav.pm:25
 #, c-format
 msgid "New"
 msgstr "Nuevo"
 
-#: 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 "Desmontar"
 
-#: 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 "Montar"
 
-#: 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 "Punto de montaje"
 
-#: diskdrake/dav.pm:85
+#: diskdrake/dav.pm:83
 #, c-format
 msgid "Please enter the WebDAV server URL"
 msgstr "Por favor, ingrese la URL del servidor WebDAV"
 
-#: diskdrake/dav.pm:89
+#: diskdrake/dav.pm:87
 #, c-format
 msgid "The URL must begin with http:// or https://"
 msgstr "La URL debería empezar con http:// o https://"
 
-#: diskdrake/dav.pm:111
+#: diskdrake/dav.pm:109
 #, c-format
 msgid "Server: "
 msgstr "Servidor: "
 
-#: 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 "Punto de montaje: "
 
-#: diskdrake/dav.pm:113 diskdrake/interactive.pm:1240
+#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1239
 #, c-format
 msgid "Options: %s"
 msgstr "Opciones: %s"
 
-#: diskdrake/hd_gtk.pm:96 diskdrake/interactive.pm:1000
-#: diskdrake/interactive.pm:1010 diskdrake/interactive.pm:1070
-#, c-format
-msgid "Read carefully!"
-msgstr "¡Lea con cuidado!"
-
-#: diskdrake/hd_gtk.pm:96
+#: diskdrake/hd_gtk.pm:95
 #, c-format
 msgid "Please make a backup of your data first"
 msgstr "Por favor, haga primero una copia de seguridad de sus datos"
 
-#: 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 "
@@ -1727,17 +1929,17 @@ msgstr ""
 "Si piensa usar aboot, no olvide dejar espacio libre (2048 sectores es\n"
 "suficiente) al principio del disco"
 
-#: diskdrake/hd_gtk.pm:156 help.pm:544
+#: diskdrake/hd_gtk.pm:155 help.pm:530
 #, c-format
 msgid "Wizard"
 msgstr "Asistente"
 
-#: diskdrake/hd_gtk.pm:189
+#: diskdrake/hd_gtk.pm:188
 #, c-format
 msgid "Choose action"
 msgstr "Elija una acción"
 
-#: diskdrake/hd_gtk.pm:193
+#: diskdrake/hd_gtk.pm:192
 #, c-format
 msgid ""
 "You have one big Microsoft Windows partition.\n"
@@ -1748,181 +1950,187 @@ msgstr ""
 "Le sugiero que primero cambie el tamaño de la misma\n"
 "(para eso haga clic sobre ella, y luego sobre \"Redimensionar\")"
 
-#: diskdrake/hd_gtk.pm:195
+#: diskdrake/hd_gtk.pm:194
 #, c-format
 msgid "Please click on a partition"
 msgstr "Por favor, haga clic sobre una partición"
 
-#: 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 "Detalles"
 
-#: diskdrake/hd_gtk.pm:255
+#: diskdrake/hd_gtk.pm:254
 #, c-format
 msgid "No hard drives found"
 msgstr "¡No se encontraron discos rígidos!"
 
-#: 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 "S. de a. transaccional"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Swap"
 msgstr "Intercambio"
 
-#: 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 "Otros"
 
-#: diskdrake/hd_gtk.pm:327 diskdrake/interactive.pm:1172
+#: diskdrake/hd_gtk.pm:326 diskdrake/interactive.pm:1172
 #, c-format
 msgid "Empty"
 msgstr "Vacío"
 
-#: diskdrake/hd_gtk.pm:331
+#: diskdrake/hd_gtk.pm:330
 #, c-format
 msgid "Filesystem types:"
 msgstr "Tipos de sistemas de archivos:"
 
-#: 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 "Use \"%s\" en su lugar"
 
-#: 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 "Tipo"
 
-#: diskdrake/hd_gtk.pm:348 diskdrake/interactive.pm:436
+#: diskdrake/hd_gtk.pm:347 diskdrake/interactive.pm:441
 #, c-format
 msgid "Create"
 msgstr "Crear"
 
 #. -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 "Borrar"
 
-#: diskdrake/hd_gtk.pm:353
+#: diskdrake/hd_gtk.pm:352
 #, c-format
 msgid "Use ``Unmount'' first"
 msgstr "Use \"Desmontar\" primero"
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose another partition"
 msgstr "Elija otra partición"
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose a partition"
 msgstr "Elija una partición"
 
-#: diskdrake/interactive.pm:213
+#: diskdrake/interactive.pm:216
 #, c-format
 msgid "Exit"
 msgstr "Salir"
 
-#: diskdrake/interactive.pm:246 help.pm:544
+#: diskdrake/interactive.pm:249 help.pm:530
 #, c-format
 msgid "Undo"
 msgstr "Deshacer"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to normal mode"
 msgstr "Cambiar al modo normal"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to expert mode"
 msgstr "Cambiar al modo experto"
 
-#: diskdrake/interactive.pm:265
+#: diskdrake/interactive.pm:268
 #, c-format
 msgid "Continue anyway?"
 msgstr "¿Seguir adelante?"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without saving"
 msgstr "Salir sin grabar"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without writing the partition table?"
 msgstr "¿Salir del programa sin grabar la tabla de particiones?"
 
-#: diskdrake/interactive.pm:275
+#: diskdrake/interactive.pm:278
 #, c-format
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "¿Desea guardar las modificaciones en /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 ""
 "Necesita reiniciar el equipo para que se efectúe la modificación de la tabla "
 "de particiones"
 
-#: diskdrake/interactive.pm:295 help.pm:544
+#: diskdrake/interactive.pm:298 help.pm:530
 #, c-format
 msgid "Clear all"
 msgstr "Borrar todas"
 
-#: diskdrake/interactive.pm:296 help.pm:544
+#: diskdrake/interactive.pm:299 help.pm:530
 #, c-format
 msgid "Auto allocate"
 msgstr "Asignación automática"
 
-#: 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 "Más"
+
+#: diskdrake/interactive.pm:305
 #, c-format
 msgid "Hard drive information"
 msgstr "Información del disco rígido"
 
-#: diskdrake/interactive.pm:334
+#: diskdrake/interactive.pm:337
 #, c-format
 msgid "All primary partitions are used"
 msgstr "Todas las particiones primarias están usadas"
 
-#: diskdrake/interactive.pm:335
+#: diskdrake/interactive.pm:338
 #, c-format
 msgid "I can't add any more partitions"
 msgstr "No se pueden agregar más particiones"
 
-#: 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 "
@@ -1931,37 +2139,37 @@ msgstr ""
 "Por favor, para tener más particiones borre alguna para poder crear una "
 "partición extendida"
 
-#: diskdrake/interactive.pm:347 help.pm:544
+#: diskdrake/interactive.pm:350 help.pm:530
 #, c-format
 msgid "Save partition table"
 msgstr "Guardar la tabla de particiones"
 
-#: diskdrake/interactive.pm:348 help.pm:544
+#: diskdrake/interactive.pm:351 help.pm:530
 #, c-format
 msgid "Restore partition table"
 msgstr "Restaurar la tabla de particiones"
 
-#: diskdrake/interactive.pm:349 help.pm:544
+#: diskdrake/interactive.pm:352 help.pm:530
 #, c-format
 msgid "Rescue partition table"
 msgstr "Rescatar la tabla de particiones"
 
-#: diskdrake/interactive.pm:351 help.pm:544
+#: diskdrake/interactive.pm:354 help.pm:530
 #, c-format
 msgid "Reload partition table"
 msgstr "Volver a cargar la tabla de particiones"
 
-#: diskdrake/interactive.pm:353
+#: diskdrake/interactive.pm:356
 #, c-format
 msgid "Removable media automounting"
 msgstr "Montaje automático de soportes extraíbles"
 
-#: diskdrake/interactive.pm:362 diskdrake/interactive.pm:382
+#: diskdrake/interactive.pm:365 diskdrake/interactive.pm:385
 #, c-format
 msgid "Select file"
 msgstr "Elija un archivo"
 
-#: diskdrake/interactive.pm:369
+#: diskdrake/interactive.pm:372
 #, c-format
 msgid ""
 "The backup partition table has not the same size\n"
@@ -1970,23 +2178,23 @@ msgstr ""
 "La tabla de particiones de respaldo no tiene\n"
 "el mismo tamaño.  ¿Desea continuar de todas formas?"
 
-#: 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 "Advertencia"
 
-#: diskdrake/interactive.pm:384
+#: diskdrake/interactive.pm:387
 #, c-format
 msgid ""
 "Insert a floppy in drive\n"
@@ -1995,92 +2203,92 @@ msgstr ""
 "Inserte un disquete en la unidad\n"
 "Se perderán todos los datos del disquete"
 
-#: diskdrake/interactive.pm:395
+#: diskdrake/interactive.pm:398
 #, c-format
 msgid "Trying to rescue partition table"
 msgstr "Tratando de rescatar la tabla de particiones"
 
-#: diskdrake/interactive.pm:401
+#: diskdrake/interactive.pm:404
 #, c-format
 msgid "Detailed information"
 msgstr "Información detallada"
 
-#: diskdrake/interactive.pm:416 diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:419 diskdrake/interactive.pm:717
 #, c-format
 msgid "Resize"
 msgstr "Redimensionar"
 
-#: diskdrake/interactive.pm:417 diskdrake/interactive.pm:779
+#: diskdrake/interactive.pm:420 diskdrake/interactive.pm:783
 #, c-format
 msgid "Move"
 msgstr "Desplazar"
 
-#: diskdrake/interactive.pm:418
+#: diskdrake/interactive.pm:421
 #, c-format
 msgid "Format"
 msgstr "Formatear"
 
-#: diskdrake/interactive.pm:420
+#: diskdrake/interactive.pm:423
 #, c-format
 msgid "Add to RAID"
 msgstr "Añadir al RAID"
 
-#: diskdrake/interactive.pm:421
+#: diskdrake/interactive.pm:424
 #, c-format
 msgid "Add to LVM"
 msgstr "Añadir al LVM"
 
-#: diskdrake/interactive.pm:424
+#: diskdrake/interactive.pm:427
 #, c-format
 msgid "Remove from RAID"
 msgstr "Quitar del RAID"
 
-#: diskdrake/interactive.pm:425
+#: diskdrake/interactive.pm:428
 #, c-format
 msgid "Remove from LVM"
 msgstr "Quitar del LVM"
 
-#: diskdrake/interactive.pm:426
+#: diskdrake/interactive.pm:429
 #, c-format
 msgid "Modify RAID"
 msgstr "Modificar el RAID"
 
-#: diskdrake/interactive.pm:427
+#: diskdrake/interactive.pm:430
 #, c-format
 msgid "Use for loopback"
 msgstr "Usar para loopback"
 
-#: diskdrake/interactive.pm:467
+#: diskdrake/interactive.pm:472
 #, c-format
 msgid "Create a new partition"
 msgstr "Crear una partición nueva"
 
-#: diskdrake/interactive.pm:470
+#: diskdrake/interactive.pm:475
 #, c-format
 msgid "Start sector: "
 msgstr "Sector de comienzo: "
 
-#: diskdrake/interactive.pm:472 diskdrake/interactive.pm:881
+#: diskdrake/interactive.pm:477 diskdrake/interactive.pm:884
 #, c-format
 msgid "Size in MB: "
 msgstr "Tamaño en MB: "
 
-#: diskdrake/interactive.pm:473 diskdrake/interactive.pm:882
+#: diskdrake/interactive.pm:478 diskdrake/interactive.pm:885
 #, c-format
 msgid "Filesystem type: "
 msgstr "Tipo de sistema de. archivos: "
 
-#: diskdrake/interactive.pm:478
+#: diskdrake/interactive.pm:483
 #, c-format
 msgid "Preference: "
 msgstr "Preferencia: "
 
-#: diskdrake/interactive.pm:481
+#: diskdrake/interactive.pm:486
 #, c-format
 msgid "Logical volume name "
 msgstr "Nombre del volúmen lógico"
 
-#: diskdrake/interactive.pm:510
+#: diskdrake/interactive.pm:515
 #, c-format
 msgid ""
 "You can't create a new partition\n"
@@ -2091,42 +2299,44 @@ msgstr ""
 "(debido a que alcanzó la cantidad máxima de particiones primarias).\n"
 "Primero debe quitar una partición primaria y crear una partición extendida."
 
-#: diskdrake/interactive.pm:540
+#: diskdrake/interactive.pm:545
 #, c-format
 msgid "Remove the loopback file?"
 msgstr "¿Borrar el archivo de loopback?"
 
-#: 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"
-msgstr "Se perderán todos los datos de la partición %s después de cambiar su tipo"
+msgid ""
+"After changing type of partition %s, all data on this partition will be lost"
+msgstr ""
+"Se perderán todos los datos de la partición %s después de cambiar su tipo"
 
-#: diskdrake/interactive.pm:570
+#: diskdrake/interactive.pm:576
 #, c-format
 msgid "Change partition type"
 msgstr "Cambiar el tipo de partición"
 
-#: 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 "¿Qué sistema de archivos desea?"
 
-#: diskdrake/interactive.pm:579
+#: diskdrake/interactive.pm:585
 #, c-format
 msgid "Switching from ext2 to ext3"
 msgstr "Cambiando de ext2 a ext3"
 
-#: diskdrake/interactive.pm:608
+#: diskdrake/interactive.pm:614
 #, c-format
 msgid "Where do you want to mount the loopback file %s?"
 msgstr "¿Dónde desea montar el archivo de loopback %s?"
 
-#: diskdrake/interactive.pm:609
+#: diskdrake/interactive.pm:615
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "¿Dónde desea montar el dispositivo %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"
@@ -2136,48 +2346,49 @@ msgstr ""
 "se usa para un montaje en loopback.\n"
 "Quite el montaje de loopback primero"
 
-#: diskdrake/interactive.pm:639
+#: diskdrake/interactive.pm:645
 #, c-format
 msgid "Where do you want to mount %s?"
 msgstr "¿Dónde desea montar a %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 "Cambiando tamaño"
 
-#: diskdrake/interactive.pm:663
+#: diskdrake/interactive.pm:669
 #, c-format
 msgid "Computing FAT filesystem bounds"
 msgstr "Calculando los límites del sistema de archivos FAT"
 
-#: diskdrake/interactive.pm:699
+#: diskdrake/interactive.pm:705
 #, c-format
 msgid "This partition is not resizeable"
 msgstr "No se puede cambiar el tamaño a esta partición"
 
-#: diskdrake/interactive.pm:704
+#: diskdrake/interactive.pm:710
 #, c-format
 msgid "All data on this partition should be backed-up"
-msgstr "Debería hacer una copia de seguridad de todos los datos de esta partición"
+msgstr ""
+"Debería hacer una copia de seguridad de todos los datos de esta partición"
 
-#: diskdrake/interactive.pm:706
+#: diskdrake/interactive.pm:712
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr "Se perderán todos los datos de la partición %s tras cambiar su tamaño"
 
-#: diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:717
 #, c-format
 msgid "Choose the new size"
 msgstr "Eligiendo el tamaño nuevo"
 
-#: diskdrake/interactive.pm:712
+#: diskdrake/interactive.pm:718
 #, c-format
 msgid "New size in MB: "
 msgstr "Tamaño nuevo en MB: "
 
-#: 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"
@@ -2187,147 +2398,142 @@ msgstr ""
 "las particiones, se pueden ejecutar verificaciones de los sist. de archivos\n"
 "la próxima vez que arranque en Windows(TM)"
 
-#: diskdrake/interactive.pm:780
+#: diskdrake/interactive.pm:784
 #, c-format
 msgid "Which disk do you want to move it to?"
 msgstr "¿A qué disco desea desplazarla?"
 
-#: diskdrake/interactive.pm:781
+#: diskdrake/interactive.pm:785
 #, c-format
 msgid "Sector"
 msgstr "Sector"
 
-#: diskdrake/interactive.pm:782
+#: diskdrake/interactive.pm:786
 #, c-format
 msgid "Which sector do you want to move it to?"
 msgstr "¿A qué sector desea desplazarla?"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving"
 msgstr "Desplazando"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving partition..."
 msgstr "Desplazando una partición..."
 
-#: diskdrake/interactive.pm:807
+#: diskdrake/interactive.pm:810
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Elegir un RAID existente al que añadir"
 
-#: diskdrake/interactive.pm:808 diskdrake/interactive.pm:825
+#: diskdrake/interactive.pm:812 diskdrake/interactive.pm:828
 #, c-format
 msgid "new"
 msgstr "nuevo"
 
-#: diskdrake/interactive.pm:823
+#: diskdrake/interactive.pm:826
 #, c-format
 msgid "Choose an existing LVM to add to"
 msgstr "Elegir un LVM existente al que añadir"
 
-#: diskdrake/interactive.pm:829
+#: diskdrake/interactive.pm:832
 #, c-format
 msgid "LVM name?"
 msgstr "¿nombre de LVM?"
 
-#: diskdrake/interactive.pm:866
+#: diskdrake/interactive.pm:869
 #, c-format
 msgid "This partition can't be used for loopback"
 msgstr "Esta partición no puede usarse para el loopback"
 
-#: diskdrake/interactive.pm:879
+#: diskdrake/interactive.pm:882
 #, c-format
 msgid "Loopback"
 msgstr "Loopback"
 
-#: diskdrake/interactive.pm:880
+#: diskdrake/interactive.pm:883
 #, c-format
 msgid "Loopback file name: "
 msgstr "Nombre del archivo de loopback: "
 
-#: diskdrake/interactive.pm:885
+#: diskdrake/interactive.pm:888
 #, c-format
 msgid "Give a file name"
 msgstr "Indique el nombre de un archivo"
 
-#: diskdrake/interactive.pm:888
+#: diskdrake/interactive.pm:891
 #, c-format
 msgid "File is already used by another loopback, choose another one"
 msgstr "El archivo ya lo utiliza otro dispositivo loopback, seleccione otro"
 
-#: diskdrake/interactive.pm:889
+#: diskdrake/interactive.pm:892
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "El archivo ya existe. ¿Desea usarlo?"
 
-#: diskdrake/interactive.pm:912
+#: diskdrake/interactive.pm:915
 #, c-format
 msgid "Mount options"
 msgstr "Opciones de montaje"
 
-#: diskdrake/interactive.pm:919
+#: diskdrake/interactive.pm:922
 #, c-format
 msgid "Various"
 msgstr "Varios"
 
-#: diskdrake/interactive.pm:983
+#: diskdrake/interactive.pm:987
 #, c-format
 msgid "device"
 msgstr "dispositivo"
 
-#: diskdrake/interactive.pm:984
+#: diskdrake/interactive.pm:988
 #, c-format
 msgid "level"
 msgstr "nivel"
 
-#: diskdrake/interactive.pm:985
+#: diskdrake/interactive.pm:989
 #, c-format
-msgid "chunk size"
-msgstr "tamaño de los bloques"
+msgid "chunk size in KiB"
+msgstr "tamaño de bloque en KiB"
 
-#: diskdrake/interactive.pm:1001
+#: diskdrake/interactive.pm:1006
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "Cuidado: esta operación es peligrosa."
 
-#: diskdrake/interactive.pm:1016
+#: diskdrake/interactive.pm:1021
 #, c-format
 msgid "What type of partitioning?"
 msgstr "¿Qué tipo de particionamiento?"
 
-#: diskdrake/interactive.pm:1032
-#, c-format
-msgid "The package %s is needed. Install it?"
-msgstr "Se necesita el paquete %s. ¿Desea instalarlo?"
-
-#: diskdrake/interactive.pm:1061
+#: diskdrake/interactive.pm:1059
 #, c-format
 msgid "You'll need to reboot before the modification can take place"
 msgstr "Necesita reiniciar el equipo para que la modificación tenga efecto"
 
-#: diskdrake/interactive.pm:1070
+#: diskdrake/interactive.pm:1068
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "¡Se escribirá al disco la tabla de particiones de la unidad %s!"
 
-#: diskdrake/interactive.pm:1083
+#: diskdrake/interactive.pm:1081
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Se perderán todos los datos de la partición %s después de formatearla"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Move files to the new partition"
 msgstr "Mover los archivos a la nueva partición"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Hide files"
 msgstr "Ocultar archivos"
 
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1102
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
@@ -2336,53 +2542,53 @@ msgstr ""
 "El directorio %s ya tiene algunos datos\n"
 "(%s)"
 
-#: diskdrake/interactive.pm:1112
+#: diskdrake/interactive.pm:1113
 #, c-format
 msgid "Moving files to the new partition"
 msgstr "Moviendo los archivos a la nueva partición"
 
-#: diskdrake/interactive.pm:1116
+#: diskdrake/interactive.pm:1117
 #, c-format
 msgid "Copying %s"
 msgstr "Copiando %s"
 
-#: diskdrake/interactive.pm:1120
+#: diskdrake/interactive.pm:1121
 #, c-format
 msgid "Removing %s"
 msgstr "Borrando %s"
 
-#: diskdrake/interactive.pm:1134
+#: diskdrake/interactive.pm:1135
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr "la partición %s ahora se conoce como %s"
 
-#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1217
+#: diskdrake/interactive.pm:1156 diskdrake/interactive.pm:1217
 #, c-format
 msgid "Device: "
 msgstr "Dispositivo: "
 
-#: diskdrake/interactive.pm:1156
+#: diskdrake/interactive.pm:1157
 #, c-format
 msgid "Devfs name: "
 msgstr "Nombre Devfs: "
 
-#: diskdrake/interactive.pm:1157
+#: diskdrake/interactive.pm:1158
 #, c-format
 msgid "Volume label: "
 msgstr "Etiqueta de volumen: "
 
-#: diskdrake/interactive.pm:1158
+#: diskdrake/interactive.pm:1159
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "Letra DOS: %s (simplemente una adivinanza)\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 "Tipo: "
 
-#: diskdrake/interactive.pm:1166 install_steps_gtk.pm:341
+#: diskdrake/interactive.pm:1167 install_steps_gtk.pm:310
 #, c-format
 msgid "Name: "
 msgstr "Nombre: "
@@ -2429,8 +2635,8 @@ msgstr "Montado\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
@@ -2457,8 +2663,8 @@ msgstr "Nivel %s\n"
 
 #: diskdrake/interactive.pm:1190
 #, c-format
-msgid "Chunk size %s\n"
-msgstr "Tamaño de los bloques %s\n"
+msgid "Chunk size %d KiB\n"
+msgstr "Tamaño de bloque %d KiB\n"
 
 #: diskdrake/interactive.pm:1191
 #, c-format
@@ -2531,40 +2737,40 @@ msgstr "Tipo de la tabla de particiones: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "en el canal %d id %d\n"
 
-#: diskdrake/interactive.pm:1257
+#: diskdrake/interactive.pm:1256
 #, c-format
 msgid "Filesystem encryption key"
 msgstr "Clave de cifrado del sistema de archivos"
 
-#: diskdrake/interactive.pm:1258
+#: diskdrake/interactive.pm:1257
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Elija la clave de cifrado de su sistema de archivos"
 
-#: 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 ""
 "Esta clave de cifrado es demasiado simple\n"
 "(tiene que tener por lo menos una longitud de %d caracteres)"
 
-#: diskdrake/interactive.pm:1262
+#: diskdrake/interactive.pm:1261
 #, c-format
 msgid "The encryption keys do not match"
 msgstr "Las claves de cifrado no coinciden"
 
-#: 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 "Clave de cifrado"
 
-#: diskdrake/interactive.pm:1266
+#: diskdrake/interactive.pm:1265
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Clave de cifrado (otra vez)"
 
-#: diskdrake/removable.pm:47
+#: diskdrake/removable.pm:46
 #, c-format
 msgid "Change type"
 msgstr "Cambiar tipo"
@@ -2593,12 +2799,13 @@ msgstr "Otro"
 
 #: diskdrake/smbnfs_gtk.pm:177
 #, c-format
-msgid "Please enter your username, password and domain name to access this host."
+msgid ""
+"Please enter your username, password and domain name to access this host."
 msgstr ""
 "Por favor, ingrese su nombre de usuario, contraseña y nombre de dominio para "
 "acceder a este host."
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3495
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3489
 #, c-format
 msgid "Username"
 msgstr "Nombre de usuario"
@@ -2613,27 +2820,72 @@ msgstr "Buscar servidores"
 msgid "Search new servers"
 msgstr "Buscar servidores nuevos"
 
-#: 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 "Se necesita instalar el paquete %s. ¿Quiere instalarlo?"
 
-#: do_pkgs.pm:26
+#: do_pkgs.pm:21 do_pkgs.pm:36
 #, c-format
 msgid "Mandatory package %s is missing"
 msgstr "Falta el paquete obligatorio %s"
 
-#: do_pkgs.pm:143
+#: do_pkgs.pm:172
 #, c-format
 msgid "Installing packages..."
 msgstr "Instalando paquetes..."
 
-#: do_pkgs.pm:217
+#: do_pkgs.pm:216
 #, c-format
 msgid "Removing packages..."
 msgstr "Quitando paquetes..."
 
-#: fs.pm:416
+#: fs.pm:445 fs.pm:494
+#, c-format
+msgid "Mounting partition %s"
+msgstr "Montando la partición %s"
+
+#: fs.pm:446 fs.pm:495
+#, c-format
+msgid "mounting partition %s in directory %s failed"
+msgstr "falló el montaje de la partición %s en el directorio %s"
+
+#: fs.pm:466 fs.pm:473
+#, c-format
+msgid "Checking %s"
+msgstr "Verificando %s"
+
+#: fs.pm:511 partition_table.pm:387
+#, c-format
+msgid "error unmounting %s: %s"
+msgstr "error desmontando %s: %s"
+
+#: fs.pm:543
+#, c-format
+msgid "Enabling swap partition %s"
+msgstr "Habilitando la partición swap %s"
+
+#: fs/format.pm:39 fs/format.pm:46
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formateando la partición %s"
+
+#: fs/format.pm:43
+#, c-format
+msgid "Creating and formatting file %s"
+msgstr "Creando y formateando el archivo %s"
+
+#: fs/format.pm:78
+#, c-format
+msgid "I don't know how to format %s in type %s"
+msgstr "No sé cómo formatear %s en el tipo %s"
+
+#: fs/format.pm:80
+#, c-format
+msgid "%s formatting of %s failed"
+msgstr "%s formateo de %s falló"
+
+#: fs/mount_options.pm:112
 #, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
@@ -2643,7 +2895,7 @@ msgstr ""
 "(ej: para un acceso más rápido al spool de noticias en un servidor de "
 "noticias)"
 
-#: fs.pm:419
+#: fs/mount_options.pm:115
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
@@ -2652,14 +2904,14 @@ msgstr ""
 "Sólo se puede montar explícitamente (es decir,\n"
 "la opción -a no causará que se monte el sistema de archivos)"
 
-#: fs.pm:422
+#: fs/mount_options.pm:118
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
 msgstr ""
 "No interpretar dispositivos especiales de bloque o caracter en el sistema de "
 "archivos."
 
-#: fs.pm:424
+#: fs/mount_options.pm:120
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2670,7 +2922,7 @@ msgstr ""
 "Esta opción puede ser útil para un servidor que tiene sistemas de archivos\n"
 "que contienen binaros para arquitecturas distintas a la propia."
 
-#: fs.pm:428
+#: fs/mount_options.pm:124
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2682,17 +2934,18 @@ msgstr ""
 "(Esto parece seguro, pero de hecho es bastante inseguro si tiene\n"
 "suidperl(1) instalado)"
 
-#: fs.pm:432
+#: fs/mount_options.pm:128
 #, c-format
 msgid "Mount the file system read-only."
 msgstr "Montar el sistema de archivos como sólo de lectura."
 
-#: fs.pm:434
+#: fs/mount_options.pm:130
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
-msgstr "Toda la E/S del sistema de archivos debería hacerse de manera sincrónica."
+msgstr ""
+"Toda la E/S del sistema de archivos debería hacerse de manera sincrónica."
 
-#: fs.pm:438
+#: fs/mount_options.pm:134
 #, c-format
 msgid ""
 "Allow an ordinary user to mount the file system. The\n"
@@ -2708,65 +2961,25 @@ msgstr ""
 "nosuid, y nodev (a menos que las opciones subsiguientes digan lo contrario,\n"
 "tales como en la línea de opciones user,exec,dev,suid)"
 
-#: fs.pm:446
+#: fs/mount_options.pm:142
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr "Dar acceso de escritura a usuarios regulares"
 
-#: fs.pm:448
+#: fs/mount_options.pm:144
 #, c-format
 msgid "Give read-only access to ordinary users"
 msgstr "Dar acceso sólo de lectura a usuarios regulares"
 
-#: 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 formateo de %s falló"
-
-#: fs.pm:655
-#, c-format
-msgid "I don't know how to format %s in type %s"
-msgstr "No sé cómo formatear %s en el tipo %s"
-
-#: fs.pm:662 fs.pm:669
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formateando la partición %s"
-
-#: fs.pm:666
-#, c-format
-msgid "Creating and formatting file %s"
-msgstr "Creando y formateando el archivo %s"
-
-#: fs.pm:726 fs.pm:775
-#, c-format
-msgid "Mounting partition %s"
-msgstr "Montando la partición %s"
-
-#: fs.pm:727 fs.pm:776
-#, c-format
-msgid "mounting partition %s in directory %s failed"
-msgstr "falló el montaje de la partición %s en el directorio %s"
-
-#: fs.pm:747 fs.pm:754
+#: fs/type.pm:364
 #, c-format
-msgid "Checking %s"
-msgstr "Verificando %s"
-
-#: fs.pm:792 partition_table.pm:639
-#, c-format
-msgid "error unmounting %s: %s"
-msgstr "error desmontando %s: %s"
-
-#: fs.pm:824
-#, c-format
-msgid "Enabling swap partition %s"
-msgstr "Habilitando la partición swap %s"
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "No se puede usar JFS para particiones menores de 32MB"
 
-#: fsedit.pm:21
+#: fs/type.pm:365
 #, c-format
-msgid "simple"
-msgstr "simple"
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "No se puede usar ReiserFS para particiones menores de 32MB"
 
 #: fsedit.pm:25
 #, c-format
@@ -2778,7 +2991,7 @@ msgstr "con /usr"
 msgid "server"
 msgstr "servidor"
 
-#: 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"
@@ -2797,32 +3010,22 @@ msgstr ""
 "\n"
 "¿Está de acuerdo en perder todas las particiones?\n"
 
-#: fsedit.pm:524
-#, c-format
-msgid "You can't use JFS for partitions smaller than 16MB"
-msgstr "No se puede usar JFS para particiones menores de 32MB"
-
-#: fsedit.pm:525
-#, c-format
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "No se puede usar ReiserFS para particiones menores de 32MB"
-
-#: fsedit.pm:544
+#: fsedit.pm:385
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "Los puntos de montaje deben comenzar con una /"
 
-#: fsedit.pm:545
+#: fsedit.pm:386
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
 msgstr "Los puntos de montaje deberían contener sólo caracteres alfanuméricos"
 
-#: fsedit.pm:546
+#: fsedit.pm:387
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Ya existe una partición con el punto de montaje %s\n"
 
-#: fsedit.pm:548
+#: fsedit.pm:389
 #, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
@@ -2834,12 +3037,12 @@ msgstr ""
 "boot.\n"
 "Por favor, asegúrese de añadir una partición /boot."
 
-#: fsedit.pm:551
+#: fsedit.pm:392
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr "No puede usar un Volumen Lógico LVM para el punto de montaje %s"
 
-#: fsedit.pm:553
+#: fsedit.pm:394
 #, c-format
 msgid ""
 "You've selected a LVM Logical Volume as root (/).\n"
@@ -2850,7 +3053,7 @@ msgstr ""
 "El cargador de arranque no puede manejar esto sin una partición /boot.\n"
 "Por favor, asegúrese de añadir una partición /boot."
 
-#: 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 "
@@ -2859,12 +3062,12 @@ msgstr ""
 "Es posible que no pueda instalar lilo (ya que lilo no maneja un LV en PVs "
 "múltiples)"
 
-#: fsedit.pm:559 fsedit.pm:561
+#: fsedit.pm:400 fsedit.pm:402
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "Este directorio debería permanecer dentro del sistema de archivos raíz"
 
-#: 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 "
@@ -2873,133 +3076,128 @@ msgstr ""
 "Necesita un sistema de archivos verdadero (ext2/ext3, reiserfs, xfs o jfs) "
 "para este punto de montaje\n"
 
-#: fsedit.pm:567
+#: fsedit.pm:408
 #, c-format
 msgid "You can't use an encrypted file system for mount point %s"
-msgstr "No puede usar un sistema de archivos cifrado para el punto de montaje %s"
+msgstr ""
+"No puede usar un sistema de archivos cifrado para el punto de montaje %s"
 
-#: fsedit.pm:628
+#: fsedit.pm:469
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "No hay espacio libre suficiente para la asignación automática"
 
-#: fsedit.pm:630
+#: fsedit.pm:471
 #, c-format
 msgid "Nothing to do"
 msgstr "Nada para hacer"
 
-#: fsedit.pm:726
+#: fsedit.pm:569
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Error al abrir %s para escribir: %s"
 
-#: harddrake/data.pm:55
+#: harddrake/data.pm:61
 #, c-format
 msgid "Floppy"
 msgstr "Disquete"
 
-#: 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 "Disco"
 
-#: 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 "Grabadoras de CD/DVD"
 
-#: 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 "Cinta"
 
-#: harddrake/data.pm:123
+#: harddrake/data.pm:129
 #, c-format
 msgid "Videocard"
 msgstr "Tarjeta de vídeo"
 
-#: harddrake/data.pm:133
+#: harddrake/data.pm:139
 #, c-format
 msgid "Tvcard"
 msgstr "Tarjeta de TV"
 
-#: harddrake/data.pm:142
+#: harddrake/data.pm:148
 #, c-format
 msgid "Other MultiMedia devices"
 msgstr "Otros dispositivos multimedios"
 
-#: harddrake/data.pm:151
+#: harddrake/data.pm:157
 #, c-format
 msgid "Soundcard"
 msgstr "Tarjeta de sonido"
 
-#: harddrake/data.pm:160
+#: harddrake/data.pm:166
 #, c-format
 msgid "Webcam"
 msgstr "Cámara web"
 
-#: harddrake/data.pm:174
+#: harddrake/data.pm:181
 #, c-format
 msgid "Processors"
 msgstr "Procesadores"
 
-#: harddrake/data.pm:183
+#: harddrake/data.pm:191
 #, c-format
 msgid "ISDN adapters"
 msgstr "Adaptadores RDSI"
 
-#: harddrake/data.pm:192
+#: harddrake/data.pm:201
 #, c-format
 msgid "Ethernetcard"
 msgstr "Tarjeta Ethernet"
 
-#: harddrake/data.pm:208 network/netconnect.pm:464
+#: harddrake/data.pm:219 network/netconnect.pm:484
 #, c-format
 msgid "Modem"
 msgstr "Módem"
 
-#: harddrake/data.pm:217
+#: harddrake/data.pm:229
 #, c-format
 msgid "ADSL adapters"
 msgstr "Adaptadores ADSL"
 
-#: harddrake/data.pm:230
+#: harddrake/data.pm:243
 #, c-format
 msgid "AGP controllers"
 msgstr "Controladoras AGP"
 
-#: harddrake/data.pm:239
+#: harddrake/data.pm:252
 #, c-format
 msgid "Bridges and system controllers"
 msgstr "Puentes y controladores del sistema"
 
-#: 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 "Impresora"
 
-#: harddrake/data.pm:257 help.pm:991 install_steps_interactive.pm:920
-#, c-format
-msgid "Mouse"
-msgstr "Ratón"
-
 #: harddrake/data.pm:271
 #, c-format
 msgid "Joystick"
@@ -3022,50 +3220,72 @@ msgstr "Controladores Firewire"
 
 #: harddrake/data.pm:308
 #, c-format
+msgid "PCMCIA controllers"
+msgstr "Controladores PCMCIA"
+
+#: harddrake/data.pm:321
+#, c-format
 msgid "SCSI controllers"
 msgstr "Controladores SCSI"
 
-#: harddrake/data.pm:317
+#: harddrake/data.pm:330
 #, c-format
 msgid "USB controllers"
 msgstr "Controladores USB"
 
-#: harddrake/data.pm:326
+#: harddrake/data.pm:339
 #, c-format
 msgid "USB ports"
 msgstr "Puertos USB"
 
-#: harddrake/data.pm:335
+#: harddrake/data.pm:348
 #, c-format
 msgid "SMBus controllers"
 msgstr "Controladores SMBus"
 
-#: 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 "Teclado"
+
+#: harddrake/data.pm:379 help.pm:855 install_steps_interactive.pm:985
+#, c-format
+msgid "Mouse"
+msgstr "Ratón"
+
+#: harddrake/data.pm:393
 #, c-format
 msgid "Scanner"
-msgstr "Escáner."
+msgstr "Escáner"
 
-#: harddrake/data.pm:354 standalone/harddrake2:336
+#: harddrake/data.pm:403 standalone/harddrake2:431
 #, c-format
 msgid "Unknown/Others"
 msgstr "Desconocido/Otros"
 
-#: harddrake/data.pm:374
+#: harddrake/data.pm:431
 #, c-format
 msgid "cpu # "
 msgstr "cpu #"
 
-#: 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 "Espere, por favor... Aplicando la configuración"
 
-#: harddrake/sound.pm:186
+#: harddrake/sound.pm:206
 #, c-format
 msgid "No alternative driver"
 msgstr "No hay controlador alternativo"
 
-#: 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 "
@@ -3074,12 +3294,12 @@ msgstr ""
 "No hay contrlador alternativo OSS/ALSA conocido para su tarjeta de sonido (%"
 "s) que en este momento usa \"%s\""
 
-#: harddrake/sound.pm:193
+#: harddrake/sound.pm:213
 #, c-format
 msgid "Sound configuration"
 msgstr "Configuración de sonido"
 
-#: harddrake/sound.pm:195
+#: harddrake/sound.pm:215
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
@@ -3088,7 +3308,7 @@ msgstr ""
 "Aquí puede seleccionar un controlador alternativo (OSS o ALSA) para su "
 "tarjeta de sonido (%s)"
 
-#: harddrake/sound.pm:197
+#: harddrake/sound.pm:217
 #, c-format
 msgid ""
 "\n"
@@ -3101,7 +3321,7 @@ msgstr ""
 "Actualmente su tarjeta usa el controlador %s\"%s\" (el controlador predet. "
 "para su tarjeta es \"%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 "
@@ -3135,24 +3355,24 @@ msgstr ""
 "- el API nuevo de ALSA que brinda muchas características mejoradas pero "
 "necesita del uso de la bilbioteca ALSA.\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 "Controlador:"
 
-#: harddrake/sound.pm:218
+#: harddrake/sound.pm:238
 #, c-format
 msgid "Trouble shooting"
 msgstr "Solución de problemas"
 
-#: 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 ""
 "El controlador antiguo \"%s\" está en la lista negra.\n"
 "\n"
@@ -3160,12 +3380,12 @@ msgstr ""
 "\n"
 "El controlador nuevo \"%s\" sólo se utilizará en el próximo arranque."
 
-#: harddrake/sound.pm:234
+#: harddrake/sound.pm:254
 #, c-format
 msgid "No open source driver"
 msgstr "No hay controlador open source"
 
-#: 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 "
@@ -3174,32 +3394,33 @@ msgstr ""
 "No hay controlador libre para su tarjeta de sonido (%s), pero hay uno "
 "propietario en \"%s\"."
 
-#: harddrake/sound.pm:238
+#: harddrake/sound.pm:258
 #, c-format
 msgid "No known driver"
 msgstr "No hay controlador conocido"
 
-#: harddrake/sound.pm:239
+#: harddrake/sound.pm:259
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
 msgstr "No hay un controlador conocido para su tarjeta de sonido (%s)"
 
-#: harddrake/sound.pm:243
+#: harddrake/sound.pm:263
 #, c-format
 msgid "Unknown driver"
 msgstr "Controlador desconocido"
 
-#: harddrake/sound.pm:244
+#: harddrake/sound.pm:264
 #, c-format
 msgid "Error: The \"%s\" driver for your sound card is unlisted"
 msgstr "Error: el controlador \"%s\" para su tarjeta de sonido no está listado"
 
-#: harddrake/sound.pm:257
+#: harddrake/sound.pm:278
 #, c-format
 msgid "Sound trouble shooting"
 msgstr "Solución de problemas de sonido"
 
-#: 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"
@@ -3245,17 +3466,18 @@ msgstr ""
 "- \"/sbin/fuser -v /dev/dsp\" le dirá qué programa utiliza la tarjeta de "
 "sonido.\n"
 
-#: harddrake/sound.pm:284
+#: harddrake/sound.pm:307
 #, c-format
 msgid "Let me pick any driver"
 msgstr "Permitirme elegir cualquier controlador"
 
-#: harddrake/sound.pm:287
+#: harddrake/sound.pm:310
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr "Eligiendo un controlador arbitrario"
 
-#: 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 "
@@ -3344,17 +3566,17 @@ msgstr "habilitar el soporte para radio"
 #, 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 ""
 "Antes de continuar, debería leer cuidadosamente los términos de la\n"
 "licencia. La misma cubre a toda la distribución Mandrakelinux. Si está de\n"
-"acuerdo con todos los términos en la misma, marque la casilla \"%s\". Si\n"
-"no, se apagará su computadora al hacer clic sobre el botón \"%s\"."
+"acuerdo con todos los términos en la misma, haga clic en el botón \"%s\".\n"
+"Si no, haga clic en el botón \"%s\" lo que reiniciará su computadora."
 
-#: 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 "Aceptar"
@@ -3364,42 +3586,41 @@ msgstr "Aceptar"
 #: 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 es un sistema multiusuario, y esto significa que cada usuario\n"
 "puede tener sus preferencias propias, sus archivos propios, y así\n"
@@ -3443,17 +3664,22 @@ msgstr ""
 "casilla \"%s\". Haga clic sobre \"%s\" una vez que seleccionó su\n"
 "preferencia."
 
-#: 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 "Nombre del usuario"
+
+#: 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 "Siguiente"
 
-#: 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"
@@ -3461,7 +3687,7 @@ msgstr "Avanzada"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: help.pm:55
+#: help.pm:54
 #, c-format
 msgid ""
 "Listed here are the existing Linux partitions detected on your hard drive.\n"
@@ -3531,38 +3757,48 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: 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 ""
 "La instalación de Mandrakelinux se distribuye en varios CD-ROM. Si un\n"
 "paquete seleccionado se encuentra en otro CD-ROM, DrakX expulsará el CD\n"
-"corriente y le pedirá que inserte el CD correcto según sea necesario."
+"corriente y le pedirá que inserte el necesario. Si no tiene el CD necesario\n"
+"a mano, simplemente haga clic sobre \"%s\", no se instalarán los paquetes\n"
+"correspondientes."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: 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"
@@ -3572,9 +3808,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"
@@ -3584,33 +3830,32 @@ 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 ""
 "Ahora es el momento de especificar los programas que desea instalar en su\n"
-"sistema. Hay miles de paquetes disponibles para Mandrakelinux, y para\n"
-"hacer más simple el manejo de los paquetes, los mismos se han puesto en\n"
-"grupos de aplicaciones similares.\n"
+"sistema. Hay miles de paquetes disponibles para Mandrakelinux, y para hacer\n"
+"más simple el manejo de los paquetes, los mismos se han puesto en grupos de\n"
+"aplicaciones similares.\n"
 "\n"
-"Los paquetes se clasifican en grupos que corresponden a un uso particular\n"
-"de su máquina. Mandrakelinux clasifica los grupos de paquetes en cuatro\n"
-"categorías. Puede mezclar y hacer coincidir aplicaciones de varias\n"
-"categorías, por lo que una instalación de \"Estación de trabajo\" puede\n"
-"tener instaladas aplicaciones de la categoría \"Desarrollo\".\n"
+"Mandrakelinux clasifica los grupos de paquetes en cuatro categorías. Puede\n"
+"mezclar y hacer coincidir aplicaciones de varias categorías, por lo que una\n"
+"instalación de \"Estación de trabajo\" puede tener instaladas aplicaciones\n"
+"de la categoría \"Desarrollo\".\n"
 "\n"
 " * \"%s\": si planifica utilizar su máquina como una estación de trabajo,\n"
 "seleccione una o más aplicaciones de la categoría estación de trabajo.\n"
 "\n"
 " * \"%s\": si planifica utilizar su máquina para programar, elija los\n"
-"paquetes apropiados de esa categoría.\n"
+"grupos apropiados de esa categoría. El grupo especial \"LSB\" configurará\n"
+"su sistema de forma tal que cumpla tanto como sea posible con las\n"
+"especificaciones Linux Standard Base.\n"
+"\n"
+"   Si selecciona el grupo \"LSB\" también se instalará la serie del núcleo\n"
+"\"2.4\", en vez de la serie predeterminada \"2.6\". Esto es para asegurar\n"
+"una compatibilidad 100%% con LSB del sistema. Sin embargo, si no selecciona\n"
+"el grupo \"LSB\" todavía obtendrá un sistema que es casi 100%% compatible\n"
+"con LSB.\n"
 "\n"
 " * \"%s\": si pretende usar la máquina como un servidor, seleccione cuáles\n"
 "de los servicios más comunes desea instalar en su máquina.\n"
@@ -3619,10 +3864,19 @@ msgstr ""
 "desea tener una estación de trabajo gráfica, debe seleccionar al menos uno.\n"
 "\n"
 "Si mueve el cursor del ratón sobre el nombre de un grupo se mostrará un\n"
-"pequeño texto explicativo acerca de ese grupo. Si deselecciona todos los\n"
-"grupos cuando está realizando una instalación regular (es decir, no una\n"
-"actualización), aparecerá un diálogo que propone opciones diferentes para\n"
-"una instalación mínima:\n"
+"pequeño texto explicativo acerca de ese grupo.\n"
+"\n"
+"Puede marcar la casilla \"%s\" que es útil si está familiarizado con los\n"
+"paquetes que se ofrecen, o si desea tener un control total sobre lo que se\n"
+"instalará.\n"
+"\n"
+"Si inició la instalación en el modo \"%s\", puede deseleccionar todos los\n"
+"grupos para evitar la instalación de cualquier paquete nuevo. Esto es útil\n"
+"para reparar o actualizar un sistema existente.\n"
+"\n"
+"Si deselecciona todos los grupos cuando está realizando una instalación\n"
+"regular (es decir, no una actualización), aparecerá un diálogo que sugiere\n"
+"opciones diferentes para una instalación mínima:\n"
 "\n"
 " * \"%s\": instala la menor cantidad de paquetes posible para tener un\n"
 "escritorio gráfico que funcione.\n"
@@ -3633,99 +3887,91 @@ msgstr ""
 "\n"
 " * \"%s\": instalará el mínimo necesario estricto para obtener un sistema\n"
 "Linux que funciona. Con esta instalación sólo tendrá una interfaz de línea\n"
-"de comandos. Esta instalación ocupa alrededor de 65 MB.\n"
-"\n"
-"Puede marcar la casilla \"%s\" que es útil si está familiarizado con los\n"
-"paquetes que se ofrecen, o si desea tener un control total sobre lo que se\n"
-"instalará.\n"
-"\n"
-"Si inició la instalación en el modo \"%s\" puede deseleccionar todos los\n"
-"grupos para evitar instalar cualquier paquete nuevo. Esto es útil para\n"
-"reparar o actualizar un sistema existente."
+"de comandos. Esta instalación ocupa alrededor de 65 MB."
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:23
 #, c-format
 msgid "Workstation"
 msgstr "Estación de trabajo"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:64 share/compssUsers.pl:162
+#: share/compssUsers.pl:164
 #, c-format
 msgid "Development"
 msgstr "Desarrollo"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:144
 #, c-format
 msgid "Graphical Environment"
 msgstr "Entorno gráfico"
 
-#: 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 "Selección de paquetes individuales"
+
+#: help.pm:146 help.pm:588
+#, c-format
+msgid "Upgrade"
+msgstr "Actualización"
+
+#: help.pm:146 install_steps_interactive.pm:600
 #, c-format
 msgid "With X"
 msgstr "Con X"
 
-#: help.pm:137
+#: help.pm:146
 #, c-format
 msgid "With basic documentation"
 msgstr "Con documentación básica"
 
-#: help.pm:137
+#: help.pm:146
 #, c-format
 msgid "Truly minimal install"
 msgstr "Instalación realmente mínima"
 
-#: help.pm:137 install_steps_gtk.pm:272 install_steps_interactive.pm:598
-#, c-format
-msgid "Individual package selection"
-msgstr "Selección de paquetes individuales"
-
-#: help.pm:137 help.pm:602
-#, c-format
-msgid "Upgrade"
-msgstr "Actualización"
-
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: help.pm:140
+#: help.pm:149
 #, 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 ""
-"Si le dijo al instalador que deseaba seleccionar los paquetes individuales,\n"
-"el mismo presentará un árbol que contiene todos los paquetes clasificados\n"
-"por grupos y subgrupos. Mientras navega por el árbol puede seleccionar\n"
-"grupos enteros, subgrupos, o paquetes individuales.\n"
+"Si eligió instalar los paquetes de manera individual, el instalador\n"
+"presentará un árbol que contiene todos los paquetes clasificados por grupos\n"
+"y subgrupos. Mientras navega por el árbol puede seleccionar grupos enteros,\n"
+"subgrupos, o paquetes individuales.\n"
 "\n"
 "Tan pronto como selecciona un paquete en el árbol, aparece una descripción\n"
 "del mismo sobre la derecha que le permite conocer el propósito del paquete.\n"
@@ -3733,127 +3979,66 @@ msgstr ""
 "Es muy probable que la gran mayoría de las descripciones de los paquetes\n"
 "estén en inglés.\n"
 "\n"
-"!! Si ha sido seleccionado un paquete de servidor ya sea porque Usted\n"
+"!! Si ha sido seleccionado un paquete de servidor, ya sea porque Usted\n"
 "seleccionó específicamente el paquete individual o porque el mismo era\n"
 "parte de un grupo de paquetes, se le pedirá que confirme que realmente\n"
-"desea que se instalen esos servidores. Bajo Mandrakelinux, cualquier\n"
-"servidor instalado se inicia de manera predeterminada al momento del\n"
-"arranque. Aunque estos son seguros y no tienen problemas conocidos al\n"
-"momento en que se publicó la distribución, es posible que se descubran\n"
-"vulnerabilidades en la seguridad luego que se terminó con esta versión de\n"
-"Mandrakelinux. En particular, si no sabe que es lo que se supone que hace\n"
-"un servicio o la razón por la cual se está instalando, entonces haga clic\n"
+"desea que se instalen esos servidores. De manera predeterminada,\n"
+"Mandrakelinux iniciará automáticamente todos los servicios instalados al\n"
+"momento del arranque. Aunque estos son seguros y no tienen problemas\n"
+"conocidos al momento en que se publicó la distribución, es muy posible que\n"
+"se descubran vulnerabilidades en la seguridad luego que se terminó con esta\n"
+"versión de Mandrakelinux. Si no sabe que es lo que se supone que hace un\n"
+"servicio o la razón por la cual se está instalando, entonces haga clic\n"
 "sobre \"%s\". Si hace clic sobre \"%s\" se instalarán todos los servicios\n"
-"listados y de manera predeterminada los mismos arrancarán automáticamente.\n"
+"listados y los mismos se iniciarán automáticamente al momento del arranque.\n"
 "!!\n"
 "\n"
-"La opción \"%s\" simplemente deshabilita el diálogo de advertencia que\n"
-"aparece cuando el instalador selecciona automáticamente un paquete para\n"
-"resolver un problema de dependencias. Algunos paquetes tienen relaciones\n"
-"entre ellos tales que la instalación de un paquete necesita que algún otro\n"
-"programa ya esté instalado. El instalador puede determinar qué paquetes se\n"
-"necesitan para satisfacer una dependencia para completar la instalación de\n"
-"manera satisfactoria.\n"
-"\n"
-"El pequeño icono del disquete bajo la lista le permite cargar la lista de\n"
-"paquetes elegida durante una instalación previa. Esto es útil si Usted\n"
-"tiene una cantidad de máquinas que desea configurar de manera idéntica.\n"
-"Haga clic sobre este icono y se le pedirá que inserte un disquete creado\n"
-"con anterioridad al final de otra instalación. Vea el segundo consejo del\n"
+"La opción \"%s\" se usa para deshabilitar el diálogo de advertencia que\n"
+"aparece cada vez que el instalador selecciona automáticamente un paquete\n"
+"para resolver un problema de dependencias. Algunos paquetes dependen de\n"
+"otros y la instalación de un paquete en particular puede requerir la\n"
+"instalación de otro paquete. El instalador puede determinar qué paquetes se\n"
+"necesitan para satisfacer una dependencia para poder completar la\n"
+"instalación de manera satisfactoria.\n"
+"\n"
+"El pequeño icono del disquete en la parte inferior de la lista le permite\n"
+"cargar la lista de paquetes elegida durante una instalación previa. Esto es\n"
+"útil si Usted tiene una cantidad de máquinas que desea configurar de manera\n"
+"idéntica. Al hacer clic sobre este icono se le pedirá que inserte un\n"
+"disquete creado al final de otra instalación. Vea el segundo consejo del\n"
 "último paso para información sobre como crear dicho disquete."
 
-#: 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 "No"
 
-#: 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 "Sí"
 
-#: help.pm:172
+#: help.pm:180
 #, c-format
 msgid "Automatic dependencies"
 msgstr "Dependencias automáticas"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: 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 ""
-"Ahora configurará su conexión de red/Internet. Haga clic sobre \"%s\" si\n"
-"desea conectar su computadora a la Internet o a una red de área local.\n"
-"Mandrakelinux intentará detectar automáticamente los dispositivos de red y\n"
-"módems. Si esta detección falla, quite la marca de la casilla \"%s\".\n"
-"También puede elegir no configurar la red, o hacerlo más tarde, en cuyo\n"
-"caso hacer clic sobre el botón \"%s\" lo llevará al paso siguiente.\n"
-"\n"
-"Cuando configura su red las opciones de conexión disponibles son: conexión\n"
-"con módem tradicional, conexión con Winmodem, conexión con módem RDSI\n"
-"(ISDN), conexión ADSL, cable módem, y finalmente una simple conexión LAN\n"
-"(Ethernet).\n"
-"\n"
-"Aquí no entraremos en detalle en cada opción de configuración - simplemente\n"
-"debe asegurarse que su Proveedor de Servicios de Internet o su\n"
-"administrador del sistema le proporcionaron todos los parámetros de\n"
-"configuración, tales como la dirección IP, la pasarela predeterminada, los\n"
-"servidores DNS, etc.\n"
-"\n"
-"Acerca de la conexión con Winmodems. Los Winmodem son módems de gama baja,\n"
-"especiales e integrados, que necesitan un software adicional para funcionar\n"
-"a diferencia de los módem normales. En realidad, algunos de esos módem\n"
-"funcionan bajo Mandrakelinux y otros no. Puede consultar la lista de módem\n"
-"soportados en LinModems.\n"
-"\n"
-"Puede consultar el capítulo de \"Guía de Comienzo\" sobre las conexiones a\n"
-"la Internet para detalles acerca de la configuración, o simplemente esperar\n"
-"hasta que su sistema esté instalado y usar el programa que se describe allí\n"
-"para configurar su conexión."
-
-#: help.pm:197
-#, c-format
-msgid "Use auto detection"
-msgstr "Usar detección automática"
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: 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\": al hacer clic sobre el botón \"%s\" se abrirá el asistente de\n"
 "configuración de la impresora. Consulte el capítulo correspondiente de la\n"
@@ -3861,55 +4046,54 @@ msgstr ""
 "impresora nueva. La interfaz presentada allí es similar a la utilizada\n"
 "durante la instalación."
 
-#: 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 "Configurar"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: help.pm:206
+#: help.pm:189
 #, 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 ""
-"Este diálogo se usa para elegir los servicios que desea se inicien durante\n"
-"el arranque.\n"
+"Este diálogo se usa para elegir cuáles servicios Usted desea que se inicien\n"
+"durante el arranque.\n"
 "\n"
-"DrakX listará todos los servicios disponibles con la instalación corriente.\n"
-"Debe revisarlos con cuidado y quitar la marca de aquellos que no siempre\n"
-"son necesarios al arrancar.\n"
+"DrakX listará todos los servicios disponibles en la instalación corriente.\n"
+"Revíselos con cuidado y quite la marca de aquellos que no son necesarios al\n"
+"arrancar.\n"
 "\n"
 "Cuando se selecciona un servicio obtendrá un pequeño texto explicativo\n"
 "acerca del mismo. Sin embargo, si no está seguro si un servicio es útil o\n"
 "no, es más seguro dejar el comportamiento predeterminado.\n"
 "\n"
 "!! Tenga mucho cuidado en esta etapa si pretende usar su máquina como un\n"
-"servidor: probablemente no deseará activar servicios que no necesita. Por\n"
-"favor recuerde que varios servicios pueden ser peligrosos si se habilitan\n"
-"en un servidor. En general, seleccione sólo aquellos servicios que\n"
-"realmente necesita. !!"
+"servidor: probablemente no desea iniciar servicios que no necesita. Por\n"
+"favor recuerde que algunos servicios pueden ser peligrosos si están\n"
+"habilitados en un servidor. En general, seleccione sólo aquellos servicios\n"
+"que realmente necesita. !!"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: help.pm:224
+#: help.pm:206
 #, c-format
 msgid ""
 "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to\n"
@@ -3917,98 +4101,100 @@ 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 administra la hora en GMT (\"Greenwich Mean Time\", Hora del\n"
 "Meridiano de Greenwich) y la traduce a la hora local de acuerdo al huso\n"
 "horario que Usted seleccionó. Sin embargo, es posible desactivar esto\n"
 "quitando la marca de la casilla \"%s\", lo que hará que GNU/Linux sepa que\n"
 "el reloj del sistema y el reloj de hardware están en el mismo huso horario.\n"
-"Esto es útil cuando la máquina también alberga otro sistema operativo como\n"
-"Windows.\n"
+"Esto es útil cuando la máquina también alberga otro sistema operativo.\n"
 "\n"
-"La opción \"%s\" regulará automáticamente el reloj conectándose a un\n"
-"servidor remoto de la hora en la Internet. Para que esta característica\n"
-"funcione debe tener una conexión con la Internet funcionando. En realidad,\n"
-"esta opción instala un servidor de la hora que puede ser utilizado por\n"
-"otras máquinas en su red local."
+"La opción \"%s\" regulará automáticamente el reloj del sistema conectándose\n"
+"a un servidor remoto de la hora en la Internet. Para que esta\n"
+"característica funcione, debe tener una conexión con la Internet\n"
+"funcionando. Le recomendamos que elija un servidor de la hora ubicado cerca\n"
+"de Usted. En realidad, esta opción instala un servidor de la hora que\n"
+"también puede ser utilizado por otras máquinas en su red local."
 
-#: 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 "Reloj interno puesto a GMT"
 
-#: help.pm:235
+#: help.pm:217
 #, c-format
 msgid "Automatic time synchronization"
 msgstr "Sincronización automática de la hora"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: 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 ""
 "Tarjeta gráfica\n"
 "\n"
 "   Normalmente el instalador puede detectar y configurar automáticamente la\n"
-"tarjeta gráfica instalada en su máquina. Si este no es el caso, en esta\n"
-"lista puede elegir la tarjeta que realmente posee.\n"
+"tarjeta de vídeo instalada en su máquina. Si este no es el caso, en esta\n"
+"lista puede elegir la tarjeta que realmente tiene instalada.\n"
 "\n"
-"   En caso que estén disponibles diferentes servidores para su tarjeta, con\n"
-"o sin aceleración de 3D, entonces se le propone elegir el servidor que\n"
-"mejor satisface sus necesidades."
+"   En caso de que estén disponibles diferentes servidores para su tarjeta,\n"
+"con o sin aceleración de 3D, entonces se le va a proponer elegir el\n"
+"servidor que mejor satisface sus necesidades."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: help.pm:249
+#: help.pm:231
 #, 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"
@@ -4017,36 +4203,38 @@ 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 (por \"X Window System\") es el corazón de la interfaz gráfica de\n"
 "GNU/Linux en el que se apoyan todos los entornos gráficos (KDE, GNOME,\n"
 "AfterStep, WindowMaker, etc.) que se incluyen con Mandrakelinux.\n"
 "\n"
 "Se le presentará la lista de parámetros diferentes a cambiar para obtener\n"
-"una presentación gráfica óptima: Tarjeta gráfica\n"
+"una presentación gráfica óptima.\n"
+"\n"
+"Tarjeta gráfica\n"
 "\n"
 "   Normalmente el instalador puede detectar y configurar automáticamente la\n"
-"tarjeta gráfica instalada en su máquina. Si este no es el caso, en esta\n"
-"lista puede elegir la tarjeta que realmente posee.\n"
+"tarjeta de vídeo instalada en su máquina. Si este no es el caso, en esta\n"
+"lista puede elegir la tarjeta que realmente tiene instalada.\n"
 "\n"
-"   En caso que estén disponibles diferentes servidores para su tarjeta, con\n"
-"o sin aceleración de 3D, entonces se le propone elegir el servidor que\n"
-"mejor satisface sus necesidades.\n"
+"   En caso de que estén disponibles diferentes servidores para su tarjeta,\n"
+"con o sin aceleración de 3D, entonces se le va a proponer elegir el\n"
+"servidor que mejor satisface sus necesidades.\n"
 "\n"
 "\n"
 "\n"
@@ -4061,9 +4249,9 @@ msgstr ""
 "Resolución\n"
 "\n"
 "   Aquí puede elegir las resoluciones y profundidades de color disponibles\n"
-"para su hardware. Seleccione la que mejor se ajuste a sus necesidades\n"
-"(tenga presente que eso se puede cambiar luego de la instalación) En la\n"
-"imagen del monitor se muestra un ejemplo de la configuración elegida.\n"
+"para su hardware de gráficos. Seleccione la que mejor se ajuste a sus\n"
+"necesidades (podrá hacer cambios luego de la instalación). En la imagen del\n"
+"monitor se muestra un ejemplo de la configuración elegida.\n"
 "\n"
 "\n"
 "\n"
@@ -4072,32 +4260,32 @@ msgstr ""
 "   Esta entrada puede no aparecer, dependiendo de su hardware.\n"
 "\n"
 "   El sistema intentará abrir una pantalla gráfica con la resolución\n"
-"deseada. Si puede ver el mensaje durante la prueba, y responde \"%s\",\n"
-"entonces DrakX continuará con el paso siguiente. Si no puede ver el\n"
-"mensaje, significa que alguna parte de la configuración detectada\n"
-"automáticamente no era la correcta y la prueba terminará automáticamente\n"
-"luego de unos segundos, restaurando el menú. Cambie los ajustes hasta\n"
-"obtener una pantalla correcta.\n"
+"deseada. Si ve el mensaje durante la prueba, y responde \"%s\", entonces\n"
+"DrakX continuará con el paso siguiente. Si no puede ver el mensaje,\n"
+"entonces significa que alguna parte de la configuración detectada\n"
+"automáticamente era incorrecta y la prueba terminará automáticamente luego\n"
+"de unos segundos, restaurando el menú. Cambie los ajustes hasta obtener una\n"
+"pantalla gráfica correcta.\n"
 "\n"
 "\n"
 "\n"
 "Opciones\n"
 "\n"
-"   Aquí puede elegir si desea que su máquina cambie automáticamente a la\n"
-"interfaz gráfica al arrancar. Obviamente, querrá marcar \"%s\" si su\n"
-"sistema actuará como servidor, o si no tuvo éxito en la configuración de su\n"
-"pantalla."
+"   Este paso le permite elegir si desea que su máquina cambie\n"
+"automáticamente a la interfaz gráfica al arrancar. Obviamente, querrá\n"
+"marcar \"%s\" si su sistema actuará como servidor, o si no tuvo éxito en la\n"
+"configuración de su pantalla."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: 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 ""
 "Monitor\n"
 "\n"
@@ -4107,113 +4295,114 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: 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 ""
 "Resolución\n"
 "\n"
 "   Aquí puede elegir las resoluciones y profundidades de color disponibles\n"
-"para su hardware. Seleccione la que mejor se ajuste a sus necesidades\n"
-"(tenga presente que eso se puede cambiar luego de la instalación) En la\n"
-"imagen del monitor se muestra un ejemplo de la configuración elegida."
+"para su hardware de gráficos. Seleccione la que mejor se ajuste a sus\n"
+"necesidades (podrá hacer cambios luego de la instalación). En la imagen del\n"
+"monitor se muestra un ejemplo de la configuración elegida."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: help.pm:319
+#: help.pm:303
 #, 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 ""
-"En caso que estén disponibles diferentes servidores para su tarjeta, con o\n"
-"sin aceleración de 3D, entonces se le propone elegir el servidor que mejor\n"
-"satisface sus necesidades."
+"En caso de que estén disponibles diferentes servidores para su tarjeta, con\n"
+"o sin aceleración de 3D, entonces se le va a proponer elegir el servidor\n"
+"que mejor satisface sus necesidades."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: help.pm:324
+#: help.pm:308
 #, 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 ""
 "Opciones\n"
 "\n"
-"   Aquí puede elegir si desea que su máquina cambie automáticamente a la\n"
-"interfaz gráfica al arrancar. Obviamente, querrá marcar \"%s\" si su\n"
-"sistema actuará como servidor, o si no tuvo éxito en la configuración de su\n"
-"pantalla."
+"   Este paso le permite elegir si desea que su máquina cambie\n"
+"automáticamente a la interfaz gráfica al arrancar. Obviamente, querrá\n"
+"marcar \"%s\" si su sistema actuará como servidor, o si no tuvo éxito en la\n"
+"configuración de su pantalla."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: help.pm:332
+#: help.pm:316
 #, 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"
@@ -4228,26 +4417,26 @@ msgstr ""
 "sistema Mandrakelinux nuevo.\n"
 "\n"
 "Debido a que el proceso de particionado de un disco rígido por lo general\n"
-"es irreversible y puede llevar a pérdida de datos si ya hay un sistema\n"
-"operativo instalado en el disco, el particionado puede ser intimidante y\n"
-"estresante si Usted es un usuario inexperto. Por fortuna, DrakX incluye un\n"
-"asistente que simplifica este proceso. Antes de continuar con este paso,\n"
-"por favor lea el resto de esta sección y, por sobre todo, tómese su tiempo.\n"
+"es irreversible y puede llevar a pérdida de datos, el particionado puede\n"
+"ser intimidante y estresante si Usted es un usuario inexperto. Por fortuna,\n"
+"DrakX incluye un asistente que simplifica este proceso. Antes de continuar\n"
+"con este paso, por favor lea el resto de esta sección y, por sobre todo,\n"
+"tómese su tiempo.\n"
 "\n"
 "Dependiendo de la configuración de su disco rígido, están disponibles\n"
 "varias opciones:\n"
 "\n"
-" * \"%s\": esta opción simplemente llevará a un particionado automático de\n"
+" * \"%s\". Esta opción simplemente llevará a un particionado automático de\n"
 "su(s) disco(s) vacío(s). Si elige esta opción, no se le pedirán más\n"
 "detalles ni se le formularán más preguntas.\n"
 "\n"
-" * \"%s\": el asistente ha detectado una o más particiones Linux existentes\n"
+" * \"%s\". El asistente ha detectado una o más particiones Linux existentes\n"
 "en su disco rígido. Si desea utilizarlas, elija esta opción. Entonces se le\n"
 "pedirá que elija los puntos de montaje asociados a cada una de las\n"
-"particiones. Los puntos de montaje legados se seleccionan automáticamente,\n"
-"y por lo general es buena idea mantenerlos.\n"
+"particiones. Los puntos de montaje legados se seleccionan de manera\n"
+"predeterminada, y por lo general es buena idea mantenerlos.\n"
 "\n"
-" * \"%s\": si Microsoft Windows está instalado en su disco rígido y ocupa\n"
+" * \"%s\". Si Microsoft Windows está instalado en su disco rígido y ocupa\n"
 "todo el espacio disponible en el mismo, Usted tendrá que liberar espacio\n"
 "para Linux. Para hacerlo, puede borrar su partición y datos Microsoft\n"
 "Windows (vea la solución \"Borrar el disco entero\") o cambiar el tamaño de\n"
@@ -4263,15 +4452,16 @@ msgstr ""
 "que cuando comenzó. Tendrá menos espacio bajo Microsoft Windows para\n"
 "almacenar sus datos o instalar software nuevo.\n"
 "\n"
-" * \"%s\": si desea borrar todos los datos y todas las particiones\n"
-"presentes en su disco rígido y reemplazarlos con su nuevo sistema Mandrake\n"
-"Linux, seleccione esta opción. Tenga cuidado con esta solución ya que no\n"
-"podrá revertir su elección después de confirmarla.\n"
+" * \"%s\". Si desea borrar todos los datos y todas las particiones\n"
+"presentes en su disco rígido y reemplazarlos con su nuevo sistema\n"
+"Mandrakelinux, seleccione esta opción. Tenga cuidado con esta solución ya\n"
+"que no podrá revertir su elección después de confirmarla.\n"
 "\n"
 "   !! Si elige esta opción, se perderán todos los datos en su disco. !!\n"
 "\n"
-" * \"%s\": esto simplemente borrará todo en el disco y comenzará\n"
-"particionando todo desde cero. Se perderán todos los datos en su disco.\n"
+" * \"%s\". Esta opción aparece cuando todo el disco está tomado por\n"
+"Microsoft Windows. Al elegir esta opción simplemente se borrará todo el\n"
+"disco y se comenzará desde cero, particionando todo de nuevo.\n"
 "\n"
 "   !! Si elige esta opción, se perderán todos los datos en su disco. !!\n"
 "\n"
@@ -4283,54 +4473,55 @@ msgstr ""
 "del utilitario DiskDrake, consulte la sección \"Administrar sus\n"
 "particiones\" de la \"Guía de Comienzo\"."
 
-#: help.pm:389 install_interactive.pm:95
+#: help.pm:374 install_interactive.pm:95
 #, c-format
 msgid "Use free space"
 msgstr "Usar el espacio libre"
 
-#: help.pm:389
+#: help.pm:374
 #, c-format
 msgid "Use existing partition"
 msgstr "Usar la partición existente"
 
-#: 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 "Usar el espacio libre de la partición Windows"
 
-#: help.pm:389 install_interactive.pm:211
+#: help.pm:374 install_interactive.pm:213
 #, c-format
 msgid "Erase entire disk"
 msgstr "Borrar el disco entero"
 
-#: help.pm:389
+#: help.pm:374
 #, c-format
 msgid "Remove Windows"
 msgstr "Quitar Windows"
 
-#: help.pm:389 install_interactive.pm:226
+#: help.pm:374 install_interactive.pm:228
 #, c-format
 msgid "Custom disk partitioning"
 msgstr "Particionamiento de disco personalizado"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: help.pm:392
+#: help.pm:377
 #, 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"
@@ -4338,13 +4529,18 @@ 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.\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"
-" * \"%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\" <<."
+"(*) 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 ""
 "Ya está. Ahora la instalación está completa y su sistema GNU/Linux está\n"
 "listo para ser utilizado. Simplemente haga clic sobre \"%s\" para volver a\n"
@@ -4354,84 +4550,83 @@ msgstr ""
 "\n"
 "El botón \"%s\" le muestra dos botones más:\n"
 "\n"
-" * \"%s\": para crear un disquete de instalación que realizará una\n"
+" * \"%s\": le permite crear un disquete de instalación que realizará una\n"
 "instalación completa automáticamente, sin la asistencia de un operador,\n"
 "similar a la instalación que ha configurado recién.\n"
 "\n"
 "   Note que hay dos opciones diferentes disponibles después de hacer clic\n"
-"sobre el botón:\n"
+"sobre ese botón:\n"
 "\n"
-"    * \"%s\" . Esta es una instalación parcialmente automatizada. La etapa\n"
+"    * \"%s\". Esta es una instalación parcialmente automatizada. La etapa\n"
 "de particionado es el único procedimiento interactivo.\n"
 "\n"
-"    * \"%s\" . Instalación completamente automatizada: el disco rígido se\n"
+"    * \"%s\". Instalación completamente automatizada: el disco rígido se\n"
 "sobreescribe por completo, y se pierden todos los datos.\n"
 "\n"
 "   Esta característica es muy útil cuando se instala una cantidad grande de\n"
 "máquinas similares. Consulte la sección Auto install (en inglés) en nuestro\n"
 "sitio web para más información.\n"
 "\n"
-" * \"%s\": guarda una lista de los paquetes seleccionados en esta\n"
+" * \"%s\"(*): guarda una lista de los paquetes seleccionados en esta\n"
 "instalación. Para usar esta selección con otra instalación, inserte el\n"
 "disquete en la disquetera y comience la instalación. En el prompt, presione\n"
-"la tecla [F1], y a continuación ingrese >>linux defcfg=\"floppy\"<<."
+"la tecla [F1], y a continuación ingrese >>linux defcfg=\"floppy\"<< y\n"
+"presione la tecla [Intro].\n"
+"\n"
+"(*) Necesita un disquete formateado con FAT. Para crear uno bajo GNU/Linux\n"
+"teclee \"mformat a:\", o \"fdformat /dev/fd0\" seguido de \"mkfs.vfat\n"
+"/dev/fd0\"."
 
-#: help.pm:418
+#: help.pm:409
 #, c-format
 msgid "Generate auto-install floppy"
 msgstr "Generar un disquete de instalación automática"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Replay"
 msgstr "Reproducir"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Automated"
 msgstr "Automatizada"
 
-#: help.pm:418 install_steps_interactive.pm:1319
+#: help.pm:409 install_steps_interactive.pm:1366
 #, c-format
 msgid "Save packages selection"
 msgstr "Guardar la selección de paquetes"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: help.pm:421
+#: help.pm:412
 #, 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 ""
-"Se debe formatear cualquier partición nueva que ha sido definida para que\n"
-"se pueda utilizar (formatear significa crear un sistema de archivos)\n"
-"\n"
-"Puede desear volver a formatear algunas particiones ya existentes para\n"
-"borrar cualquier dato que pudieran contener. Si así lo desea, por favor\n"
-"seleccione también dichas particiones.\n"
+"Si desea volver a utilizar algunas particiones GNU/Linux legadas, puede\n"
+"desear volver a formatear algunas de ellas y borrar cualquier dato que\n"
+"pudieran contener. Para hacerlo, por favor seleccione también dichas\n"
+"particiones.\n"
 "\n"
 "Por favor note que no es necesario volver a formatear todas las particiones\n"
 "preexistentes. Debe volver a formatear las particiones que contienen el\n"
@@ -4451,93 +4646,91 @@ msgstr ""
 "Haga clic sobre \"%s\" si desea seleccionar las particiones del disco en\n"
 "las que se buscarán bloques defectuosos."
 
-#: 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 "Anterior"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: help.pm:447
+#: help.pm:434
 #, 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 ""
 "Es probable que cuando instale Mandrakelinux algunos paquetes se hayan\n"
-"actualizado desde la publicación inicial. Se pueden haber corregido algunos\n"
-"errores y solucionado problemas de seguridad. Para permitir que Usted se\n"
-"beneficie de estas actualizaciones, ahora se le propone transferirlas desde\n"
-"la Internet. Marque \"%s\" si tiene funcionando una conexión con la\n"
-"Internet, o \"%s\" si prefiere instalar los paquetes actualizados más\n"
-"tarde.\n"
+"actualizado desde la publicación inicial. Se pueden haber corregido errores\n"
+"y solucionado problemas de seguridad. Para permitir que Usted se beneficie\n"
+"de estas actualizaciones, ahora las puede descargar desde la Internet.\n"
+"Marque \"%s\" si tiene funcionando una conexión con la Internet, o \"%s\"\n"
+"si prefiere instalar los paquetes actualizados más tarde.\n"
 "\n"
-"Si elige \"%s\" se mostrará una lista de lugares desde los que se pueden\n"
-"obtener las actualizaciones. Elija el más cercano a Usted. Luego aparece un\n"
-"árbol de selección de paquetes: revise la selección y presione \"%s\" para\n"
-"transferir e instalar los paquetes seleccionados, o \"%s\" para abortar."
+"Al elegir \"%s\" se mostrará una lista de lugares desde los que se pueden\n"
+"obtener las actualizaciones. Debería elegir el más cercano a Usted.\n"
+"Aparecerá un árbol de selección de paquetes: revise la selección y presione\n"
+"\"%s\" para obtener e instalar los paquetes seleccionados, o \"%s\" para\n"
+"abortar."
 
-#: 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 "Instalar"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: help.pm:460
+#: help.pm:447
 #, 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 ""
-"En este punto, DrakX le permitirá elegir el nivel de seguridad deseado para\n"
-"la máquina. Como regla general, el nivel de seguridad debería ser mayor\n"
-"cuanto más cruciales sean los datos que tenga almacenados, o si la máquina\n"
-"estará directamente expuesta a la Internet. No obstante, un nivel de\n"
-"seguridad más alto generalmente se obtiene a expensas de la facilidad de\n"
-"uso.\n"
+"En este punto, DrakX le permitirá elegir el nivel de seguridad que desea\n"
+"para su máquina. Como regla general, el nivel de seguridad debería ser\n"
+"mayor si la máquina va a contener datos cruciales, o si estará expuesta\n"
+"directamente a la Internet. No obstante, un nivel de seguridad más alto\n"
+"generalmente se obtiene a expensas de la facilidad de uso.\n"
 "\n"
-"Si no sabe cual elegir, no cambie la opción predeterminada. Podrá cambiar\n"
-"ese nivel de seguridad más adelante con la herramienta draksec del Centro\n"
-"de Control de Mandrake.\n"
+"Si no sabe cual elegir, mantenga la opción predeterminada. Podrá cambiarla\n"
+"más adelante con la herramienta draksec, que es parte del Centro de Control\n"
+"de Mandrakelinux.\n"
 "\n"
-"El campo \"%s\" puede informar al sistema del usuario en esta computadora\n"
-"que será responsable de la seguridad. Los mensajes relativos a la seguridad\n"
+"Complete el campo \"%s\" con la dirección de correo electrónico de la\n"
+"persona responsable de la seguridad. Los mensajes relativos a la seguridad\n"
 "se enviarán a esa dirección."
 
-#: help.pm:472
+#: help.pm:458
 #, c-format
 msgid "Security Administrator"
 msgstr "Administrador de seguridad"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: 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"
@@ -4689,19 +4882,19 @@ msgstr ""
 "50 MB, puede ver que es un lugar útil para almacenar un núcleo y ramdisk\n"
 "alternativos para arrancar en situaciones de emergencia."
 
-#: help.pm:544
+#: help.pm:530
 #, c-format
 msgid "Removable media auto-mounting"
 msgstr "Montaje automático de soportes extraíbles"
 
-#: help.pm:544
+#: help.pm:530
 #, c-format
 msgid "Toggle between normal/expert mode"
 msgstr "Cambiar entre el modo normal/experto"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: help.pm:547
+#: help.pm:533
 #, c-format
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
@@ -4770,98 +4963,96 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: help.pm:578
+#: help.pm:564
 #, 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\": verifique la selección corriente del país. Si Usted no se encuentra\n"
-"en este país haga clic sobre el botón \"%s\" y seleccione otro. Si su país\n"
-"no se muestra en la primer lista haga clic sobre el botón \"%s\" para\n"
-"obtener la lista completa de países."
+"\"%s\": verifique la selección actual del país. Si Usted no se encuentra en\n"
+"este país haga clic sobre el botón \"%s\" y seleccione otro. Si su país no\n"
+"se muestra en la primer lista que se muestra, haga clic sobre el botón\n"
+"\"%s\" para obtener la lista completa de países."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: 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 ""
-"Este paso se activa sólo si se encontró una partición GNU/Linux antigua en\n"
-"su máquina.\n"
+"Este paso se activa sólo si se encontró una partición GNU/Linux existente\n"
+"en su máquina.\n"
 "\n"
 "DrakX ahora necesita saber si desea realizar una instalación nueva o una\n"
 "actualización de un sistema Mandrakelinux existente:\n"
 "\n"
-" * \"%s\": Esta opción borrará prácticamente por completo el sistema\n"
-"anterior. Si desea cambiar la forma en que se particionan sus discos, o\n"
-"cambiar el sistema de archivos, debería utilizar esta opción. Sin embargo,\n"
-"dependiendo de su esquema de particionado, puede evitar que se\n"
-"sobre-escriban algunos datos existentes.\n"
+" * \"%s\". En gran parte, esta opción borrará por completo el sistema\n"
+"anterior. Sin embargo, dependiendo de su esquema de particiones, puede\n"
+"evitar que se sobre-escriban algunos datos existentes (notablemente los\n"
+"directorios de \"home\"). Si desea cambiar la forma en la que se\n"
+"particionan sus discos, debería usar esta opción.\n"
 "\n"
 " * \"%s\": Esta clase de instalación le permite actualizar los paquetes que\n"
-"en este momento están instalados en su sistema Mandrakelinux. No se\n"
-"alteran las particiones corrientes de sus discos ni los datos de los\n"
-"usuarios. La mayoría de los otros pasos de configuración permanecen\n"
-"disponibles, de manera similar a lo que ocurre con una instalación\n"
-"estándar.\n"
+"en este momento están instalados en su sistema Mandrakelinux. No se alteran\n"
+"las particiones corrientes de sus discos ni los datos de los usuarios. La\n"
+"mayoría de los otros pasos de configuración permanecen disponibles y son\n"
+"similares a una instalación estándar.\n"
 "\n"
 "El uso de la opción \"Actualizar\" debería funcionar sin problemas para los\n"
-"sistemas Mandrakelinux que corren la versión \"8.1\" o una posterior. No\n"
-"se recomienda realizar una actualización sobre versiones anteriores a\n"
+"sistemas Mandrakelinux que corren la versión \"8.1\" o una posterior. No se\n"
+"recomienda realizar una actualización sobre versiones anteriores a\n"
 "Mandrakelinux versión \"8.1\"."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: help.pm:605
+#: help.pm:591
 #, 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 ""
-"Dependiendo del idioma que eligió en , DrakX selecciona automáticamente un\n"
-"tipo particular de configuración del teclado. Verifique que la selección le\n"
-"satisface o elija otra distribución de teclado.\n"
+"Dependiendo del idioma que eligió (ver ), DrakX seleccionará\n"
+"automáticamente un tipo particular de configuración del teclado. Verifique\n"
+"que la selección le satisface o elija otra distribución de teclado.\n"
 "\n"
 "También, puede ser que Usted no tenga un teclado que se corresponde\n"
 "exactamente con su idioma: por ejemplo, si Usted es un argentino que habla\n"
-"inglés, puede ser que tenga un teclado latinoamericano. O si habla\n"
+"inglés, puede ser que tenga un teclado latino americano. O si habla\n"
 "castellano pero está en Inglaterra puede estar en la misma situación en la\n"
 "cual su idioma nativo y su teclado no coinciden. En cualquier caso, este\n"
 "paso de instalación le permitirá elegir un teclado apropiado de una lista.\n"
@@ -4875,25 +5066,27 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: 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"
@@ -4902,23 +5095,25 @@ 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 ""
-"Su elección de idioma preferido afectará al idioma de la documentación, el\n"
-"instalador y el sistema en general. Seleccione primero la región en la que\n"
-"se encuentra, y luego el idioma que habla.\n"
+"El primer paso es elegir el idioma que prefiere.\n"
+"\n"
+"Su elección de idioma preferido afectará al idioma del instalador, de la\n"
+"documentación, y del sistema en general. Seleccione primero la región en la\n"
+"que se encuentra, y luego el idioma que habla.\n"
 "\n"
 "Al hacer clic sobre el botón \"%s\" (Avanzada) podrá seleccionar otros\n"
 "idiomas para instalar en su sistema, instalando así los archivos\n"
@@ -4951,91 +5146,103 @@ msgstr ""
 "traducciones, tipografías, correctores ortográficos, etc. para dicho\n"
 "idioma.\n"
 "\n"
-"Puede ejecutar el comando \"/usr/sbin/localedrake\" como \"root\" para\n"
-"cambiar el idioma de todo el sistema de uno a otro. Ejecutar el comando\n"
-"como usuario no privilegiado sólo cambiará la configuración de idioma para\n"
-"ese usuario en particular."
+"Puede ejecutar el comando \"localedrake\" como \"root\" para cambiar el\n"
+"idioma de todo el sistema de uno a otro. Ejecutar el comando como usuario\n"
+"no privilegiado sólo cambiará la configuración de idioma para ese usuario\n"
+"en particular."
 
 # este es el idioma de ejemplo en la ayuda de la seleccion de idiomas;
 # en la traduccion de la ayuda se usa el frances como idioma extra de ejemplo
-#: help.pm:660
+#: help.pm:647
 #, c-format
 msgid "Espanol"
 msgstr "Français"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: 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 ""
 "Por lo general, DrakX no tiene problemas en detectar la cantidad de botones\n"
-"que tiene su ratón. En caso contrario, asume que Usted tiene un ratón de\n"
-"dos botones y lo configurará para que emule el tercero. El tercer botón del\n"
-"ratón de un ratón de dos botones se puede \"presionar\" haciendo clic\n"
-"simultáneamente sobre el botón izquierdo y el derecho. DrakX sabrá\n"
-"automáticamente si su ratón utiliza una interfaz PS/2, serie o USB.\n"
+"de su ratón. Si no es así, asume que Usted tiene un ratón de dos botones y\n"
+"lo configurará para que emule el tercero. El tercer botón del ratón en un\n"
+"ratón de dos botones se puede \"obtener\" haciendo clic simultáneamente\n"
+"sobre el botón izquierdo y el derecho. DrakX sabrá automáticamente si su\n"
+"ratón utiliza una interfaz PS/2, serie o USB.\n"
 "\n"
-"En caso que tenga un ratón de 3 botones sin rueda, puede elegir el ratón\n"
-"que dice \"%s\". Entonces, DrakX configurará su ratón de forma tal que el\n"
-"mismo pueda simular la rueda: para hacerlo, presione el botón del medio y,\n"
-"sin soltarlo, mueva su ratón arriba y abajo.\n"
+"En caso que tenga un ratón de 3 botones sin rueda, puede elegir un ratón\n"
+"\"%s\". Entonces, DrakX configurará su ratón de forma tal que pueda simular\n"
+"la rueda con el mismo: para hacerlo, presione el botón del medio y, sin\n"
+"soltarlo, mueva el puntero de su ratón arriba y abajo.\n"
 "\n"
 "Si, por alguna razón, desea especificar un tipo de ratón diferente,\n"
 "selecciónelo de la lista que se proporciona.\n"
 "\n"
-"Si elige un ratón distinto al predeterminado, se le presentará una pantalla\n"
-"de prueba. Use los botones y la rueda para verificar que la configuración\n"
-"es correcta y que el ratón está funcionando correctamente. Si el ratón no\n"
-"está funcionando bien, presione la barra espaciadora o la tecla [Intro]\n"
-"para cancelar la prueba y volver a la lista de opciones.\n"
+"Puede seleccionar la entrada \"%s\" para elegir un tipo de ratón\n"
+"\"genérico\" que funcionará con casi todos los ratones.\n"
+"\n"
+"Si elige un ratón distinto al predeterminado, se mostrará una pantalla de\n"
+"prueba. Use los botones y la rueda para verificar que los ajustes son\n"
+"correctos y que el ratón está funcionando correctamente. Si el ratón no\n"
+"está funcionando bien, presione la [barra espaciadora] o la tecla [Intro]\n"
+"para cancelar la prueba y volverá a la lista de opciones.\n"
 "\n"
-"Los ratones con rueda a veces no se detectan automáticamente por lo que\n"
-"deberá seleccionar su ratón de una lista. Debe asegurarse de seleccionar el\n"
-"correspondiente al puerto en el cual está conectado su ratón. Después de\n"
-"seleccionar un ratón y presionar el botón \"%s\", se muestra la pantalla de\n"
-"prueba del ratón. Mueva la rueda de su ratón para asegurarse que está\n"
-"activa correctamente. Una vez que ve que se mueve la rueda en la pantalla a\n"
-"medida que mueve la rueda de su ratón, pruebe los botones y verifique que\n"
-"el puntero del ratón se mueve en la pantalla a medida que mueve su ratón."
+"Ocasionalmente, los ratones con rueda no se detectan automáticamente, por\n"
+"lo que deberá seleccionar su ratón de una lista. Debe asegurarse de\n"
+"seleccionar el correspondiente al puerto en el cual está conectado su\n"
+"ratón. Después de seleccionar un ratón y presionar el botón \"%s\", se\n"
+"mostrará la imagen de un ratón en la pantalla. Mueva la rueda de su ratón\n"
+"para asegurarse que está activa correctamente. A medida que mueva la rueda,\n"
+"verá que se mueve la rueda en la pantalla. Pruebe los botones y verifique\n"
+"que el puntero del ratón se mueve en la pantalla a medida que mueve su\n"
+"ratón."
 
-#: help.pm:691
+#: help.pm:681
 #, c-format
 msgid "with Wheel emulation"
 msgstr "Con emulación de rueda"
 
+#: help.pm:681
+#, c-format
+msgid "Universal | Any PS/2 & USB mice"
+msgstr "Universal | Cualquier ratón PS/2 y USB"
+
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: help.pm:694
+#: help.pm:684
 #, c-format
 msgid ""
 "Please select the correct port. For example, the \"COM1\" port under\n"
@@ -5046,16 +5253,16 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: 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"
@@ -5064,27 +5271,26 @@ 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 ""
 "Este es el punto de decisión más crucial para la seguridad de su sistema\n"
 "GNU/Linux: tendrá que ingresar la contraseña de \"root\". El usuario\n"
@@ -5102,218 +5308,67 @@ msgstr ""
 "\n"
 "La contraseña debería ser una mezcla de caracteres alfanuméricos y tener al\n"
 "menos una longitud de 8 caracteres. Nunca escriba la contraseña de \"root\"\n"
-"- por ejemplo, en un papel - eso hace que sea muy fácil comprometer a un\n"
+"- por ejemplo, en un papel - eso hace que sea muy fácil comprometer su\n"
 "sistema.\n"
 "\n"
 "Sin embargo, no debería hacer la contraseña muy larga o complicada ¡debido\n"
 "a que Usted debe poder recordarla!\n"
 "\n"
 "La contraseña no se mostrará en la pantalla a medida que Usted la teclee.\n"
-"Por lo tanto tendrá que teclear la contraseña dos veces para reducir la\n"
-"posibilidad de un error de tecleo. Si ocurre que Usted comete dos veces el\n"
-"mismo error de tecleo, tendrá que utilizar esta contraseña \"incorrecta\"\n"
-"la primera vez que se conecte.\n"
+"Deberá teclear la contraseña dos veces para reducir la posibilidad de un\n"
+"error de tecleo a ciegas. Si ocurre que Usted comete dos veces el mismo\n"
+"error de tecleo, tendrá que utilizar esta contraseña \"incorrecta\" la\n"
+"primera vez que intente conectarse como \"root\".\n"
 "\n"
-"Si desea que el acceso a esta computadora esté controlado por un servidor\n"
-"de autenticación, haga clic sobre el botón \"%s\".\n"
+"Si desea utilizar un servidor de autenticación para controlar el acceso a\n"
+"su computadora, haga clic sobre el botón \"%s\".\n"
 "\n"
 "Si su red usa los protocolos LDAP, NIS, o servicios de autenticación de PDC\n"
-"Dominio de Windows, seleccione el botón apropiado para \"%s\". Si no sabe\n"
-"cual utilizar, debería preguntar al administrador de su red.\n"
+"Dominio de Windows, seleccione el apropiado como método de %s.\n"
+"Si no sabe cual utilizar, debería preguntar al administrador de su red.\n"
 "\n"
-"Si ocurre que tiene problemas para recordar contraseñas puede elegir el\n"
-"botón \"%s\", si es que su computadora nunca estará conectada a la Internet\n"
-"y Usted confía absolutamente en cualquier persona que tenga acceso a la\n"
-"misma."
+"Si ocurre que tiene problemas para recordar contraseñas, o si su\n"
+"computadora nunca estará conectada a la Internet y Usted confía\n"
+"absolutamente en cualquier persona que tenga acceso a la misma, puede\n"
+"elegir el botón \"%s\"."
 
-#: help.pm:733
+#: help.pm:722
 #, c-format
 msgid "authentication"
 msgstr "autenticación"
 
 #. -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 "Sin contraseña"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: help.pm:736
-#, 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 ""
-"Este diálogo le permite un ajuste fino de su cargador de arranque:\n"
-"\n"
-" * \"%s\": hay tres opciones para su cargador de arranque:\n"
-"\n"
-"    * \"%s\": si prefiere a GRUB (menú de texto).\n"
-"\n"
-"    * \"%s\": si prefiere a LILO con su interfaz de texto.\n"
-"\n"
-"    * \"%s\": si prefiere a LILO con su interfaz gráfica.\n"
-"\n"
-" * \"%s\": en la mayoría de los casos, no cambiará lo predeterminado\n"
-"(\"%s\"), pero si lo prefiere el cargador de arranque se puede instalar en\n"
-"el segundo disco rígido (\"%s\") o incluso en un disquete (\"%s\")\n"
-"\n"
-" * \"%s\": luego de arrancar o volver a arrancar la computadora, esta es la\n"
-"demora que se garantiza al usuario para elegir, en el menú del cargador de\n"
-"arranque, una entrada distinta a la predeterminada.\n"
-"\n"
-" * \"%s\": ACPI es un estándar nuevo (apareció durante el año 2002) para\n"
-"administración de energía, notablemente para las portátiles. Si Usted sabe\n"
-"que su hardware lo soporta y lo necesita, marque esta casilla.\n"
-"\n"
-" * \"%s\": Si notó problemas de hardware en su máquina (conflictos de IRQ,\n"
-"inestabilidad, congelamiento de la máquina, ...) debería intentar\n"
-"deshabilitar APIC marcando esta casilla.\n"
-"\n"
-"!! Tenga presente que si no elige instalar un cargador de arranque\n"
-"(seleccionando \"%s\"), ¡debe asegurarse que tiene una forma de arrancar a\n"
-"su sistema Mandrakelinux! También debe asegurarse que sabe lo que hace\n"
-"antes de cambiar cualquier opción. !!\n"
-"\n"
-"Haciendo clic sobre el botón \"%s\" en este diálogo se le ofrecerán\n"
-"opciones avanzadas que están reservadas para el usuario experto."
-
-#: 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 "Demora antes de arrancar la imagen predeterminada"
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: 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 ""
-"Luego que haya configurado los parámetros generales del cargador de\n"
-"arranque se mostrará la lista de opciones de arranque que estarán\n"
-"disponibles al momento de arrancar.\n"
-"\n"
-"Si hay otros sistemas operativos instalados en su máquina los mismos se\n"
-"agregarán automáticamente al menú de arranque. Puede elegir ajustar las\n"
-"opciones existentes haciendo clic sobre \"%s\" para crear una nueva\n"
-"entrada; seleccionando una entrada y haciendo clic sobre \"%s\" o \"%s\"\n"
-"para modificarla o quitarla. \"%s\" valida sus cambios.\n"
-"\n"
-"También puede ser que no desee dar acceso a los otros sistemas operativos a\n"
-"cualquiera que vaya a la consola y reinicie la máquina. Puede borrar las\n"
-"entradas correspondientes para los sistemas operativos para quitarlas del\n"
-"menú, pero ¡necesitará un disquete de arranque para poder arrancar esos\n"
-"otros sistemas operativos!"
-
-#: 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 "Agregar"
-
-#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#, c-format
-msgid "Modify"
-msgstr "Modificar"
-
-#: 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 "Quitar"
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: help.pm:787
+#: help.pm:725
 #, 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 ""
-"LILO y GRUB son cargadores de arranque para GNU/Linux. Normalmente esta\n"
-"etapa está completamente automatizada. DrakX analizará el sector de\n"
-"arranque del disco y actuará en función de lo que encuentre allí:\n"
+"Un cargador de arranque es un pequeño programa que la computadora inicia al\n"
+"momento del arranque. Es el responsable de arrancar todo el sistema.\n"
+"Normalmente la instalación del cargador de arranque está completamente\n"
+"automatizada. DrakX analizará el sector de arranque del disco y actuará en\n"
+"función de lo que encuentre allí:\n"
 "\n"
 " * Si encuentra un sector de arranque de Windows, lo reemplazará con un\n"
 "sector de arranque de GRUB/LILO de forma tal que Usted pueda cargar\n"
@@ -5329,38 +5384,38 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: 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 ""
 "Ahora es el momento de seleccionar un sistema de impresión para su\n"
-"computadora. Otros sistemas operativos pueden ofrecerle uno, pero Mandrake\n"
-"Linux le ofrece dos. Cada uno de los sistemas de impresión es mejor para un\n"
-"tipo de configuración particular.\n"
+"computadora. Otros sistemas operativos pueden ofrecerle uno, pero\n"
+"Mandrakelinux le ofrece dos. Cada uno de los sistemas de impresión es más\n"
+"adecuado para tipos de configuración particulares.\n"
 "\n"
 " * \"%s\" - \"print, don't queue\" (imprimir sin poner en cola) es la\n"
 "elección si Usted tiene una conexión directa a su impresora y desea evitar\n"
@@ -5369,34 +5424,39 @@ msgstr ""
 "utiliza con las redes) Se recomienda utilizar \"pdq\" si esta es su primer\n"
 "experiencia con GNU/Linux.\n"
 "\n"
-" * \"%s\" - \"Common Unix Printing System\" (Sistema de Impresión Común de\n"
-"Unix) es una elección excelente para imprimir en su impresora local o en\n"
-"una en la otra punta del planeta. Es simple de configurar y puede actuar\n"
-"como servidor o cliente para el sistema de impresión antiguo \"lpd\", por\n"
-"lo que es compatible con sistemas operativos más antiguos que todavía\n"
-"pueden necesitar servicios de impresión. Si bien es bastante potente, la\n"
-"configuración básica es tan simple como la de \"pdq\". Si necesita que\n"
-"emule a un servidor \"lpd\", debe activar el demonio \"cups-lpd\". \"%s\"\n"
-"incluye interfaces gráficas para imprimir o elegir las opciones de la\n"
-"impresora y para administrar la impresora.\n"
+" * \"%s\" - \"Common Unix Printing System\"punta (Sistema de Impresión\n"
+"Común de Unix) es una elección excelente para imprimir en su impresora\n"
+"local o en una que se encuentre al otro lado del planeta. Es simple de\n"
+"configurar y puede actuar como servidor o cliente para el sistema de\n"
+"impresión antiguo \"lpd\", por lo que es compatible con sistemas operativos\n"
+"más antiguos que todavía pueden necesitar servicios de impresión. Si bien\n"
+"es bastante potente, la configuración básica es tan simple como la de\n"
+"\"pdq\". Si necesita que emule a un servidor \"lpd\", debe activar el\n"
+"demonio \"cups-lpd\". \"%s\" incluye interfaces gráficas para imprimir o\n"
+"elegir las opciones de la impresora y para administrar la impresora.\n"
 "\n"
 "Si hace una elección ahora y más tarde encuentra que a Usted no le gusta su\n"
 "sistema de impresión, puede cambiarlo ejecutando PrinterDrake desde el\n"
-"Centro de Control de Mandrake y haciendo clic sobre el botón para expertos."
+"Centro de Control de Mandrakelinux y haciendo clic sobre el botón \"%s\"."
 
-#: 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:765
+#, c-format
+msgid "Expert"
+msgstr "Experto"
+
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: help.pm:829
+#: help.pm:768
 #, c-format
 msgid ""
 "DrakX will first detect any IDE devices present in your computer. It will\n"
@@ -5437,244 +5497,77 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: help.pm:847
+#: help.pm:786
 #, 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 ""
-"Puede agregar entradas adicionales para Yaboot, ya sea para otros sistemas\n"
-"operativos, núcleos alternativos, o para una imagen de arranque de\n"
-"emergencia.\n"
-"\n"
-"Para otros sistemas operativos, la entrada consiste sólo de una etiqueta y\n"
-"la partición raíz.\n"
-"\n"
-"Para Linux, hay algunas opciones posibles:\n"
-"\n"
-" * Etiqueta: esta es simplemente el nombre que deberá teclear en el prompt\n"
-"de yaboot para seleccionar esta opción de arranque.\n"
-"\n"
-" * Imagen: esta debería ser el nombre del núcleo a arrancar. Típicamente,\n"
-"vmlinux o una variación de vmlinux con una extensión.\n"
-"\n"
-" * Raíz: el dispositivo \"root\" o \"/\" para su instalación Linux.\n"
-"\n"
-" * Añadir: la opción de añadir al núcleo se usa bastante sobre el hardware\n"
-"Apple para asistir en la inicialización del hardware de vídeo, o para\n"
-"habilitar la emulación de los botones del ratón con el teclado para los\n"
-"botones 2do y 3ro del ratón que por lo general no tienen los ratones\n"
-"estándar de Apple. Algunos ejemplos son los siguientes:\n"
-"\n"
-"          video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
-"hda=autotune\n"
-"\n"
-"          video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
-"\n"
-" * Initrd: esta opción se puede usar o bien para cargar los módulos\n"
-"iniciales, antes que esté disponible el dispositivo de arranque, o bien\n"
-"cargar una imagen de ramdisk para una situación de arranque de emergencia.\n"
-"\n"
-" * Tamaño de Initrd: generalmente el tamaño por defecto del ramdisk es 4096\n"
-"bytes. Puede usar esta opción si necesita asignar un ramdisk mayor.\n"
-"\n"
-" * Lectura-Escritura: normalmente la partición \"root\" se levanta en modo\n"
-"de sólo lectura, para permitir una verificación del sistema de archivos\n"
-"antes que el sistema se levante por completo. Aquí puede cambiar esta\n"
-"opción.\n"
-"\n"
-" * NoVideo: en caso que el hardware de vídeo de Apple sea excepcionalmente\n"
-"problemático, puede seleccionar esta opción para arrancar en el modo\n"
-"\"novideo\", con soporte nativo para el frame-buffer.\n"
-"\n"
-" * Predeterminada: selecciona a esta entrada como la opción Linux por\n"
-"defecto, que se puede elegir simplemente presionando [Intro] en el prompt\n"
-"de Yaboot. Esta entrada también se marcará con un \"*\", si presiona [Tab]\n"
-"para ver las selecciones del arranque."
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: 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 ""
-"Yaboot es un cargador de arranque para el hardware NewWorld MacIntosh. El\n"
-"mismo puede arrancar o GNU/Linux, o MacOS o MacOSX si se encuentran en su\n"
-"computadora. Normalmente, estos sistemas operativos se detectan e instalan\n"
-"correctamente. Si este no es el caso, puede agregar una entrada a mano en\n"
-"esta pantalla. Tenga cuidado de elegir los parámetros correctos.\n"
-"\n"
-"Las opciones principales de Yaboot son:\n"
-"\n"
-" * Mensaje de Init: un mensaje de texto simple que se muestra antes del\n"
-"prompt de arranque.\n"
-"\n"
-" * Dispositivo de arranque: indica donde desea colocar la información\n"
-"necesaria para arrancar en GNU/Linux. Generalmente, se configura una\n"
-"partición bootstrap con anterioridad para contener esta información.\n"
-"\n"
-" * Demora de Open Firmware: a diferencia de LILO, hay dos demoras\n"
-"disponibles con Yaboot. La primera se mide en segundos y aquí puede elegir\n"
-"entre CD, arranque OF, MacOS o Linux.\n"
-"\n"
-" * Demora de arranque del núcleo: esta demora es similar a la demora de\n"
-"arranque de LILO. Luego de seleccionar Linux, tendrá esta demora en décimas\n"
-"de segundo antes que se seleccione su descripción del núcleo\n"
-"predeterminada.\n"
-"\n"
-" * ¿Habilitar arranque desde el CD?: marcando esta opción Usted puede\n"
-"elegir \"C\" para el CD en el primer prompt de arranque.\n"
-"\n"
-" * ¿Habilitar arranque OF?: marcando esta opción Usted puede elegir \"N\"\n"
-"para Open Firmware en el primer prompt de arranque.\n"
-"\n"
-" * SO predeterminado: puede seleccionar qué sistema operativo arrancará por\n"
-"defecto cuando expira la demora de Open Firmware."
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: help.pm:926
-#, 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\": si se detecta una tarjeta de sonido en su sistema, la misma se\n"
-"muestra aquí. Si nota que la tarjeta de sonido mostrada no es la que está\n"
-"realmente instalada en su sistema, puede hacer clic sobre el botón y elegir\n"
-"otro controlador."
+"mostrará aquí. Si nota que la tarjeta de sonido no es la que está realmente\n"
+"presente en su sistema, puede hacer clic sobre el botón y elegir un\n"
+"controlador diferente."
 
-#: 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 "Tarjeta de sonido"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: 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"
@@ -5684,27 +5577,29 @@ 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 ""
 "A manera de revisión, DrakX presentará un resumen de las distintas\n"
-"informaciones que tiene acerca de su sistema. Dependiendo del hardware\n"
-"instalado puede tener algunas o todas las entradas siguientes. Cada entrada\n"
-"está compuesta del elemento a configurar, seguido de un pequeño resumen de\n"
-"la configuración corriente. Haga clic sobre el botón \"%s\" correspondiente\n"
-"para modificar la configuración.\n"
+"informaciones que recopiló acerca de su sistema. Dependiendo del hardware\n"
+"instalado en su máquina, puede tener algunas o todas las entradas\n"
+"siguientes. Cada entrada está compuesta del elemento a configurar, seguido\n"
+"de un pequeño resumen de la configuración actual. Haga clic sobre el botón\n"
+"\"%s\" correspondiente para hacer los cambios.\n"
 "\n"
-" * \"%s\": verifique la configuración de la disposición corriente del\n"
-"teclado y cámbiela si es necesario.\n"
+" * \"%s\": verifique la configuración de la disposición actual del teclado\n"
+"y cámbiela si es necesario.\n"
 "\n"
-" * \"%s\": verifique la selección corriente del país. Si Usted no se\n"
-"encuentra en este país haga clic sobre el botón \"%s\" y seleccione otro.\n"
-"Si su país no se muestra en la primer lista haga clic sobre el botón \"%s\"\n"
-"para obtener la lista completa de países.\n"
+" * \"%s\": verifique la selección actual del país. Si Usted no se encuentra\n"
+"en este país haga clic sobre el botón \"%s\" y seleccione otro. Si su país\n"
+"no se muestra en la primer lista que se muestra, haga clic sobre el botón\n"
+"\"%s\" para obtener la lista completa de países.\n"
 "\n"
 " * \"%s\": De manera predeterminada DrakX deduce su huso horario basándose\n"
 "en el país que ha elegido. Puede hacer clic sobre el botón \"%s\" si esto\n"
@@ -5720,27 +5615,32 @@ msgstr ""
 "durante la instalación.\n"
 "\n"
 " * \"%s\": si se detecta una tarjeta de sonido en su sistema, la misma se\n"
-"muestra aquí. Si nota que la tarjeta de sonido mostrada no es la que está\n"
-"realmente instalada en su sistema, puede hacer clic sobre el botón y elegir\n"
-"otro controlador.\n"
-"\n"
-" * \"%s\": de manera predeterminada DrakX configura su interfaz gráfica en\n"
-"\"800x600\" o \"1024x768\" de resolución. Si eso no le satisface, haga clic\n"
-"sobre \"%s\" para cambiar la configuración su interfaz gráfica.\n"
+"mostrará aquí. Si nota que la tarjeta de sonido no es la que está realmente\n"
+"presente en su sistema, puede hacer clic sobre el botón y elegir un\n"
+"controlador diferente.\n"
 "\n"
 " * \"%s\": si se detecta una tarjeta de TV en su sistema, la misma se\n"
 "muestra aquí. Si tiene una tarjeta de TV y la misma no se detecta, haga\n"
 "clic sobre \"%s\" para intentar configurarla a mano.\n"
 "\n"
-" * \"%s\": si se detecta una tarjeta RDSI en su sistema, la misma se\n"
-"muestra aquí. Puede hacer clic sobre \"%s\" para cambiar los parámetros\n"
-"asociados a la misma.\n"
+" * \"%s\": Puede hacer clic sobre \"%s\" para cambiar los parámetros\n"
+"asociados a la tarjeta si cree que no son los correctos.\n"
+"\n"
+" * \"%s\": de manera predeterminada DrakX configura su interfaz gráfica en\n"
+"\"800x600\" o \"1024x768\" de resolución. Si eso no le satisface, haga clic\n"
+"sobre \"%s\" para cambiar la configuración su interfaz gráfica.\n"
+"\n"
+" * \"%s\": si desea configurar ahora el acceso a la Internet o a su red\n"
+"local, puede hacerlo ahora. Consulte la documentación impresa o utilice el\n"
+"Centro de Control de Mandrakelinux luego que finalizó la instalación para\n"
+"aprovechar la ayuda en línea completa.\n"
 "\n"
-" * \"%s\": si desea configurar ahora el acceso a la Internet o a su red "
-"local.\n"
+" * \"%s\": permite configurar las direcciones de los proxy HTTP y FTP si la\n"
+"máquina sobre la que está instalando estará ubicada detrás de un servidor\n"
+"proxy.\n"
 "\n"
 " * \"%s\": esta entrada le ofrece volver a definir el nivel de seguridad\n"
-"como se ajustó en un paso previo ().\n"
+"como se ajustó en un paso previo (ver ).\n"
 "\n"
 " * \"%s\": si planifica conectar su máquina a la Internet, es una buena\n"
 "idea protegerse de las intrusiones configurando un cortafuegos. Consulte la\n"
@@ -5748,67 +5648,68 @@ msgstr ""
 "los ajustes del cortafuegos.\n"
 "\n"
 " * \"%s\": si desea cambiar la configuración de su cargador de arranque,\n"
-"haga clic sobre ese botón. Esto debería estar reservado para usuarios\n"
-"avanzados.\n"
+"haga clic sobre este botón. Esto debería estar reservado para los usuarios\n"
+"avanzados. Consulte la documentación impresa o la ayuda en línea acerca de\n"
+"la configuración del cargador de arranque en el Centro de Control de\n"
+"Mandrakelinux.\n"
 "\n"
-" * \"%s\": aquí podrá tener un control fino sobre qué servicios correrán en\n"
-"su máquina. Si planifica utilizar esta máquina como servidor es una buena\n"
-"idea revisar estos ajustes."
-
-#: help.pm:991 install_steps_interactive.pm:110
-#: install_steps_interactive.pm:887 standalone/keyboarddrake:23
-#, c-format
-msgid "Keyboard"
-msgstr "Teclado"
+" * \"%s\": por medio de esta entrada podrá tener un control fino sobre qué\n"
+"servicios correrán en su máquina. Si planifica utilizar esta máquina como\n"
+"servidor es una buena idea revisar estos ajustes."
 
-#: 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 "Huso horario"
 
-#: help.pm:991
-#, c-format
-msgid "Graphical Interface"
-msgstr "Interfaz gráfica"
-
-#: help.pm:991 install_steps_interactive.pm:987
+#: help.pm:855 install_steps_interactive.pm:1052
 #, c-format
 msgid "TV card"
 msgstr "Tarjeta de TV"
 
-#: help.pm:991
+#: help.pm:855
 #, c-format
 msgid "ISDN card"
 msgstr "Tarjeta RDSI"
 
-#: help.pm:991 install_steps_interactive.pm:1005 standalone/drakbackup:2010
+#: help.pm:855
+#, c-format
+msgid "Graphical Interface"
+msgstr "Interfaz gráfica"
+
+#: help.pm:855 install_steps_interactive.pm:1070 standalone/drakbackup:2030
 #, c-format
 msgid "Network"
 msgstr "Red"
 
-#: help.pm:991 install_steps_interactive.pm:1031
+#: help.pm:855 install_steps_interactive.pm:1085
+#, c-format
+msgid "Proxies"
+msgstr "Proxis"
+
+#: help.pm:855 install_steps_interactive.pm:1096
 #, c-format
 msgid "Security Level"
 msgstr "Nivel de seguridad"
 
-#: help.pm:991 install_steps_interactive.pm:1045
+#: help.pm:855 install_steps_interactive.pm:1110
 #, c-format
 msgid "Firewall"
 msgstr "Cortafuegos"
 
-#: help.pm:991 install_steps_interactive.pm:1059
+#: help.pm:855 install_steps_interactive.pm:1124
 #, c-format
 msgid "Bootloader"
 msgstr "Cargador de arranque"
 
-#: 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 "Servicios"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: help.pm:994
+#: help.pm:858
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
@@ -5821,7 +5722,7 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
-#: help.pm:999
+#: help.pm:863
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
@@ -5840,7 +5741,17 @@ msgstr ""
 "Haga clic sobre \"%s\" para detener esta operación sin perder los datos ni\n"
 "las particiones presentes en esta unidad de disco rígido."
 
-#: install2.pm:119
+#: help.pm:869
+#, c-format
+msgid "Next ->"
+msgstr "Siguiente ->"
+
+#: help.pm:869
+#, c-format
+msgid "<- Previous"
+msgstr "<- Anterior"
+
+#: install2.pm:117
 #, c-format
 msgid ""
 "Can't access kernel modules corresponding to your kernel (file %s is "
@@ -5852,12 +5763,83 @@ msgstr ""
 "de arranque no contiene un núcleo de misma versión que el soporte de "
 "instalación (haga un nuevo disquete de arranque por favor)"
 
-#: install2.pm:169
+#: install2.pm:167
 #, c-format
 msgid "You must also format %s"
 msgstr "Tú también debes formatear %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 ""
+"Se han encontrado los siguientes soportes de instalación. Si quiere saltarse "
+"alguno de ellos, puede deseleccionarlos ahora."
+
+#: install_any.pm:411
+#, c-format
+msgid "Do you have further supplementary media?"
+msgstr "¿Tiene algún otro soporte de instalación suplementario?"
+
+#. -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 ""
+"Se encontraron los soportes siguiente, que seran usados durante la "
+"instalación: %s\n"
+"¿Tiene un soporte de instalación suplementario que configurar?"
+
+#: 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 "Red (http)"
+
+#: install_any.pm:420
+#, c-format
+msgid "Network (ftp)"
+msgstr "Red (ftp)"
+
+#: install_any.pm:464 standalone/drakbackup:112
+#, c-format
+msgid "No device found"
+msgstr "No se encontraron dispositivos"
+
+#: install_any.pm:468
+#, c-format
+msgid "Insert the CD"
+msgstr "Inserte el CD"
+
+#: install_any.pm:492
+#, c-format
+msgid "Insert the CD 1 again"
+msgstr "Vuelva a insertar el CD 1"
+
+#: install_any.pm:502 install_any.pm:506
+#, c-format
+msgid "URL of the mirror?"
+msgstr "¿URL del sitio réplica?"
+
+#: install_any.pm:532
+#, c-format
+msgid "Can't find hdlist file on this mirror"
+msgstr "No puedo encontrar el archivo hdlist en este sitio réplica"
+
+#. -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"
@@ -5881,7 +5863,8 @@ msgstr ""
 "\n"
 "¿Realmente desea instalar estos servidores?\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"
@@ -5894,17 +5877,17 @@ msgstr ""
 "\n"
 "¿Realmente desea quitar estos paquetes?\n"
 
-#: install_any.pm:818
+#: install_any.pm:1116
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Inserte un disquete formateado con FAT en la disquetera %s"
 
-#: install_any.pm:822
+#: install_any.pm:1120
 #, c-format
 msgid "This floppy is not FAT formatted"
 msgstr "Este disquete no está formateado con FAT"
 
-#: install_any.pm:834
+#: install_any.pm:1132
 #, c-format
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
@@ -5913,12 +5896,17 @@ msgstr ""
 "Para utilizar esta selección de paquetes salvada, arranque la instalación "
 "con \"linux defcfg=floppy\""
 
-#: install_any.pm:862 partition_table.pm:848
+#: install_any.pm:1160 partition_table.pm:595
 #, c-format
 msgid "Error reading file %s"
 msgstr "Error al leer el archivo %s"
 
-#: install_any.pm:987
+#: install_any.pm:1361
+#, c-format
+msgid "%s (was %s)"
+msgstr "%s (era %s)"
+
+#: install_any.pm:1396
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
@@ -5928,12 +5916,12 @@ msgstr ""
 "nuevos sistemas de archivos. Por favor, verifique su equipo para saber la "
 "razón de este fallo"
 
-#: install_gtk.pm:161
+#: install_gtk.pm:160
 #, c-format
 msgid "System installation"
 msgstr "Instalación del sistema"
 
-#: install_gtk.pm:164
+#: install_gtk.pm:163
 #, c-format
 msgid "System configuration"
 msgstr "Configuración del sistema"
@@ -5970,7 +5958,7 @@ msgstr ""
 "\n"
 "¿Desea continuar de todas formas?"
 
-#: 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 "Debe tener una partición FAT montada en /boot/efi"
@@ -6031,7 +6019,7 @@ msgstr "¿A qué partición desea cambiarle el tamaño?"
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
-"the following error occured: %s"
+"the following error occurred: %s"
 msgstr ""
 "El redimensionador de tamaño de la FAT no puede gestionar su partición, \n"
 "ocurrió el error siguiente: %s"
@@ -6051,7 +6039,8 @@ msgstr ""
 "Su partición Windows está muy fragmentada, por favor primero ejecute \"defrag"
 "\""
 
-#: 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"
@@ -6080,52 +6069,53 @@ msgstr ""
 "una copia de seguridad de sus datos.\n"
 "Cuando esté seguro, pulse sobre Aceptar."
 
-#: install_interactive.pm:176
+#: install_interactive.pm:178
 #, c-format
 msgid "Which size do you want to keep for Windows on"
 msgstr "¿Qué tamaño desea conservar para Windows en la"
 
-#: install_interactive.pm:177
+#: install_interactive.pm:179
 #, c-format
 msgid "partition %s"
 msgstr "partición %s"
 
-#: install_interactive.pm:186
+#: install_interactive.pm:188
 #, c-format
 msgid "Resizing Windows partition"
 msgstr "Cambiando tamaño a partición Windows"
 
-#: install_interactive.pm:191
+#: install_interactive.pm:193
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "Falló el redimensionado de la 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 "No hay particiones FAT para redimensionar (o no queda espacio suficiente)"
+msgstr ""
+"No hay particiones FAT para redimensionar (o no queda espacio suficiente)"
 
-#: install_interactive.pm:211
+#: install_interactive.pm:213
 #, c-format
 msgid "Remove Windows(TM)"
 msgstr "Quitar Windows(TM)"
 
-#: 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 "Tiene más de un disco rígido, ¿sobre cuál desea instalar Linux?"
 
-#: install_interactive.pm:217
+#: install_interactive.pm:219
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr "Se perderán TODAS las particiones y sus datos en la unidad  %s"
 
-#: install_interactive.pm:230
+#: install_interactive.pm:232
 #, c-format
 msgid "Use fdisk"
 msgstr "Usar fdisk"
 
-#: install_interactive.pm:233
+#: install_interactive.pm:235
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -6134,32 +6124,34 @@ msgstr ""
 "Ahora puede particionar %s.\n"
 "Cuando haya terminado, no se olvide de guardar usando 'w'"
 
-#: install_interactive.pm:269
+#: install_interactive.pm:271
 #, c-format
 msgid "I can't find any room for installing"
 msgstr "No se puede encontrar nada de espacio para instalar"
 
-#: install_interactive.pm:273
+#: install_interactive.pm:275
 #, c-format
 msgid "The DrakX Partitioning wizard found the following solutions:"
-msgstr "El asistente de particionamiento de DrakX encontró las siguientes soluciones:"
+msgstr ""
+"El asistente de particionamiento de DrakX encontró las siguientes soluciones:"
 
-#: install_interactive.pm:279
+#: install_interactive.pm:281
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Falló el particionamiento: %s"
 
-#: install_interactive.pm:286
+#: install_interactive.pm:288
 #, c-format
 msgid "Bringing up the network"
 msgstr "Levantando la red"
 
-#: install_interactive.pm:291
+#: install_interactive.pm:293
 #, c-format
 msgid "Bringing down the network"
 msgstr "Bajando la red"
 
-#: 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"
@@ -6177,7 +6169,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 "
@@ -6199,7 +6191,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"
@@ -6207,14 +6199,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"
@@ -6244,10 +6236,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"
@@ -6258,11 +6250,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"
@@ -6278,7 +6270,7 @@ 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 ""
 "EL PRESENTE TEXTO ES UNA TRADUCCIÓN A PROPÓSITO EXCLUSIVAMENTE\n"
 "INFORMATIVO DE LOS TÉRMINOS DE LA LICENCIA DE MANDRAKELINUX. EN\n"
@@ -6302,7 +6294,7 @@ msgstr ""
 "1. Acuerdo de Licencia\n"
 "\n"
 "Por favor, lea con cuidado este documento. El mismo constituye un\n"
-"contrato de licencia entre Usted y MandrakeSoft S.A. que se aplica\n"
+"contrato de licencia entre Usted y Mandrakesoft S.A. que se aplica\n"
 " a los Productos Software.\n"
 "El hecho de instalar, duplicar o usar los Productos Software de\n"
 "cualquier manera, indica que acepta explícitamente, y está de acuerdo\n"
@@ -6322,7 +6314,7 @@ msgstr ""
 "Los Productos Software y la documentación que los acompaña se\n"
 "proporcionan \"tal cual\", sin garantía alguna hasta donde lo permita la "
 "ley.\n"
-"MandrakeSoft S.A. no se responsabilizará, bajo circunstancia alguna,\n"
+"Mandrakesoft S.A. no se responsabilizará, bajo circunstancia alguna,\n"
 "y hasta donde lo permita la ley, por cualquier daño directo o indirecto,\n"
 "especial o accesorio, de cualquier naturaleza (incluyendo\n"
 "sin limitación daños por pérdidas de beneficios, inerrupción de\n"
@@ -6330,13 +6322,13 @@ msgstr ""
 "costas legales y penalidades resultantes de un juicio en la corte,\n"
 " o cualquier pérdida consequente)\n"
 "que resulte del uso o de la incapacidad de uso de los\n"
-"Productos Software, incluso si MandrakeSoft S.A. hubiera sido informada\n"
+"Productos Software, incluso si Mandrakesoft S.A. hubiera sido informada\n"
 "de la posibilidad de ocurrencia de tales daños.\n"
 "\n"
 "ADVERTENCIA EN CUANTO A LA POSESIÓN O USO DE PROGRAMAS PROHIBIDOS\n"
 "EN CIERTOS PAÍSES\n"
 "\n"
-"Dentro de lo que permita la ley, MandrakeSoft S.A. ni sus proveedores\n"
+"Dentro de lo que permita la ley, Mandrakesoft S.A. ni sus proveedores\n"
 "podrán ser responsabilizados en circunstancia alguna por un perjuicio\n"
 "especial, directo, indirecto o accesorio, de cualquier naturaleza\n"
 "(incluyendo sin limitación daños por pérdidas de beneficio, interrupción\n"
@@ -6364,9 +6356,9 @@ msgstr ""
 "términos y condiciones de las licencias que acompañan a cada uno de\n"
 "ellos antes de usarlos. Toda pregunta relativa a la licencia de un\n"
 "componente se debe dirigir al autor (o su representante) de dicho\n"
-"componente, y no a MandrakeSoft.  Los programas desarrollados\n"
-"por MandrakeSoft están sometidos a la licencia GPL.  La documentación\n"
-"escrita por MandrakeSoft está sometida a una licencia especifica.\n"
+"componente, y no a Mandrakesoft.  Los programas desarrollados\n"
+"por Mandrakesoft están sometidos a la licencia GPL.  La documentación\n"
+"escrita por Mandrakesoft está sometida a una licencia especifica.\n"
 "Por favor, consulte la documentación para obtener más detalles.\n"
 "\n"
 "\n"
@@ -6376,11 +6368,11 @@ msgstr ""
 "pertenecen a sus autores respectivos y están protegidos por la ley\n"
 "de propiedad intelectual y de copyright aplicables a los programas\n"
 "de software.\n"
-"MandrakeSoft S.A. se reserva el derecho de modificar o adaptar los\n"
+"Mandrakesoft S.A. se reserva el derecho de modificar o adaptar los\n"
 "Productos Software, como un todo o en parte, por todos los medios\n"
 "y para cualquier propósito.\n"
 "\"Mandrake\", \"Mandrakelinux\" y los logos asociados están registrados\n"
-"por MandrakeSoft S.A.\n"
+"por Mandrakesoft S.A.\n"
 "\n"
 "\n"
 "5. Disposiciones diversas\n"
@@ -6396,9 +6388,9 @@ msgstr ""
 "la disputa será tramitada en la Corte de Ley correspondiente de\n"
 "París, Francia.\n"
 "Para cualquier pregunta relacionada con este documento, por favor,\n"
-"póngase en contacto con MandrakeSoft S.A.\n"
+"póngase en contacto con Mandrakesoft S.A.\n"
 
-#: install_messages.pm:89
+#: install_messages.pm:90
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -6418,7 +6410,8 @@ msgstr ""
 "para más detalles). Si no está seguro si una patente puede o no aplicarse\n"
 "a Usted, por favor consulte las leyes locales."
 
-#: 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"
@@ -6486,7 +6479,7 @@ msgstr ""
 "derecho de la propiedad intelectual y otras leyes aplicables al derecho\n"
 "del software.\n"
 
-#: install_messages.pm:128
+#: install_messages.pm:131
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
@@ -6520,30 +6513,31 @@ msgstr ""
 "configuración tras la instalación de la Guía del Usuario de Mandrakelinux "
 "oficial."
 
-#: 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 "Punto de montaje %s duplicado"
 
-#: 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 ""
 "Algunos paquetes importantes no fueron instalados correctamente.\n"
 "Seguramente su lector de CD o su CD de instalación sean defectuosos.\n"
 "Compruebe el CD de instalación en un sistema ya existente con el comando:\n"
-"  rpm -qpl Mandrake/RPMS/*.rpm\n"
+"  rpm -qpl media/main/*.rpm\n"
 
-#: install_steps.pm:533
+#: install_steps.pm:603
 #, c-format
 msgid "No floppy drive available"
 msgstr "Ninguna disquetera disponible"
@@ -6553,7 +6547,7 @@ msgstr "Ninguna disquetera disponible"
 msgid "Entering step `%s'\n"
 msgstr "Entrando en la etapa '%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"
@@ -6565,94 +6559,95 @@ msgstr ""
 "Mandrakelinux. Si eso ocurre, puede intentar una instalación tipo texto.\n"
 "Para ello, presione 'F1' cuando arranque desde el CDROM, e introduzca 'text'."
 
-#: 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 "Selección de grupos de paquetes"
 
-#: 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 "Tamaño total: %d / %d MB"
 
-#: install_steps_gtk.pm:340
+#: install_steps_gtk.pm:309
 #, c-format
 msgid "Bad package"
 msgstr "Paquete incorrecto"
 
-#: install_steps_gtk.pm:342
+#: install_steps_gtk.pm:311
 #, c-format
 msgid "Version: "
 msgstr "Versión: "
 
-#: install_steps_gtk.pm:343
+#: install_steps_gtk.pm:312
 #, c-format
 msgid "Size: "
 msgstr "Tamaño: "
 
-#: install_steps_gtk.pm:343
+#: install_steps_gtk.pm:312
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: install_steps_gtk.pm:344
+#: install_steps_gtk.pm:313
 #, c-format
 msgid "Importance: "
 msgstr "Importancia: "
 
-#: install_steps_gtk.pm:377
+#: install_steps_gtk.pm:346
 #, c-format
 msgid "You can't select/unselect this package"
 msgstr "No puede seleccionar/deseleccionar este paquete"
 
-#: install_steps_gtk.pm:381
+#: install_steps_gtk.pm:350
 #, c-format
 msgid "due to missing %s"
 msgstr "debido a que falta %s"
 
-#: install_steps_gtk.pm:382
+#: install_steps_gtk.pm:351
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "debido a que no se satisfizo %s"
 
-#: install_steps_gtk.pm:383
+#: install_steps_gtk.pm:352
 #, c-format
 msgid "trying to promote %s"
 msgstr "intentando promover a %s"
 
-#: install_steps_gtk.pm:384
+#: install_steps_gtk.pm:353
 #, c-format
 msgid "in order to keep %s"
 msgstr "para mantener %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"
+msgid ""
+"You can't select this package as there is not enough space left to install it"
 msgstr ""
 "No puede seleccionar este paquete porque no hay espacio suficiente para "
 "instalarlo"
 
-#: install_steps_gtk.pm:392
+#: install_steps_gtk.pm:361
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Se van a instalar los siguientes paquetes"
 
-#: install_steps_gtk.pm:393
+#: install_steps_gtk.pm:362
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Se van a quitar los siguientes paquetes"
 
-#: install_steps_gtk.pm:417
+#: install_steps_gtk.pm:386
 #, c-format
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Este es un paquete obligatorio, no puede desmarcarlo"
 
-#: install_steps_gtk.pm:419
+#: install_steps_gtk.pm:388
 #, c-format
 msgid "You can't unselect this package. It is already installed"
 msgstr "No puede desmarcar este paquete. Ya está instalado"
 
-#: install_steps_gtk.pm:422
+#: install_steps_gtk.pm:391
 #, c-format
 msgid ""
 "This package must be upgraded.\n"
@@ -6661,221 +6656,224 @@ msgstr ""
 "Se debe actualizar este paquete\n"
 "¿Está seguro que quiere desmarcarlo?"
 
-#: install_steps_gtk.pm:425
+#: install_steps_gtk.pm:394
 #, c-format
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "No puede desmarcar este paquete. Debe ser actualizado"
 
-#: install_steps_gtk.pm:430
+#: install_steps_gtk.pm:399
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Mostrar los paquetes seleccionados automáticamente"
 
-#: install_steps_gtk.pm:435
+#: install_steps_gtk.pm:404
 #, c-format
 msgid "Load/Save on floppy"
 msgstr "Cargar/Guardar en un disquete"
 
-#: install_steps_gtk.pm:436
+#: install_steps_gtk.pm:405
 #, c-format
 msgid "Updating package selection"
 msgstr "Actualizando la selección de paquetes"
 
-#: install_steps_gtk.pm:441
+#: install_steps_gtk.pm:410
 #, c-format
 msgid "Minimal install"
 msgstr "Instalación mínima"
 
-#: 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 "Elija los paquetes que desea instalar"
 
-#: 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 "Instalando"
 
-#: install_steps_gtk.pm:477
-#, c-format
-msgid "No details"
-msgstr "Sin detalles"
-
-#: install_steps_gtk.pm:478
+#: install_steps_gtk.pm:447
 #, c-format
 msgid "Estimating"
 msgstr "Estimando"
 
-#: install_steps_gtk.pm:484
+#: install_steps_gtk.pm:453
 #, c-format
 msgid "Time remaining "
 msgstr "Tiempo restante "
 
-#: install_steps_gtk.pm:496
+#: install_steps_gtk.pm:464
 #, c-format
 msgid "Please wait, preparing installation..."
 msgstr "Preparando la instalación. Espere, por favor"
 
-#: install_steps_gtk.pm:557
+#: install_steps_gtk.pm:474
+#, c-format
+msgid "No details"
+msgstr "Sin detalles"
+
+#: install_steps_gtk.pm:527
 #, c-format
 msgid "%d packages"
 msgstr "%d paquetes"
 
-#: install_steps_gtk.pm:562
+#: install_steps_gtk.pm:532
 #, c-format
 msgid "Installing package %s"
 msgstr "Instalando el paquete %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 "Rechazar"
 
-#: 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 ""
 "¡Cambie su CD-ROM!\n"
 "\n"
-"Inserte el CD-ROM etiquetado como \"%s\" en la unidad y pulse Aceptar cuando "
-"lo  haya hecho.\n"
-"Si no lo posee, pulse Cancelar para cancelar la instalación desde este CD-"
-"ROM."
+"Por favor, inserte CD-ROM etiquetado \"%s\" en la unidad y pulse Aceptar "
+"cuando lo haya hecho.\n"
+"Si no lo posee, pulse Cancelar para evitar la instalación desde este CD-ROM."
 
-#: 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 "Hubo un error al ordenar los paquetes:"
 
-#: 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 "¿Seguir adelante?"
 
-#: 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 "Hubo un error al instalar los paquetes:"
 
-#: 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 "no configurada"
 
-#: install_steps_interactive.pm:81
+#: install_steps_interactive.pm:86
 #, c-format
 msgid "Do you want to recover your system?"
 msgstr "¿Desea recuperar su sistema?"
 
-#: install_steps_interactive.pm:82
+#: install_steps_interactive.pm:87
 #, c-format
 msgid "License agreement"
 msgstr "Acuerdo de licencia"
 
-#: install_steps_interactive.pm:111
+#: install_steps_interactive.pm:91
+#, c-format
+msgid "Release Notes"
+msgstr "Notas de versión:"
+
+#: install_steps_interactive.pm:121
 #, c-format
 msgid "Please choose your keyboard layout."
 msgstr "Seleccione la distribución de su teclado."
 
-#: install_steps_interactive.pm:113
+#: install_steps_interactive.pm:123
 #, c-format
 msgid "Here is the full list of available keyboards"
 msgstr "Aquí tiene la lista completa de teclados disponibles"
 
-#: install_steps_interactive.pm:143
+#: install_steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Instalación/Actualización"
 
-#: install_steps_interactive.pm:144
+#: install_steps_interactive.pm:154
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "¿Es una instalación o una actualización?"
 
-#: install_steps_interactive.pm:150
+#: install_steps_interactive.pm:160
 #, c-format
 msgid "Upgrade %s"
 msgstr "Actualizar %s"
 
-#: install_steps_interactive.pm:160
+#: install_steps_interactive.pm:170
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Clave de cifrado para %s"
 
-#: install_steps_interactive.pm:177
+#: install_steps_interactive.pm:187
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Por favor, seleccione el tipo de su ratón."
 
-#: install_steps_interactive.pm:186 standalone/mousedrake:46
+#: install_steps_interactive.pm:196 standalone/mousedrake:46
 #, c-format
 msgid "Mouse Port"
 msgstr "Puerto del ratón"
 
-#: 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 "Seleccione el puerto serie al que está conectado el ratón, por favor."
 
-#: install_steps_interactive.pm:197
+#: install_steps_interactive.pm:207
 #, c-format
 msgid "Buttons emulation"
 msgstr "Emulación de los botones"
 
-#: install_steps_interactive.pm:199
+#: install_steps_interactive.pm:209
 #, c-format
 msgid "Button 2 Emulation"
 msgstr "Emulación del botón 2"
 
-#: install_steps_interactive.pm:200
+#: install_steps_interactive.pm:210
 #, c-format
 msgid "Button 3 Emulation"
 msgstr "Emulación del botón 3"
 
-#: 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 "Configurando tarjetas PCMCIA..."
 
-#: 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 "Configurando dispositivos 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 "no hay particiones disponibles"
 
-#: install_steps_interactive.pm:251
+#: install_steps_interactive.pm:261
 #, c-format
 msgid "Scanning partitions to find mount points"
 msgstr "Rastreando las particiones para encontrar los puntos de montaje"
 
-#: install_steps_interactive.pm:258
+#: install_steps_interactive.pm:268
 #, c-format
 msgid "Choose the mount points"
 msgstr "Seleccione los puntos de montaje"
 
-#: 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 "
@@ -6884,17 +6882,17 @@ msgstr ""
 "¡No hay 1MB de espacio para bootstrap! La instalación continuará, pero para "
 "arrancar su sistema, necesitará crear la partición bootstrap en DiskDrake"
 
-#: install_steps_interactive.pm:325
+#: install_steps_interactive.pm:337
 #, c-format
 msgid "Choose the partitions you want to format"
 msgstr "Elija las particiones que desea formatear"
 
-#: install_steps_interactive.pm:327
+#: install_steps_interactive.pm:339
 #, c-format
 msgid "Check bad blocks?"
 msgstr "¿Verificar el disco en busca de bloques malos?"
 
-#: 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, "
@@ -6903,41 +6901,56 @@ msgstr ""
 "Falló la verificación del sistema de archivos %s. ¿Desea reparar los "
 "errores? (cuidado, puede perder datos)"
 
-#: install_steps_interactive.pm:362
+#: install_steps_interactive.pm:374
 #, c-format
 msgid "Not enough swap space to fulfill installation, please add some"
 msgstr ""
 "Espacio de intercambio insuficiente para completar la instalación, añada un "
 "poco más"
 
-#: install_steps_interactive.pm:369
+#: install_steps_interactive.pm:381
 #, c-format
 msgid "Looking for available packages and rebuilding rpm database..."
-msgstr "Buscando los paquetes disponibles y reconstruyendo la base de datos de RPM..."
+msgstr ""
+"Buscando los paquetes disponibles y reconstruyendo la base de datos de RPM..."
 
-#: 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 "Buscando los paquetes disponibles..."
 
-#: install_steps_interactive.pm:373
+#: install_steps_interactive.pm:385
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Buscando paquetes ya instalados..."
 
-#: install_steps_interactive.pm:377
+#: install_steps_interactive.pm:389
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Encontrando los paquetes a actualizar..."
 
-#: 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 ""
+"Contactando con el sitio web de Mandrakelinux para obtener la lista de las "
+"réplicas disponibles"
+
+#: install_steps_interactive.pm:411 install_steps_interactive.pm:839
+#, c-format
+msgid "Choose a mirror from which to get the packages"
+msgstr "Elija un sitio de réplica del cual obtener los paquetes"
+
+#: install_steps_interactive.pm:451
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%d "
 "> %d)"
-msgstr "Su sistema no tiene espacio suficiente para instalar o actualizar (%d > %d)"
+msgstr ""
+"Su sistema no tiene espacio suficiente para instalar o actualizar (%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"
@@ -6948,42 +6961,42 @@ msgstr ""
 "El formato es el mismo que los disquetes generados para la instalación "
 "automática."
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Load from floppy"
 msgstr "Cargar desde un disquete"
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Save on floppy"
 msgstr "Guardar en un disquete"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Package selection"
 msgstr "Selección de paquetes"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Loading from floppy"
 msgstr "Cargando desde un disquete"
 
-#: install_steps_interactive.pm:450
+#: install_steps_interactive.pm:504
 #, c-format
 msgid "Insert a floppy containing package selection"
 msgstr "Introduzca un disquete que contenga la selección de paquetes"
 
-#: install_steps_interactive.pm:533
+#: install_steps_interactive.pm:581
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "El tamaño seleccionado es mayor que el disponible"
 
-#: install_steps_interactive.pm:548
+#: install_steps_interactive.pm:596
 #, c-format
 msgid "Type of install"
 msgstr "Tipo de instalación."
 
-#: install_steps_interactive.pm:549
+#: install_steps_interactive.pm:597
 #, c-format
 msgid ""
 "You haven't selected any group of packages.\n"
@@ -6992,22 +7005,22 @@ msgstr ""
 "No ha seleccionado ningún grupo de paquetes\n"
 "Elija por favor la mínima instalación que quiera."
 
-#: install_steps_interactive.pm:553
+#: install_steps_interactive.pm:601
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Con documentación básica (¡recomendado!)"
 
-#: install_steps_interactive.pm:554
+#: install_steps_interactive.pm:602
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Instalación mínima \"en serio\" (especialmente sin urpmi)"
 
-#: install_steps_interactive.pm:597 standalone/drakxtv:50
+#: install_steps_interactive.pm:645 standalone/drakxtv:52
 #, c-format
 msgid "All"
 msgstr "Todo"
 
-#: 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"
@@ -7018,17 +7031,17 @@ msgstr ""
 "Si no tiene ningún CD, haga clic sobre \"Cancelar\".\n"
 "Si sólo le faltan algunos CD, desmárquelos y haga clic sobre \"Aceptar\"."
 
-#: install_steps_interactive.pm:646
+#: install_steps_interactive.pm:699
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "CD-ROM etiquetado como \"%s\""
 
-#: install_steps_interactive.pm:666
+#: install_steps_interactive.pm:720
 #, c-format
 msgid "Preparing installation"
 msgstr "Preparando la instalación"
 
-#: install_steps_interactive.pm:675
+#: install_steps_interactive.pm:729
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -7037,17 +7050,17 @@ msgstr ""
 "Instalando el paquete %s\n"
 "%d%%"
 
-#: install_steps_interactive.pm:721
+#: install_steps_interactive.pm:778
 #, c-format
 msgid "Post-install configuration"
 msgstr "Configuración posterior a la instalación"
 
-#: install_steps_interactive.pm:727
+#: install_steps_interactive.pm:784
 #, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
 msgstr "Por favor, inserte el disquete de módulos actualizados en la unidad %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"
@@ -7057,7 +7070,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 ""
 "Ahora tiene la oportunidad de bajar paquetes actualizados. Estos paquetes\n"
 "se han actualizad después de que se publicó la distribución. Puede que los\n"
@@ -7068,86 +7081,74 @@ msgstr ""
 "\n"
 "¿Desea instalar las actualizaciones?"
 
-#: install_steps_interactive.pm:769
-#, c-format
-msgid "Contacting Mandrakelinux web site to get the list of available mirrors..."
-msgstr ""
-"Contactando con el sitio web de Mandrakelinux para obtener la lista de las "
-"réplicas disponibles"
-
-#: install_steps_interactive.pm:774
-#, c-format
-msgid "Choose a mirror from which to get the packages"
-msgstr "Elija un sitio de réplica del cual obtener los paquetes"
-
-#: install_steps_interactive.pm:788
+#: install_steps_interactive.pm:853
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr ""
 "Contactando con el sitio de réplica para obtener la lista de los paquetes "
 "disponibles..."
 
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "No se puede contactar al sitio de réplica %s"
 
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
 #, c-format
 msgid "Would you like to try again?"
 msgstr "¿Desea intentar nuevamente?"
 
-#: install_steps_interactive.pm:818 standalone/drakclock:45
+#: install_steps_interactive.pm:883 standalone/drakclock:46
 #, c-format
 msgid "Which is your timezone?"
 msgstr "¿Cuál es su huso horario?"
 
-#: install_steps_interactive.pm:823
+#: install_steps_interactive.pm:888
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "Sincronización automática de hora (usando NTP)"
 
-#: install_steps_interactive.pm:831
+#: install_steps_interactive.pm:896
 #, c-format
 msgid "NTP Server"
 msgstr "Servidor NTP"
 
-#: install_steps_interactive.pm:873 steps.pm:30
+#: install_steps_interactive.pm:938 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "Resumen"
 
-#: 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 "Sistema"
 
-#: 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 "Hardware"
 
-#: 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 "Servidor CUPS remoto"
 
-#: install_steps_interactive.pm:932
+#: install_steps_interactive.pm:997
 #, c-format
 msgid "No printer"
 msgstr "Sin impresora"
 
-#: install_steps_interactive.pm:974
+#: install_steps_interactive.pm:1039
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "¿Tiene una tarjeta de sonido ISA?"
 
-#: install_steps_interactive.pm:976
+#: install_steps_interactive.pm:1041
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -7156,97 +7157,93 @@ msgstr ""
 "Use \"alsaconf\" o \"sndconfig\" luego de la instalación para configurar su "
 "tarjeta de sonido"
 
-#: install_steps_interactive.pm:978
+#: install_steps_interactive.pm:1043
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
-msgstr "No se detectó tarjeta de sonido. Pruebe \"harddrake\" luego de la instalación"
+msgstr ""
+"No se detectó tarjeta de sonido. Pruebe \"harddrake\" luego de la instalación"
 
-#: install_steps_interactive.pm:998
+#: install_steps_interactive.pm:1063
 #, c-format
 msgid "Graphical interface"
 msgstr "Interfaz gráfica"
 
-#: 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 "Redes e Internet"
 
-#: install_steps_interactive.pm:1020
-#, c-format
-msgid "Proxies"
-msgstr "Proxis"
-
-#: install_steps_interactive.pm:1021
+#: install_steps_interactive.pm:1086
 #, c-format
 msgid "configured"
 msgstr "configurado"
 
-#: 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 "Seguridad"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, c-format
 msgid "activated"
 msgstr "activado"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, c-format
 msgid "disabled"
 msgstr "deshabilitado"
 
-#: install_steps_interactive.pm:1058
+#: install_steps_interactive.pm:1123
 #, c-format
 msgid "Boot"
 msgstr "Arranque"
 
 #. -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 en %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 "Servicios: %d activados de %d registrados"
 
-#: 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 "No ha configurado a X ¿Está seguro que realmente desea esto?"
 
-#: install_steps_interactive.pm:1141
+#: install_steps_interactive.pm:1205
 #, c-format
 msgid "Set root password and network authentication methods"
 msgstr "Configurar contraseña de root y métodos de autenticación de red"
 
-#: install_steps_interactive.pm:1142
+#: install_steps_interactive.pm:1206
 #, c-format
 msgid "Set root password"
 msgstr "Contraseña de root"
 
-#: 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 ""
 "Esta contraseña es demasiado simple\n"
 "(tiene que tener por lo menos una longitud de %d caracteres)"
 
-#: 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 "Autentificación"
 
-#: install_steps_interactive.pm:1188
+#: install_steps_interactive.pm:1254
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Preparando el cargador de arranque"
 
-#: install_steps_interactive.pm:1198
+#: install_steps_interactive.pm:1264
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
@@ -7259,12 +7256,12 @@ msgstr ""
 "La instalación continuará, pero necesitará\n"
 "utilizar BootX o alguna otra manera para arrancar su máquina"
 
-#: install_steps_interactive.pm:1204
+#: install_steps_interactive.pm:1270
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "¿Desea usar aboot?"
 
-#: install_steps_interactive.pm:1207
+#: install_steps_interactive.pm:1273
 #, c-format
 msgid ""
 "Error installing aboot, \n"
@@ -7274,35 +7271,7 @@ msgstr ""
 "¿desea forzar la instalación incluso si ello implicara la destrucción de la "
 "primera partición?"
 
-#: install_steps_interactive.pm:1218
-#, c-format
-msgid "Installing bootloader"
-msgstr "Instalando cargador de arranque"
-
-#: install_steps_interactive.pm:1225
-#, c-format
-msgid "Installation of bootloader failed. The following error occured:"
-msgstr "Falló la instalación del cargador de arranque. Ocurrió el siguiente error:"
-
-#: 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 ""
-"Puede necesitar cambiar el dispositivo de arranque de Open Firmware para\n"
-" activar el cargador de arranque. Si no ve el prompt del cargador de\n"
-" arranque al reiniciar, mantenga presionado Command-Option-O-F al\n"
-" reiniciar e introduzca:\n"
-" setenv boot-device %s, \\\\:tbxi\n"
-" Luego escriba: shut-down\n"
-"La próxima vez que arranque debería ver el prompt del cargador de arranque."
-
-#: 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 "
@@ -7311,22 +7280,22 @@ msgstr ""
 "En este nivel de seguridad, el acceso a los archivos en la partición Windows "
 "está restringido sólo al administrador."
 
-#: 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 "Inserte un disquete en blanco en la unidad %s"
 
-#: install_steps_interactive.pm:1280
+#: install_steps_interactive.pm:1327
 #, c-format
 msgid "Please insert another floppy for drivers disk"
 msgstr "Por favor, inserte otro disquete para los controladores"
 
-#: install_steps_interactive.pm:1282
+#: install_steps_interactive.pm:1329
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Creando el disquete de instalación automática"
 
-#: install_steps_interactive.pm:1294
+#: install_steps_interactive.pm:1341
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -7337,12 +7306,12 @@ msgstr ""
 "\n"
 "¿Realmente desea salir ahora?"
 
-#: install_steps_interactive.pm:1309
+#: install_steps_interactive.pm:1356
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "Generar un disquete de instalación automática"
 
-#: install_steps_interactive.pm:1311
+#: install_steps_interactive.pm:1358
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -7362,9 +7331,11 @@ msgstr ""
 msgid "Mandrakelinux Installation %s"
 msgstr "Instalación %s de Mandrakelinux"
 
-#: 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 "
+msgid ""
+"  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 " <Tab>/<Alt-Tab> entre elementos  | <espacio> selecciona | <F12> pantalla "
 "sig. "
@@ -7374,17 +7345,37 @@ msgstr ""
 msgid "Choose a file"
 msgstr "Elija un archivo"
 
+#: 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 "Agregar"
+
+#: interactive.pm:295 interactive/gtk.pm:482
+#, c-format
+msgid "Modify"
+msgstr "Modificar"
+
+#: 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 "Quitar"
+
 #: interactive.pm:372
 #, c-format
 msgid "Basic"
 msgstr "Básico"
 
-#: 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 "Finalizar"
 
-#: interactive/newt.pm:83
+#: interactive/newt.pm:92
 #, c-format
 msgid "Do"
 msgstr "Hacer"
@@ -7463,572 +7454,765 @@ msgstr ""
 msgid "Re-submit"
 msgstr "Reenviar"
 
-#: keyboard.pm:161 keyboard.pm:193
+#: keyboard.pm:163 keyboard.pm:194
 #, c-format
-msgid "Czech (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTZ)"
 msgstr "Checo (QWERTZ)"
 
-#: keyboard.pm:162 keyboard.pm:195
+#: keyboard.pm:164 keyboard.pm:196
 #, c-format
-msgid "German"
+msgid ""
+"_: keyboard\n"
+"German"
 msgstr "Alemán"
 
-#: 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 "Español"
 
-#: keyboard.pm:165 keyboard.pm:205
+#: keyboard.pm:167 keyboard.pm:207
 #, c-format
-msgid "Finnish"
+msgid ""
+"_: keyboard\n"
+"Finnish"
 msgstr "Finlandés"
 
-#: keyboard.pm:166 keyboard.pm:206
+#: keyboard.pm:168 keyboard.pm:208
 #, c-format
-msgid "French"
+msgid ""
+"_: keyboard\n"
+"French"
 msgstr "Francés"
 
-#: keyboard.pm:167 keyboard.pm:246
+#: keyboard.pm:169 keyboard.pm:254
 #, c-format
-msgid "Norwegian"
+msgid ""
+"_: keyboard\n"
+"Norwegian"
 msgstr "Noruego"
 
-#: keyboard.pm:168
+#: keyboard.pm:170
 #, c-format
-msgid "Polish"
+msgid ""
+"_: keyboard\n"
+"Polish"
 msgstr "Polaco"
 
-#: keyboard.pm:169 keyboard.pm:255
+#: keyboard.pm:171 keyboard.pm:264
 #, c-format
-msgid "Russian"
+msgid ""
+"_: keyboard\n"
+"Russian"
 msgstr "Ruso"
 
-#: keyboard.pm:171 keyboard.pm:259
+#: keyboard.pm:173 keyboard.pm:268
 #, c-format
-msgid "Swedish"
+msgid ""
+"_: keyboard\n"
+"Swedish"
 msgstr "Sueco"
 
-#: keyboard.pm:172 keyboard.pm:278
+#: keyboard.pm:174 keyboard.pm:287
 #, c-format
 msgid "UK keyboard"
 msgstr "Británico"
 
-#: keyboard.pm:173 keyboard.pm:279
+#: keyboard.pm:175 keyboard.pm:288
 #, c-format
 msgid "US keyboard"
 msgstr "Estadounidense"
 
-#: keyboard.pm:175
+#: keyboard.pm:177
 #, c-format
-msgid "Albanian"
+msgid ""
+"_: keyboard\n"
+"Albanian"
 msgstr "Albano"
 
-#: keyboard.pm:176
+#: keyboard.pm:178
 #, c-format
-msgid "Armenian (old)"
+msgid ""
+"_: keyboard\n"
+"Armenian (old)"
 msgstr "Armenio (antiguo)"
 
-#: keyboard.pm:177
+#: keyboard.pm:179
 #, c-format
-msgid "Armenian (typewriter)"
+msgid ""
+"_: keyboard\n"
+"Armenian (typewriter)"
 msgstr "Armenio (nuevo)"
 
-#: keyboard.pm:178
+#: keyboard.pm:180
 #, c-format
-msgid "Armenian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Armenian (phonetic)"
 msgstr "Armenio (fonético)"
 
-#: keyboard.pm:179
+#: keyboard.pm:181
 #, c-format
-msgid "Arabic"
+msgid ""
+"_: keyboard\n"
+"Arabic"
 msgstr "Arábico"
 
-#: keyboard.pm:180
+#: keyboard.pm:182
 #, c-format
-msgid "Azerbaidjani (latin)"
+msgid ""
+"_: keyboard\n"
+"Azerbaidjani (latin)"
 msgstr "Azerbadján (latín)"
 
-#: keyboard.pm:182
+#: keyboard.pm:183
 #, c-format
-msgid "Belgian"
+msgid ""
+"_: keyboard\n"
+"Belgian"
 msgstr "Belga"
 
-#: keyboard.pm:183
+#: keyboard.pm:184
 #, c-format
-msgid "Bengali"
+msgid ""
+"_: keyboard\n"
+"Bengali"
 msgstr "Indio (Bengalí)"
 
-#: keyboard.pm:184
+#: keyboard.pm:185
 #, c-format
-msgid "Bulgarian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (phonetic)"
 msgstr "Búlgaro (fonético)"
 
-#: keyboard.pm:185
+#: keyboard.pm:186
 #, c-format
-msgid "Bulgarian (BDS)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (BDS)"
 msgstr "Búlgaro (BDS)"
 
-#: keyboard.pm:186
+#: keyboard.pm:187
 #, c-format
-msgid "Brazilian (ABNT-2)"
+msgid ""
+"_: keyboard\n"
+"Brazilian (ABNT-2)"
 msgstr "Brasileño (ABNT-2)"
 
-#: keyboard.pm:189
+#: keyboard.pm:188
 #, c-format
-msgid "Bosnian"
+msgid ""
+"_: keyboard\n"
+"Bosnian"
 msgstr "Bosnio"
 
-#: keyboard.pm:190
+#: keyboard.pm:189
 #, c-format
-msgid "Belarusian"
+msgid ""
+"_: keyboard\n"
+"Belarusian"
 msgstr "Bielorruso"
 
 #: keyboard.pm:191
 #, c-format
-msgid "Swiss (German layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (German layout)"
 msgstr "Suizo (germánico)"
 
-#: keyboard.pm:192
+#: keyboard.pm:193
 #, c-format
-msgid "Swiss (French layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (French layout)"
 msgstr "Suizo (francés)"
 
-#: keyboard.pm:194
+#: keyboard.pm:195
 #, c-format
-msgid "Czech (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTY)"
 msgstr "Checo (QWERTY)"
 
-#: keyboard.pm:196
+#: keyboard.pm:197
 #, c-format
-msgid "German (no dead keys)"
+msgid ""
+"_: keyboard\n"
+"German (no dead keys)"
 msgstr "Alemán (sin teclas muertas)"
 
-#: keyboard.pm:197
+#: keyboard.pm:198
 #, c-format
-msgid "Devanagari"
+msgid ""
+"_: keyboard\n"
+"Devanagari"
 msgstr "Indio (Devanagari)"
 
-#: keyboard.pm:198
+#: keyboard.pm:199
 #, c-format
-msgid "Danish"
+msgid ""
+"_: keyboard\n"
+"Danish"
 msgstr "Danés"
 
-#: keyboard.pm:199
+#: keyboard.pm:200
 #, c-format
-msgid "Dvorak (US)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: 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 (Noruego)"
 
-#: keyboard.pm:202
+#: keyboard.pm:203
 #, c-format
-msgid "Dvorak (Swedish)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Swedish)"
 msgstr "Dvorak (Sueco)"
 
-#: keyboard.pm:203
+#: keyboard.pm:205
 #, c-format
-msgid "Estonian"
+msgid ""
+"_: keyboard\n"
+"Estonian"
 msgstr "Estonio"
 
-#: keyboard.pm:207
+#: keyboard.pm:209
 #, c-format
-msgid "Georgian (\"Russian\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Russian\" layout)"
 msgstr "Georgiano (estilo \"ruso\")"
 
-#: keyboard.pm:208
+#: keyboard.pm:210
 #, c-format
-msgid "Georgian (\"Latin\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Latin\" layout)"
 msgstr "Georgiano (estilo \"latín\")"
 
-#: keyboard.pm:209
+#: keyboard.pm:211
 #, c-format
-msgid "Greek"
+msgid ""
+"_: keyboard\n"
+"Greek"
 msgstr "Griego"
 
-#: keyboard.pm:210
+#: keyboard.pm:212
 #, c-format
-msgid "Greek (polytonic)"
+msgid ""
+"_: keyboard\n"
+"Greek (polytonic)"
 msgstr "Griego (politónico)"
 
-#: keyboard.pm:211
+#: keyboard.pm:213
 #, c-format
-msgid "Gujarati"
+msgid ""
+"_: keyboard\n"
+"Gujarati"
 msgstr "Indio (Gujarati)"
 
-#: keyboard.pm:212
+#: keyboard.pm:214
 #, c-format
-msgid "Gurmukhi"
+msgid ""
+"_: keyboard\n"
+"Gurmukhi"
 msgstr "Indio (Gurmukhi)"
 
-#: keyboard.pm:213
+#: keyboard.pm:216
 #, c-format
-msgid "Hungarian"
+msgid ""
+"_: keyboard\n"
+"Hungarian"
 msgstr "Húngaro"
 
-#: keyboard.pm:214
+#: keyboard.pm:217
 #, c-format
-msgid "Croatian"
+msgid ""
+"_: keyboard\n"
+"Croatian"
 msgstr "Croata"
 
-#: keyboard.pm:215
+#: keyboard.pm:218
 #, c-format
-msgid "Irish"
+msgid ""
+"_: keyboard\n"
+"Irish"
 msgstr "irlandés"
 
-#: keyboard.pm:216
+#: keyboard.pm:219
 #, c-format
-msgid "Israeli"
+msgid ""
+"_: keyboard\n"
+"Israeli"
 msgstr "Israelí"
 
-#: keyboard.pm:217
+#: keyboard.pm:220
 #, c-format
-msgid "Israeli (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Israeli (phonetic)"
 msgstr "Israelí (fonético)"
 
-#: keyboard.pm:218
+#: keyboard.pm:221
 #, c-format
-msgid "Iranian"
+msgid ""
+"_: keyboard\n"
+"Iranian"
 msgstr "Iraní"
 
-#: keyboard.pm:219
+#: keyboard.pm:222
 #, c-format
-msgid "Icelandic"
+msgid ""
+"_: keyboard\n"
+"Icelandic"
 msgstr "Islandés"
 
-#: keyboard.pm:220
+#: keyboard.pm:223
 #, c-format
-msgid "Italian"
+msgid ""
+"_: keyboard\n"
+"Italian"
 msgstr "Italiano"
 
-#: keyboard.pm:221
+#: keyboard.pm:224
 #, c-format
-msgid "Inuktitut"
+msgid ""
+"_: keyboard\n"
+"Inuktitut"
 msgstr "Inuktitut"
 
-#: keyboard.pm:225
+#: keyboard.pm:229
 #, c-format
-msgid "Japanese 106 keys"
+msgid ""
+"_: keyboard\n"
+"Japanese 106 keys"
 msgstr "Japonés de 106 teclas"
 
-#: 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 "Coreano"
 
-#: keyboard.pm:230
+#: keyboard.pm:234
 #, c-format
-msgid "Kyrgyz keyboard"
+msgid ""
+"_: keyboard\n"
+"Kyrgyz"
 msgstr "Teclado Kyrgyz"
 
-#: keyboard.pm:231
+#: keyboard.pm:235
 #, c-format
-msgid "Latin American"
+msgid ""
+"_: keyboard\n"
+"Latin American"
 msgstr "Latinoamericano"
 
-#: keyboard.pm:232
+#: keyboard.pm:236
 #, c-format
-msgid "Laotian"
+msgid ""
+"_: keyboard\n"
+"Laotian"
 msgstr "Laosiano"
 
-#: keyboard.pm:233
+#: keyboard.pm:238
 #, c-format
-msgid "Lithuanian AZERTY (old)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (old)"
 msgstr "Lituano AZERTY (antiguo)"
 
-#: keyboard.pm:235
+#: keyboard.pm:241
 #, c-format
-msgid "Lithuanian AZERTY (new)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (new)"
 msgstr "Lituano AZERTY (nuevo)"
 
-#: keyboard.pm:236
+#: keyboard.pm:243
 #, c-format
-msgid "Lithuanian \"number row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"number row\" QWERTY"
 msgstr "Lituano \"numérico\" QWERTY"
 
-#: keyboard.pm:237
+#: keyboard.pm:245
 #, c-format
-msgid "Lithuanian \"phonetic\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"phonetic\" QWERTY"
 msgstr "Lituano \"fonético\" QWERTY"
 
-#: keyboard.pm:238
+#: keyboard.pm:246
 #, c-format
-msgid "Latvian"
+msgid ""
+"_: keyboard\n"
+"Latvian"
 msgstr "Letón"
 
-#: keyboard.pm:239
+#: keyboard.pm:247
 #, c-format
-msgid "Malayalam"
+msgid ""
+"_: keyboard\n"
+"Malayalam"
 msgstr "Malayo"
 
-#: keyboard.pm:240
+#: keyboard.pm:248
 #, c-format
-msgid "Macedonian"
+msgid ""
+"_: keyboard\n"
+"Macedonian"
 msgstr "Macedonio"
 
-#: keyboard.pm:241
+#: keyboard.pm:249
 #, c-format
-msgid "Myanmar (Burmese)"
+msgid ""
+"_: keyboard\n"
+"Myanmar (Burmese)"
 msgstr "Myanmar (Birmano)"
 
-#: keyboard.pm:242
+#: keyboard.pm:250
 #, c-format
-msgid "Mongolian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Mongolian (cyrillic)"
 msgstr "Mongol (cirílico)"
 
-#: keyboard.pm:243
+#: keyboard.pm:251
 #, c-format
-msgid "Maltese (UK)"
+msgid ""
+"_: keyboard\n"
+"Maltese (UK)"
 msgstr "Maltés (Reino Unido)"
 
-#: keyboard.pm:244
+#: keyboard.pm:252
 #, c-format
-msgid "Maltese (US)"
+msgid ""
+"_: keyboard\n"
+"Maltese (US)"
 msgstr "Maltés (EE.UU.)"
 
-#: keyboard.pm:245
+#: keyboard.pm:253
 #, c-format
-msgid "Dutch"
+msgid ""
+"_: keyboard\n"
+"Dutch"
 msgstr "Holandés"
 
-#: 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 "Polaco (distribución qwerty)"
 
-#: keyboard.pm:249
+#: keyboard.pm:257
 #, c-format
-msgid "Polish (qwertz layout)"
+msgid ""
+"_: keyboard\n"
+"Polish (qwertz layout)"
 msgstr "Polaco (distribución qwertz)"
 
-#: keyboard.pm:250
+#: keyboard.pm:258
 #, c-format
-msgid "Portuguese"
+msgid ""
+"_: keyboard\n"
+"Portuguese"
 msgstr "Portugués"
 
-#: keyboard.pm:251
+#: keyboard.pm:260
 #, c-format
-msgid "Canadian (Quebec)"
+msgid ""
+"_: keyboard\n"
+"Canadian (Quebec)"
 msgstr "Canadiense (Quebec)"
 
-#: keyboard.pm:253
+#: keyboard.pm:262
 #, c-format
-msgid "Romanian (qwertz)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwertz)"
 msgstr "Rumano (qwertz)"
 
-#: keyboard.pm:254
+#: keyboard.pm:263
 #, c-format
-msgid "Romanian (qwerty)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwerty)"
 msgstr "Rumano (qwerty)"
 
-#: keyboard.pm:256
+#: keyboard.pm:265
 #, c-format
-msgid "Russian (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Russian (phonetic)"
 msgstr "Ruso (fonético)"
 
-#: keyboard.pm:257
+#: keyboard.pm:266
 #, c-format
-msgid "Saami (norwegian)"
+msgid ""
+"_: keyboard\n"
+"Saami (norwegian)"
 msgstr "Saami (noruego)"
 
-#: keyboard.pm:258
+#: keyboard.pm:267
 #, c-format
-msgid "Saami (swedish/finnish)"
+msgid ""
+"_: keyboard\n"
+"Saami (swedish/finnish)"
 msgstr "Saami (sueco/finlandés)"
 
-#: keyboard.pm:260
+#: keyboard.pm:269
 #, c-format
-msgid "Slovenian"
+msgid ""
+"_: keyboard\n"
+"Slovenian"
 msgstr "Esloveno"
 
-#: keyboard.pm:261
+#: keyboard.pm:270
 #, c-format
-msgid "Slovakian (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTZ)"
 msgstr "Eslovaco (QWERTZ)"
 
-#: keyboard.pm:262
+#: keyboard.pm:271
 #, c-format
-msgid "Slovakian (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTY)"
 msgstr "Eslovaco (QWERTY)"
 
-#: keyboard.pm:264
+#: keyboard.pm:273
 #, c-format
-msgid "Serbian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Serbian (cyrillic)"
 msgstr "Serbio (cirílico)"
 
-#: keyboard.pm:265
+#: keyboard.pm:274
 #, c-format
-msgid "Syriac"
+msgid ""
+"_: keyboard\n"
+"Syriac"
 msgstr "Syriac"
 
-#: keyboard.pm:266
+#: keyboard.pm:275
 #, c-format
-msgid "Syriac (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Syriac (phonetic)"
 msgstr "Syriac (fonético)"
 
-#: 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 (disposición ISCII)"
 
-#: keyboard.pm:270
+#: keyboard.pm:279
 #, c-format
-msgid "Tamil (Typewriter-layout)"
+msgid ""
+"_: keyboard\n"
+"Tamil (Typewriter-layout)"
 msgstr "Tamil (disposición de máquina de escribir)"
 
-#: keyboard.pm:271
+#: keyboard.pm:280
 #, c-format
-msgid "Thai keyboard"
+msgid ""
+"_: keyboard\n"
+"Thai"
 msgstr "Teclado tailandés"
 
-#: keyboard.pm:273
+#: keyboard.pm:282
 #, c-format
-msgid "Tajik keyboard"
+msgid ""
+"_: keyboard\n"
+"Tajik"
 msgstr "Teclado tajik"
 
-#: keyboard.pm:274
+#: keyboard.pm:283
 #, c-format
-msgid "Turkish (traditional \"F\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (traditional \"F\" model)"
 msgstr "Turco (modelo \"F\" tradicional)"
 
-#: keyboard.pm:275
+#: keyboard.pm:284
 #, c-format
-msgid "Turkish (modern \"Q\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (modern \"Q\" model)"
 msgstr "Turco (modelo \"Q\" moderno)"
 
-#: keyboard.pm:277
+#: keyboard.pm:286
 #, c-format
-msgid "Ukrainian"
+msgid ""
+"_: keyboard\n"
+"Ukrainian"
 msgstr "Ucraniano"
 
-#: keyboard.pm:280
+#: keyboard.pm:289
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Estadounidense (internacional)"
 
-#: keyboard.pm:281
+#: keyboard.pm:290
 #, c-format
-msgid "Uzbek (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Uzbek (cyrillic)"
 msgstr "Uzbek (cirílico)"
 
-#: keyboard.pm:282
+#: keyboard.pm:292
 #, c-format
-msgid "Vietnamese \"numeric row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamita \"numérico\" QWERTY"
 
-#: keyboard.pm:283
+#: keyboard.pm:293
 #, c-format
-msgid "Yugoslavian (latin)"
+msgid ""
+"_: keyboard\n"
+"Yugoslavian (latin)"
 msgstr "Yugoslavo (latín)"
 
-#: keyboard.pm:290
+#: keyboard.pm:300
 #, c-format
 msgid "Right Alt key"
 msgstr "Tecla Alt derecha"
 
-#: keyboard.pm:291
+#: keyboard.pm:301
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Ambas teclas Mayús simultáneamente"
 
-#: keyboard.pm:292
+#: keyboard.pm:302
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Las teclas Control y Mayús simultáneamente"
 
-#: keyboard.pm:293
+#: keyboard.pm:303
 #, c-format
 msgid "CapsLock key"
 msgstr "Tecla CapsLock"
 
-#: keyboard.pm:294
+#: keyboard.pm:304
+#, c-format
+msgid "Shift and CapsLock keys simultaneously"
+msgstr "Las teclas Mayús y CapsLock simultáneamente"
+
+#: keyboard.pm:305
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Las teclas Ctrl y Alt simultáneamente"
 
-#: keyboard.pm:295
+#: keyboard.pm:306
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Las teclas Alt y Shift simultáneamente"
 
-#: keyboard.pm:296
+#: keyboard.pm:307
 #, c-format
 msgid "\"Menu\" key"
 msgstr "La tecla \"Menú\""
 
-#: keyboard.pm:297
+#: keyboard.pm:308
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Tecla \"Windows\" de la izquierda"
 
-#: keyboard.pm:298
+#: keyboard.pm:309
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Tecla \"Windows\" de la derecha"
 
-#: keyboard.pm:299
+#: keyboard.pm:310
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Ambas teclas Control simultáneamente"
 
-#: keyboard.pm:300
+#: keyboard.pm:311
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Ambas teclas Alt simultáneamente"
 
-#: keyboard.pm:301
+#: keyboard.pm:312
 #, c-format
 msgid "Left Shift key"
 msgstr "Tecla Mayús izquierda"
 
-#: keyboard.pm:302
+#: keyboard.pm:313
 #, c-format
 msgid "Right Shift key"
 msgstr "Tecla Mayús derecha"
 
-#: keyboard.pm:303
+#: keyboard.pm:314
 #, c-format
 msgid "Left Alt key"
 msgstr "Tecla Alt izquierda"
 
-#: keyboard.pm:304
+#: keyboard.pm:315
 #, c-format
 msgid "Left Control key"
 msgstr "Tecla Control izquierda"
 
-#: keyboard.pm:305
+#: keyboard.pm:316
 #, c-format
 msgid "Right Control key"
 msgstr "Tecla Control derecha"
 
-#: keyboard.pm:336
+#: keyboard.pm:347
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -8039,7 +8223,7 @@ msgstr ""
 "cambiar entre los diferentes esquemas de teclado\n"
 "(ej.: latino y no latino)"
 
-#: keyboard.pm:341
+#: keyboard.pm:352
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -8050,1164 +8234,1188 @@ msgstr ""
 "Durante la instalación, deberá utilizar la tecla Control derecha\n"
 "para cambiar entre las distintas distribuciones de teclado."
 
-#: 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 "predet.:LTR"
 
-#: lang.pm:169
-#, c-format
-msgid "Afghanistan"
-msgstr "Afganistán"
-
-#: 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 "Emiratos Árabes Unidos"
 
-#: lang.pm:172
+#: lang.pm:184
+#, c-format
+msgid "Afghanistan"
+msgstr "Afganistán"
+
+#: lang.pm:185
 #, c-format
 msgid "Antigua and Barbuda"
 msgstr "Antigua y 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 "Antillas Holandesas"
 
-#: lang.pm:177
+#: lang.pm:190
 #, c-format
 msgid "Angola"
 msgstr "Angola"
 
-#: lang.pm:178
+#: lang.pm:191
 #, c-format
 msgid "Antarctica"
 msgstr "Antártica"
 
-#: 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 "Samoa Americana"
 
-#: 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 "Azerbayán"
 
-#: lang.pm:185
+#: lang.pm:198
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnia Herzegovina"
 
-#: 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 "Bahrein"
 
-#: lang.pm:192
+#: lang.pm:205
 #, c-format
 msgid "Burundi"
 msgstr "Burundi"
 
-#: lang.pm:193
+#: lang.pm:206
 #, c-format
 msgid "Benin"
 msgstr "Benín"
 
-#: 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 Darussalam"
 
-#: 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 "Bután"
 
-#: lang.pm:200
+#: lang.pm:213
 #, c-format
 msgid "Bouvet Island"
 msgstr "Isla Bouvet"
 
-#: lang.pm:201
+#: lang.pm:214
 #, c-format
 msgid "Botswana"
 msgstr "Botswana"
 
-#: lang.pm:202
+#: lang.pm:215
 #, c-format
 msgid "Belarus"
 msgstr "Bielorrusia"
 
-#: lang.pm:203
+#: lang.pm:216
 #, c-format
 msgid "Belize"
 msgstr "Belice"
 
-#: lang.pm:204
+#: lang.pm:217
 #, c-format
 msgid "Canada"
 msgstr "Canadá"
 
-#: lang.pm:205
+#: lang.pm:218
 #, c-format
 msgid "Cocos (Keeling) Islands"
 msgstr "Islas Cocos (Keeling)"
 
-#: lang.pm:206
+#: lang.pm:219
 #, c-format
 msgid "Congo (Kinshasa)"
 msgstr "Congo (Kinshasa)"
 
-#: lang.pm:207
+#: lang.pm:220
 #, c-format
 msgid "Central African Republic"
 msgstr "República Centroafricana"
 
-#: lang.pm:208
+#: lang.pm:221
 #, c-format
 msgid "Congo (Brazzaville)"
 msgstr "Congo (Brazzaville)"
 
-#: lang.pm:209
+#: lang.pm:222 network/adsl_consts.pm:568 network/adsl_consts.pm:575
 #, c-format
 msgid "Switzerland"
 msgstr "Suiza"
 
-#: lang.pm:210
+#: lang.pm:223
 #, c-format
 msgid "Cote d'Ivoire"
 msgstr "Costa de Marfil"
 
-#: lang.pm:211
+#: lang.pm:224
 #, c-format
 msgid "Cook Islands"
 msgstr "Islas Cook"
 
-#: lang.pm:212
+#: lang.pm:225
 #, c-format
 msgid "Chile"
 msgstr "Chile"
 
-#: lang.pm:213
+#: lang.pm:226
 #, c-format
 msgid "Cameroon"
 msgstr "Camerún"
 
-#: 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 "China"
 
-#: 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 & Montenegro"
+
+#: lang.pm:231
 #, c-format
 msgid "Cuba"
 msgstr "Cuba"
 
-#: lang.pm:218
+#: lang.pm:232
 #, c-format
 msgid "Cape Verde"
 msgstr "Cabo Verde"
 
-#: lang.pm:219
+#: lang.pm:233
 #, c-format
 msgid "Christmas Island"
 msgstr "Isla Navidad"
 
-#: lang.pm:220
+#: lang.pm:234
 #, c-format
 msgid "Cyprus"
 msgstr "Chipre"
 
-#: lang.pm:223
+#: lang.pm:237
 #, c-format
 msgid "Djibouti"
 msgstr "Djibuti"
 
-#: lang.pm:224
+#: lang.pm:238 network/adsl_consts.pm:302
 #, c-format
 msgid "Denmark"
 msgstr "Dinamarca"
 
-#: lang.pm:225
+#: lang.pm:239
 #, c-format
 msgid "Dominica"
 msgstr "Dominica"
 
-#: lang.pm:226
+#: lang.pm:240
 #, c-format
 msgid "Dominican Republic"
 msgstr "República Dominicana"
 
-#: lang.pm:227
+#: lang.pm:241
 #, c-format
 msgid "Algeria"
 msgstr "Argelia"
 
-#: lang.pm:228
+#: lang.pm:242
 #, c-format
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: lang.pm:229
+#: lang.pm:243
 #, c-format
 msgid "Estonia"
 msgstr "Estonia"
 
-#: lang.pm:230
+#: lang.pm:244
 #, c-format
 msgid "Egypt"
 msgstr "Egipto"
 
-#: lang.pm:231
+#: lang.pm:245
 #, c-format
 msgid "Western Sahara"
 msgstr "Sahara Oeste"
 
-#: 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 "España"
 
-#: lang.pm:234
+#: lang.pm:248
 #, c-format
 msgid "Ethiopia"
 msgstr "Etiopía"
 
-#: lang.pm:235 network/adsl_consts.pm:127
+#: lang.pm:249 network/adsl_consts.pm:402
 #, c-format
 msgid "Finland"
 msgstr "Finlandia"
 
-#: lang.pm:236
+#: lang.pm:250
 #, c-format
 msgid "Fiji"
 msgstr "Fidji"
 
-#: lang.pm:237
+#: lang.pm:251
 #, c-format
 msgid "Falkland Islands (Malvinas)"
 msgstr "Islas Malvinas"
 
-#: lang.pm:238
+#: lang.pm:252
 #, c-format
 msgid "Micronesia"
 msgstr "Micronesia"
 
-#: lang.pm:239
+#: lang.pm:253
 #, c-format
 msgid "Faroe Islands"
 msgstr "Islas Feroe"
 
-#: lang.pm:241
+#: lang.pm:255
 #, c-format
 msgid "Gabon"
 msgstr "Gabón"
 
-#: 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 "Reino Unido"
 
-#: lang.pm:243
+#: lang.pm:257
 #, c-format
 msgid "Grenada"
 msgstr "Granada"
 
-#: lang.pm:244
+#: lang.pm:258
 #, c-format
 msgid "Georgia"
 msgstr "Georgia"
 
-#: lang.pm:245
+#: lang.pm:259
 #, c-format
 msgid "French Guiana"
 msgstr "Guayana Francesa"
 
-#: 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 "Groenlandia"
 
-#: 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 "Guadalupe"
 
-#: lang.pm:252
+#: lang.pm:266
 #, c-format
 msgid "Equatorial Guinea"
 msgstr "Guinea Ecuatorial"
 
-#: lang.pm:254
+#: lang.pm:268
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "Islas Georgia del Sur y Sandwich del Sur"
 
-#: 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)"
-msgstr "China (Hong Kong)"
+msgid "Hong Kong SAR (China)"
+msgstr "Hong Kong SAR (China)"
 
-#: lang.pm:260
+#: lang.pm:274
 #, c-format
 msgid "Heard and McDonald Islands"
 msgstr "Islas Heard y McDonald"
 
-#: lang.pm:261
+#: lang.pm:275
 #, c-format
 msgid "Honduras"
 msgstr "Honduras"
 
-#: lang.pm:262
+#: lang.pm:276
 #, c-format
 msgid "Croatia"
 msgstr "Croacia"
 
-#: lang.pm:263
+#: lang.pm:277
 #, c-format
 msgid "Haiti"
 msgstr "Haití"
 
-#: lang.pm:264 network/adsl_consts.pm:152
+#: lang.pm:278 network/adsl_consts.pm:436
 #, c-format
 msgid "Hungary"
 msgstr "Hungría"
 
-#: 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 "Irlanda"
 
-#: 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 "Territorio Británico del Océano Índico"
 
-#: lang.pm:270
+#: lang.pm:284
 #, c-format
 msgid "Iraq"
 msgstr "Iraq"
 
-#: lang.pm:271
+#: lang.pm:285
 #, c-format
 msgid "Iran"
 msgstr "Irán"
 
-#: lang.pm:272
+#: lang.pm:286
 #, c-format
 msgid "Iceland"
 msgstr "Islandia"
 
-#: lang.pm:274
+#: lang.pm:288
 #, c-format
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: lang.pm:275
+#: lang.pm:289
 #, c-format
 msgid "Jordan"
 msgstr "Jordania"
 
-#: lang.pm:276
+#: lang.pm:290
 #, c-format
 msgid "Japan"
 msgstr "Japón"
 
-#: lang.pm:277
+#: lang.pm:291
 #, c-format
 msgid "Kenya"
 msgstr "Kenia"
 
-#: lang.pm:278
+#: lang.pm:292
 #, c-format
 msgid "Kyrgyzstan"
 msgstr "Kirguizistán"
 
-#: lang.pm:279
+#: lang.pm:293
 #, c-format
 msgid "Cambodia"
 msgstr "Camboya"
 
-#: lang.pm:280
+#: lang.pm:294
 #, c-format
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: lang.pm:281
+#: lang.pm:295
 #, c-format
 msgid "Comoros"
 msgstr "Comores"
 
-#: lang.pm:282
+#: lang.pm:296
 #, c-format
 msgid "Saint Kitts and Nevis"
 msgstr "Saint Kitts y Nevis"
 
-#: lang.pm:283
+#: lang.pm:297
 #, c-format
 msgid "Korea (North)"
 msgstr "Corea (del Norte)"
 
-#: lang.pm:284
+#: lang.pm:298
 #, c-format
 msgid "Korea"
 msgstr "Corea"
 
-#: lang.pm:285
+#: lang.pm:299
 #, c-format
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: lang.pm:286
+#: lang.pm:300
 #, c-format
 msgid "Cayman Islands"
 msgstr "Islas Caimán"
 
-#: lang.pm:287
+#: lang.pm:301
 #, c-format
 msgid "Kazakhstan"
 msgstr "Kazajstán"
 
-#: lang.pm:288
+#: lang.pm:302
 #, c-format
 msgid "Laos"
 msgstr "Laos"
 
-#: lang.pm:289
+#: lang.pm:303
 #, c-format
 msgid "Lebanon"
 msgstr "Líbano"
 
-#: lang.pm:290
+#: lang.pm:304
 #, c-format
 msgid "Saint Lucia"
 msgstr "Santa Lucía"
 
-#: 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 "Lesoto"
 
-#: lang.pm:295
+#: lang.pm:309 network/adsl_consts.pm:479
 #, c-format
 msgid "Lithuania"
 msgstr "Lituania"
 
-#: lang.pm:296
+#: lang.pm:310
 #, c-format
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
-#: lang.pm:297
+#: lang.pm:311
 #, c-format
 msgid "Latvia"
 msgstr "Letonia"
 
-#: lang.pm:298
+#: lang.pm:312
 #, c-format
 msgid "Libya"
 msgstr "Libia"
 
-#: lang.pm:299
+#: lang.pm:313 network/adsl_consts.pm:487
 #, c-format
 msgid "Morocco"
 msgstr "Marruecos"
 
-#: lang.pm:300
+#: lang.pm:314
 #, c-format
 msgid "Monaco"
 msgstr "Mónaco"
 
-#: lang.pm:301
+#: lang.pm:315
 #, c-format
 msgid "Moldova"
 msgstr "Moldavia"
 
-#: lang.pm:302
+#: lang.pm:316
 #, c-format
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: lang.pm:303
+#: lang.pm:317
 #, c-format
 msgid "Marshall Islands"
 msgstr "Islas Marshall"
 
-#: lang.pm:304
+#: lang.pm:318
 #, c-format
 msgid "Macedonia"
 msgstr "Macedonia"
 
-#: 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 "Islas Marianas del Norte"
 
-#: lang.pm:309
+#: lang.pm:323
 #, c-format
 msgid "Martinique"
 msgstr "Martinica"
 
-#: lang.pm:310
+#: lang.pm:324
 #, c-format
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: lang.pm:311
+#: lang.pm:325
 #, c-format
 msgid "Montserrat"
 msgstr "Monserrat"
 
-#: lang.pm:312
+#: lang.pm:326
 #, c-format
 msgid "Malta"
 msgstr "Malta"
 
-#: lang.pm:313
+#: lang.pm:327
 #, c-format
 msgid "Mauritius"
 msgstr "Mauricio"
 
-#: lang.pm:314
+#: lang.pm:328
 #, c-format
 msgid "Maldives"
 msgstr "Maldivas"
 
-#: lang.pm:315
+#: lang.pm:329
 #, c-format
 msgid "Malawi"
 msgstr "Malawi"
 
-#: lang.pm:316
+#: lang.pm:330
 #, c-format
 msgid "Mexico"
 msgstr "México"
 
-#: lang.pm:317
+#: lang.pm:331
 #, c-format
 msgid "Malaysia"
 msgstr "Malasia"
 
-#: lang.pm:318
+#: lang.pm:332
 #, c-format
 msgid "Mozambique"
 msgstr "Mozambique"
 
-#: lang.pm:319
+#: lang.pm:333
 #, c-format
 msgid "Namibia"
 msgstr "Namibia"
 
-#: lang.pm:320
+#: lang.pm:334
 #, c-format
 msgid "New Caledonia"
 msgstr "Nueva Caledonia"
 
-#: lang.pm:321
+#: lang.pm:335
 #, c-format
 msgid "Niger"
 msgstr "Níger"
 
-#: lang.pm:322
+#: lang.pm:336
 #, c-format
 msgid "Norfolk Island"
 msgstr "Isla Norfolk"
 
-#: 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 "Nueva Zelanda"
 
-#: lang.pm:331
+#: lang.pm:345
 #, c-format
 msgid "Oman"
 msgstr "Omán"
 
-#: lang.pm:332
+#: lang.pm:346
 #, c-format
 msgid "Panama"
 msgstr "Panamá"
 
-#: lang.pm:333
+#: lang.pm:347
 #, c-format
 msgid "Peru"
 msgstr "Perú"
 
-#: lang.pm:334
+#: lang.pm:348
 #, c-format
 msgid "French Polynesia"
 msgstr "Polinesia Francesa"
 
-#: lang.pm:335
+#: lang.pm:349
 #, c-format
 msgid "Papua New Guinea"
 msgstr "Papúa Nueva Guinea"
 
-#: lang.pm:336
+#: lang.pm:350
 #, c-format
 msgid "Philippines"
 msgstr "Filipinas"
 
-#: lang.pm:337
+#: lang.pm:351
 #, c-format
 msgid "Pakistan"
 msgstr "Pakistán"
 
-#: lang.pm:338 network/adsl_consts.pm:186
+#: lang.pm:352 network/adsl_consts.pm:503
 #, c-format
 msgid "Poland"
 msgstr "Polonia"
 
-#: lang.pm:339
+#: lang.pm:353
 #, c-format
 msgid "Saint Pierre and Miquelon"
 msgstr "Saint Pierre y 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 "Reunión"
 
-#: lang.pm:348
+#: lang.pm:362
 #, c-format
 msgid "Romania"
 msgstr "Rumanía"
 
-#: lang.pm:349
+#: lang.pm:363
 #, c-format
 msgid "Russia"
 msgstr "Rusia"
 
-#: lang.pm:350
+#: lang.pm:364
 #, c-format
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: lang.pm:351
+#: lang.pm:365
 #, c-format
 msgid "Saudi Arabia"
 msgstr "Arabia Saudí"
 
-#: lang.pm:352
+#: lang.pm:366
 #, c-format
 msgid "Solomon Islands"
 msgstr "Islas Salomón"
 
-#: lang.pm:353
+#: lang.pm:367
 #, c-format
 msgid "Seychelles"
 msgstr "Seychelles"
 
-#: lang.pm:354
+#: lang.pm:368
 #, c-format
 msgid "Sudan"
 msgstr "Sudán"
 
-#: lang.pm:356
+#: lang.pm:370
 #, c-format
 msgid "Singapore"
 msgstr "Singapur"
 
-#: lang.pm:357
+#: lang.pm:371
 #, c-format
 msgid "Saint Helena"
 msgstr "Santa Helena"
 
-#: lang.pm:358
+#: lang.pm:372 network/adsl_consts.pm:520
 #, c-format
 msgid "Slovenia"
 msgstr "Eslovenia"
 
-#: lang.pm:359
+#: lang.pm:373
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "Islas Svalbard e Islas Jan Mayen"
 
-#: lang.pm:360
+#: lang.pm:374
 #, c-format
 msgid "Slovakia"
 msgstr "Eslovaquia"
 
-#: lang.pm:361
+#: lang.pm:375
 #, c-format
 msgid "Sierra Leone"
 msgstr "Sierra Leona"
 
-#: 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 "Santo Tomé y 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 "Siria"
 
-#: lang.pm:369
+#: lang.pm:383
 #, c-format
 msgid "Swaziland"
 msgstr "Swazilandia"
 
-#: lang.pm:370
+#: lang.pm:384
 #, c-format
 msgid "Turks and Caicos Islands"
 msgstr "Islas Turks y Caicos"
 
-#: lang.pm:371
+#: lang.pm:385
 #, c-format
 msgid "Chad"
 msgstr "Chad"
 
-#: lang.pm:372
+#: lang.pm:386
 #, c-format
 msgid "French Southern Territories"
 msgstr "Terrotorios Franceses del Sur"
 
-#: 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 "Tailandia"
 
-#: lang.pm:375
+#: lang.pm:389
 #, c-format
 msgid "Tajikistan"
 msgstr "Tajikistán"
 
-#: lang.pm:376
+#: lang.pm:390
 #, c-format
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: lang.pm:377
+#: lang.pm:391
 #, c-format
 msgid "East Timor"
 msgstr "Timor Oriental"
 
-#: lang.pm:378
+#: lang.pm:392
 #, c-format
 msgid "Turkmenistan"
 msgstr "Turkmenistán"
 
-#: lang.pm:379
+#: lang.pm:393
 #, c-format
 msgid "Tunisia"
 msgstr "Tunicia"
 
-#: lang.pm:380
+#: lang.pm:394
 #, c-format
 msgid "Tonga"
 msgstr "Tonga"
 
-#: lang.pm:381
+#: lang.pm:395
 #, c-format
 msgid "Turkey"
 msgstr "Turquía"
 
-#: lang.pm:382
+#: lang.pm:396
 #, c-format
 msgid "Trinidad and Tobago"
 msgstr "Trinidad y Tobago"
 
-#: lang.pm:383
+#: lang.pm:397
 #, c-format
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: lang.pm:384
+#: lang.pm:398
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwán"
 
-#: lang.pm:385
+#: lang.pm:399
 #, c-format
 msgid "Tanzania"
 msgstr "Tanzania"
 
-#: lang.pm:386
+#: lang.pm:400
 #, c-format
 msgid "Ukraine"
 msgstr "Ucrania"
 
-#: 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 "Islas Circundantes Menores de los Estados Unidos"
 
-#: lang.pm:390
+#: lang.pm:404
 #, c-format
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: lang.pm:391
+#: lang.pm:405
 #, c-format
 msgid "Uzbekistan"
 msgstr "Uzbekistán"
 
-#: lang.pm:392
+#: lang.pm:406
 #, c-format
 msgid "Vatican"
 msgstr "Vaticano"
 
-#: lang.pm:393
+#: lang.pm:407
 #, c-format
 msgid "Saint Vincent and the Grenadines"
 msgstr "San Vicente y las Granadinas"
 
-#: 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 "Islas Vírgenes (Británicas)"
 
-#: lang.pm:396
+#: lang.pm:410
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr "Islas Vírgenes (EE.UU.)"
 
-#: 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 y Futuna"
 
-#: lang.pm:400
+#: lang.pm:414
 #, c-format
 msgid "Samoa"
 msgstr "Samoa"
 
-#: lang.pm:401
+#: lang.pm:415
 #, c-format
 msgid "Yemen"
 msgstr "Yemen"
 
-#: lang.pm:402
+#: lang.pm:416
 #, c-format
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: lang.pm:403
-#, c-format
-msgid "Serbia & Montenegro"
-msgstr "Serbia & Montenegro"
-
-#: lang.pm:404 standalone/drakxtv:47
+#: lang.pm:417 standalone/drakxtv:49
 #, c-format
 msgid "South Africa"
 msgstr "Sudáfrica"
 
-#: lang.pm:405
+#: lang.pm:418
 #, c-format
 msgid "Zambia"
 msgstr "Zambia"
 
-#: lang.pm:406
+#: lang.pm:419
 #, c-format
 msgid "Zimbabwe"
 msgstr "Zimbaue"
 
-#: lang.pm:1004
+#: lang.pm:1047
+#, c-format
+msgid "You should install the following packages: %s"
+msgstr "Debería instalar los paquetes siguientes: %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 "Bienvenido a %s"
 
-#: loopback.pm:32
+#: loopback.pm:31
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "Montajes circulares %s\n"
 
-#: lvm.pm:115
+#: lvm.pm:116
 #, c-format
 msgid "Remove the logical volumes first\n"
 msgstr "Quite los volúmenes lógicos primero\n"
 
-#: modules/interactive.pm:21 standalone/drakconnect:982
+#: modules/interactive.pm:21 standalone/drakconnect:1033
 #, c-format
 msgid "Parameters"
 msgstr "Parámetros"
 
-#: modules/interactive.pm:21 standalone/draksec:44
+#: modules/interactive.pm:21 standalone/draksec:51
 #, c-format
 msgid "NONE"
 msgstr "NINGUNO"
@@ -9224,8 +9432,8 @@ msgstr "Aquí puede configurar cada parámetro del módulo."
 
 #: modules/interactive.pm:63
 #, c-format
-msgid "Found %s %s interfaces"
-msgstr "%s interfaces %s encontradas"
+msgid "Found %s interfaces"
+msgstr "Interfaces encontradas: %s"
 
 #: modules/interactive.pm:64
 #, c-format
@@ -9280,12 +9488,12 @@ msgid "Module options:"
 msgstr "Opciones de los módulos:"
 
 #. -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 "¿Qué controlador de %s debo probar?"
 
-#: 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"
@@ -9304,17 +9512,17 @@ msgstr ""
 "el probar el equipo puede provocar que éste se cuelgue, pero no debería\n"
 "causar ningún daño."
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Autoprobe"
 msgstr "Autodetección"
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Specify options"
 msgstr "Especificar las opciones"
 
-#: modules/interactive.pm:143
+#: modules/interactive.pm:144
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -9373,11 +9581,11 @@ msgstr "Ratón genérico PS2 con rueda"
 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 "Automático"
@@ -9522,50 +9730,55 @@ msgstr "Universal"
 msgid "Any PS/2 & USB mice"
 msgstr "Cualquier ratón PS/2 y USB"
 
-#: mouse.pm:92 standalone/drakvpn:1140
+#: mouse.pm:89 mouse.pm:359 mouse.pm:368 mouse.pm:420
+#, c-format
+msgid "Synaptics Touchpad"
+msgstr "Synaptics Touchpad"
+
+#: mouse.pm:93 standalone/drakconnect:358 standalone/drakvpn:1140
 #, c-format
 msgid "none"
 msgstr "ninguno"
 
-#: mouse.pm:94
+#: mouse.pm:95
 #, c-format
 msgid "No mouse"
 msgstr "Sin ratón"
 
-#: mouse.pm:514
+#: mouse.pm:546
 #, c-format
 msgid "Please test the mouse"
 msgstr "Pruebe su ratón, por favor."
 
-#: mouse.pm:516
+#: mouse.pm:548
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Para activar el ratón,"
 
-#: mouse.pm:517
+#: mouse.pm:549
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "¡MUEVA SU RUEDA!"
 
 #: network/adsl.pm:19
 #, c-format
-msgid "use pppoe"
-msgstr "usar pppoe"
+msgid "use PPPoE"
+msgstr "usar PPPoE"
 
 #: network/adsl.pm:20
 #, c-format
-msgid "use pptp"
-msgstr "usar pptp"
+msgid "use PPTP"
+msgstr "usar PPTP"
 
 #: network/adsl.pm:21
 #, c-format
-msgid "use dhcp"
-msgstr "usar dhcp"
+msgid "use DHCP"
+msgstr "usar 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
@@ -9574,36 +9787,36 @@ msgstr "- detectada"
 
 #: network/adsl.pm:23
 #, c-format
-msgid "Sagem (using pppoa) usb"
-msgstr "Sagem (usando pppoa) usb"
+msgid "Sagem (using PPPoA) USB"
+msgstr "Sagem USB (usando PPPoA)"
 
 #: network/adsl.pm:24
 #, c-format
-msgid "Sagem (using dhcp) usb"
-msgstr "Sagem (usando dhcp) usb"
+msgid "Sagem (using DHCP) USB"
+msgstr "Sagem USB (usando 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 "Conectar a Internet"
 
-#: 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 ""
 "La forma más común de conexión ADSL es con pppoe.\n"
-"Algunas conexiones usan pptp, otras pocas usan dhcp.\n"
-"Si no lo sabe con seguridad, elija 'usar pppoe'"
+"Algunas conexiones usan PPTP, otras pocas usan DHCP.\n"
+"Si no lo sabe con seguridad, elija 'usar PPPoE'"
 
-#: 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 "Tipo de conexión ADSL :"
 
-#: network/drakfirewall.pm:12
+#: network/drakfirewall.pm:12 share/compssUsers.pl:84
 #, c-format
 msgid "Web Server"
 msgstr "Servidor web"
@@ -9733,106 +9946,107 @@ msgstr "Todo (sin cortafuegos)"
 msgid "Other ports"
 msgstr "Otros puertos"
 
-#: 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 "No listado - editar manualmente"
 
-#: 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 "No lo sé"
 
-#: 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 "Manual"
 
-#: 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 "Elección manual"
 
-#: network/netconnect.pm:88
+#: network/netconnect.pm:89
 #, c-format
 msgid "Internal ISDN card"
 msgstr "Tarjeta RDSI interna"
 
-#: 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 "Administrada"
 
-#: network/netconnect.pm:99
+#: network/netconnect.pm:100
 #, c-format
 msgid "Master"
 msgstr "Maestro"
 
-#: network/netconnect.pm:100
+#: network/netconnect.pm:101
 #, c-format
 msgid "Repeater"
 msgstr "Repetidor"
 
-#: network/netconnect.pm:101
+#: network/netconnect.pm:102
 #, c-format
 msgid "Secondary"
 msgstr "Secundario"
 
-#: network/netconnect.pm:102
+#: network/netconnect.pm:103
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
-#: 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 "Configuración manual"
 
-#: network/netconnect.pm:106
+#: network/netconnect.pm:107
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "IP automática (BOOTP/DHCP)"
 
-#: network/netconnect.pm:108
+#: network/netconnect.pm:109
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
 msgstr "IP automática (BOOTP/DHCP/Zeroconf)"
 
-#: network/netconnect.pm:111
+#: network/netconnect.pm:112
 #, c-format
 msgid "Protocol for the rest of the world"
 msgstr "Protocolo para el resto del mundo"
 
-#: network/netconnect.pm:113 standalone/drakconnect:541
+#: network/netconnect.pm:114 standalone/drakconnect:539
 #, c-format
 msgid "European protocol (EDSS1)"
 msgstr "Protocolo europeo (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"
@@ -9841,163 +10055,168 @@ msgstr ""
 "Protocolo para el resto del mundo \n"
 " sin canal D (líneas alquiladas)"
 
-#: network/netconnect.pm:147
+#: network/netconnect.pm:151
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "Módem Alcatel Speedtouch USB"
 
-#: network/netconnect.pm:148
+#: network/netconnect.pm:152
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Módem Sagem USB"
 
-#: network/netconnect.pm:149
+#: network/netconnect.pm:153
 #, c-format
 msgid "Bewan modem"
 msgstr "Módem Bewan PCI"
 
-#: network/netconnect.pm:150
+#: network/netconnect.pm:154
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr "Módem ECI Hi-Focus"
 
-#: network/netconnect.pm:154
+#: network/netconnect.pm:158
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr "Protocolo de configuración dinámica del host (DHCP)"
 
-#: network/netconnect.pm:155
+#: network/netconnect.pm:159
 #, c-format
 msgid "Manual TCP/IP configuration"
 msgstr "Configuración manual de TCP/IP"
 
-#: network/netconnect.pm:156
+#: network/netconnect.pm:160
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr "Protocolo de túnel punto a punto (PPTP)"
 
-#: network/netconnect.pm:157
+#: network/netconnect.pm:161
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr "PPP sobre Ethernet (PPPoE)"
 
-#: network/netconnect.pm:158
+#: network/netconnect.pm:162
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr "PPP sobre ATM (PPPoA)"
 
-#: network/netconnect.pm:162
+#: network/netconnect.pm:163
+#, c-format
+msgid "DSL over CAPI"
+msgstr "DSL sobre CAPI"
+
+#: network/netconnect.pm:167
 #, c-format
 msgid "Bridged Ethernet LLC"
 msgstr "LLC de Ethernet"
 
-#: network/netconnect.pm:163
+#: network/netconnect.pm:168
 #, c-format
 msgid "Bridged Ethernet VC"
 msgstr "VC de Ethernet"
 
-#: network/netconnect.pm:164
+#: network/netconnect.pm:169
 #, c-format
 msgid "Routed IP LLC"
 msgstr "LLC de IP ruteada"
 
-#: network/netconnect.pm:165
+#: network/netconnect.pm:170
 #, c-format
 msgid "Routed IP VC"
 msgstr "VC de IP ruteada"
 
-#: network/netconnect.pm:166
+#: network/netconnect.pm:171
 #, c-format
-msgid "PPPOA LLC"
+msgid "PPPoA LLC"
 msgstr "LLC de PPPoA"
 
-#: network/netconnect.pm:167
+#: network/netconnect.pm:172
 #, c-format
-msgid "PPPOA VC"
+msgid "PPPoA VC"
 msgstr "VC de PPPoA"
 
-#: network/netconnect.pm:171 standalone/drakconnect:477
+#: network/netconnect.pm:176 standalone/drakconnect:474
 #, c-format
 msgid "Script-based"
 msgstr "Por script"
 
-#: 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 "Por terminal"
 
-#: 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 "Configuración de la Red e Internet"
 
-#: network/netconnect.pm:234
+#: network/netconnect.pm:242
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(detectada en el puerto %s)"
 
 #. -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 "(detectada %s)"
 
-#: network/netconnect.pm:236
+#: network/netconnect.pm:244
 #, c-format
 msgid "(detected)"
 msgstr "(detectada)"
 
-#: network/netconnect.pm:238
+#: network/netconnect.pm:246
 #, c-format
 msgid "Modem connection"
 msgstr "Conexión por módem"
 
-#: network/netconnect.pm:239
+#: network/netconnect.pm:247
 #, c-format
 msgid "ISDN connection"
 msgstr "Conexión RDSI"
 
-#: network/netconnect.pm:240
+#: network/netconnect.pm:248
 #, c-format
 msgid "ADSL connection"
 msgstr "Conexión ADSL"
 
-#: network/netconnect.pm:241
+#: network/netconnect.pm:249
 #, c-format
 msgid "Cable connection"
 msgstr "Conexión por cable"
 
-#: network/netconnect.pm:242
+#: network/netconnect.pm:250
 #, c-format
 msgid "LAN connection"
 msgstr "Conexión a la red local"
 
-#: network/netconnect.pm:243 network/netconnect.pm:257
+#: network/netconnect.pm:251 network/netconnect.pm:265
 #, c-format
 msgid "Wireless connection"
 msgstr "Conexión inalámbrica"
 
-#: network/netconnect.pm:253
+#: network/netconnect.pm:261
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "Elija la conexión que desea configurar"
 
-#: network/netconnect.pm:270
+#: network/netconnect.pm:279
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -10010,131 +10229,130 @@ msgstr ""
 "\n"
 "Presione \"%s\" para continuar."
 
-#: network/netconnect.pm:278 network/netconnect.pm:788
+#: network/netconnect.pm:287 network/netconnect.pm:839
 #, c-format
 msgid "Connection Configuration"
 msgstr "Configuración de la conexión"
 
-#: 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 "Por favor, complete o verifique el campo de abajo"
 
-#: network/netconnect.pm:286 standalone/drakconnect:532
+#: network/netconnect.pm:295 standalone/drakconnect:530
 #, c-format
 msgid "Card IRQ"
 msgstr "IRQ de la tarjeta"
 
-#: network/netconnect.pm:287 standalone/drakconnect:533
+#: network/netconnect.pm:296 standalone/drakconnect:531
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "Memoria (DMA) de la tarjeta"
 
-#: network/netconnect.pm:288 standalone/drakconnect:534
+#: network/netconnect.pm:297 standalone/drakconnect:532
 #, c-format
 msgid "Card IO"
 msgstr "E/S de la tarjeta"
 
-#: network/netconnect.pm:289 standalone/drakconnect:535
+#: network/netconnect.pm:298 standalone/drakconnect:533
 #, c-format
 msgid "Card IO_0"
 msgstr "E/S_0 de la tarjeta"
 
-#: network/netconnect.pm:290
+#: network/netconnect.pm:299
 #, c-format
 msgid "Card IO_1"
 msgstr "E/S_1 de la tarjeta"
 
-#: network/netconnect.pm:291
+#: network/netconnect.pm:300
 #, c-format
 msgid "Your personal phone number"
 msgstr "Su número de teléfono personal"
 
-#: 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 "Nombre del proveedor (ej proveedor.net)"
 
-#: network/netconnect.pm:293 standalone/drakconnect:473
+#: network/netconnect.pm:302 standalone/drakconnect:469
 #, c-format
 msgid "Provider phone number"
 msgstr "Número de teléfono del proveedor"
 
-#: network/netconnect.pm:294
+#: network/netconnect.pm:303
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "DNS 1 del proveedor (opcional)"
 
-#: network/netconnect.pm:295
+#: network/netconnect.pm:304
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "DNS 2 del proveedor (opcional)"
 
-#: network/netconnect.pm:296 standalone/drakconnect:429
+#: network/netconnect.pm:305 standalone/drakconnect:420
 #, c-format
 msgid "Dialing mode"
 msgstr "Modo de marcación"
 
-#: 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 "Velocidad de la conexión"
 
-#: network/netconnect.pm:298 standalone/drakconnect:439
+#: network/netconnect.pm:307 standalone/drakconnect:430
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "Demora de la conexión (en seg)"
 
-#: 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 "Usuario de la cuenta (nombre de usuario)"
 
-#: 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 "Contraseña de la cuenta"
 
-#: 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 "Seleccione la interfaz de red a configurar:"
 
-#: 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 "Dispositivo de red"
 
-#: network/netconnect.pm:335 network/netconnect.pm:343
+#: network/netconnect.pm:331 network/netconnect.pm:339
 #, c-format
 msgid "External ISDN modem"
 msgstr "Módem RDSI externo"
 
-#. -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 "¡Seleccione un dispositivo!"
 
-#: 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 "Configuración de RDSI"
 
-#: network/netconnect.pm:384
+#: network/netconnect.pm:387
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "¿Qué tipo de tarjeta tiene?"
 
-#: network/netconnect.pm:394
+#: network/netconnect.pm:397
 #, c-format
 msgid ""
 "\n"
@@ -10149,34 +10367,51 @@ msgstr ""
 "\n"
 "Si tiene una tarjeta PCMCIA, tiene que saber la irq y la e/s de su tarjeta.\n"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Continue"
 msgstr "Continuar"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Abort"
 msgstr "Abortar"
 
-#: network/netconnect.pm:404
+#: network/netconnect.pm:407
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "¿Cuál de las siguientes es su tarjeta RDSI?"
 
-#: 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 ""
+"Existe un controlador CAPI disponible para este módem. Este controlador CAPI "
+"puede ofrecerle más posibilidades que el controlador libre (como enviar "
+"faxes). ¿Qué controlador desea usar?"
+
+#: network/netconnect.pm:427 standalone/drakconnect:116 standalone/drakups:247
+#: standalone/harddrake2:117
+#, c-format
+msgid "Driver"
+msgstr "Controlador"
+
+#: network/netconnect.pm:439
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "¿Qué protocolo desea utilizar?"
 
-#: 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 "Protocolo"
 
-#: network/netconnect.pm:433
+#: network/netconnect.pm:453
 #, c-format
 msgid ""
 "Select your provider.\n"
@@ -10185,13 +10420,13 @@ msgstr ""
 "Seleccione su proveedor.\n"
 " Si no está en la lista, elija No listado"
 
-#: 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 "Proveedor:"
 
-#: network/netconnect.pm:450
+#: network/netconnect.pm:470
 #, c-format
 msgid ""
 "Your modem isn't supported by the system.\n"
@@ -10200,122 +10435,117 @@ msgstr ""
 "El sistema no soporta a su módem.\n"
 "Eche un vistazo en http://www.linmodems.org"
 
-#: network/netconnect.pm:462
+#: network/netconnect.pm:482
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "Seleccione el módem a configurar:"
 
-#: network/netconnect.pm:469 standalone/drakgw:113 standalone/drakvpn:51
-#, c-format
-msgid "Sorry, we support only 2.4 and above kernels."
-msgstr "Lo siento, sólo se soportan los núcleos 2.4 y superiores"
-
-#: network/netconnect.pm:510
+#: network/netconnect.pm:530
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Seleccione el puerto serie al que está conectado su módem."
 
-#: network/netconnect.pm:539
+#: network/netconnect.pm:561
 #, c-format
 msgid "Select your provider:"
 msgstr "Seleccione su proveedor:"
 
-#: network/netconnect.pm:568
+#: network/netconnect.pm:589
 #, c-format
 msgid "Dialup: account options"
 msgstr "Acceso telefónico: opciones de la cuenta"
 
-#: network/netconnect.pm:571
+#: network/netconnect.pm:592
 #, c-format
 msgid "Connection name"
 msgstr "Nombre de la conexión"
 
-#: network/netconnect.pm:572
+#: network/netconnect.pm:593
 #, c-format
 msgid "Phone number"
 msgstr "Número de teléfono"
 
-#: network/netconnect.pm:573
+#: network/netconnect.pm:594
 #, c-format
 msgid "Login ID"
 msgstr "ID de conexión"
 
-#: network/netconnect.pm:588 network/netconnect.pm:621
+#: network/netconnect.pm:609 network/netconnect.pm:642
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr "Acceso telefónico: Parámetros IP"
 
-#: network/netconnect.pm:591
+#: network/netconnect.pm:612
 #, c-format
 msgid "IP parameters"
 msgstr "Parámetros IP"
 
-#: 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 "Dirección IP"
 
-#: network/netconnect.pm:593
+#: network/netconnect.pm:614
 #, c-format
 msgid "Subnet mask"
 msgstr "Máscara de subred"
 
-#: network/netconnect.pm:605
+#: network/netconnect.pm:626
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr "Acceso telefónico: Parámetros DNS"
 
-#: 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 "Nombre de dominio"
 
-#: 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 "Primer servidor DNS (opcional)"
 
-#: 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 "Segundo servidor DNS (opcional)"
 
-#: network/netconnect.pm:612
+#: network/netconnect.pm:633
 #, c-format
 msgid "Set hostname from IP"
 msgstr "Configurar nombre de host desde IP"
 
-#: network/netconnect.pm:624 standalone/drakconnect:343
+#: network/netconnect.pm:645 standalone/drakconnect:334
 #, c-format
 msgid "Gateway"
 msgstr "Pasarela"
 
-#: network/netconnect.pm:625
+#: network/netconnect.pm:646
 #, c-format
 msgid "Gateway IP address"
 msgstr "Dirección IP de la pasarela"
 
-#: network/netconnect.pm:649
+#: network/netconnect.pm:677
 #, c-format
 msgid "ADSL configuration"
 msgstr "Configuración ADSL"
 
-#: network/netconnect.pm:681
+#: network/netconnect.pm:717
 #, c-format
 msgid "Please choose your ADSL provider"
 msgstr "Por favor, seleccione su proveedor de ADSL"
 
-#: network/netconnect.pm:699
+#: network/netconnect.pm:735
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10326,32 +10556,32 @@ msgstr ""
 "Puede proporcionarlo ahora en un disquete o en su partición Windows,\n"
 "o puede omitirlo y realizarlo luego."
 
-#: network/netconnect.pm:703 network/netconnect.pm:708
+#: network/netconnect.pm:739 network/netconnect.pm:744
 #, c-format
 msgid "Use a floppy"
 msgstr "Usar un disquete"
 
-#: network/netconnect.pm:703 network/netconnect.pm:712
+#: network/netconnect.pm:739 network/netconnect.pm:748
 #, c-format
 msgid "Use my Windows partition"
 msgstr "Usar mi partición Windows"
 
-#: network/netconnect.pm:703 network/netconnect.pm:715
+#: network/netconnect.pm:739 network/netconnect.pm:751
 #, c-format
 msgid "Do it later"
 msgstr "Hacerlo luego"
 
-#: network/netconnect.pm:722
+#: network/netconnect.pm:758
 #, c-format
 msgid "Firmware copy failed, file %s not found"
 msgstr "Falló la copia del firmware, el archivo %s no se encuentra"
 
-#: network/netconnect.pm:729
+#: network/netconnect.pm:765
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr "Copia del firmware exitosa"
 
-#: network/netconnect.pm:744
+#: network/netconnect.pm:780
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10364,22 +10594,22 @@ msgstr ""
 "%s\n"
 "y copie mgmt.o en /usr/share/speedtouch"
 
-#: network/netconnect.pm:797
+#: network/netconnect.pm:849
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr "ID de ruta virtual (VPI):"
 
-#: network/netconnect.pm:798
+#: network/netconnect.pm:850
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr "ID de circuito virtual (VCI):"
 
-#: network/netconnect.pm:800
+#: network/netconnect.pm:853
 #, c-format
-msgid "Encapsulation :"
+msgid "Encapsulation:"
 msgstr "Encapsulado :"
 
-#: network/netconnect.pm:817
+#: network/netconnect.pm:870
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -10392,25 +10622,25 @@ msgstr ""
 "\n"
 "Puede encontrar un controlador en http://eciadsl.flashtux.org/"
 
-#: network/netconnect.pm:829
+#: network/netconnect.pm:882
 #, c-format
 msgid "Manually load a driver"
 msgstr "Cargar un controlador manualmente"
 
-#: 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 ""
 "ADVERTENCIA: Previamente se ha configurado este dispositivo para conectarse "
 "con Internet.\n"
-"Simplemente acepte para mantener la configuración del dispositivo.\n"
-"Al modificar los campos de abajo se ignorará esta configuración."
+"Al modificar los campos de abajo se modificará esta configuración.\n"
+"¿Desea realmente reconfigurar este dispositivo?"
 
-#: 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"
@@ -10419,17 +10649,17 @@ msgstr ""
 "Felicidades, la configuración de la red y de la Internet ha terminado.\n"
 "\n"
 
-#: network/netconnect.pm:871
+#: network/netconnect.pm:929
 #, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "Resolución de nombre del host Zeroconf"
 
-#: 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 "Configurando el dispositivo de red %s (controlador %s)"
 
-#: network/netconnect.pm:873
+#: network/netconnect.pm:931
 #, c-format
 msgid ""
 "The following protocols can be used to configure an ethernet connection. "
@@ -10438,7 +10668,7 @@ msgstr ""
 "Se pueden usar los protocolos siguientes para configurar una conexión "
 "Ethernet. Por favor elija el que desea usar"
 
-#: network/netconnect.pm:907
+#: network/netconnect.pm:964
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -10449,89 +10679,95 @@ msgstr ""
 "Cada valor tiene que introducirse como una dirección IP en notación\n"
 "decimal con puntos (por ejemplo: 1.2.3.4)."
 
-#: network/netconnect.pm:914
+#: network/netconnect.pm:971
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr "Asignar nombre de máquina desde dirección DHCP"
 
-#: network/netconnect.pm:915
+#: network/netconnect.pm:972
 #, c-format
 msgid "DHCP host name"
 msgstr "Nombre de la máquina DHCP"
 
-#: 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 "Máscara de red"
 
-#: 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 "Id tarjeta de red (útil para portátiles)"
 
-#: network/netconnect.pm:923 standalone/drakconnect:423
+#: network/netconnect.pm:980 standalone/drakconnect:414
 #, c-format
 msgid "Network Hotplugging"
 msgstr "\"Enchufe en caliente\" de la red"
 
-#: network/netconnect.pm:924 standalone/drakconnect:417
+#: network/netconnect.pm:982 standalone/drakconnect:408
 #, c-format
 msgid "Start at boot"
 msgstr "Iniciar al arrancar"
 
-#: network/netconnect.pm:926 standalone/drakconnect:833
+#: network/netconnect.pm:985 standalone/drakconnect:884
 #, c-format
 msgid "DHCP client"
 msgstr "cliente DHCP"
 
-#: 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 "Las direcciones IP deben estar en el formato 1.2.3.4"
 
-#: network/netconnect.pm:939
+#: network/netconnect.pm:999
 #, c-format
-msgid "Warning : IP address %s is usually reserved !"
+msgid "Warning: IP address %s is usually reserved!"
 msgstr "Advertencia: ¡Por lo general la dirección IP %s está reservada!"
 
-#: network/netconnect.pm:969 network/netconnect.pm:998
+#: network/netconnect.pm:1004 standalone/drakTermServ:1690
+#: standalone/drakTermServ:1691 standalone/drakTermServ:1692
+#, c-format
+msgid "%s already in use\n"
+msgstr "%s ya está en uso\n"
+
+#: network/netconnect.pm:1030 network/netconnect.pm:1059
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
 msgstr "Por favor, ingrese los parámetros inalámbricos para esta tarjeta:"
 
-#: network/netconnect.pm:972 standalone/drakconnect:389
+#: network/netconnect.pm:1033 standalone/drakconnect:380
 #, c-format
 msgid "Operating Mode"
 msgstr "Modo de operación"
 
-#: network/netconnect.pm:974 standalone/drakconnect:390
+#: network/netconnect.pm:1035 standalone/drakconnect:381
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Nombre de red (ESSID)"
 
-#: network/netconnect.pm:975 standalone/drakconnect:391
+#: network/netconnect.pm:1036 standalone/drakconnect:382
 #, c-format
 msgid "Network ID"
 msgstr "ID de red"
 
-#: network/netconnect.pm:976 standalone/drakconnect:392
+#: network/netconnect.pm:1037 standalone/drakconnect:383
 #, c-format
 msgid "Operating frequency"
 msgstr "Frecuencia de operación"
 
-#: network/netconnect.pm:977 standalone/drakconnect:393
+#: network/netconnect.pm:1038 standalone/drakconnect:384
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Nivel de sensibilidad"
 
-#: network/netconnect.pm:978 standalone/drakconnect:394
+#: network/netconnect.pm:1039 standalone/drakconnect:385
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Tasa de bits (en 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 "
@@ -10540,7 +10776,7 @@ msgstr ""
 "La frec. debería tener el sufijo k, M o G (por ejemplo, \"2.46G\" para una "
 "frec. de 2.46 GHz), o añadir suficientes '0' (ceros)"
 
-#: 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 "
@@ -10549,12 +10785,12 @@ msgstr ""
 "La tasa debería tener el sufijo k, M o G (por ejemplo, \"11M\" para 11M), o "
 "añadir suficientes '0' (ceros)"
 
-#: 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 "
@@ -10577,38 +10813,38 @@ msgstr ""
 "máximo del paquete deshabilita el esquema. También puede configurar este\n"
 "parámetro como auto, fixed (fijo), u off (desactivado)."
 
-#: network/netconnect.pm:1009 standalone/drakconnect:406
+#: network/netconnect.pm:1070 standalone/drakconnect:397
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentación"
 
-#: network/netconnect.pm:1010 standalone/drakconnect:407
+#: network/netconnect.pm:1071 standalone/drakconnect:398
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr "Argumentos extra del comando lwconfig"
 
-#: 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 ""
 "Aquí, puede configurar algunos parámetros inalámbricos extra tales como:\n"
 "ap, channel, commit, enc, power, retry, sens, txpower (el apodo ya está\n"
 "configurado como nombre del host).\n"
 "\n"
-"Vea la página man iwpconfig(8) para más información"
+"Vea la página man iwconfig(8) para más información"
 
 #. -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 "argumentos extra para el comando lwspy"
 
-#: 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"
@@ -10628,12 +10864,12 @@ msgstr ""
 "\n"
 "Vea la página man iwpspy(8) para más información."
 
-#: network/netconnect.pm:1027 standalone/drakconnect:409
+#: network/netconnect.pm:1088 standalone/drakconnect:400
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr "argumentos extra para el comando Iwpriv"
 
-#: network/netconnect.pm:1028
+#: network/netconnect.pm:1089
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10664,28 +10900,7 @@ msgstr ""
 "\n"
 "Vea la página man iwpriv(8) para más información."
 
-#: 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 ""
-"No se ha detectado ningún adaptador de red ethernet en su sistema.\n"
-"No se puede configurar este tipo de conexión."
-
-#: network/netconnect.pm:1059 standalone/drakgw:261 standalone/drakpxe:142
-#, c-format
-msgid "Choose the network interface"
-msgstr "Elija la interfaz de red"
-
-#: network/netconnect.pm:1060
-#, c-format
-msgid "Please choose which network adapter you want to use to connect to Internet."
-msgstr ""
-"Por favor, elija el adaptador de red que desea usar para conectarse a "
-"Internet"
-
-#: network/netconnect.pm:1081
+#: network/netconnect.pm:1163
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -10699,88 +10914,93 @@ msgstr ""
 "como \"mimaquina.milabo.micompa.com\".También puede introducir la dirección "
 "IP de la pasarela si tiene una"
 
-#: 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 "También puede ingresar la dirección IP de su servidor DNS."
 
-#: network/netconnect.pm:1087 standalone/drakconnect:946
+#: network/netconnect.pm:1169 standalone/drakconnect:997
 #, c-format
 msgid "Host name (optional)"
 msgstr "Nombre de host (opcional)"
 
-#: network/netconnect.pm:1087
+#: network/netconnect.pm:1169
 #, c-format
 msgid "Host name"
 msgstr "Nombre de la máquina"
 
-#: network/netconnect.pm:1089
+#: network/netconnect.pm:1171
 #, c-format
 msgid "DNS server 1"
 msgstr "Servidor DNS 1"
 
-#: network/netconnect.pm:1090
+#: network/netconnect.pm:1172
 #, c-format
 msgid "DNS server 2"
 msgstr "Servidor DNS 2"
 
-#: network/netconnect.pm:1091
+#: network/netconnect.pm:1173
 #, c-format
 msgid "DNS server 3"
 msgstr "Servidor DNS 3"
 
-#: network/netconnect.pm:1092
+#: network/netconnect.pm:1174
 #, c-format
 msgid "Search domain"
 msgstr "Dominio de búsqueda"
 
-#: 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 ""
 "De manera predeterminada el dominio de búsqueda se configura a partir del "
 "nombre de host completamente calificado"
 
-#: network/netconnect.pm:1094
+#: network/netconnect.pm:1176
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr "Pasarela de red (ej %s)"
 
-#: network/netconnect.pm:1096
+#: network/netconnect.pm:1178
 #, c-format
 msgid "Gateway device"
 msgstr "Dispositivo de pasarela de red"
 
-#: network/netconnect.pm:1105
+#: network/netconnect.pm:1187
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Las direcciones del servidor DNS deberían estar en el formato 1.2.3.4"
 
-#: 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 "Las direcciones de la pasarela deberían estar en el formato 1.2.3.4"
 
-#: 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 ""
-"Ingrese un nombre de host Zeroconf que será el que su máquina tenga frente a "
-"otras máquinas en la red:"
+"Si lo desea, ingrese un nombre de host Zerocof.\n"
+"Este es el nombre que usará su máquina para identificar\n"
+"cualquiera de sus recursos compartidos no administrados\n"
+"por la red.\n"
+"No es necesario en la mayoría de las redes."
 
-#: network/netconnect.pm:1122
+#: network/netconnect.pm:1207
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Nombre de la máquina Zeroconf"
 
-#: network/netconnect.pm:1125
+#: network/netconnect.pm:1210
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "El nombre de la máquina Zeroconf no debe contener un ."
 
-#: network/netconnect.pm:1135
+#: network/netconnect.pm:1220
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -10791,35 +11011,55 @@ msgstr ""
 "Seleccione la que quiere utilizar.\n"
 "\n"
 
-#: network/netconnect.pm:1137
+#: network/netconnect.pm:1222
 #, c-format
 msgid "Internet connection"
 msgstr "Conexión a Internet"
 
-#: 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 "La configuración está completa, ¿desea aplicar los ajustes?"
 
-#: network/netconnect.pm:1155
+#: network/netconnect.pm:1240
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "¿Desea iniciar su conexión al arrancar?"
 
-#: network/netconnect.pm:1172
+#: network/netconnect.pm:1258
+#, c-format
+msgid "Automatically at boot"
+msgstr "Automáticamente al arrancar"
+
+#: network/netconnect.pm:1260
+#, c-format
+msgid "By using Net Applet in the system tray"
+msgstr "Usando applet de red en la bandeja del sistema"
+
+#: network/netconnect.pm:1262
+#, c-format
+msgid "Manually (the interface would still be activated at boot)"
+msgstr "Manualmente (la interfaz todavía se activaría al arrancar)"
+
+#: network/netconnect.pm:1271
 #, c-format
-msgid "The network needs to be restarted. Do you want to restart it ?"
+msgid "How do you want to dial this connection?"
+msgstr "¿Cómo desea discar esta conexión?"
+
+#: network/netconnect.pm:1284
+#, c-format
+msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr "Se necesita reiniciar la red. ¿Desea reiniciarla?"
 
-#: network/netconnect.pm:1179 network/netconnect.pm:1244
+#: network/netconnect.pm:1291 network/netconnect.pm:1356
 #, c-format
 msgid "Network Configuration"
 msgstr "Configuración de la red"
 
-#: 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 ""
@@ -10827,27 +11067,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: network/netconnect.pm:1188
+#: network/netconnect.pm:1300
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "¿Desea intentar conectarse a Internet ahora?"
 
-#: network/netconnect.pm:1196 standalone/drakconnect:978
+#: network/netconnect.pm:1308 standalone/drakconnect:1029
 #, c-format
 msgid "Testing your connection..."
 msgstr "Probando su conexión..."
 
-#: network/netconnect.pm:1212
+#: network/netconnect.pm:1324
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "Ahora el sistema está conectado a la Internet."
 
-#: network/netconnect.pm:1213
+#: network/netconnect.pm:1325
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "Por motivos de seguridad, se desconectará ahora."
 
-#: network/netconnect.pm:1214
+#: network/netconnect.pm:1326
 #, c-format
 msgid ""
 "The system doesn't seem to be connected to the Internet.\n"
@@ -10856,7 +11096,7 @@ msgstr ""
 "El sistema no parece estar conectado a la Internet.\n"
 "Intente volver a configurar su conexión."
 
-#: network/netconnect.pm:1231
+#: network/netconnect.pm:1343
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
@@ -10865,10 +11105,10 @@ msgstr ""
 "Después de esto, se recomienda que reinicie su entorno X\n"
 "para evitar el problema del cambio del nombre de la máquina."
 
-#: 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 ""
@@ -10876,7 +11116,7 @@ msgstr ""
 "Verifique su conexión con net_monitor o mcc. Si su conexión no funciona, "
 "puede que desee volver a iniciar la configuración"
 
-#: network/netconnect.pm:1245
+#: network/netconnect.pm:1357
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -10890,7 +11130,7 @@ msgstr ""
 "para\n"
 "volver a configurar sus conexiones de red y a Internet.\n"
 
-#: network/netconnect.pm:1333
+#: network/netconnect.pm:1393
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
@@ -10899,27 +11139,27 @@ msgstr ""
 "Ha ocurrido un error inesperado:\n"
 "%s"
 
-#: network/network.pm:315
+#: network/network.pm:316
 #, c-format
 msgid "Proxies configuration"
 msgstr "Configuración de los proxies"
 
-#: network/network.pm:316
+#: network/network.pm:317
 #, c-format
 msgid "HTTP proxy"
 msgstr "Proxy HTTP"
 
-#: network/network.pm:317
+#: network/network.pm:318
 #, c-format
 msgid "FTP proxy"
 msgstr "Proxy FTP"
 
-#: network/network.pm:320
+#: network/network.pm:321
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "El nombre del proxy debe ser http://..."
 
-#: network/network.pm:321
+#: network/network.pm:322
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "La Url debería empezar con 'ftp:' o 'http:'"
@@ -10938,7 +11178,7 @@ msgstr ""
 "¡Atención! Se ha detectado la configuración del cortafuegos existente. Puede "
 "que necesite algún ajuste manual tras la instalación."
 
-#: 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"
@@ -10955,12 +11195,12 @@ msgstr ""
 "\t\teth0, o eth1 para conexión por cable,\n"
 "\t\tippp+ para una conexión RDSI.\n"
 
-#: network/tools.pm:165
+#: network/tools.pm:197
 #, c-format
 msgid "Insert floppy"
 msgstr "Inserte un disquete"
 
-#: 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 "
@@ -10969,22 +11209,22 @@ msgstr ""
 "Inserte un disquete formateado con FAT en la disquetera %s con %s en el "
 "directorio raíz y presione %s"
 
-#: network/tools.pm:167
+#: network/tools.pm:199
 #, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr "Error accediendo al disquete, no se puede montar el dispositivo %s"
 
-#: partition_table.pm:645
+#: partition_table.pm:393
 #, c-format
 msgid "mount failed: "
 msgstr "mount falló: "
 
-#: partition_table.pm:750
+#: partition_table.pm:498
 #, c-format
 msgid "Extended partition not supported on this platform"
 msgstr "La partición extendida no está disponible en esta plataforma"
 
-#: 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"
@@ -10995,22 +11235,22 @@ msgstr ""
 "La única solución es desplazar sus particiones primarias para que el hueco "
 "esté después de las particiones extendidas"
 
-#: partition_table.pm:855
+#: partition_table.pm:602
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Falló la restauración a partir del archivo %s: %s"
 
-#: partition_table.pm:857
+#: partition_table.pm:604
 #, c-format
 msgid "Bad backup file"
 msgstr "Archivo de respaldo incorrecto"
 
-#: partition_table.pm:877
+#: partition_table.pm:624
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Error al escribir en el archivo %s"
 
-#: partition_table/raw.pm:187
+#: partition_table/raw.pm:238
 #, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -11023,27 +11263,27 @@ msgstr ""
 "Esto significa que escribir cualquier cosa en el disco terminará produciendo "
 "datos aleatorios, corruptos."
 
-#: pkgs.pm:24
+#: pkgs.pm:23
 #, c-format
 msgid "must have"
 msgstr "necesario"
 
-#: pkgs.pm:25
+#: pkgs.pm:24
 #, c-format
 msgid "important"
 msgstr "importante"
 
-#: pkgs.pm:26
+#: pkgs.pm:25
 #, c-format
 msgid "very nice"
 msgstr "muy bueno"
 
-#: pkgs.pm:27
+#: pkgs.pm:26
 #, c-format
 msgid "nice"
 msgstr "bueno"
 
-#: pkgs.pm:28
+#: pkgs.pm:27
 #, c-format
 msgid "maybe"
 msgstr "quizás"
@@ -11058,7 +11298,7 @@ msgstr "(en %s)"
 msgid "(on this machine)"
 msgstr "(en esta máquina)"
 
-#: printer/cups.pm:115 standalone/printerdrake:197
+#: printer/cups.pm:115 standalone/printerdrake:203
 #, c-format
 msgid "Configured on other machines"
 msgstr "Configurada en otras máquinas"
@@ -11068,296 +11308,309 @@ msgstr "Configurada en otras máquinas"
 msgid "On CUPS server \"%s\""
 msgstr "En servidor CUPS \"%s\""
 
-#: 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 " (Por defecto)"
 
-#: printer/data.pm:22
+#: printer/data.pm:40
 #, c-format
 msgid "PDQ - Print, Don't Queue"
 msgstr "PDQ - Print, Don't Queue (Imprimir, no encolar)"
 
-#: printer/data.pm:23
+#: printer/data.pm:41
 #, c-format
 msgid "PDQ"
 msgstr "PDQ"
 
-#: printer/data.pm:34
+#: printer/data.pm:53
 #, c-format
 msgid "LPD - Line Printer Daemon"
 msgstr "LPD - Line Printer Daemon (Demonio de impresora de líneas)"
 
-#: printer/data.pm:35
+#: printer/data.pm:54
 #, c-format
 msgid "LPD"
 msgstr "LPD"
 
-#: printer/data.pm:56
+#: printer/data.pm:76
 #, c-format
 msgid "LPRng - LPR New Generation"
 msgstr "LPRng - LPR de nueva generación"
 
-#: printer/data.pm:57
+#: printer/data.pm:77
 #, c-format
 msgid "LPRng"
 msgstr "LPRng"
 
-#: printer/data.pm:82
+#: printer/data.pm:103
 #, c-format
 msgid "CUPS - Common Unix Printing System"
-msgstr "CUPS - Common Unix Printing System (Sistema de impresión común de Unix)"
+msgstr ""
+"CUPS - Common Unix Printing System (Sistema de impresión común de Unix)"
+
+#: printer/data.pm:132
+#, c-format
+msgid "CUPS - Common Unix Printing System (remote server)"
+msgstr ""
+"CUPS - Common Unix Printing System (Sistema de impresión común de Unix) "
+"(servidor remoto)"
+
+#: printer/data.pm:133
+#, c-format
+msgid "Remote CUPS"
+msgstr "CUPS remoto"
 
 #: 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 "Modelo desconocido"
 
-#: printer/main.pm:29
+#: printer/main.pm:27
 #, c-format
 msgid "Local printer"
 msgstr "Impresora local"
 
-#: printer/main.pm:30
+#: printer/main.pm:28
 #, c-format
 msgid "Remote printer"
 msgstr "Impresora remota"
 
-#: printer/main.pm:31
+#: printer/main.pm:29
 #, c-format
 msgid "Printer on remote CUPS server"
 msgstr "Impresora en un servidor CUPS remoto"
 
-#: 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 "Impresora en un servidor lpd remoto"
 
-#: printer/main.pm:33
+#: printer/main.pm:31
 #, c-format
 msgid "Network printer (TCP/Socket)"
 msgstr "Impresora de red (TCP/Socket)"
 
-#: printer/main.pm:34
+#: printer/main.pm:32
 #, c-format
 msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "Impresora en un servidor SMB/Windows 95/98/NT"
 
-#: printer/main.pm:35
+#: printer/main.pm:33
 #, c-format
 msgid "Printer on NetWare server"
 msgstr "Impresora en un servidor NetWare"
 
-#: 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 "Introduzca el URI del dispositivo de impresión"
 
-#: printer/main.pm:37
+#: printer/main.pm:35
 #, c-format
 msgid "Pipe job into a command"
 msgstr "Filtrar el trabajo en un comando"
 
-#: 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 "Modelo desconocido"
 
-#: printer/main.pm:332 standalone/printerdrake:196
+#: printer/main.pm:346 standalone/printerdrake:202
 #, c-format
 msgid "Configured on this machine"
 msgstr "Configurada en esta máquina"
 
-#: printer/main.pm:338 printer/printerdrake.pm:963
+#: printer/main.pm:352 printer/printerdrake.pm:1069
 #, c-format
 msgid " on parallel port #%s"
 msgstr " en el puerto paralelo #%s"
 
-#: printer/main.pm:341 printer/printerdrake.pm:965
+#: printer/main.pm:355 printer/printerdrake.pm:1072
 #, c-format
 msgid ", USB printer #%s"
 msgstr ", impresora USB #%s"
 
-#: printer/main.pm:343
+#: printer/main.pm:357
 #, c-format
 msgid ", USB printer"
 msgstr ", impresora USB"
 
-#: printer/main.pm:348
+#: printer/main.pm:362
 #, c-format
 msgid ", multi-function device on parallel port #%s"
 msgstr ", dispositivo multifunción en puerto paralelo #%s"
 
-#: printer/main.pm:351
+#: printer/main.pm:365
 #, c-format
 msgid ", multi-function device on a parallel port"
 msgstr ", dispositivo multifunción en puerto paralelo"
 
-#: printer/main.pm:353
+#: printer/main.pm:367
 #, c-format
 msgid ", multi-function device on USB"
 msgstr ", dispositivo multi-función en USB"
 
-#: printer/main.pm:355
+#: printer/main.pm:369
 #, c-format
 msgid ", multi-function device on HP JetDirect"
 msgstr ", dispositivo multifunción en HP JetDirect"
 
-#: printer/main.pm:357
+#: printer/main.pm:371
 #, c-format
 msgid ", multi-function device"
 msgstr ", dispositivo multifunción"
 
-#: printer/main.pm:360
+#: printer/main.pm:375
 #, c-format
 msgid ", printing to %s"
 msgstr ", imprimiendo en %s"
 
-#: printer/main.pm:362
+#: printer/main.pm:378
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
 msgstr " en servidor LPD \"%s\", impresora \"%s\""
 
-#: printer/main.pm:364
+#: printer/main.pm:381
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
 msgstr ", host TCP/IP \"%s\", puerto %s"
 
-#: printer/main.pm:368
+#: printer/main.pm:386
 #, c-format
 msgid " on SMB/Windows server \"%s\", share \"%s\""
 msgstr " en servidor SMB/Windows \"%s\", compartida como \"%s\""
 
-#: printer/main.pm:372
+#: printer/main.pm:391
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
 msgstr " en servidor Novell \"%s\", impresora \"%s\""
 
-#: printer/main.pm:374
+#: printer/main.pm:394
 #, c-format
 msgid ", using command %s"
 msgstr ", usando comando %s"
 
-#: printer/main.pm:389
+#: printer/main.pm:409
 #, c-format
 msgid "Parallel port #%s"
 msgstr "Puerto paralelo #%s"
 
-#: 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 "Impresora USB #%s"
 
-#: printer/main.pm:394
+#: printer/main.pm:414
 #, c-format
 msgid "USB printer"
 msgstr "Impresora USB"
 
-#: printer/main.pm:399
+#: printer/main.pm:419
 #, c-format
 msgid "Multi-function device on parallel port #%s"
 msgstr "Dispositivo multifunción en puerto paralelo #%s"
 
-#: printer/main.pm:402
+#: printer/main.pm:422
 #, c-format
 msgid "Multi-function device on a parallel port"
 msgstr "Dispositivo multifunción en puerto paralelo"
 
-#: printer/main.pm:404
+#: printer/main.pm:424
 #, c-format
 msgid "Multi-function device on USB"
 msgstr "Dispositivo multi-función en USB"
 
-#: printer/main.pm:406
+#: printer/main.pm:426
 #, c-format
 msgid "Multi-function device on HP JetDirect"
 msgstr "Dispositivo multifunción en HP JetDirect"
 
-#: printer/main.pm:408
+#: printer/main.pm:428
 #, c-format
 msgid "Multi-function device"
 msgstr "Dispositivo multifunción"
 
-#: printer/main.pm:411
+#: printer/main.pm:432
 #, c-format
 msgid "Prints into %s"
 msgstr "Imprimiendo en %s"
 
-#: printer/main.pm:413
+#: printer/main.pm:435
 #, c-format
 msgid "LPD server \"%s\", printer \"%s\""
 msgstr "Servidor LPD \"%s\", impresora \"%s\""
 
-#: printer/main.pm:415
+#: printer/main.pm:438
 #, c-format
 msgid "TCP/IP host \"%s\", port %s"
 msgstr "Host TCP/IP \"%s\", puerto %s"
 
-#: printer/main.pm:419
+#: printer/main.pm:443
 #, c-format
 msgid "SMB/Windows server \"%s\", share \"%s\""
 msgstr "Servidor SMB/Windows \"%s\", compartida como \"%s\""
 
-#: printer/main.pm:423
+#: printer/main.pm:448
 #, c-format
 msgid "Novell server \"%s\", printer \"%s\""
 msgstr "Servidor Novell \"%s\", impresora \"%s\""
 
-#: printer/main.pm:425
+#: printer/main.pm:451
 #, c-format
 msgid "Uses command %s"
 msgstr "Usando comando %s"
 
-#: 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 "Impresora \"en crudo\" (sin controlador)"
 
-#: 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 "Red(es) local(es)"
 
-#: printer/main.pm:1088 printer/printerdrake.pm:195
+#: printer/main.pm:1149 printer/printerdrake.pm:221
 #, c-format
 msgid "Interface \"%s\""
 msgstr "Interfaz \"%s\""
 
-#: printer/main.pm:1090
+#: printer/main.pm:1151
 #, c-format
 msgid "Network %s"
 msgstr "Red %s"
 
-#: printer/main.pm:1092
+#: printer/main.pm:1153
 #, c-format
 msgid "Host %s"
 msgstr "Host %s"
 
-#: printer/main.pm:1121
+#: printer/main.pm:1182
 #, c-format
 msgid "%s (Port %s)"
 msgstr "%s (Puerto %s)"
 
-#: 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"
@@ -11371,12 +11624,12 @@ msgstr ""
 "lo transfiere y lo transferirá cada vez que se conecte y encienda la "
 "impresora.\n"
 
-#: printer/printerdrake.pm:62
+#: printer/printerdrake.pm:61
 #, c-format
 msgid "CUPS printer configuration"
 msgstr "Configuración de impresora CUPS"
 
-#: printer/printerdrake.pm:63
+#: printer/printerdrake.pm:62
 #, c-format
 msgid ""
 "Here you can choose whether the printers connected to this machine should be "
@@ -11385,7 +11638,7 @@ msgstr ""
 "Aquí puede elegir si las impresoras conectadas a esta máquina deberían poder "
 "accederse desde máquinas remotas y desde qué máquinas remotas."
 
-#: printer/printerdrake.pm:64
+#: printer/printerdrake.pm:63
 #, c-format
 msgid ""
 "You can also decide here whether printers on remote machines should be "
@@ -11394,43 +11647,39 @@ msgstr ""
 "También puede decidir aquí si las impresoras en las máquinas remotas "
 "deberían estar disponibles automáticamente en esta máquina."
 
-#: printer/printerdrake.pm:67
+#: printer/printerdrake.pm:66
 #, c-format
 msgid "The printers on this machine are available to other computers"
-msgstr "Las impresoras en esta máquina están disponibles para otras computadoras"
+msgstr ""
+"Las impresoras en esta máquina están disponibles para otras computadoras"
 
-#: printer/printerdrake.pm:69
+#: printer/printerdrake.pm:71
 #, c-format
 msgid "Automatically find available printers on remote machines"
 msgstr "Encontrar automáticamente impresoras disponibles en máquinas remotas"
 
-#: printer/printerdrake.pm:71
+#: printer/printerdrake.pm:76
 #, c-format
 msgid "Printer sharing on hosts/networks: "
 msgstr "Compartir impresoras en hosts/redes: "
 
-#: printer/printerdrake.pm:73
+#: printer/printerdrake.pm:78
 #, c-format
 msgid "Custom configuration"
 msgstr "Configuración personalizada"
 
-#: 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 "Ninguna máquina remota"
 
-#: printer/printerdrake.pm:88
+#: printer/printerdrake.pm:94
 #, c-format
 msgid "Additional CUPS servers: "
 msgstr "Servidores CUPS adicionales:"
 
-#: printer/printerdrake.pm:93
-#, c-format
-msgid "None"
-msgstr "Ninguno"
-
-#: 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 "
@@ -11452,20 +11701,20 @@ msgstr ""
 "números de puerto para obtener la información de las impresoras de los "
 "servidores."
 
-#: printer/printerdrake.pm:100
+#: printer/printerdrake.pm:109
 #, c-format
 msgid "Japanese text printing mode"
 msgstr "Modo de impresión de texto japonés"
 
-#: 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 ""
 "Habilitar esto le permite imprimir archivos de texto plano en idioma "
@@ -11476,12 +11725,12 @@ msgstr ""
 "desea imprimir texto en una impresora ubicada en un máquina remota, debe "
 "activar esta función en dicha máquina remota."
 
-#: printer/printerdrake.pm:105
+#: printer/printerdrake.pm:117
 #, c-format
 msgid "Automatic correction of CUPS configuration"
 msgstr "Corrección automática de la configuración de CUPS"
 
-#: 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 "
@@ -11510,12 +11759,43 @@ msgstr ""
 "Si alguna de esas medidas lo pone en problemas, apague esta opción, pero "
 "entonces, tiene que ocuparse de estos puntos."
 
-#: 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 "Servidor CUPS remoto sin demonio CUPS local"
+
+#: printer/printerdrake.pm:135
+#, c-format
+msgid "On"
+msgstr "Activo"
+
+#: printer/printerdrake.pm:137 printer/printerdrake.pm:492
+#: printer/printerdrake.pm:519
+#, c-format
+msgid "Off"
+msgstr "Inactivo"
+
+#: 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 ""
+"En este modo, el demonio local CUPS se detendrá y todas las peticiones de "
+"impresión se dirigirán directamente al servidor especificado abajo. Tener en "
+"cuenta que en ese momento no es posible definir colas de impresión locales y "
+"si el servidor especificado estuviera fuera de servicio no se podría "
+"imprimir de ninguna manera desde este equipo."
+
+#: printer/printerdrake.pm:155 printer/printerdrake.pm:230
 #, c-format
 msgid "Sharing of local printers"
 msgstr "Compartir impresoras locales"
 
-#: printer/printerdrake.pm:130
+#: printer/printerdrake.pm:156
 #, c-format
 msgid ""
 "These are the machines and networks on which the locally connected printer"
@@ -11524,29 +11804,29 @@ msgstr ""
 "Estas son las máquinas y redes en las cuales debería(n) estar disponible(s) "
 "la(s) impresora(s) conectada(s) localmente:"
 
-#: printer/printerdrake.pm:141
+#: printer/printerdrake.pm:167
 #, c-format
 msgid "Add host/network"
 msgstr "Añadir host/red"
 
-#: printer/printerdrake.pm:147
+#: printer/printerdrake.pm:173
 #, c-format
 msgid "Edit selected host/network"
 msgstr "Editar host/red seleccionada"
 
-#: printer/printerdrake.pm:156
+#: printer/printerdrake.pm:182
 #, c-format
 msgid "Remove selected host/network"
 msgstr "Quitar host/red seleccionada."
 
-#: 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 "Dirección IP del host/red:"
 
-#: printer/printerdrake.pm:206
+#: printer/printerdrake.pm:231
 #, c-format
 msgid ""
 "Choose the network or host on which the local printers should be made "
@@ -11555,32 +11835,32 @@ msgstr ""
 "Elija la red o host donde se deberían hacer disponibles las impresoras "
 "locales:"
 
-#: printer/printerdrake.pm:213
+#: printer/printerdrake.pm:238
 #, c-format
 msgid "Host/network IP address missing."
 msgstr "Falta dirección IP del host/red."
 
-#: printer/printerdrake.pm:221
+#: printer/printerdrake.pm:246
 #, c-format
 msgid "The entered host/network IP is not correct.\n"
 msgstr "La IP del host/red ingresada no es correcta.\n"
 
-#: 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 "Ejemplos de IP correctas:\n"
 
-#: 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 "Este host/red ya está en la lista, no se puede volver a añadir.\n"
 
-#: 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 "Accediendo impresoras en servidores CUPS remotos"
 
-#: 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 "
@@ -11591,102 +11871,119 @@ msgstr ""
 "hacer esto si los servidores no difunden la información de sus impresoras en "
 "la red local."
 
-#: printer/printerdrake.pm:328
+#: printer/printerdrake.pm:352
 #, c-format
 msgid "Add server"
 msgstr "Añadir servidor"
 
-#: printer/printerdrake.pm:334
+#: printer/printerdrake.pm:358
 #, c-format
 msgid "Edit selected server"
 msgstr "Editar servidor seleccionado"
 
-#: printer/printerdrake.pm:343
+#: printer/printerdrake.pm:367
 #, c-format
 msgid "Remove selected server"
 msgstr "Quitar servidor seleccionado"
 
-#: 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 "Ingrese la dirección IP y el puerto del host cuyas impresoras desea utilizar."
+msgstr ""
+"Ingrese la dirección IP y el puerto del host cuyas impresoras desea utilizar."
 
-#: printer/printerdrake.pm:389
+#: printer/printerdrake.pm:412
 #, c-format
 msgid "If no port is given, 631 will be taken as default."
 msgstr "Si no se proporciona un puerto, se tomará 631 como predeterminado."
 
-#: printer/printerdrake.pm:393
+#: printer/printerdrake.pm:416
 #, c-format
 msgid "Server IP missing!"
 msgstr "¡Falta la IP del servidor!"
 
-#: printer/printerdrake.pm:399
+#: printer/printerdrake.pm:422
 #, c-format
 msgid "The entered IP is not correct.\n"
 msgstr "La IP ingresada no es correcta.\n"
 
-#: 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 "¡El número de puerto debe ser un número entero!"
 
-#: 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 "Este servidor ya está en la lista, no se puede volver a añadir.\n"
 
-#: 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 "Puerto"
 
-#: 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 "Activado, Nombre o dirección IP del servidor remoto:"
+
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:3942
+#: printer/printerdrake.pm:4007
+#, c-format
+msgid "CUPS server name or IP address missing."
+msgstr "Falta el nombre o dirección IP del servidor CUPS."
+
+#: 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 "Printerdrake"
 
-#: printer/printerdrake.pm:479
+#: printer/printerdrake.pm:561 printer/printerdrake.pm:3550
+#: printer/printerdrake.pm:4077
+#, c-format
+msgid "Reading printer data..."
+msgstr "Leyendo los datos de la impresora ..."
+
+#: printer/printerdrake.pm:581
 #, c-format
 msgid "Restarting CUPS..."
 msgstr "Reiniciando CUPS..."
 
-#: printer/printerdrake.pm:502
+#: printer/printerdrake.pm:606
 #, c-format
 msgid "Select Printer Connection"
 msgstr "Seleccione la conexión de la impresora"
 
-#: printer/printerdrake.pm:503
+#: printer/printerdrake.pm:607
 #, c-format
 msgid "How is the printer connected?"
 msgstr "¿Cómo está conectada la impresora?"
 
-#: printer/printerdrake.pm:505
+#: printer/printerdrake.pm:609
 #, c-format
 msgid ""
 "\n"
@@ -11697,7 +11994,7 @@ msgstr ""
 "Aquí no tiene que configurar las impresoras en los servidores CUPS remotos; "
 "las mismas se detectarán automáticamente."
 
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:4012
+#: printer/printerdrake.pm:612 printer/printerdrake.pm:4315
 #, c-format
 msgid ""
 "\n"
@@ -11708,29 +12005,30 @@ msgstr ""
 "ATENCIÓN: No hay conexión de red local activa, ¡no se pueden detectar ni "
 "probar las impresoras remotas!"
 
-#: printer/printerdrake.pm:515
+#: printer/printerdrake.pm:619
 #, c-format
-msgid "Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
+msgid ""
+"Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
 msgstr ""
 "Detección automática de impresora (Local, TCP/Socket, SMB, y URI de "
 "dispositivo)"
 
-#: printer/printerdrake.pm:545
+#: printer/printerdrake.pm:649
 #, c-format
 msgid "Checking your system..."
 msgstr "Verificando su sistema..."
 
-#: printer/printerdrake.pm:561
+#: printer/printerdrake.pm:665
 #, c-format
 msgid "and one unknown printer"
 msgstr "y una impresora desconocida está "
 
-#: printer/printerdrake.pm:563
+#: printer/printerdrake.pm:667
 #, c-format
 msgid "and %d unknown printers"
 msgstr "y %d impresoras desconocidas están "
 
-#: printer/printerdrake.pm:567
+#: printer/printerdrake.pm:671
 #, c-format
 msgid ""
 "The following printers\n"
@@ -11743,7 +12041,7 @@ msgstr ""
 "%s%s\n"
 "están conectadas directamente a su sistema"
 
-#: printer/printerdrake.pm:569
+#: printer/printerdrake.pm:673
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11756,7 +12054,7 @@ msgstr ""
 "%s%s\n"
 "están conectadas directamente a su sistema"
 
-#: printer/printerdrake.pm:570
+#: printer/printerdrake.pm:674
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11769,7 +12067,7 @@ msgstr ""
 "%s%s\n"
 "está conectada directamente a su sistema"
 
-#: printer/printerdrake.pm:574
+#: printer/printerdrake.pm:678
 #, c-format
 msgid ""
 "\n"
@@ -11778,7 +12076,7 @@ msgstr ""
 "\n"
 "Hay una impresaora desconocida conectada directamente a su sistema"
 
-#: printer/printerdrake.pm:575
+#: printer/printerdrake.pm:679
 #, c-format
 msgid ""
 "\n"
@@ -11787,17 +12085,19 @@ msgstr ""
 "\n"
 "Hay %d impresoras desconocidas conectadas directamente a su sistema"
 
-#: printer/printerdrake.pm:578
+#: printer/printerdrake.pm:682
 #, c-format
-msgid "There are no printers found which are directly connected to your machine"
+msgid ""
+"There are no printers found which are directly connected to your machine"
 msgstr "No se encontraron impresoras conectadas directamente a su máquina"
 
-#: printer/printerdrake.pm:581
+#: printer/printerdrake.pm:685
 #, c-format
 msgid " (Make sure that all your printers are connected and turned on).\n"
-msgstr "(Debe asegurarse que todas sus impresoras están conectadas y encendidas).\n"
+msgstr ""
+"(Debe asegurarse que todas sus impresoras están conectadas y encendidas).\n"
 
-#: printer/printerdrake.pm:594
+#: printer/printerdrake.pm:698
 #, c-format
 msgid ""
 "Do you want to enable printing on the printers mentioned above or on "
@@ -11806,22 +12106,22 @@ msgstr ""
 "¿Desea habilitar la impresión en las impresoras mencionadas arriba o en las "
 "impresoras en la red local?\n"
 
-#: 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 "¿Desea habilitar la impresión en las impresoras en la red local?\n"
 
-#: printer/printerdrake.pm:597
+#: printer/printerdrake.pm:701
 #, c-format
 msgid "Do you want to enable printing on the printers mentioned above?\n"
 msgstr "¿Desea habilitar la impresión en las impresoras mencionadas arriba?\n"
 
-#: 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 "¿Está seguro que desea configurar la impresión en esta máquina?\n"
 
-#: 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 "
@@ -11830,48 +12130,42 @@ msgstr ""
 "NOTA: Dependiendo del modelo de la impresora y del sistema de impresión, se "
 "instalarán hasta %d MB de software adicional."
 
-#: printer/printerdrake.pm:629
+#: printer/printerdrake.pm:742
 #, c-format
 msgid "Searching for new printers..."
 msgstr "Buscando impresoras nuevas..."
 
-#: printer/printerdrake.pm:713
-#, c-format
-msgid "Configuring printer ..."
-msgstr "Configurando impresora..."
-
-#: printer/printerdrake.pm:714 printer/printerdrake.pm:769
-#: printer/printerdrake.pm:3790
+#: printer/printerdrake.pm:797
 #, c-format
-msgid "Configuring printer \"%s\"..."
-msgstr "Configurando la impresora \"%s\" ..."
+msgid "Found printer on %s..."
+msgstr "Impresora encontrada en %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 " en "
 
-#: 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 "Selección del modelo de impresora"
 
-#: 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 "¿Qué modelo de impresora tiene?"
 
-#: printer/printerdrake.pm:743
+#: printer/printerdrake.pm:831
 #, c-format
 msgid ""
 "\n"
@@ -11884,7 +12178,7 @@ msgstr ""
 "Printerdrake no pudo determinar qué modelo es su impresora %s. Por favor, "
 "escoja el modelo correcto de la lista."
 
-#: 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 "
@@ -11893,21 +12187,24 @@ msgstr ""
 "Si no se lista su impresora, elija una compatible (vea el manual de la "
 "misma) o una simliar."
 
-#: 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 "Configurando las aplicaciones..."
+msgid "Configuring printer on %s..."
+msgstr "Configurando la impresora en %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:849 printer/printerdrake.pm:4096
+#, c-format
+msgid "Configuring printer \"%s\"..."
+msgstr "Configurando la impresora \"%s\" ..."
+
+#: 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 "Añadir una impresora nueva"
 
-#: printer/printerdrake.pm:832
+#: printer/printerdrake.pm:933
 #, c-format
 msgid ""
 "\n"
@@ -11930,7 +12227,7 @@ msgstr ""
 "darle acceso a los controladores de todas las impresoras disponibles, "
 "opciones del controlador y tipos de conexión de impresoras."
 
-#: printer/printerdrake.pm:845
+#: printer/printerdrake.pm:946
 #, c-format
 msgid ""
 "\n"
@@ -11970,7 +12267,7 @@ msgstr ""
 "Haga clic sobre \"Siguiente\" cuando esté listo, o sobre \"Cancelar\" si "
 "Usted no desea configurar sus impresoras ahora."
 
-#: printer/printerdrake.pm:854
+#: printer/printerdrake.pm:955
 #, c-format
 msgid ""
 "\n"
@@ -11997,7 +12294,7 @@ msgstr ""
 "Haga clic sobre \"Siguiente\" cuando esté listo, o sobre \"Cancelar\" si "
 "Usted no desea configurar sus impresoras ahora."
 
-#: printer/printerdrake.pm:862
+#: printer/printerdrake.pm:963
 #, c-format
 msgid ""
 "\n"
@@ -12035,7 +12332,7 @@ msgstr ""
 "Haga clic sobre \"Siguiente\" cuando esté listo, o sobre \"Cancelar\" si "
 "Usted no desea configurar sus impresoras ahora."
 
-#: printer/printerdrake.pm:871
+#: printer/printerdrake.pm:972
 #, c-format
 msgid ""
 "\n"
@@ -12062,26 +12359,26 @@ msgstr ""
 "Haga clic sobre \"Siguiente\" cuando esté listo, o sobre \"Cancelar\" si "
 "Usted no desea configurar sus impresoras ahora."
 
-#: printer/printerdrake.pm:880
+#: printer/printerdrake.pm:981
 #, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr "Detectar automáticamente las impresoras conectadas a esta máquina"
 
-#: printer/printerdrake.pm:883
+#: printer/printerdrake.pm:984
 #, c-format
 msgid "Auto-detect printers connected directly to the local network"
 msgstr ""
 "Detectar automáticamente las impresoras conectadas directamente a la red "
 "local"
 
-#: printer/printerdrake.pm:886
+#: printer/printerdrake.pm:987
 #, c-format
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr ""
 "Detectar automáticamente las impersoras conectadas a máquinas que corren "
 "Microsoft Windows"
 
-#: printer/printerdrake.pm:902
+#: printer/printerdrake.pm:1003
 #, c-format
 msgid ""
 "\n"
@@ -12105,70 +12402,70 @@ msgstr ""
 "de impresión, ...), seleccione \"Impresora\" en la sección de \"Hardware\" "
 "del Centro de control de %s."
 
-#: 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 "¡No se pudieron instalar los paquetes %s!"
 
-#: printer/printerdrake.pm:939
+#: printer/printerdrake.pm:1040
 #, c-format
 msgid "Skipping Windows/SMB server auto-detection"
 msgstr "Omitiendo detección automática de servidor Windows/SMB"
 
-#: 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 "Detección automática de impresoras"
 
-#: printer/printerdrake.pm:945
+#: printer/printerdrake.pm:1046
 #, c-format
 msgid "Detecting devices..."
 msgstr "Detectando los dispositivos..."
 
-#: printer/printerdrake.pm:967
+#: printer/printerdrake.pm:1075
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ", impresora de red \"%s\", puerto %s"
 
-#: printer/printerdrake.pm:969
+#: printer/printerdrake.pm:1078
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ", impresora \"%s\" en el servidor SMB/Windows \"%s\""
 
-#: printer/printerdrake.pm:973
+#: printer/printerdrake.pm:1082
 #, c-format
 msgid "Detected %s"
 msgstr "Detectada %s"
 
-#: 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 "Impresora en puerto paralelo #%s"
 
-#: printer/printerdrake.pm:981
+#: printer/printerdrake.pm:1093
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "Impresora de red \"%s\", puerto %s"
 
-#: printer/printerdrake.pm:983
+#: printer/printerdrake.pm:1096
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "Impresora \"%s\" en el servidor SMB/Windows \"%s\""
 
-#: printer/printerdrake.pm:1062
+#: printer/printerdrake.pm:1177
 #, c-format
 msgid "Local Printer"
 msgstr "Impresora local"
 
-#: printer/printerdrake.pm:1063
+#: printer/printerdrake.pm:1178
 #, c-format
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
@@ -12181,32 +12478,32 @@ msgstr ""
 "(Puertos paralelos: /dev/lp0, /dev/lp1, ..., equivalen a LPT1:, LPT2, ..., "
 "1ª impresora USB: /dev/usb/lp0, 2ª impresora USB: /dev/usb/lp1, ...)."
 
-#: printer/printerdrake.pm:1067
+#: printer/printerdrake.pm:1182
 #, c-format
 msgid "You must enter a device or file name!"
 msgstr "Debe introducir un dispositivo un un nombre de archivo"
 
-#: printer/printerdrake.pm:1076
+#: printer/printerdrake.pm:1191
 #, c-format
 msgid "No printer found!"
 msgstr "¡No se encontró impresora alguna!"
 
-#: printer/printerdrake.pm:1084
+#: printer/printerdrake.pm:1199
 #, c-format
 msgid "Local Printers"
 msgstr "Impresoras locales"
 
-#: printer/printerdrake.pm:1085
+#: printer/printerdrake.pm:1200
 #, c-format
 msgid "Available printers"
 msgstr "Impresoras disponibles"
 
-#: 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 "Se detectó automáticamente la impresora siguientes. "
 
-#: 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 "
@@ -12215,19 +12512,20 @@ msgstr ""
 "Si no es una de las que desea configurar, introduzca un nombre de "
 "dispositivo o archivo en la línea de entrada"
 
-#: printer/printerdrake.pm:1092
+#: printer/printerdrake.pm:1207
 #, c-format
-msgid "Alternatively, you can specify a device name/file name in the input line"
+msgid ""
+"Alternatively, you can specify a device name/file name in the input line"
 msgstr ""
 "Alternativamente, puede especificar el nombre de un dispositivo o archivo en "
 "la línea de entrada"
 
-#: 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 "Aquí está la lista de todas las impresoras detectadas automáticamente."
 
-#: 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 "
@@ -12236,7 +12534,7 @@ msgstr ""
 "Por favor, elija la impresora que desea configurar o ingrese el nombre de un "
 "dispositivo o archivo en la línea de entrada"
 
-#: 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 "
@@ -12245,7 +12543,7 @@ msgstr ""
 "Por favor, elija la impresora a la cual deberían ir los trabajos o ingrese "
 "el nombre de un dispositivo o archivo en la línea de entrada"
 
-#: printer/printerdrake.pm:1100
+#: printer/printerdrake.pm:1215
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
@@ -12256,12 +12554,12 @@ msgstr ""
 "Si su impresora no se detectó correctamente o si prefiere una configuración "
 "personalizada, active la \"Configuración manual\"."
 
-#: printer/printerdrake.pm:1101
+#: printer/printerdrake.pm:1216
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr "En este momento no hay alternativa posible"
 
-#: printer/printerdrake.pm:1104
+#: printer/printerdrake.pm:1219
 #, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -12274,14 +12572,14 @@ msgstr ""
 "detectó correctamente o si prefiere una configuración personalizada, active "
 "la \"Configuración manual\"."
 
-#: printer/printerdrake.pm:1105
+#: printer/printerdrake.pm:1220
 #, c-format
 msgid "Please choose the printer to which the print jobs should go."
 msgstr ""
 "Por favor, elija la impresora a la cual deberían ir los trabajos de "
 "impresión."
 
-#: 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 "
@@ -12290,12 +12588,12 @@ msgstr ""
 "Por favor, elija el puerto donde está conectada su impresora o ingrese el "
 "nombre de un dispositivo o archivo en la línea de entrada"
 
-#: printer/printerdrake.pm:1108
+#: printer/printerdrake.pm:1223
 #, c-format
 msgid "Please choose the port that your printer is connected to."
 msgstr "Por favor, elija el puerto al que está conectado su impresora."
 
-#: printer/printerdrake.pm:1110
+#: printer/printerdrake.pm:1225
 #, c-format
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
@@ -12304,26 +12602,26 @@ msgstr ""
 "(Puertos paralelo: /dev/lp0, /dev/lp1, ..., equivalen a LPT1:, LPT2, ..., "
 "1er impresora USB: /dev/usb/lp0, 2da impresora USB: /dev/usb/lp1, ...) "
 
-#: printer/printerdrake.pm:1114
+#: printer/printerdrake.pm:1229
 #, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr "¡Debe elegir/ingresar una impresora o un dispositivo!"
 
-#: 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 "Abortando"
 
-#: printer/printerdrake.pm:1189
+#: printer/printerdrake.pm:1304
 #, c-format
 msgid "Remote lpd Printer Options"
 msgstr "Opciones de la impresora remota lpd"
 
-#: 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 "
@@ -12332,63 +12630,63 @@ msgstr ""
 "Para utilizar impresora LPD remota, necesita proporcionar el nombre de host "
 "del servidor de impresión y el nombre de la impresora en ese servidor."
 
-#: printer/printerdrake.pm:1191
+#: printer/printerdrake.pm:1306
 #, c-format
 msgid "Remote host name"
 msgstr "Nombre de host del servidor remoto"
 
-#: printer/printerdrake.pm:1192
+#: printer/printerdrake.pm:1307
 #, c-format
 msgid "Remote printer name"
 msgstr "Nombre de la impresora remota"
 
-#: printer/printerdrake.pm:1195
+#: printer/printerdrake.pm:1310
 #, c-format
 msgid "Remote host name missing!"
 msgstr "¡Falta el nombre del host remoto!"
 
-#: printer/printerdrake.pm:1199
+#: printer/printerdrake.pm:1314
 #, c-format
 msgid "Remote printer name missing!"
 msgstr "¡Falta el nombre de la impresora remota!"
 
-#: 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 "Información"
 
-#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
+#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
 #, c-format
 msgid "Detected model: %s %s"
 msgstr "Modelo detectado: %s %s"
 
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
 #, c-format
 msgid "Scanning network..."
 msgstr "Buscando en la red ..."
 
-#: 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 ", impresora \"%s\" en el servidor \"%s\""
 
-#: 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 "Impresora \"%s\" en el servidor \"%s\""
 
-#: printer/printerdrake.pm:1366
+#: printer/printerdrake.pm:1481
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Opciones de la impresora SMB (Windows 9x/NT)"
 
-#: 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 "
@@ -12403,7 +12701,7 @@ msgstr ""
 "cualquier otra información del nombre de usuario, contraseña y grupo de "
 "trabajo que haga falta."
 
-#: printer/printerdrake.pm:1368
+#: printer/printerdrake.pm:1483
 #, c-format
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
@@ -12413,47 +12711,47 @@ msgstr ""
 "la lista y luego agregue el nombre de usuario, contraseña, y/o grupo de "
 "trabajo si es necesario."
 
-#: printer/printerdrake.pm:1370
+#: printer/printerdrake.pm:1485
 #, c-format
 msgid "SMB server host"
 msgstr "Máquina del servidor SMB"
 
-#: printer/printerdrake.pm:1371
+#: printer/printerdrake.pm:1486
 #, c-format
 msgid "SMB server IP"
 msgstr "IP del servidor SMB"
 
-#: printer/printerdrake.pm:1372
+#: printer/printerdrake.pm:1487
 #, c-format
 msgid "Share name"
 msgstr "Nombre del recurso compartido"
 
-#: printer/printerdrake.pm:1375
+#: printer/printerdrake.pm:1490
 #, c-format
 msgid "Workgroup"
 msgstr "Grupo de trabajo"
 
-#: printer/printerdrake.pm:1377
+#: printer/printerdrake.pm:1492
 #, c-format
 msgid "Auto-detected"
 msgstr "Detectada automáticamente"
 
-#: printer/printerdrake.pm:1387
+#: printer/printerdrake.pm:1502
 #, c-format
 msgid "Either the server name or the server's IP must be given!"
 msgstr "¡Debe indicar el nombre o la dirección IP del servidor!"
 
-#: printer/printerdrake.pm:1391
+#: printer/printerdrake.pm:1506
 #, c-format
 msgid "Samba share name missing!"
 msgstr "¡No se encuentra el nombre del recurso compartido de Samba!"
 
-#: printer/printerdrake.pm:1397
+#: printer/printerdrake.pm:1512
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr "¡ADVERTENCIA DE SEGURIDAD!"
 
-#: 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 "
@@ -12497,7 +12795,7 @@ msgstr ""
 "conexión \"%s\" en PrinterDrake.\n"
 "\n"
 
-#: printer/printerdrake.pm:1408
+#: printer/printerdrake.pm:1523
 #, c-format
 msgid ""
 "Set up your Windows server to make the printer available under the IPP "
@@ -12510,7 +12808,7 @@ msgstr ""
 "conexión \"%s\" en PrinterDrake.\n"
 "\n"
 
-#: printer/printerdrake.pm:1411
+#: printer/printerdrake.pm:1526
 #, c-format
 msgid ""
 "Connect your printer to a Linux server and let your Windows machine(s) "
@@ -12523,12 +12821,12 @@ msgstr ""
 "\n"
 "¿Realmente desea continuar configurando esta impresora como lo está haciendo?"
 
-#: printer/printerdrake.pm:1489
+#: printer/printerdrake.pm:1604
 #, c-format
 msgid "NetWare Printer Options"
 msgstr "Opciones de la impresora NetWare"
 
-#: 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 "
@@ -12541,42 +12839,42 @@ msgstr ""
 "de la máquina en TCP/IP) así como el nombre de la cola de impresión que "
 "desea usar y el nombre de usuario y la contraseña apropiados."
 
-#: printer/printerdrake.pm:1491
+#: printer/printerdrake.pm:1606
 #, c-format
 msgid "Printer Server"
 msgstr "Servidor de impresión"
 
-#: printer/printerdrake.pm:1492
+#: printer/printerdrake.pm:1607
 #, c-format
 msgid "Print Queue Name"
 msgstr "Nombre de la cola de impresión"
 
-#: printer/printerdrake.pm:1497
+#: printer/printerdrake.pm:1612
 #, c-format
 msgid "NCP server name missing!"
 msgstr "¡No se encuentra el nombre del servidor NCP!"
 
-#: printer/printerdrake.pm:1501
+#: printer/printerdrake.pm:1616
 #, c-format
 msgid "NCP queue name missing!"
 msgstr "¡No se encuentra la cola del servidor NCP!"
 
-#: printer/printerdrake.pm:1574 printer/printerdrake.pm:1594
+#: printer/printerdrake.pm:1689 printer/printerdrake.pm:1709
 #, c-format
 msgid ", host \"%s\", port %s"
 msgstr ", host \"%s\", puerto %s"
 
-#: printer/printerdrake.pm:1577 printer/printerdrake.pm:1597
+#: printer/printerdrake.pm:1692 printer/printerdrake.pm:1712
 #, c-format
 msgid "Host \"%s\", port %s"
 msgstr "Host \"%s\", puerto %s"
 
-#: printer/printerdrake.pm:1618
+#: printer/printerdrake.pm:1733
 #, c-format
 msgid "TCP/Socket Printer Options"
 msgstr "Opciones de la impresora por socket/TCP"
 
-#: 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 "
@@ -12586,7 +12884,7 @@ msgstr ""
 "el nombre del host o la IP y el número de puerto opcional (9100, por "
 "defecto) en los campos."
 
-#: 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 "
@@ -12600,27 +12898,27 @@ msgstr ""
 "por lo general es 9100, en otros servidores puede variar. Consulte el manual "
 "de su hardware."
 
-#: printer/printerdrake.pm:1625
+#: printer/printerdrake.pm:1740
 #, c-format
 msgid "Printer host name or IP missing!"
 msgstr "¡Falta el nombre de host o la IP de la impresora!"
 
-#: printer/printerdrake.pm:1648
+#: printer/printerdrake.pm:1763
 #, c-format
 msgid "Printer host name or IP"
 msgstr "Nombre de host o IP de la impresora"
 
-#: printer/printerdrake.pm:1704
+#: printer/printerdrake.pm:1819
 #, c-format
 msgid "Refreshing Device URI list..."
 msgstr "Refrescando lista de URI de dispositivo..."
 
-#: printer/printerdrake.pm:1707 printer/printerdrake.pm:1709
+#: printer/printerdrake.pm:1822 printer/printerdrake.pm:1824
 #, c-format
 msgid "Printer Device URI"
 msgstr "URI del dispositivo de impresión"
 
-#: 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 "
@@ -12631,17 +12929,17 @@ msgstr ""
 "debe cumplir con las especificaciones Foomatic o CUPS. Recuerde que no todos "
 "los sistemas de impresión admiten URIs."
 
-#: printer/printerdrake.pm:1731
+#: printer/printerdrake.pm:1846
 #, c-format
 msgid "A valid URI must be entered!"
 msgstr "¡Debe introducir un URI válido!"
 
-#: printer/printerdrake.pm:1834
+#: printer/printerdrake.pm:1949
 #, c-format
 msgid "Pipe into command"
 msgstr "Enviar el trabajo a un comando"
 
-#: 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 "
@@ -12651,17 +12949,17 @@ msgstr ""
 "ponerse el trabajo de impresión en vez de enviarse directamente a la "
 "impresora."
 
-#: printer/printerdrake.pm:1836
+#: printer/printerdrake.pm:1951
 #, c-format
 msgid "Command line"
 msgstr "Línea de comandos"
 
-#: printer/printerdrake.pm:1840
+#: printer/printerdrake.pm:1955
 #, c-format
 msgid "A command line must be entered!"
 msgstr "¡Debe ingresar un comando!"
 
-#: printer/printerdrake.pm:1873
+#: printer/printerdrake.pm:1988
 #, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
@@ -12672,75 +12970,76 @@ msgstr ""
 "LaserJet 1100/1200/1220/3200/3300 con scanner, DeskJet 450, Sony IJP-V100), "
 "una HP PhotoSmart o una HP LaserJet 2200?"
 
-#: printer/printerdrake.pm:1887
+#: printer/printerdrake.pm:2005
 #, c-format
 msgid "Installing HPOJ package..."
 msgstr "Instalando paquete HPOJ..."
 
-#: printer/printerdrake.pm:1894
+#: printer/printerdrake.pm:2012
 #, c-format
 msgid "Only printing will be possible on the %s."
 msgstr "Sólo será posible imprimir en %s."
 
-#: 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 "Verificando dispositivo y configurando HPOJ..."
 
-#: printer/printerdrake.pm:1946
+#: printer/printerdrake.pm:2065
 #, c-format
 msgid "Installing SANE packages..."
 msgstr "Instalando paquetes SANE..."
 
-#: printer/printerdrake.pm:1956
+#: printer/printerdrake.pm:2078
 #, c-format
 msgid "Scanning on the %s will not be possible."
 msgstr "El escaneo en %s no será posible."
 
-#: printer/printerdrake.pm:1983
+#: printer/printerdrake.pm:2105
 #, c-format
 msgid "Installing mtools packages..."
 msgstr "Instalando paquetes mtools..."
 
-#: printer/printerdrake.pm:1990
+#: printer/printerdrake.pm:2113
 #, c-format
 msgid "Photo memory card access on the %s will not be possible."
 msgstr "No será posible acceder a la tarjeta de memoria de fotos en %s."
 
-#: printer/printerdrake.pm:2005
+#: printer/printerdrake.pm:2128
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr "Escaneo en su dispositivo multifunción HP"
 
-#: printer/printerdrake.pm:2013
+#: printer/printerdrake.pm:2136
 #, c-format
 msgid "Photo memory card access on your HP multi-function device"
-msgstr "Acceso a la tarjeta de memoria de fotos en su dispositivo multifunción HP"
+msgstr ""
+"Acceso a la tarjeta de memoria de fotos en su dispositivo multifunción HP"
 
-#: printer/printerdrake.pm:2062
+#: printer/printerdrake.pm:2185
 #, c-format
 msgid "Making printer port available for CUPS..."
 msgstr "Haciendo que el puerto de la impresora esté disponible para CUPS..."
 
-#: 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 "Leyendo base de datos de impresoras ..."
 
-#: printer/printerdrake.pm:2281
+#: printer/printerdrake.pm:2404
 #, c-format
 msgid "Enter Printer Name and Comments"
 msgstr "Ingrese nombre de la impresora y comentarios"
 
-#: 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 ""
 "El nombre de la impresora sólo debería contener letras, números y el guión "
 "bajo"
 
-#: 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"
@@ -12749,7 +13048,7 @@ msgstr ""
 "La impresora \"%s\" ya existe,\n"
 "¿realmente desea sobre-escribir la configuración de la misma?"
 
-#: printer/printerdrake.pm:2300
+#: printer/printerdrake.pm:2423
 #, c-format
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
@@ -12759,35 +13058,35 @@ msgstr ""
 "qué rellenar los campos Descripción ni Ubicación. Son comentarios para los "
 "usuarios."
 
-#: printer/printerdrake.pm:2301
+#: printer/printerdrake.pm:2424
 #, c-format
 msgid "Name of printer"
 msgstr "Nombre de la impresora"
 
-#: 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 "Descripción"
 
-#: 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 "Ubicación"
 
-#: printer/printerdrake.pm:2320
+#: printer/printerdrake.pm:2443
 #, c-format
 msgid "Preparing printer database..."
 msgstr "Preparando base de datos de impresoras ..."
 
-#: printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2559
 #, c-format
 msgid "Your printer model"
 msgstr "El modelo de su impresora"
 
-#: printer/printerdrake.pm:2439
+#: printer/printerdrake.pm:2560
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -12814,18 +13113,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: printer/printerdrake.pm:2444 printer/printerdrake.pm:2447
+#: printer/printerdrake.pm:2565 printer/printerdrake.pm:2568
 #, c-format
 msgid "The model is correct"
 msgstr "El modelo es correcto"
 
-#: 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 "Seleccionar el modelo manualmente"
 
-#: printer/printerdrake.pm:2472
+#: printer/printerdrake.pm:2593
 #, c-format
 msgid ""
 "\n"
@@ -12840,12 +13139,12 @@ msgstr ""
 "automática del modelo de su impresora. Busque el modelo correcto en la lista "
 "si está resaltado un modelo equivocado o \"Impresora en crudo\"."
 
-#: printer/printerdrake.pm:2491
+#: printer/printerdrake.pm:2612
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
 msgstr "Instalar un archivo PPD provisto por el fabricante"
 
-#: printer/printerdrake.pm:2522
+#: printer/printerdrake.pm:2643
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
@@ -12854,7 +13153,7 @@ msgstr ""
 "Cada impresora PostScript se envía junto con un archivo PPD que describe las "
 "opciones y características de la impresora."
 
-#: 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 "
@@ -12863,12 +13162,12 @@ msgstr ""
 "Este archivo por lo general está en algún lugar del CD con los controladores "
 "para Windows y Mac que se entregan con la impresora."
 
-#: 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 "También puede encontrar archivos PPD en los sitios web del fabricante."
 
-#: 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 "
@@ -12877,7 +13176,7 @@ msgstr ""
 "Si tiene Windows instalado en su máquina, también puede encontrar el archivo "
 "PPD en su partición Windows."
 
-#: 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 "
@@ -12888,7 +13187,7 @@ msgstr ""
 "que estén disponibles todas las opciones de la impresora que brinda el "
 "hardware de la misma."
 
-#: 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 "
@@ -12897,58 +13196,51 @@ msgstr ""
 "Aquí puede elegir el archivo PPD a instalar en su máquina, luego se usará el "
 "mismo para la configuración de su impresora."
 
-#: printer/printerdrake.pm:2529
+#: printer/printerdrake.pm:2650
 #, c-format
 msgid "Install PPD file from"
 msgstr "Instalar archivo PPD desde"
 
-#: 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 "Disquete"
 
-#: 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 "Otro lugar"
 
-#: printer/printerdrake.pm:2548
+#: printer/printerdrake.pm:2669
 #, c-format
 msgid "Select PPD file"
 msgstr "Seleccione archivo PPD"
 
-#: printer/printerdrake.pm:2552
+#: printer/printerdrake.pm:2673
 #, c-format
 msgid "The PPD file %s does not exist or is unreadable!"
 msgstr "¡El archivo PPD %s no existe o no se puede leer!"
 
-#: printer/printerdrake.pm:2558
+#: printer/printerdrake.pm:2679
 #, c-format
 msgid "The PPD file %s does not conform with the PPD specifications!"
 msgstr "¡El archivo PPD %s no está conforme a las especificaciones PPD!"
 
-#: printer/printerdrake.pm:2569
+#: printer/printerdrake.pm:2690
 #, c-format
 msgid "Installing PPD file..."
 msgstr "Instalando archivo PPD..."
 
-#: printer/printerdrake.pm:2682
+#: printer/printerdrake.pm:2807
 #, c-format
 msgid "OKI winprinter configuration"
 msgstr "Configuración de impresora de windows OKI"
 
-#: printer/printerdrake.pm:2683
+#: printer/printerdrake.pm:2808
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -12966,12 +13258,12 @@ msgstr ""
 "impresora no funcionará. El controlador ignorará la configuración del tipo "
 "de conexión."
 
-#: printer/printerdrake.pm:2707 printer/printerdrake.pm:2736
+#: printer/printerdrake.pm:2833 printer/printerdrake.pm:2863
 #, c-format
 msgid "Lexmark inkjet configuration"
 msgstr "Configuración de impresora de inyección de tinta Lexmark"
 
-#: printer/printerdrake.pm:2708
+#: printer/printerdrake.pm:2834
 #, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -12979,12 +13271,12 @@ msgid ""
 "printer to a local port or configure it on the machine where it is connected "
 "to."
 msgstr ""
-"Los controladores de impresión de chorro de tinta que proporciona "
-"Lexmark sólo admiten impresoras locales, no impresoras en máquinas "
-"remotas o servidores de impresión. Por favor, conecte su impresora "
-"a un puerto local o configúrela en la máquina a la que está conectada."
+"Los controladores de impresión de chorro de tinta que proporciona Lexmark "
+"sólo admiten impresoras locales, no impresoras en máquinas remotas o "
+"servidores de impresión. Por favor, conecte su impresora a un puerto local o "
+"configúrela en la máquina a la que está conectada."
 
-#: printer/printerdrake.pm:2737
+#: printer/printerdrake.pm:2864
 #, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -13007,12 +13299,12 @@ msgstr ""
 "cabezal de impresión con \"lexmarkmaintain\" y ajuste la configuración de la "
 "alineación de la cabeza con este programa."
 
-#: printer/printerdrake.pm:2746
+#: printer/printerdrake.pm:2874
 #, c-format
 msgid "Lexmark X125 configuration"
 msgstr "Configuración de Lexmark X125"
 
-#: printer/printerdrake.pm:2747
+#: printer/printerdrake.pm:2875
 #, c-format
 msgid ""
 "The driver for this printer only supports printers locally connected via "
@@ -13023,14 +13315,38 @@ msgstr ""
 "El controlador para esta impresora sólo soporta impresoras locales "
 "conectadas por USB, no impresoras en máquinas remotas o servidores de "
 "impresión. Por favor, conecte su impresora a un puerto USB local o "
-"configúrel en la máquina en la que está conectada."
+"configúrela en la máquina en la que está conectada."
+
+#: printer/printerdrake.pm:2897
+#, c-format
+msgid "Samsung ML/QL-85G configuration"
+msgstr "Configuración del Samsung ML/QL-85G"
+
+#: 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 ""
+"El controlador para esta impresora sólo soporta impresoras locales "
+"conectadas en el primer puerto paralelo, no impresoras en máquinas remotas o "
+"servidores de impresión, ni conectadas localmente en otro puerto paralelo "
+"que el primero. Por favor, conecte su impresora al primer puerto paralelo o "
+"configúrela en la máquina en la que está conectada."
+
+#: printer/printerdrake.pm:2924
+#, c-format
+msgid "Canon LBP-460/660 configuration"
+msgstr "Configuración del Canon LBP-460/660"
 
-#: printer/printerdrake.pm:2765
+#: printer/printerdrake.pm:2943
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr "Transferencia de Firmware para HP LaserJet 1000"
 
-#: printer/printerdrake.pm:2878
+#: printer/printerdrake.pm:3056
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -13048,27 +13364,27 @@ msgstr ""
 "configurados correctamente. Note que una calidad de impresión o resolución "
 "extremadamente alta puede ser bastante lenta."
 
-#: printer/printerdrake.pm:3003
+#: printer/printerdrake.pm:3181
 #, c-format
 msgid "Printer default settings"
 msgstr "Configuraciones predeterminadas de la impresora"
 
-#: printer/printerdrake.pm:3010
+#: printer/printerdrake.pm:3188
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "¡La opción %s debe ser un número entero!"
 
-#: printer/printerdrake.pm:3014
+#: printer/printerdrake.pm:3192
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "¡La opción %s debe ser un número!"
 
-#: printer/printerdrake.pm:3018
+#: printer/printerdrake.pm:3196
 #, c-format
 msgid "Option %s out of range!"
 msgstr "¡La opción %s está fuera de rango"
 
-#: printer/printerdrake.pm:3069
+#: printer/printerdrake.pm:3247
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
@@ -13077,12 +13393,12 @@ msgstr ""
 "¿Quiere configurar esta impresora (\"%s\")\n"
 "como la impresora predeterminada?"
 
-#: printer/printerdrake.pm:3084
+#: printer/printerdrake.pm:3262
 #, c-format
 msgid "Test pages"
 msgstr "Páginas de prueba"
 
-#: printer/printerdrake.pm:3085
+#: printer/printerdrake.pm:3263
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -13095,57 +13411,57 @@ msgstr ""
 "incluso en impresoras láser con muy poca memoria puede que no salga. En la "
 "mayoría de los casos, basta con imprimir la página de prueba estándar."
 
-#: printer/printerdrake.pm:3089
+#: printer/printerdrake.pm:3267
 #, c-format
 msgid "No test pages"
 msgstr "No hay páginas de prueba"
 
-#: printer/printerdrake.pm:3090
+#: printer/printerdrake.pm:3268
 #, c-format
 msgid "Print"
 msgstr "Imprimir"
 
-#: printer/printerdrake.pm:3115
+#: printer/printerdrake.pm:3293
 #, c-format
 msgid "Standard test page"
 msgstr "Página de prueba estándar"
 
-#: printer/printerdrake.pm:3118
+#: printer/printerdrake.pm:3296
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr "Página de prueba alternativa (Letter)"
 
-#: printer/printerdrake.pm:3121
+#: printer/printerdrake.pm:3299
 #, c-format
 msgid "Alternative test page (A4)"
 msgstr "Página de prueba alternativa (A4)"
 
-#: printer/printerdrake.pm:3123
+#: printer/printerdrake.pm:3301
 #, c-format
 msgid "Photo test page"
 msgstr "Página de prueba de foto"
 
-#: printer/printerdrake.pm:3127
+#: printer/printerdrake.pm:3305
 #, c-format
 msgid "Do not print any test page"
 msgstr "No imprimir ninguna página de prueba"
 
-#: printer/printerdrake.pm:3135 printer/printerdrake.pm:3300
+#: printer/printerdrake.pm:3313 printer/printerdrake.pm:3485
 #, c-format
 msgid "Printing test page(s)..."
 msgstr "Imprimir la(s) página(s) de prueba..."
 
-#: printer/printerdrake.pm:3150
+#: printer/printerdrake.pm:3331
 #, c-format
 msgid "Could not install the %s package!"
 msgstr "¡No se pudo instalar el paquete %s!"
 
-#: printer/printerdrake.pm:3152
+#: printer/printerdrake.pm:3333
 #, c-format
 msgid "Skipping photo test page."
 msgstr "Omitiendo página de prueba de foto."
 
-#: printer/printerdrake.pm:3169
+#: printer/printerdrake.pm:3350
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -13160,7 +13476,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: printer/printerdrake.pm:3173
+#: printer/printerdrake.pm:3354
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -13169,17 +13485,17 @@ msgstr ""
 "La(s) página(s) de prueba se enviaron al demonio de impresión.\n"
 "Puede que pase algo de tiempo antes de que comience la impresión.\n"
 
-#: printer/printerdrake.pm:3180
+#: printer/printerdrake.pm:3364
 #, c-format
 msgid "Did it work properly?"
 msgstr "¿Funcionó adecuadamente?"
 
-#: printer/printerdrake.pm:3201 printer/printerdrake.pm:4397
+#: printer/printerdrake.pm:3386 printer/printerdrake.pm:4689
 #, c-format
 msgid "Raw printer"
 msgstr "Impresora en crudo"
 
-#: 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 "
@@ -13193,7 +13509,7 @@ msgstr ""
 "permiten seleccionar la impresora y modificar las opciones de configuración "
 "fácilmente.\n"
 
-#: printer/printerdrake.pm:3233
+#: printer/printerdrake.pm:3418
 #, c-format
 msgid ""
 "These commands you can also use in the \"Printing command\" field of the "
@@ -13205,8 +13521,8 @@ msgstr ""
 "nombre del archivo porque el archivo a imprimir lo proporciona la "
 "aplicación.\n"
 
-#: 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"
@@ -13220,7 +13536,7 @@ msgstr ""
 "configuraciones deseadas a la línea de comando, por ejemplo \"%s <archivo>"
 "\". "
 
-#: 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 "
@@ -13231,7 +13547,7 @@ msgstr ""
 "lista que se muestra debajo o haga clic sobre el botón \"Imprimir lista de "
 "opciones\".%s%s%s\n"
 
-#: 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"
@@ -13240,7 +13556,7 @@ msgstr ""
 "Aquí tiene una lista de las opciones disponibles para la impresora actual:\n"
 "\n"
 
-#: 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 "
@@ -13249,8 +13565,8 @@ msgstr ""
 "Para imprimir un archivo desde la línea de comando (ventana de terminal) use "
 "el comando \"%s <archivo>\".\n"
 
-#: 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 "
@@ -13262,7 +13578,7 @@ msgstr ""
 "del archivo porque el nombre del archivo a imprimir lo proporciona la "
 "aplicación.\n"
 
-#: 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 "
@@ -13271,7 +13587,7 @@ msgstr ""
 "Para obtener una lista de las opciones disponibles para la impresora actual, "
 "haga clic en el botón \"Imprimir lista de opciones\"."
 
-#: 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 "
@@ -13280,7 +13596,7 @@ msgstr ""
 "Para imprimir un archivo desde la línea de comando (ventana de terminal) use "
 "el comando \"%s <archivo>\" o \"%s <archivo>\".\n"
 
-#: printer/printerdrake.pm:3272
+#: printer/printerdrake.pm:3457
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -13297,7 +13613,7 @@ msgstr ""
 "detiene todos los trabajos de impresión inmediatamente cuando hace clic en "
 "él. Esto es útil, por ejemplo, para atascos de papel.\n"
 
-#: printer/printerdrake.pm:3276
+#: printer/printerdrake.pm:3461
 #, c-format
 msgid ""
 "\n"
@@ -13310,42 +13626,32 @@ msgstr ""
 "configuración para un trabajo de impresión particular. Simplemente añada las "
 "opciones deseadas a la línea de comando, por ejemplo \"%s <archivo>\".\n"
 
-#: printer/printerdrake.pm:3286
+#: printer/printerdrake.pm:3471
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr "Tarjetas de Impresora/Escaner/Foto en \"%s\""
 
-#: printer/printerdrake.pm:3287
+#: printer/printerdrake.pm:3472
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "Imprimiendo/Escaneando en \"%s\""
 
-#: printer/printerdrake.pm:3289
+#: printer/printerdrake.pm:3474
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr "Acceso de tarjetas de Impresora/Foto en \"%s\""
 
-#: printer/printerdrake.pm:3290
+#: printer/printerdrake.pm:3475
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "Imprimiendo en la impresora \"%s\""
 
-#: 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 "Cerrar"
-
-#: printer/printerdrake.pm:3296
+#: printer/printerdrake.pm:3481
 #, c-format
 msgid "Print option list"
 msgstr "Imprimir lista de opciones"
 
-#: printer/printerdrake.pm:3317
+#: printer/printerdrake.pm:3502
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -13356,7 +13662,9 @@ 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 ""
 "Su dispositivo multifunción se configuró automáticamente para poder "
 "escanear. Ahora puede escanear con \"scanimage\" (\"scanimage -d hp:%s\" "
@@ -13366,9 +13674,11 @@ msgstr ""
 "\"Archivo\"/\"Adquirir\". Ejecute también \"man scanimage\" en la línea de "
 "comandos para obtener más información.\n"
 "\n"
-"¡No utilice \"scannerdrake\" para este dispositivo!"
+"No es necesario utilizar \"scannerdrake\" para poder escaner con este "
+"dispositivo, solo necesita \"scannerdrake\" si desea comparir el escáner en "
+"la red."
 
-#: printer/printerdrake.pm:3343
+#: printer/printerdrake.pm:3528
 #, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -13392,18 +13702,13 @@ msgstr ""
 "cambiar entre las letras de unidad con el campo en la esquina superior "
 "derecha de la lista de archivos."
 
-#: printer/printerdrake.pm:3365 printer/printerdrake.pm:3767
-#, c-format
-msgid "Reading printer data..."
-msgstr "Leyendo los datos de la impresora ..."
-
-#: 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 "Transferir configuración de la impresora"
 
-#: printer/printerdrake.pm:3386
+#: printer/printerdrake.pm:3571
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -13419,7 +13724,7 @@ msgstr ""
 "transfieren.\n"
 "Debido a las siguientes razones no todas las colas se pueden transferir:\n"
 
-#: printer/printerdrake.pm:3389
+#: printer/printerdrake.pm:3574
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
@@ -13428,7 +13733,7 @@ msgstr ""
 "CUPS no soporta impresoras en servidores Novell o impresoras que envían los "
 "datos en un comando formado libremente.\n"
 
-#: printer/printerdrake.pm:3391
+#: printer/printerdrake.pm:3576
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
@@ -13437,12 +13742,12 @@ msgstr ""
 "PDQ sólo soporta impresoras locales, impresoras LPD remotas, e impresoras "
 "Socket/TCP.\n"
 
-#: printer/printerdrake.pm:3393
+#: printer/printerdrake.pm:3578
 #, c-format
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr "LPD y LPRng no soportan impresoras IPP.\n"
 
-#: printer/printerdrake.pm:3395
+#: printer/printerdrake.pm:3580
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
@@ -13451,7 +13756,7 @@ msgstr ""
 "Además, las colas no creadas con este programa o con \"foomatic-configure\" "
 "no se pueden transferir."
 
-#: printer/printerdrake.pm:3396
+#: printer/printerdrake.pm:3581
 #, c-format
 msgid ""
 "\n"
@@ -13462,7 +13767,7 @@ msgstr ""
 "Tampoco se pueden transferir las impresoras configuradas con los archivos "
 "PPD provistos por sus fabricantes o con controladores CUPS nativos."
 
-#: printer/printerdrake.pm:3397
+#: printer/printerdrake.pm:3582
 #, c-format
 msgid ""
 "\n"
@@ -13473,17 +13778,17 @@ msgstr ""
 "Marque las impresoras que desea transferir y haga clic \n"
 "sobre \"Transferir\"."
 
-#: printer/printerdrake.pm:3400
+#: printer/printerdrake.pm:3585
 #, c-format
 msgid "Do not transfer printers"
 msgstr "No transferir impresoras"
 
-#: printer/printerdrake.pm:3401 printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3586 printer/printerdrake.pm:3602
 #, c-format
 msgid "Transfer"
 msgstr "Transferir"
 
-#: printer/printerdrake.pm:3413
+#: printer/printerdrake.pm:3598
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -13494,17 +13799,17 @@ msgstr ""
 "Haga clic sobre \"Transferir\" para sobre-escribirla.\n"
 "También puede ingresar un nombre nuevo o saltear esta impresora."
 
-#: printer/printerdrake.pm:3434
+#: printer/printerdrake.pm:3619
 #, c-format
 msgid "New printer name"
 msgstr "Nuevo nombre de la impresora"
 
-#: printer/printerdrake.pm:3437
+#: printer/printerdrake.pm:3622
 #, c-format
 msgid "Transferring %s..."
 msgstr "Transfiriendo %s ..."
 
-#: printer/printerdrake.pm:3448
+#: printer/printerdrake.pm:3633
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
@@ -13513,28 +13818,28 @@ msgstr ""
 "Ha transferido su impresora por defecto anterior (\"%s\"), ¿Debería ser "
 "también la impresora por defecto bajo el nuevo sistema de impresión %s?"
 
-#: printer/printerdrake.pm:3458
+#: printer/printerdrake.pm:3643
 #, c-format
 msgid "Refreshing printer data..."
 msgstr "Refrescando datos de impresora ..."
 
-#: printer/printerdrake.pm:3467
+#: printer/printerdrake.pm:3652
 #, c-format
 msgid "Starting network..."
 msgstr "Iniciando la red ..."
 
-#: 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 "Configurar la red ahora"
 
-#: printer/printerdrake.pm:3509
+#: printer/printerdrake.pm:3696
 #, c-format
 msgid "Network functionality not configured"
 msgstr "Funcionalidad de red no configurada"
 
-#: printer/printerdrake.pm:3510
+#: printer/printerdrake.pm:3697
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -13547,12 +13852,12 @@ msgstr ""
 "configuración de red, no podrá utilizar la impresoara que está configurando "
 "ahora. ¿Cómo desea proceder?"
 
-#: printer/printerdrake.pm:3513
+#: printer/printerdrake.pm:3700
 #, c-format
 msgid "Go on without configuring the network"
 msgstr "Continuar sin configurar la red"
 
-#: printer/printerdrake.pm:3547
+#: printer/printerdrake.pm:3735
 #, c-format
 msgid ""
 "The network configuration done during the installation cannot be started "
@@ -13568,7 +13873,7 @@ msgstr ""
 "impresora, también utilizando el Centro de Control de %s, sección \"Hardware"
 "\"/\"Impresora\"."
 
-#: printer/printerdrake.pm:3548
+#: printer/printerdrake.pm:3736
 #, c-format
 msgid ""
 "The network access was not running and could not be started. Please check "
@@ -13579,27 +13884,27 @@ msgstr ""
 "verifique su configuración y su hardware. Luego, intente configurar su "
 "impresora remota de nuevo."
 
-#: printer/printerdrake.pm:3558
+#: printer/printerdrake.pm:3746
 #, c-format
 msgid "Restarting printing system..."
 msgstr "Reiniciando el sistema de impresión ..."
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, c-format
 msgid "high"
 msgstr "Alta"
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, c-format
 msgid "paranoid"
 msgstr "Paranoica"
 
-#: printer/printerdrake.pm:3598
+#: printer/printerdrake.pm:3778
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr "Instalando un sistema de impresión en el nivel de seguridad %s"
 
-#: 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 %"
@@ -13624,12 +13929,12 @@ msgstr ""
 "\n"
 "¿Seguro que desea configurar la impresión para esta máquina?"
 
-#: printer/printerdrake.pm:3633
+#: printer/printerdrake.pm:3814
 #, c-format
 msgid "Starting the printing system at boot time"
 msgstr "Iniciar el sistema de impresión al arrancar"
 
-#: printer/printerdrake.pm:3634
+#: printer/printerdrake.pm:3815
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -13652,67 +13957,173 @@ msgstr ""
 "¿Desea volver a activar el inicio automático de la impresión cuando el "
 "sistema se vuelva a encender?"
 
-#: printer/printerdrake.pm:3655 printer/printerdrake.pm:3889
+#: printer/printerdrake.pm:3837
 #, c-format
 msgid "Checking installed software..."
 msgstr "Verificando software instalado..."
 
-#: printer/printerdrake.pm:3661
+#: printer/printerdrake.pm:3843
 #, c-format
-msgid "Removing %s ..."
+msgid "Removing %s..."
 msgstr "Quitando %s ..."
 
-#: printer/printerdrake.pm:3665
+#: printer/printerdrake.pm:3847
 #, c-format
 msgid "Could not remove the %s printing system!"
 msgstr "¡No se pudo quitar el sistema de impresión %s!"
 
-#: printer/printerdrake.pm:3674
+#: printer/printerdrake.pm:3863
 #, c-format
-msgid "Installing %s ..."
+msgid "Installing %s..."
 msgstr "Instalando %s ..."
 
-#: printer/printerdrake.pm:3678
+#: printer/printerdrake.pm:3867
 #, c-format
 msgid "Could not install the %s printing system!"
 msgstr "¡No se pudo instalar el sistema de impresión %s!"
 
-#: 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 ""
+"En este modo, no hay sistema de impresión local, todas las peticiones de "
+"impresión se dirigirán directamente al servidor especificado abajo. Tener en "
+"cuenta que entonces no es posible definir colas de impresión locales y que "
+"si el servidor especificado estuviera fuera de servicio no se podría "
+"imprimir de ninguna manera desde esta máquina."
+
+#: 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 ""
+"Introduzca el nombre del host o la IP de su servidor CUPS y pulse Acepar si "
+"desea usar este modo, pulse \"Salir\" en caso contrario."
+
+#: printer/printerdrake.pm:3950
+#, c-format
+msgid "Name or IP of remote server:"
+msgstr "Nombre o dirección IP del servidor remoto:"
+
+#: printer/printerdrake.pm:3970
 #, c-format
 msgid "Setting Default Printer..."
 msgstr "Configurando impresora predeterminada..."
 
-#: printer/printerdrake.pm:3747
+#: printer/printerdrake.pm:3989
+#, c-format
+msgid "Local CUPS printing system or remote CUPS server?"
+msgstr "¿Sistema de impresión CUPS local o servidor CUPS remoto?"
+
+#: printer/printerdrake.pm:3990
+#, c-format
+msgid "The CUPS printing system can be used in two ways: "
+msgstr "El sistema de impresión CUPS se puede usar de dos maneras: "
+
+#: printer/printerdrake.pm:3992
+#, c-format
+msgid "1. The CUPS printing system can run locally. "
+msgstr "1. El sistema de impresión CUPS puede ejecutarse de manera local. "
+
+#: 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 ""
+"Entonces, se pueden usar impresoras locales y se descubren de manera "
+"automática impresoras remotas en otros servidores CUPS dentro de la misma "
+"red."
+
+#: 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 ""
+"La desventaja de esta aproximación es que se necesitan más recursos en la "
+"máquina local: Se necesita instalar paquetes sotware adicionales, el demonio "
+"CUPS tiene que ejecutarse en segundo plano y consume algo de memoria, y el "
+"puerto IPP (puerto 631) se abre."
+
+#: printer/printerdrake.pm:3996
+#, c-format
+msgid "2. All printing requests are immediately sent to a remote CUPS server. "
+msgstr ""
+"2. Todas la peticiones de impresión de envían de manera inmediata a un "
+"servidor CUPS remoto."
+
+#: 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 ""
+"Aquí la ocupación de recursos locales se reduce al mínimo. No se arranca el "
+"demonio CUPS ni se abre ningún puerto, no se instala ninguna infraestructura "
+"software para configurar las colas de impresión locales, por lo que se usa "
+"menos memoria y espacio en disco."
+
+#: 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 ""
+"La desventaja es que entonces no es posible definir impresoras locales y si "
+"el servidor especificado estuviera fuera de servicio no se podría imprimir "
+"de ninguna manera desde esta máquina."
+
+#: printer/printerdrake.pm:4000
+#, c-format
+msgid "How should CUPS be set up on your machine?"
+msgstr "¿Cómo debería configurarse CUPS en su máquina?"
+
+#: 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 "Servidor remoto, especifique el nombre o dirección IP aquí:"
+
+#: printer/printerdrake.pm:4018
+#, c-format
+msgid "Local CUPS printing system"
+msgstr "Sistema de impresión CUPS local"
+
+#: printer/printerdrake.pm:4056
 #, c-format
 msgid "Select Printer Spooler"
 msgstr "Seleccione sistema de impresión (spooler)"
 
-#: printer/printerdrake.pm:3748
+#: printer/printerdrake.pm:4057
 #, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "¿Qué sistema de impresión (spooler) desea usar?"
 
-#: printer/printerdrake.pm:3799
+#: printer/printerdrake.pm:4105
 #, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr "¡Falló la configuración de la impresora \"%s\"!"
 
-#: printer/printerdrake.pm:3812
+#: printer/printerdrake.pm:4118
 #, c-format
 msgid "Installing Foomatic..."
 msgstr "Instalando Foomatic ..."
 
-#: printer/printerdrake.pm:3818
+#: printer/printerdrake.pm:4124
 #, c-format
 msgid "Could not install %s packages, %s cannot be started!"
 msgstr "¡No se pudieron instalar los paquetes %s, no se puede iniciar %s!"
 
-#: printer/printerdrake.pm:3910
-#, c-format
-msgid "Could not install necessary packages, %s cannot be started!"
-msgstr "No se pudieron instalar los paquetes necesarios, ¡no se puede iniciar %s!"
-
-#: printer/printerdrake.pm:4011
+#: printer/printerdrake.pm:4314
 #, c-format
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
@@ -13723,190 +14134,161 @@ msgstr ""
 "ellas para cambiar los ajustes, para configurarla como predeterminada, o "
 "para ver información acerca de la misma."
 
-#: printer/printerdrake.pm:4039
+#: printer/printerdrake.pm:4344
 #, c-format
 msgid "Display all available remote CUPS printers"
 msgstr "Mostrar todas las impresoras CUPS remotas"
 
-#: printer/printerdrake.pm:4040
+#: printer/printerdrake.pm:4345
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr ""
 "Refrescar la lista de impresoras (para visualizar todas las impresoras CUPS "
 "remotas)"
 
-#: printer/printerdrake.pm:4050
+#: printer/printerdrake.pm:4356
 #, c-format
 msgid "CUPS configuration"
 msgstr "Configuración de CUPS"
 
-#: printer/printerdrake.pm:4062
+#: printer/printerdrake.pm:4368
 #, c-format
 msgid "Change the printing system"
 msgstr "Cambiar el sistema de impresión"
 
-#: printer/printerdrake.pm:4071
+#: printer/printerdrake.pm:4377
 #, c-format
 msgid "Normal Mode"
 msgstr "Modo normal"
 
-#: printer/printerdrake.pm:4072
+#: printer/printerdrake.pm:4378
 #, c-format
 msgid "Expert Mode"
 msgstr "Modo experto"
 
-#: 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 "Opciones de la impresora"
 
-#: printer/printerdrake.pm:4379
+#: printer/printerdrake.pm:4668
 #, c-format
 msgid "Modify printer configuration"
 msgstr "Modificar configuración de la impresora"
 
-#: 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 ""
-"Impresora %s\n"
+"Impresora %s%s\n"
 "¿Qué desea modificar de esta impresora?"
 
-#: printer/printerdrake.pm:4385
+#: printer/printerdrake.pm:4675
+#, c-format
+msgid "This printer is disabled"
+msgstr "Esta impresora está desactivada"
+
+#: printer/printerdrake.pm:4677
 #, c-format
 msgid "Do it!"
 msgstr "¡Hacerlo!"
 
-#: printer/printerdrake.pm:4390 printer/printerdrake.pm:4448
+#: printer/printerdrake.pm:4682 printer/printerdrake.pm:4737
 #, c-format
 msgid "Printer connection type"
 msgstr "Tipo de conexión de la impresora"
 
-#: printer/printerdrake.pm:4391 printer/printerdrake.pm:4452
+#: printer/printerdrake.pm:4683 printer/printerdrake.pm:4743
 #, c-format
 msgid "Printer name, description, location"
 msgstr "Nombre de la impresora, descripción, ubicación"
 
-#: printer/printerdrake.pm:4393 printer/printerdrake.pm:4471
+#: printer/printerdrake.pm:4685 printer/printerdrake.pm:4761
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr "Fabricante de la impresora, modelo, controlador"
 
-#: printer/printerdrake.pm:4394 printer/printerdrake.pm:4472
+#: printer/printerdrake.pm:4686 printer/printerdrake.pm:4762
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr "Fabricante de la impresora, modelo"
 
-#: 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 "Poner esta impresora como predeterminada"
 
-#: 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 "Agregar esta impresora a Star Office/OpenOffice.org/GIMP"
+msgid "Enable Printer"
+msgstr "Habilitar la impresora"
 
-#: 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 "Quitar esta impresora de Star Office/OpenOffice.org/GIMP"
+msgid "Disable Printer"
+msgstr "Deshabilitar la impresora"
 
-#: printer/printerdrake.pm:4404 printer/printerdrake.pm:4500
+#: printer/printerdrake.pm:4701 printer/printerdrake.pm:4788
 #, c-format
 msgid "Print test pages"
 msgstr "Imprimir la(s) página(s) de prueba"
 
-#: 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 "Aprender como usar esta impresora"
 
-#: printer/printerdrake.pm:4406 printer/printerdrake.pm:4504
+#: printer/printerdrake.pm:4703 printer/printerdrake.pm:4792
 #, c-format
 msgid "Remove printer"
 msgstr "Borrar impresora"
 
-#: printer/printerdrake.pm:4460
+#: printer/printerdrake.pm:4750
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "Quitando la impresora antigua \"%s\" ..."
 
-#: printer/printerdrake.pm:4491
-#, c-format
-msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
-msgstr "Agregando impresora a Star Office/OpenOffice.org/GIMP"
-
-#: printer/printerdrake.pm:4493
+#: printer/printerdrake.pm:4781
 #, c-format
-msgid "The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"La impresora \"%s\" se agregó satisfactoriamente a Star Office/OpenOffice."
-"org."
+msgid "Printer \"%s\" is now enabled."
+msgstr "Ahora, la impresora \"%s\" está habilitada."
 
-#: printer/printerdrake.pm:4494
+#: printer/printerdrake.pm:4786
 #, c-format
-msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
-msgstr "No se pudo agregar la impresora \"%s\" a Star Office/OpenOffice.org/GIMP."
+msgid "Printer \"%s\" is now disabled."
+msgstr "Ahora, la impresora \"%s\" está deshabilitada."
 
-#: printer/printerdrake.pm:4496
-#, c-format
-msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
-msgstr "Quitando la impresora de Star Office/OpenOffice.org/GIMP"
-
-#: printer/printerdrake.pm:4498
-#, c-format
-msgid ""
-"The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
-"GIMP."
-msgstr ""
-"La impresora \"%s\" se quitó satisfactoriamnete de Star Office/OpenOffice."
-"org."
-
-#: printer/printerdrake.pm:4499
-#, c-format
-msgid "Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
-msgstr "No se pudo quitar la impresora \"%s\" de Star Office/OpenOffice.org/GIMP."
-
-#: printer/printerdrake.pm:4543
+#: printer/printerdrake.pm:4823
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "¿Seguro que quiere borrar la impresora \"%s\"?"
 
-#: printer/printerdrake.pm:4547
+#: printer/printerdrake.pm:4827
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "Quitando la impresora \"%s\" ..."
 
-#: printer/printerdrake.pm:4571
+#: printer/printerdrake.pm:4851
 #, c-format
 msgid "Default printer"
 msgstr "Impresora predeterminada"
 
-#: printer/printerdrake.pm:4572
+#: printer/printerdrake.pm:4852
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr "La impresora \"%s\" ahora es la impresora predeterminada."
 
-#: raid.pm:37
-#, c-format
-msgid "Can't add a partition to _formatted_ RAID md%d"
-msgstr "No se puede añadir una partición al RAID md%d _ya formateado_"
-
-#: raid.pm:139
+#: raid.pm:36
 #, c-format
-msgid "mkraid failed (maybe raidtools are missing?)"
-msgstr "Falló mkraid (¿quizás no estén las herramientas de raid (raidtools)?)"
+msgid "Can't add a partition to _formatted_ RAID %s"
+msgstr "No se puede añadir una partición al RAID %s_ya formateado_"
 
-#: raid.pm:139
-#, c-format
-msgid "mkraid failed"
-msgstr "Falló mkraid"
-
-#: raid.pm:155
+#: raid.pm:132
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "No hay suficientes particiones para un RAID de nivel %d\n"
@@ -13924,26 +14306,28 @@ msgstr "¡No se pudo crear vínculo /usr/share/sane/%s!"
 #: scanner.pm:114
 #, c-format
 msgid "Could not copy firmware file %s to /usr/share/sane/firmware!"
-msgstr "¡No se pudo copiar el archivo de firmware %s a /usr/share/sane/firmware!"
+msgstr ""
+"¡No se pudo copiar el archivo de firmware %s a /usr/share/sane/firmware!"
 
 #: scanner.pm:121
 #, c-format
 msgid "Could not set permissions of firmware file %s!"
 msgstr "¡No se pudo ajustar permisos en el archivo de firmware %s!"
 
-#: 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 "Scannerdrake"
 
-#: 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 "No se pueden instalar los paquetes necesarios para compartir sus escáneres."
+msgstr ""
+"No se pueden instalar los paquetes necesarios para compartir sus escáneres."
 
 #: scanner.pm:202
 #, c-format
@@ -13970,7 +14354,8 @@ msgstr "Aceptar/Rechazar eco ICMP."
 msgid "Allow/Forbid autologin."
 msgstr "Permitir/Prohibir conexión automática."
 
-#: 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"
@@ -13984,22 +14369,22 @@ msgstr ""
 "\n"
 "De lo contrario sólo se permite /etc/issue."
 
-#: security/help.pm:25
+#: security/help.pm:27
 #, c-format
 msgid "Allow/Forbid reboot by the console user."
 msgstr "Permitir/Prohibir reinicio por parte del usuario de la consola."
 
-#: security/help.pm:27
+#: security/help.pm:29
 #, c-format
 msgid "Allow/Forbid remote root login."
 msgstr "Permitir/Prohibir conexión remota de root."
 
-#: security/help.pm:29
+#: security/help.pm:31
 #, c-format
 msgid "Allow/Forbid direct root login."
 msgstr "Permitir/Prohibir conexión directa de root."
 
-#: 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 "
@@ -14008,7 +14393,20 @@ msgstr ""
 "Permitir/Prohibir la lista de usuarios del sistema en administradores de "
 "conexión (kdm y gdm)."
 
-#: 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 ""
+"Permitr/prohibir exportar pantalla cuando\n"
+"se pasa de la cuenta root a las otras cuentas.\n"
+"\n"
+"Consulte pam_xauth(8) para más detalles.'"
+
+#: security/help.pm:40
 #, c-format
 msgid ""
 "Allow/Forbid X connections:\n"
@@ -14027,7 +14425,7 @@ msgstr ""
 "\n"
 "- NINGUNO (ninguna conexión)."
 
-#: security/help.pm:41
+#: security/help.pm:48
 #, c-format
 msgid ""
 "The argument specifies if clients are authorized to connect\n"
@@ -14036,7 +14434,8 @@ msgstr ""
 "El argumento especifica si los clientes están autorizados a conectar\n"
 "al servidor X en el puerto TCP 6000 o no."
 
-#: 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"
@@ -14063,7 +14462,7 @@ msgstr ""
 "Para autorizar los servicios que necesita, use /etc/hosts.allow (ver hosts."
 "allow(5))."
 
-#: security/help.pm:54
+#: security/help.pm:63
 #, c-format
 msgid ""
 "If SERVER_LEVEL (or SECURE_LEVEL if absent)\n"
@@ -14084,7 +14483,7 @@ msgstr ""
 "añadir un servicio si está presente en el archivo\n"
 "durante la instalación de paquetes."
 
-#: security/help.pm:63
+#: security/help.pm:72
 #, c-format
 msgid ""
 "Enable/Disable crontab and at for users.\n"
@@ -14097,89 +14496,96 @@ msgstr ""
 "Poner los permitidos en /etc/cron y /etc/at.allow\n"
 "(ver man at(1) y crontab(1))."
 
-#: security/help.pm:68
+#: security/help.pm:77
 #, c-format
 msgid "Enable/Disable syslog reports to console 12"
 msgstr "Habilitar/Deshabilitar reporte de syslog en la consola 12"
 
-#: 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 ""
 "Habilitar/deshabilitar protección de engaño de resolución de nombres. Si\n"
-"\"alert\" es verdadero, también reportar a syslog."
+"\"%s\" es verdadero, también reportar a syslog."
+
+#: security/help.pm:80 standalone/draksec:213
+#, c-format
+msgid "Security Alerts:"
+msgstr "Alertas de seguridad:"
 
-#: security/help.pm:73
+#: security/help.pm:82
 #, c-format
 msgid "Enable/Disable IP spoofing protection."
 msgstr "Habilitar/Deshabilitar protección contra engaño de IP."
 
-#: security/help.pm:75
+#: security/help.pm:84
 #, c-format
 msgid "Enable/Disable libsafe if libsafe is found on the system."
 msgstr "Habilitar/Deshabilitar libsafe si es que se encuentra en el sistema."
 
-#: security/help.pm:77
+#: security/help.pm:86
 #, c-format
 msgid "Enable/Disable the logging of IPv4 strange packets."
 msgstr "Habilitar/Deshabilitar registro de paquetes IPv4 extraños."
 
-#: security/help.pm:79
+#: security/help.pm:88
 #, c-format
 msgid "Enable/Disable msec hourly security check."
 msgstr "Habilitar/Deshabilitar verificación horaria de seguridad de msec."
 
-#: 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."
+msgid ""
+" Enabling su only from members of the wheel group or allow su from any user."
 msgstr ""
 "Permitir su sólo a miembros del grupo wheel o permitir su a cualquier "
 "usuario."
 
-#: security/help.pm:83
+#: security/help.pm:92
 #, c-format
 msgid "Use password to authenticate users."
 msgstr "Usar contraseña para autenticar usuarios."
 
-#: security/help.pm:85
+#: security/help.pm:94
 #, c-format
 msgid "Activate/Disable ethernet cards promiscuity check."
-msgstr "Activar/desactivar verificaciones de promiscuidad de tarjetas Ethernet."
+msgstr ""
+"Activar/desactivar verificaciones de promiscuidad de tarjetas Ethernet."
 
-#: security/help.pm:87
+#: security/help.pm:96
 #, c-format
 msgid " Activate/Disable daily security check."
 msgstr "Activar/desactivar verificaciones diarias de seguridad."
 
-#: security/help.pm:89
+#: security/help.pm:98
 #, c-format
 msgid " Enable/Disable sulogin(8) in single user level."
 msgstr "Habilitar/Deshabilitar sulogin(8) en nivel de usuario único."
 
-#: 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 ""
 "Añadir el nombre como una excepción al manejo de edad de contraseñas por "
 "msec."
 
-#: security/help.pm:93
+#: security/help.pm:102
 #, c-format
 msgid "Set password aging to \"max\" days and delay to change to \"inactive\"."
 msgstr ""
 "Configurar edad de contraseñas en \"max\" días y demorar el cambio a "
 "\"inactive\"."
 
-#: security/help.pm:95
+#: security/help.pm:104
 #, c-format
 msgid "Set the password history length to prevent password reuse."
 msgstr ""
 "Configurar la longitud de la historia de contraseñas para prevenir "
 "reutilización de contraseñas."
 
-#: security/help.pm:97
+#: security/help.pm:106
 #, c-format
 msgid ""
 "Set the password minimum length and minimum number of digit and minimum "
@@ -14188,20 +14594,20 @@ msgstr ""
 "Configurar la longitud mínima de contraseña y la cantidad mínima de dígitos "
 "y cantidad mínima de letras mayúsculas."
 
-#: security/help.pm:99
+#: security/help.pm:108
 #, c-format
 msgid "Set the root umask."
 msgstr "Configurar la umask de root."
 
-#: security/help.pm:100
+#: security/help.pm:109
 #, c-format
 msgid "if set to yes, check open ports."
 msgstr "si se pone en sí, verificar puertos abiertos."
 
-#: 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"
@@ -14217,110 +14623,114 @@ msgstr ""
 "\n"
 "- por usuarios con el id 0 que no sean root."
 
-#: security/help.pm:108
+#: security/help.pm:117
 #, c-format
 msgid "if set to yes, check permissions of files in the users' home."
 msgstr ""
 "si se pone en sí, verificar permisos de archivos en dirs. personales de "
 "usuarios."
 
-#: 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 ""
 "si se pone en sí, verificar si los dispositivos de red están en modo "
 "promiscuo."
 
-#: security/help.pm:110
+#: security/help.pm:119
 #, c-format
 msgid "if set to yes, run the daily security checks."
 msgstr "si se pone en sí, ejecutar las verificaciones de seguridad diarias."
 
-#: security/help.pm:111
+#: security/help.pm:120
 #, c-format
 msgid "if set to yes, check additions/removals of sgid files."
 msgstr "si se pone en sí, verificar adiciones/remociones de archivos sgid."
 
-#: security/help.pm:112
+#: security/help.pm:121
 #, c-format
 msgid "if set to yes, check empty password in /etc/shadow."
 msgstr "si se pone en sí, verificar contraseña vacía en /etc/shadow."
 
-#: security/help.pm:113
+#: security/help.pm:122
 #, c-format
 msgid "if set to yes, verify checksum of the suid/sgid files."
 msgstr "si se pone en sí, verificar suma de los archivos suid/sgid."
 
-#: security/help.pm:114
+#: security/help.pm:123
 #, c-format
 msgid "if set to yes, check additions/removals of suid root files."
-msgstr "si se pone en sí, verificar adiciones/remociones de archivos suid root."
+msgstr ""
+"si se pone en sí, verificar adiciones/remociones de archivos suid root."
 
-#: security/help.pm:115
+#: security/help.pm:124
 #, c-format
 msgid "if set to yes, report unowned files."
 msgstr "si se pone en sí, reportar archivos sin dueño."
 
-#: security/help.pm:116
+#: security/help.pm:125
 #, c-format
 msgid "if set to yes, check files/directories writable by everybody."
-msgstr "si se pone en sí, verificar archivos/directorios que todos pueden escribir."
+msgstr ""
+"si se pone en sí, verificar archivos/directorios que todos pueden escribir."
 
-#: security/help.pm:117
+#: security/help.pm:126
 #, c-format
 msgid "if set to yes, run chkrootkit checks."
 msgstr "si se pone en sí, ejecutar verificaciones chkrootkit."
 
-#: 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."
+msgid ""
+"if set, send the mail report to this email address else send it to root."
 msgstr ""
 "si está activo, enviar el correo de reporte a esta dirección, caso contrario "
 "a root."
 
-#: security/help.pm:119
+#: security/help.pm:128
 #, c-format
 msgid "if set to yes, report check result by mail."
 msgstr "si se pone en sí, reportar resultado de verificación por correo-e."
 
-#: security/help.pm:120
+#: security/help.pm:129
 #, c-format
 msgid "Do not send mails if there's nothing to warn about"
 msgstr "No enviar correo si no hay advertencias"
 
-#: security/help.pm:121
+#: security/help.pm:130
 #, c-format
 msgid "if set to yes, run some checks against the rpm database."
-msgstr "si se pone en sí, correr algunas pruebas contra la base de datos de rpm."
+msgstr ""
+"si se pone en sí, correr algunas pruebas contra la base de datos de rpm."
 
-#: security/help.pm:122
+#: security/help.pm:131
 #, c-format
 msgid "if set to yes, report check result to syslog."
 msgstr "si se pone en sí, reportar resultado de verificación en syslog."
 
-#: security/help.pm:123
+#: security/help.pm:132
 #, c-format
 msgid "if set to yes, reports check result to tty."
 msgstr "si se pone en sí, reportar resultados de verificación en tty."
 
-#: security/help.pm:125
+#: security/help.pm:134
 #, c-format
 msgid "Set shell commands history size. A value of -1 means unlimited."
 msgstr ""
 "Ajustar el tamaño de la historia de comandos. Un valor de -1 significa "
 "ilimitada."
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Set the shell timeout. A value of zero means no timeout."
 msgstr "Ajustar el timeout del shell. Un valor de cero significa sin timeout."
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Timeout unit is second"
 msgstr "La unidad del tiempo de espera es el segundo"
 
-#: security/help.pm:129
+#: security/help.pm:138
 #, c-format
 msgid "Set the user umask."
 msgstr "Configurar la umask de usuario."
@@ -14367,212 +14777,219 @@ msgstr "Listar usuarios del sistema en administradores de conexión (kdm y gdm)"
 
 #: security/l10n.pm:20
 #, c-format
+msgid "Export display when passing from root to the other users"
+msgstr "Exportar pantalla cuando se pasa de root a otras cuentas"
+
+#: security/l10n.pm:21
+#, c-format
 msgid "Allow X Window connections"
 msgstr "Permitir conexiones X Window"
 
-#: security/l10n.pm:21
+#: security/l10n.pm:22
 #, c-format
 msgid "Authorize TCP connections to X Window"
 msgstr "Autorizar conexiones TCP desde X Window"
 
-#: security/l10n.pm:22
+#: security/l10n.pm:23
 #, c-format
 msgid "Authorize all services controlled by tcp_wrappers"
 msgstr "Autorizar todos los servicios controlados por tcp_wrappers"
 
-#: security/l10n.pm:23
+#: security/l10n.pm:24
 #, c-format
 msgid "Chkconfig obey msec rules"
 msgstr "Chkconfig obedece las reglas de msec"
 
-#: security/l10n.pm:24
+#: security/l10n.pm:25
 #, c-format
 msgid "Enable \"crontab\" and \"at\" for users"
 msgstr "Habilitar \"crontab\" y \"at\" para los usuarios"
 
-#: security/l10n.pm:25
+#: security/l10n.pm:26
 #, c-format
 msgid "Syslog reports to console 12"
 msgstr "Syslog reporta en la consola 12"
 
-#: security/l10n.pm:26
+#: security/l10n.pm:27
 #, c-format
 msgid "Name resolution spoofing protection"
 msgstr "Protección contra engaño de resolución de nombres"
 
-#: security/l10n.pm:27
+#: security/l10n.pm:28
 #, c-format
 msgid "Enable IP spoofing protection"
 msgstr "Habilitar protección contra engaño de IP"
 
-#: security/l10n.pm:28
+#: security/l10n.pm:29
 #, c-format
 msgid "Enable libsafe if libsafe is found on the system"
 msgstr "Habilitar libsafe si es que se encuentra en el sistema"
 
-#: security/l10n.pm:29
+#: security/l10n.pm:30
 #, c-format
 msgid "Enable the logging of IPv4 strange packets"
 msgstr "Habilitar registro de paquetes IPv4 extraños"
 
-#: security/l10n.pm:30
+#: security/l10n.pm:31
 #, c-format
 msgid "Enable msec hourly security check"
 msgstr "Habilitar verificación horaria de seguridad de msec"
 
-#: security/l10n.pm:31
+#: security/l10n.pm:32
 #, c-format
 msgid "Enable su only from the wheel group members or for any user"
 msgstr "Permitir su sólo a miembros del grupo wheel o a cualquier usuario"
 
-#: security/l10n.pm:32
+#: security/l10n.pm:33
 #, c-format
 msgid "Use password to authenticate users"
 msgstr "Usar contraseña para autenticar usuarios"
 
-#: security/l10n.pm:33
+#: security/l10n.pm:34
 #, c-format
 msgid "Ethernet cards promiscuity check"
 msgstr "Verificaciones de promiscuidad de tarjetas Ethernet"
 
-#: security/l10n.pm:34
+#: security/l10n.pm:35
 #, c-format
 msgid "Daily security check"
 msgstr "Verificación diaria de seguridad"
 
-#: security/l10n.pm:35
+#: security/l10n.pm:36
 #, c-format
 msgid "Sulogin(8) in single user level"
 msgstr "Sulogin(8) en nivel de usuario único"
 
-#: security/l10n.pm:36
+#: security/l10n.pm:37
 #, c-format
 msgid "No password aging for"
 msgstr "Sin edad de contraseñas para"
 
-#: security/l10n.pm:37
+#: security/l10n.pm:38
 #, c-format
 msgid "Set password expiration and account inactivation delays"
-msgstr "Ajustar expiración de contraseñas y demoras de desactivación de cuentas"
+msgstr ""
+"Ajustar expiración de contraseñas y demoras de desactivación de cuentas"
 
-#: security/l10n.pm:38
+#: security/l10n.pm:39
 #, c-format
 msgid "Password history length"
 msgstr "Longitud de historia de contraseñas"
 
-#: security/l10n.pm:39
+#: security/l10n.pm:40
 #, c-format
 msgid "Password minimum length and number of digits and upcase letters"
-msgstr "Longitud mínima y cantidad de dígitos y letras mayúsculas para contraseñas"
+msgstr ""
+"Longitud mínima y cantidad de dígitos y letras mayúsculas para contraseñas"
 
-#: security/l10n.pm:40
+#: security/l10n.pm:41
 #, c-format
 msgid "Root umask"
 msgstr "Máscara de root"
 
-#: security/l10n.pm:41
+#: security/l10n.pm:42
 #, c-format
 msgid "Shell history size"
 msgstr "Tamaño de historia del shell"
 
-#: security/l10n.pm:42
+#: security/l10n.pm:43
 #, c-format
 msgid "Shell timeout"
 msgstr "Tiempo de espera del shell"
 
-#: security/l10n.pm:43
+#: security/l10n.pm:44
 #, c-format
 msgid "User umask"
 msgstr "Máscara de usuario"
 
-#: security/l10n.pm:44
+#: security/l10n.pm:45
 #, c-format
 msgid "Check open ports"
 msgstr "Verificar puertos abiertos"
 
-#: security/l10n.pm:45
+#: security/l10n.pm:46
 #, c-format
 msgid "Check for unsecured accounts"
 msgstr "Verificar cuentas no seguras"
 
-#: security/l10n.pm:46
+#: security/l10n.pm:47
 #, c-format
 msgid "Check permissions of files in the users' home"
 msgstr "Verificar permisos de archivos en dirs. personales de usuarios"
 
-#: security/l10n.pm:47
+#: security/l10n.pm:48
 #, c-format
 msgid "Check if the network devices are in promiscuous mode"
 msgstr "Verificar si los dispositivos de red están en modo promiscuo"
 
-#: security/l10n.pm:48
+#: security/l10n.pm:49
 #, c-format
 msgid "Run the daily security checks"
 msgstr "Ejecutar verificaciones de seguridad diarias"
 
-#: security/l10n.pm:49
+#: security/l10n.pm:50
 #, c-format
 msgid "Check additions/removals of sgid files"
 msgstr "Verificar adiciones/remociones de archivos sgid"
 
-#: security/l10n.pm:50
+#: security/l10n.pm:51
 #, c-format
 msgid "Check empty password in /etc/shadow"
 msgstr "Cerificar contraseña vacía en /etc/shadow"
 
-#: security/l10n.pm:51
+#: security/l10n.pm:52
 #, c-format
 msgid "Verify checksum of the suid/sgid files"
 msgstr "Verificar suma de los archivos suid/sgid"
 
-#: security/l10n.pm:52
+#: security/l10n.pm:53
 #, c-format
 msgid "Check additions/removals of suid root files"
 msgstr "Verificar adiciones/remociones de archivos suid root"
 
-#: security/l10n.pm:53
+#: security/l10n.pm:54
 #, c-format
 msgid "Report unowned files"
 msgstr "Reportar archivos sin dueño"
 
-#: security/l10n.pm:54
+#: security/l10n.pm:55
 #, c-format
 msgid "Check files/directories writable by everybody"
 msgstr "Verificar archivos/directorios que todos pueden escribir"
 
-#: security/l10n.pm:55
+#: security/l10n.pm:56
 #, c-format
 msgid "Run chkrootkit checks"
 msgstr "Ejecutar verificaciones chkrootkit"
 
-#: security/l10n.pm:56
+#: security/l10n.pm:57
 #, c-format
 msgid "Do not send mails when unneeded"
 msgstr "No enviar correos cuando no sea necesario"
 
-#: 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 ""
 "Si está activo, enviar el correo de reporte a esta dirección, caso contrario "
 "a root."
 
-#: security/l10n.pm:58
+#: security/l10n.pm:59
 #, c-format
 msgid "Report check result by mail"
 msgstr "Reportar resultado de verificación por correo-e"
 
-#: security/l10n.pm:59
+#: security/l10n.pm:60
 #, c-format
 msgid "Run some checks against the rpm database"
 msgstr "Correr algunas pruebas contra la base de datos de rpm"
 
-#: security/l10n.pm:60
+#: security/l10n.pm:61
 #, c-format
 msgid "Report check result to syslog"
 msgstr "Reportar resultado de verificación en syslog"
 
-#: security/l10n.pm:61
+#: security/l10n.pm:62
 #, c-format
 msgid "Reports check result to tty"
 msgstr "Reportar resultados de verificación en tty"
@@ -14687,7 +15104,8 @@ msgstr "Utilizar libsafe para los servidores"
 
 #: security/level.pm:63
 #, c-format
-msgid "A library which defends against buffer overflow and format string attacks."
+msgid ""
+"A library which defends against buffer overflow and format string attacks."
 msgstr ""
 "Una biblioteca que le defiende ante ataques de desbordamiento de búfer y "
 "ataques con cadenas de formato."
@@ -14700,7 +15118,8 @@ msgstr "Administrador de la seguridad (login o correo electrónico)"
 #: services.pm:19
 #, c-format
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
-msgstr "Lanzar el sistema de sonido ALSA (Arquitectura avanzada de sonido de Linux)"
+msgstr ""
+"Lanzar el sistema de sonido ALSA (Arquitectura avanzada de sonido de Linux)"
 
 #: services.pm:20
 #, c-format
@@ -14776,7 +15195,8 @@ msgstr ""
 
 #: services.pm:35
 #, c-format
-msgid "Apache is a World Wide Web server. It is used to serve HTML files and CGI."
+msgid ""
+"Apache is a World Wide Web server. It is used to serve HTML files and CGI."
 msgstr ""
 "Apache es un servidor de páginas web. Se usa para servir archivos HTML y "
 "programas CGI."
@@ -14914,10 +15334,10 @@ msgstr ""
 #, c-format
 msgid ""
 "Automatically switch on numlock key locker under console\n"
-"and XFree at boot."
+"and Xorg at boot."
 msgstr ""
 "Activar el bloqueo numérico automáticamente bajo la consola y\n"
-"XFree al arrancar."
+"Xorg al arrancar."
 
 #: services.pm:66
 #, c-format
@@ -15013,7 +15433,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 ""
 "El protocolo rwho permite que los usuarios remotos obtengan una lista\n"
 "de todos los usuarios conectados a una máquina que ejecuta el demonio rwho\n"
@@ -15041,8 +15461,8 @@ msgstr "Carga los controladores para sus dispositivos USB."
 
 #: services.pm:91
 #, c-format
-msgid "Starts the X Font Server (this is mandatory for XFree to run)."
-msgstr "Inicia el servidor de tipografías X11 (obligatorio para correr XFree)."
+msgid "Starts the X Font Server (this is mandatory for Xorg to run)."
+msgstr "Inicia el servidor de tipografías X11 (obligatorio para correr Xorg)."
 
 #: services.pm:117 services.pm:159
 #, c-format
@@ -15086,7 +15506,7 @@ msgstr "parado"
 
 #: services.pm:215
 #, c-format
-msgid "Services and deamons"
+msgid "Services and daemons"
 msgstr "Servicios y demonios"
 
 #: services.pm:221
@@ -15098,7 +15518,7 @@ msgstr ""
 "No hay información adicional para\n"
 "este servicio. Disculpe."
 
-#: services.pm:226 ugtk2.pm:1176
+#: services.pm:226 ugtk2.pm:1214
 #, c-format
 msgid "Info"
 msgstr "Info"
@@ -15113,840 +15533,1368 @@ msgstr "Comenzar cuando se pida"
 msgid "On boot"
 msgstr "Al iniciar"
 
-#: services.pm:244
+#: services.pm:246
 #, c-format
 msgid "Start"
 msgstr "Iniciar"
 
-#: services.pm:244
+#: services.pm:246
 #, c-format
 msgid "Stop"
 msgstr "Parar"
 
-#: 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>Congratulations for choosing Mandrakelinux!</b>"
-msgstr "<b>¡Felicitaciones por elegir Mandrakelinux!</b>"
+msgid "<b>What is Mandrakelinux?</b>"
+msgstr "<b>¿Qué es Mandrakelinux?</b>"
 
-#: 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/01.pl:15
 #, c-format
-msgid "Welcome to the Open Source world!"
-msgstr "¡Bienvenido al mundo del Código Abierto!"
+msgid "Welcome to <b>Mandrakelinux</b>!"
+msgstr "¡Bienvenido a <b>Mandrakelinux</b>!"
 
-#: share/advertising/dis-01.pl:17
+#: share/advertising/01.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 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 ""
-"Su sistema operativo Mandrakelinux nuevo y las muchas aplicaciones del mismo "
-"son el resultado de efuerzos conjuntos de los desarrolladores de "
-"MandrakeSoft y los contribuyentes de Mandrakelinux del mundo entero."
+"Mandrakelinux is una <b>distribución Linux</b> que incluye la base del "
+"sistema, llamado el <b>sistema operativo</b> (basado en el núcleo Linux) así "
+"como <b>una gran cantidad de programas</b> que cubren todas las cosas que le "
+"gustaría hacer."
 
-#: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19
-#: share/advertising/ppp-01.pl:19
+#: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of this "
-"latest release."
+"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 ""
-"Desearíamos agradecer a todos los que participaron en el desarrollo de esta "
-"última versión."
+"Mandrakelinux es la distribución más <b>amigable</b> hoy en día. "
+"¡Mandrakelinux es también una de las distribuciones Linux <b>más usadas</b> "
+"en todo el mundo!"
 
-#: share/advertising/dis-02.pl:13
+#: share/advertising/02.pl:13
 #, c-format
-msgid "<b>Discovery</b>"
-msgstr "<b>Discovery</b>"
+msgid "<b>Open Source</b>"
+msgstr "<b>Código Abierto</b>"
 
-#: share/advertising/dis-02.pl:15
+#: share/advertising/02.pl:15
+#, c-format
+msgid "Welcome to the <b>world of open source</b>!"
+msgstr "¡Bienvenido al <b>mundo del Código Abierto</b>!"
+
+#: share/advertising/02.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."
+"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 ""
-"Discovery es la distribución Linux más fácil y amigable con el usuario. "
-"Inlcuye una selección de software excelente para la oficina, los multimedios "
-"y las actividades de la Internet."
+"MandrakeLinux está comprometido con el modelo Open Source. Ello significa "
+"que esta nueva versión es el resultado de la <b>colaboración</b> entre el "
+"<b>equipo de desarrolladores de Mandrakesoft</b> y la <b>comunidad mundial</"
+"b> de contribuyentes de Mandrakelinux."
 
-#: share/advertising/dis-02.pl:17
+#: share/advertising/02.pl:19
 #, c-format
-msgid "The menu is task-oriented, with a single selected application per task."
+msgid ""
+"We would like to <b>thank</b> everyone who participated in the development "
+"of this latest release."
 msgstr ""
-"El menú es orientado a tareas, con una única aplicación seleccionada por "
-"tarea."
+"Desearíamos <b>agradecer</b> a todos los que participaron en el desarrollo "
+"de esta última versión."
 
-#: share/advertising/dis-03.pl:13
+#: share/advertising/03.pl:13
 #, c-format
-msgid "<b>The KDE Choice</b>"
-msgstr "<b>La elección KDE</b>"
+msgid "<b>The GPL</b>"
+msgstr "<b>La GPL</b>"
 
-#: share/advertising/dis-03.pl:15
+#: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"The powerful Open Source graphical desktop environment KDE is the desktop of "
-"choice for the Discovery Pack."
+"Most of the software included in the distribution and all of the "
+"Mandrakelinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
-"El escritorio gráfico KDE, Open Source, potente, es el escritorio elegido "
-"para el Discovery Pack."
+"La mayoría de los programas incluidos en esta distribucion, así como todas "
+"las herramientas de Mandrakelinux estan bajo la <b>Licencia Pública General "
+"(GPL)</b>."
 
-#: share/advertising/dis-04.pl:13
+#: share/advertising/03.pl:17
 #, c-format
-msgid "<b>OpenOffice.org</b>: The complete Linux office suite."
+msgid ""
+"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 ""
-"<b>OpenOffice.org<b>: El conjunto completo de programas para la oficina "
-"Linux."
+"La GPL es el alma del modelo de código abierto; ella garantiza a todos la "
+"<b>libertad</b> de usar, estudiar, distribuir y mejorar los programas  de "
+"cualquier modo que uno quiera, siempre y cuando el resultado sea disponible "
+"bajo las mismas condiciones."
 
-#: share/advertising/dis-04.pl:15
+#: share/advertising/03.pl:19
 #, 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."
+"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 ""
-"<b>WRITER</b> es un procesador de palabras potente para crear todo tipo de "
-"documentos de texto. Los documentos pueden incluir imágenes, diagramas y "
-"tablas."
+"La principal ventaja de ello es que el número de desarolladores es "
+"virtualmente <b>ilimitado</b>, lo que resulta en programas de <b>muy alta "
+"calidad</b>."
 
-#: share/advertising/dis-04.pl:16
+#: share/advertising/04.pl:13
+#, c-format
+msgid "<b>Join the Community</b>"
+msgstr "<b>¡Únase a la comunidad!</b>"
+
+#: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"<b>CALC</b> is a feature-packed spreadsheet which enables you to compute, "
-"analyze and manage all of your data."
+"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 ""
-"<b>CALC</b> es una planilla de cálculos completa que le permite computar, "
-"analizar y administrar todos sus datos."
+"Mandrakelinux posee una de las <b>mayores comunidades</b> de usuarios y "
+"desarrolladores. El rol de dicha comunidad es muy amplio, llendo de las "
+"notificaciones de errores al desarrollo de nuevos programas. La comunidad "
+"juega un <b>papel clave</b> en el mundo de Mandrakelinux."
 
-#: share/advertising/dis-04.pl:17
+#: share/advertising/04.pl:17
 #, c-format
 msgid ""
-"<b>IMPRESS</b> is the fastest, most powerful way to create effective "
-"multimedia presentations."
+"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 ""
-"<b>IMPRESS</b> es la manera más rápida y potente para crear presentaciones "
-"multimedios efectivas."
+"Para <b>saber más</b> acerca de nuestra dinámica comunidad, por favor, "
+"visite <b>www.mandrakelinux.com</b> or directamente <b>www.mandrakelinux.com/"
+"en/cookerdevel.php3</b> si desea <b>involucrarse</b> en el desarrollo."
+
+#: share/advertising/05.pl:13
+#, c-format
+msgid "<b>Download Version</b>"
+msgstr "<b>Versión de descarga</b>"
 
-#: share/advertising/dis-04.pl:18
+#: share/advertising/05.pl:15
 #, c-format
 msgid ""
-"<b>DRAW</b> will produce everything from simple diagrams to dynamic 3D "
-"illustrations."
+"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>DRAW</b> producirá desde diagramas simples hasta ilustraciones 3D "
-"dinámicas."
+"Instalando <b>Mandrakelinux \"Download\"</b>. Esta es la versión gratuíta "
+"que Mandrakesoft desea mantener <b>disponible a todo el mundo</b>."
 
-#: share/advertising/dis-05.pl:13 share/advertising/dis-06.pl:13
+#: share/advertising/05.pl:17
 #, c-format
-msgid "<b>Surf The Internet</b>"
-msgstr "<b>Navegar por la Internet</b>"
+msgid ""
+"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 ""
+"La \"Download version\" <b>no puede incluír</b> todo el software que no es "
+"codigo abierto.  Por lo tanto, en la \"Download version\" no encontrará:"
 
-#: share/advertising/dis-05.pl:15
+#: share/advertising/05.pl:18
 #, c-format
-msgid "Discover the new integrated personal information suite KDE Kontact."
+msgid ""
+"\t* <b>Proprietary drivers</b> (such as drivers for NVIDIA®, ATI™, etc.)."
 msgstr ""
-"Descubra KDE Kontact, el nuevo conjunto de programas de información personal "
-"integrado."
+"\t* <b>Drivers propietarios</b> (tales como drivers para NVIDIA®, ATI™, "
+"etc.)."
 
-#: share/advertising/dis-05.pl:17
+#: share/advertising/05.pl:19
 #, 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!"
+"\t* <b>Proprietary software</b> (such as Acrobat® Reader®, RealPlayer®, "
+"Flash™, etc.)."
 msgstr ""
-"Más que un cliente de correos completo, <b>Kontact</b> también incluye una "
-"libreta de direcciones, un calendario y un programa de agenda, ¡más una "
-"herramienta para tomar notas!"
+"\t* <b>Software propietario</b> (como Acrobat® Reader®, RealPlayer®, Flash™, "
+"etc.)."
 
-#: share/advertising/dis-06.pl:15
+#: share/advertising/05.pl:21
 #, c-format
-msgid "You can also:"
-msgstr "También puede:"
+msgid ""
+"You won't have access to the <b>services included</b> in the other "
+"Mandrakesoft products either."
+msgstr ""
+"Tampoco tendrá acceso a los <b>servicios incluidos</b> en los otros "
+"productos deMandrakesoft."
 
-#: share/advertising/dis-06.pl:16
+#: share/advertising/06.pl:13
 #, c-format
-msgid "\t- browse the Web"
-msgstr "\t- navegar por la web"
+msgid "<b>Discovery, Your First Linux Desktop</b>"
+msgstr "<b>Discovery, Su primer escitorio Linux</b>"
 
-#: share/advertising/dis-06.pl:17
+#: share/advertising/06.pl:15
 #, c-format
-msgid "\t- chat"
-msgstr "\t- charlar"
+msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgstr "Instalando <b>Mandrakelinux Discovery</b>."
 
-#: share/advertising/dis-06.pl:18
+#: share/advertising/06.pl:17
 #, c-format
-msgid "\t- organize a video-conference"
-msgstr "\t- organizar una vídeo-conferencia"
+msgid ""
+"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 ""
+"Discovery es la distribución Linux <b>más fácil</b> y <b>amigable con el "
+"usuario</b>. Incluye una selección de <b>software excelente</b> para la "
+"oficina, los multimedios y las actividades de la Internet. Su menú está "
+"orientado a tareas, con un simple programa por tarea."
 
-#: share/advertising/dis-06.pl:19
+#: share/advertising/07.pl:13
 #, c-format
-msgid "\t- create your own Web site"
-msgstr "\t- crear su sitio web propio"
+msgid "<b>PowerPack, The Ultimate Linux Desktop</b>"
+msgstr "<b>PowerPack, lo último en el escritorio Linux</b>"
 
-#: share/advertising/dis-06.pl:20
+#: share/advertising/07.pl:15
 #, c-format
-msgid "\t- ..."
-msgstr "\t- ..."
+msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgstr "Instalando <b>Mandrakelinux PowerPack</b>."
 
-#: share/advertising/dis-07.pl:13
+#: share/advertising/07.pl:17
 #, c-format
-msgid "<b>Multimedia</b>: Software for every need!"
-msgstr "<b>Multimedios</b>: ¡Software para cada necesidad!"
+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 ""
+"PowerPack es el producto de <b>escritorio Linux de primer clase</b>. El "
+"PowerPack incluye <b>miles de aplicaciones</b> - todas, desde la más popular "
+"hasta la más técnica."
 
-#: share/advertising/dis-07.pl:15
+#: share/advertising/08.pl:13
 #, c-format
-msgid "Listen to audio CDs with <b>KsCD</b>."
-msgstr "Escuchar CDs de audio con <b>ksCD</b>"
+msgid "<b>PowerPack+, The Linux Solution for Desktops and Servers</b>"
+msgstr "<b>PowerPack+, La solución Linux para escritorios y servidores</b>"
 
-#: share/advertising/dis-07.pl:17
+#: share/advertising/08.pl:15
 #, c-format
-msgid "Listen to music files and watch videos with <b>Totem</b>."
-msgstr "Escuchar archivos musicales y mirar vídeos con <b>Totem</b>."
+msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgstr "Ya está instalando <b>Mandrakelinux PowerPack+</b>."
 
-#: share/advertising/dis-07.pl:19
+#: share/advertising/08.pl:17
 #, c-format
-msgid "View and edit images and photos with <b>GQview</b> and <b>The Gimp!</b>"
-msgstr "¡Ver y editar imágenes y fotos con <b>GQview</b> y el <b>GIMP</b>!"
+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 ""
+"PowerPack+ es una <b>solución Linux completa</b> para <b>redes</b> pequeñas "
+"a medianas. El PowerPack+ incluye miles de <b>programas de escritorio</b> y "
+"una selección completa de <b>aplicaciones de servidor</b> de primer nivel."
 
-#: share/advertising/dis-08.pl:13 share/advertising/ppp-08.pl:13
-#: share/advertising/pwp-07.pl:13
+#: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrake Control Center</b>"
-msgstr "<b>Centro de control de Mandrake</b>"
+msgid "<b>Mandrakesoft Products</b>"
+msgstr "<b>Productos Mandrakesoft</b>"
 
-#: share/advertising/dis-08.pl:15 share/advertising/ppp-08.pl:15
-#: share/advertising/pwp-07.pl:15
+#: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"The Mandrake Control Center is an essential collection of Mandrake-specific "
-"utilities for simplifying the configuration of your computer."
+"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"products."
 msgstr ""
-"El Centro de Control de Mandrake es una colección esencial de utilitarios "
-"específicos de Mandrake para simplificar la configuración de su computadora."
+"<b>Mandrakesoft</b> ha desarollado una amplia gama de productos "
+"<b>Mandrakelinux</b>."
+
+#: share/advertising/09.pl:17
+#, c-format
+msgid "The Mandrakelinux 10.1 products are:"
+msgstr "Los productos Mandrakelinux 10.1 son:"
+
+#: share/advertising/09.pl:18
+#, c-format
+msgid "\t* <b>Discovery</b>, Your First Linux Desktop."
+msgstr "\t* <b>Discovery</b>, Su primer escitorio Linux."
 
-#: share/advertising/dis-08.pl:17 share/advertising/ppp-08.pl:17
-#: share/advertising/pwp-07.pl:17
+#: share/advertising/09.pl:19
+#, c-format
+msgid "\t* <b>PowerPack</b>, The Ultimate Linux Desktop."
+msgstr "\t* <b>PowerPack</b>, El escritorio Linux definitivo."
+
+#: share/advertising/09.pl:20
+#, c-format
+msgid "\t* <b>PowerPack+</b>, The Linux Solution for Desktops and Servers."
+msgstr "\t* <b>PowerPack+</b>, La solución Linux para escritorio y servidor."
+
+#: share/advertising/09.pl:21
 #, 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."
+"\t* <b>Mandrakelinux 10.1 for x86-64</b>, The Mandrakelinux solution for "
+"making the most of your 64-bit processor."
 msgstr ""
-"Apreciará de inmediato esta colección de utilitarios para configurar con "
-"facilidad los dispositivos de hardware, definir puntos de montaje, "
-"configurar la red y la Internet, ajustar el nivel de seguridad de su "
-"computadora, y casi cualquier cosa relacionada con el sistema."
+"\t* <b>Mandrakelinux 10.1 para x86-64</b>, La solución de Mandrakelinux para "
+"dar lo mejor de su procesador de 64 bits."
 
-#: 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:13
 #, c-format
-msgid "<b>MandrakeStore</b>"
-msgstr "<b>MandrakeStore</b>"
+msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgstr "<b>Productos Mandrakesoft (Productos Nómada)</b>"
 
-#: share/advertising/dis-09.pl:15 share/advertising/ppp-09.pl:15
-#: share/advertising/pwp-08.pl:15
+#: share/advertising/10.pl:15
 #, c-format
 msgid ""
-"Find all MandrakeSoft products and services at <b>MandrakeStore</b> -- our "
-"full service e-commerce platform."
+"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 ""
-"Encuentre todos los productos y servicios MandrakeSoft en <b>MandrakeStore</"
-"b> -- nuestra plataforma completa de servicios e-commerce."
+"Mandrakesoft ha desarrollado dos productos que le permiten usar "
+"Mandrakelinux <b>en cualquier ordenador</b> sin necesidad de instalalación."
 
-#: 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:16
 #, c-format
-msgid "Stop by today at <b>www.mandrakestore.com</b>"
-msgstr "Visítela hoy mismo en <b>www.mandrakestore.com</b>"
+msgid ""
+"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"bootable CD-Rom."
+msgstr ""
+"\t* <b>Move</b>, una distribucion de Mandrakelinux que se ejecuta de forma "
+"completa desde una CD-ROM autoarrancable."
 
-#: share/advertising/dis-10.pl:13 share/advertising/ppp-10.pl:13
-#: share/advertising/pwp-09.pl:13
+#: share/advertising/10.pl:17
 #, c-format
-msgid "Become a <b>MandrakeClub</b> member!"
-msgstr "¡Conviértase en miembro de <b>MandrakeClub</b>!"
+msgid ""
+"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"ultra-compact “LaCie Mobile Hard Drive”."
+msgstr ""
+"\t* <b>Trotamundo («GlobeTrotter»)</b>, es una distribución Mandrakelinux "
+"preinstalada en el disco duro ultra-compacto  “LaCie Mobile Hard Drive”."
+
+#: share/advertising/11.pl:13
+#, c-format
+msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgstr "<b>Productos Mandrakesoft (Soluciones Profesionales)</b>"
 
-#: 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 ""
-"Aproveche beneficios, productos y servicios valiosos uniéndose a "
-"MandrakeClub, tales como:"
+"Abajo están los productos de Mandrakesoft diseñados para cubrir las "
+"<b>necesidades profesionales</b>:"
 
-#: 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"
-msgstr "\t- Acceso completo a aplicaciones comerciales"
+msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgstr ""
+"\t* <b>Corporate Desktop</b>, El escritorio empresarial de Mandrakelinux."
 
-#: 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"
-msgstr "\t- Lista de sitios de réplica de descarga especial, exclusiva para miembros"
+msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgstr ""
+"\t* <b>Corporate Server</b>, La solución para servidor de Mandrakelinux."
 
-#: 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"
-msgstr "\t- Votar por software a incluir en Mandrakelinux"
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgstr ""
+"\t* <b>Multi-Network Firewall</b>, La solución para la seguridad de "
+"Mandrakelinux."
 
-#: 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"
-msgstr "\t- Descuentos especiales sobre productos y servicios en MandrakeStore"
+msgid "<b>The KDE Choice</b>"
+msgstr "<b>La elección KDE</b>"
 
-#: 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:15
 #, c-format
-msgid "\t- Plus much more"
-msgstr "\t- Y mucho más"
+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 ""
+"Con su Discovery, se le presentará <b>KDE</b>, el <b>entorno de escritorio "
+"gráfico</b> disponible más avanzado y fácil de usar."
 
-#: 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:17
 #, c-format
-msgid "For more information, please visit <b>www.mandrakeclub.com</b>"
-msgstr "Para más información, por favor visite <b>www.mandrakeclub.com</b>"
+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 ""
+"¡KDE hará de sus <b>primeros pasos</b> con Linux algo tan <b>fácil</b> que "
+"ni siquiera podrá pensar en arrancar otro sistema operativo!"
 
-#: share/advertising/dis-11.pl:13
+#: share/advertising/12.pl:19
 #, c-format
-msgid "Do you require assistance?"
-msgstr "¿Necesita asistencia?"
+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 ""
+"KDE también incluye un montón de <b>aplicaciones bien integradas</b> tales "
+"como Konqueror, el navegador web, y Kontact, el gestor de información "
+"personal."
 
-#: 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:13 share/advertising/13-b.pl:13
 #, c-format
-msgid "<b>MandrakeExpert</b> is the primary source for technical support."
-msgstr "<b>MandrakeExpert</b> es la fuente primaria para soporte técnico."
+msgid "<b>Choose your Favorite Desktop Environment</b>"
+msgstr "<b>¡Elija su entorno gráfico de escritorio favorito!</b>"
 
-#: 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:15
 #, c-format
 msgid ""
-"If you have Linux questions, subscribe to MandrakeExpert at <b>www."
-"mandrakeexpert.com</b>"
+"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 ""
-"Si tiene preguntas acerca de Linux, suscríbase a MandrakeExpert en <b>www."
-"mandrakeexpert.com</b>"
+"Con PowerPack+, tendrá la oportunidad de un <b>entorno gráfico de "
+"escritorio</b>. Mandrakesoft ha elegido <b>KDE</b> como predeterminado."
 
-#: share/advertising/dwd-01.pl:17
+#: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, 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."
+"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 ""
-"MandrakeLinux está comprometido con el modelo Open Source y respeta por "
-"completo la Licencia Pública General. Esta nueva versión es el resultado de "
-"la colaboración entre el equipo de desarrolladores de MandrakeSoft y la "
-"comunidad mundial de contribuyentes de Mandrakelinux."
+"KDE es uno de los entornos gráficos de escritorio disponibles <b>más "
+"avanzados</b> y <b>fáciles de usar</b>. Incluye un montón de aplicaciones "
+"integradas."
 
-#: share/advertising/dwd-02.pl:13
+#: share/advertising/13-a.pl:19 share/advertising/13-b.pl:19
 #, c-format
-msgid "<b>Join the Mandrakelinux community!</b>"
-msgstr "<b>¡Únase a la comunidad Mandrakelinux!</b>"
+msgid ""
+"But we advise you to try all available ones (including <b>GNOME</b>, "
+"<b>IceWM</b>, etc.) and pick your favorite."
+msgstr ""
+"Pero le aconsejamos que pruebe todos los disponibles (incluyendo <b>GNOME</"
+"b>, <b>IceWM</b>, etc.) y elija su favorito."
 
-#: share/advertising/dwd-02.pl:15
+#: share/advertising/13-b.pl:15
 #, 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>"
+"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 ""
-"Si desearía participar, por favor suscríbase a la lista de correos \"Cooker"
-"\"  visitando <b>mandrake-linux.com/cooker</b>"
+"Con PowerPack+, tendrá la oportunidad de un <b>entorno gráfico de escrtorio</"
+"b>. Mandrakesoft ha elegido <b>KDE</b> como predeterminado."
+
+#: 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 "With Discovery, you will discover <b>OpenOffice.org</b>."
+msgstr "Con Discovery, descubrirás <b>OpenOffice.org</b>."
 
-#: share/advertising/dwd-02.pl:17
+#: share/advertising/14.pl:17
 #, c-format
 msgid ""
-"To learn more about our dynamic community, please visit <b>www.mandrake-"
-"linux.com</b>!"
+"It is a <b>full-featured office suite</b> that includes word processor, "
+"spreadsheet, presentation and drawing applications."
 msgstr ""
-"¡Para aprender más acerca de nuestra comunidad dinámica, por favor visite "
-"<b>www.mandrake-linux.com</b>!"
+"Es una <b>suite ofimática llena de características</b>, que incluye un "
+"procesador de textos, una hoja de cálculo y aplicaciones para presentaciones "
+"y dibujo."
 
-#: share/advertising/dwd-03.pl:13
+#: share/advertising/14.pl:19
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>¿Qué es Mandrakelinux?</b>"
+msgid ""
+"OpenOffice.org can read and write most types of <b>Microsoft® Office</b> "
+"documents such as Word, Excel and PowerPoint® files."
+msgstr ""
+"Openoffice.org puede leer y editar la mayoría de los tipos de documentos de "
+"<b>Microsoft® Office</b> tales como ficheros de Word, Excel y PowerPoint®."
+
+#: share/advertising/15.pl:13
+#, c-format
+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 ""
-"Mandrakelinux es una distribución Open Source creada con miles de las "
-"mejores aplicaciones del mundo del Software Libre ¡Mandrakelinux es una de "
-"las distribuciones Linux más usadas en todo el mundo!"
+"Discovery incluye <b>Kontact</b>, la nueva <b>solución de grupos</b> de KDE."
 
-#: 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 ""
-"Mandrakelinux incluye los famosos escritorios gráficos KDE y GNOME, más las "
-"últimas versiones de las aplicaciones Open Source más populares."
+"Más que un <b>cliente de correos</b> completo, Kontact también incluye una "
+"<b>libreta de direcciones</b>, un <b>calendario</b> y un programa de agenda, "
+"¡más una herramienta para tomar <b>notas</b>!"
 
-#: 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 ""
-"Mandrakelinux es ampliamente conocida como la distribución Linux más "
-"amigable con el usuario y más fácil de instalar."
+"Es la manera más sencilla de comunicar con sus contactos y organizar su "
+"tiempo."
+
+#: share/advertising/16.pl:13
+#, c-format
+msgid "<b>Surf the Internet</b>"
+msgstr "<b>Navegar por internet</b>"
+
+#: share/advertising/16.pl:15
+#, c-format
+msgid "Discovery will give you access to <b>every Internet resource</b>:"
+msgstr "Discovery le proporcionará <b>todos los recursos de Internet</b>:"
+
+#: share/advertising/16.pl:16
+#, c-format
+msgid "\t* Browse the <b>Web</b> with Konqueror."
+msgstr "\t* Navegar por la <b>web</b> con Konqueror."
 
-#: share/advertising/dwd-04.pl:15
+#: share/advertising/16.pl:17
 #, c-format
-msgid "Find out about our <b>Personal Solutions</b>:"
-msgstr "Conozca nuestras <b>Soluciones Personales</b>:"
+msgid "\t* <b>Chat</b> online with your friends using Kopete."
+msgstr "\t* <b>Chatee</b> \"online\" con sus amistades usando Kopete."
 
-#: share/advertising/dwd-04.pl:16
+#: share/advertising/16.pl:18
 #, c-format
-msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
-msgstr "\t- Conozca Mandrakelinux en un CD que arranca con <b>MandrakeMove</b>"
+msgid "\t* <b>Transfer</b> files with KBear."
+msgstr "\t* <b>Transferir</b> archivos con KBear."
 
-#: share/advertising/dwd-04.pl:17
+#: share/advertising/16.pl:19 share/advertising/17.pl:19
+#: share/advertising/18.pl:22
+#, c-format
+msgid "\t* ..."
+msgstr "\t* ..."
+
+#: share/advertising/17.pl:13
+#, c-format
+msgid "<b>Enjoy our Multimedia Features</b>"
+msgstr "<b>Disfrute de nuestras funcionalidades multimedios</b>"
+
+#: share/advertising/17.pl:15
+#, c-format
+msgid "Discovery will also make <b>multimedia</b> very easy for you:"
+msgstr ""
+"Discovery hará también del <b>multimedia</b> algo muy fácil para usted."
+
+#: share/advertising/17.pl:16
+#, c-format
+msgid "\t* Watch your favorite <b>videos</b> with Kaffeine."
+msgstr "\t* Vea sus <b>videos</b> favoritos con Kaffeine."
+
+#: share/advertising/17.pl:17
+#, c-format
+msgid "\t* Listen to your <b>music files</b> with amaroK."
+msgstr "\t* Escuche sus <b>archivos de música</b> con amaroK."
+
+#: share/advertising/17.pl:18
+#, c-format
+msgid "\t* Edit and create <b>images</b> with the GIMP."
+msgstr "\t* Crear y modificar <b>imágenes</b> el GIMP."
+
+#: share/advertising/18.pl:13
+#, c-format
+msgid "<b>Enjoy the Wide Range of Applications</b>"
+msgstr "<b>Aprecie la amplia gama de programas</b>"
+
+#: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"\t- If you use Linux mostly for Office, Internet and Multimedia tasks, "
-"<b>Discovery</b> perfectly meets your needs"
+"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"<b>all of your tasks</b>:"
 msgstr ""
-"\t- Si usa Linux mayormente para tareas de oficina, Internet y multimedios, "
-"<b>Discovery</b> satisface sus necesidades a la perfección"
+"En el menú Mandrakelinux encontrará aplicaciones <b>fáciles de usar</b> para "
+"<b>todas sus tareas</b>:"
 
-#: share/advertising/dwd-04.pl:18
+#: share/advertising/18.pl:16
+#, c-format
+msgid "\t* Create, edit and share office documents with <b>OpenOffice.org</b>."
+msgstr ""
+"\t* Crear, editar y compartir documentos de oficina con <b>OpenOffice.org</b>"
+
+#: share/advertising/18.pl:17
 #, c-format
 msgid ""
-"\t- If you appreciate the largest selection of software including powerful "
-"development tools, <b>PowerPack</b> is for you"
+"\t* Manage your personal data with the integrated personal information "
+"suites <b>Kontact</b> and <b>Evolution</b>."
 msgstr ""
-"\t- Si aprecia la selección de software más amplia incluyendo herramientas "
-"de desarrollo potentes, <b>PowerPack</b> es para Usted"
+"\t* Administrar sus datos personales con programas integrados de información "
+"personal: <b>Kontact</b> y <b>Evolution</b>."
+
+#: share/advertising/18.pl:18
+#, c-format
+msgid "\t* Browse the web with <b>Mozilla</b> and <b>Konqueror</b>."
+msgstr "\t* Navegar por la web con <b>Mozilla</b> y <b>Konqueror</b>."
+
+#: share/advertising/18.pl:19
+#, c-format
+msgid "\t* Participate in online chat with <b>Kopete</b>."
+msgstr "\t* Participar en charlas en línea con <b>Kopete</b>."
 
-#: share/advertising/dwd-04.pl:19
+#: share/advertising/18.pl:20
 #, c-format
 msgid ""
-"\t- If you require a full-featured Linux solution customized for small to "
-"medium-sized networks, choose <b>PowerPack+</b>"
+"\t* Listen to your <b>audio CDs</b> and <b>music files</b>, watch your "
+"<b>videos</b>."
 msgstr ""
-"\t- Si necesita una solución Linux completa personalizada para redes "
-"pequeñas a medianas, elija <b>PowerPack+</b>"
+"\t* Escuchar <b>CDs de audio</b> y <b>archivos musicales</b>, ver sus "
+"<b>videos</b>."
+
+#: share/advertising/18.pl:21
+#, c-format
+msgid "\t* Edit and create images with the <b>GIMP</b>."
+msgstr "\t* Editar imágenes y fotos con el <b>GIMP</b>"
 
-#: share/advertising/dwd-05.pl:13
+#: share/advertising/19.pl:13
 #, c-format
-msgid "Find out also our <b>Business Solutions</b>!"
-msgstr "¡Conozca también nuestras <b>Soluciones para las Empresas</b>!"
+msgid "<b>Development Environments</b>"
+msgstr "<b>Entornos de desarrollo</b>"
+
+#: share/advertising/19.pl:15 share/advertising/22.pl:15
+#, c-format
+msgid ""
+"PowerPack gives you the best tools to <b>develop</b> your own applications."
+msgstr ""
+"PowerPack le proporciona las mejores herramientas para <b>desarrollar</b> "
+"sus propias aplicaciones."
 
-#: share/advertising/dwd-05.pl:15
+#: share/advertising/19.pl:17
 #, 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."
+"You will enjoy the powerful, integrated development environment from KDE, "
+"<b>KDevelop</b>, which will let you program in a lot of languages."
 msgstr ""
-"<b>Corporate Server</b>: la solución ideal para las empresas. Es una "
-"solución \"todo en uno\" completa que incluye todo lo necesario para "
-"desplegar con rapidez aplicaciones de servidor Linux de primera línea."
+"Disfrutará del potente entorno de desarrollo integrado de KDE, <b>KDevelop</"
+"b>, que le permitirá programar en un gran número de lenguajes."
 
-#: share/advertising/dwd-05.pl:17
+#: share/advertising/19.pl:19
 #, 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."
+"PowerPack also ships with <b>GCC</b>, the leading Linux compiler and <b>GDB</"
+"b>, the associated debugger."
 msgstr ""
-"<b>Multi Network Firewall</b>: basado en Linux 2.4 \"kernel secure\" para "
-"brindar multi-VPN así como también funcionalidad de DMZ múltiple. Es la "
-"solución de seguridad de alto rendimiento perfecta."
+"PowerPack también incluye <b>GCC</b>, el compilador líder en Linux, y "
+"<b>GDB</b>, el depurador asociado."
+
+#: share/advertising/20.pl:13
+#, c-format
+msgid "<b>Development Editors</b>"
+msgstr "<b>Editores para desarrolladores</b>"
+
+#: share/advertising/20.pl:15
+#, c-format
+msgid "PowerPack will let you choose between those <b>popular editors</b>:"
+msgstr "PowerPack le permite elegir entre estos <b>populares editores</b>:"
+
+#: share/advertising/20.pl:16
+#, c-format
+msgid "\t* <b>Emacs</b>: a customizable and real time display editor."
+msgstr "\t* <b>Emacs</b>: un editor personalizable"
 
-#: share/advertising/dwd-05.pl:19
+#: share/advertising/20.pl:17
 #, 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* <b>XEmacs</b>: another open source text editor and application "
+"development system."
 msgstr ""
-"<b>MandrakeClustering</b>: la potencia y velocidad de un cluster Linux "
-"combinada con la estabilidad y facilidad de uso de la distribución Mandrake "
-"Linux mundialmente famosa. Una mezcla única para un rendimiento HPC "
-"incomparable."
+"\t* <b>XEmacs</b>: otro editor de texto y sistema de desarrollo de "
+"aplicaciones de código abierto"
 
-#: share/advertising/dwd-06.pl:15
+#: share/advertising/20.pl:18
 #, c-format
 msgid ""
-"Find all MandrakeSoft products at <b>MandrakeStore</b> -- our full service e-"
-"commerce platform."
+"\t* <b>Vim</b>: an advanced text editor with more features than standard Vi."
 msgstr ""
-"Encuentre todos los productos MandrakeSoft en <b>MandrakeStore</b> - nuestra "
-"plataforma de servicios e-commerce completa."
+"\t* <b>Vim</b>: un editor de texto avanzado con más características que el "
+"Vi estándar"
 
-#: share/advertising/dwd-06.pl:17
+#: share/advertising/21.pl:13
+#, c-format
+msgid "<b>Development Languages</b>"
+msgstr "<b>Lenguajes de programación</b>"
+
+#: share/advertising/21.pl:15
 #, 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!"
+"With all these <b>powerful tools</b>, you will be able to write applications "
+"in <b>dozens of programming languages</b>:"
 msgstr ""
-"Conozca también el soporte de incidentes, si tiene cualquier problema, desde "
-"soporte estándar a profesional, desde 1 a 50 incidentes, ¡tome el que mejor "
-"satisface sus necesidades!"
+"Con todas estas <b>potentes herramientas</b>, usted será capaz de escribir "
+"programas en <b>docenas de lenguajes de programación</b>:"
+
+#: share/advertising/21.pl:16
+#, c-format
+msgid "\t* The famous <b>C language</b>."
+msgstr "\t* El famoso <b>lenguaje C</b>."
+
+#: share/advertising/21.pl:17
+#, c-format
+msgid "\t* Object oriented languages:"
+msgstr "\t* Lenguajes orientados objeto:"
+
+#: 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>"
+
+# TODO: no habrá algo mejor en castellano que "scripting"?
+#: share/advertising/21.pl:20
+#, c-format
+msgid "\t* Scripting languages:"
+msgstr "\t* Lenguajes de scripting:"
 
-#: share/advertising/dwd-07.pl:13
+#: share/advertising/21.pl:21
 #, c-format
-msgid "<b>Become a MandrakeClub member!</b>"
-msgstr "<b>¡Conviértase en miembro de MandrakeClub!</b>"
+msgid "\t\t* <b>Perl</b>"
+msgstr "\t\t* <b>Perl</b>"
 
-#: share/advertising/dwd-08.pl:14 share/advertising/ppp-11.pl:13
-#: share/advertising/pwp-10.pl:13
+#: share/advertising/21.pl:22
 #, c-format
-msgid "<b>Do you require assistance?</b>"
-msgstr "<b>¿Necesita asistencia?</b>"
+msgid "\t\t* <b>Python</b>"
+msgstr "\t\t* <b>Python</b>"
 
-#: share/advertising/dwd-09.pl:16
+#: share/advertising/21.pl:23 share/advertising/28.pl:22
 #, c-format
-msgid "<b>Note</b>"
-msgstr "<b>Nota</b>"
+msgid "\t* And many more."
+msgstr "\t* Y mucho más."
 
-#: share/advertising/dwd-09.pl:18
+#: share/advertising/22.pl:13
 #, c-format
-msgid "This is the Mandrakelinux <b>Download version</b>."
-msgstr "Esta es Mandrakelinux <b>Download Edition</b>."
+msgid "<b>Development Tools</b>"
+msgstr "<b>Herramientas de desarrollo</b>"
 
-#: share/advertising/dwd-09.pl:20
+#: share/advertising/22.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®)."
+"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 ""
-"La versión libre para descargar no incluye software comercial, y por lo "
-"tanto puede no funcionar con ciertos módems (tales como algunos ADSL y RTC) "
-"y tarjetas de vídeo (tales como las ATI® y las NVIDIA®)."
+"Con el potente entorno de desarrollo integrado <b>KDevelop</b> y el "
+"compilador lider de Linux, <b>GCC</b>, será capaz de crear aplicaciones en "
+"<b>muchos lenguajes diferentes</b> (C, C++, Java™, Perl, Python, etc.)."
+
+#: share/advertising/23.pl:13
+#, c-format
+msgid "<b>Groupware Server</b>"
+msgstr "<b>Servidor de grupos</b>"
 
-#: share/advertising/ppp-01.pl:17
+#: share/advertising/23.pl:15
 #, 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."
+"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 ""
-"Su distribución Mandrakelinux nueva y las muchas aplicaciones son el "
-"resultado de efuerzos colaborativos entre los desarrolladores de "
-"MandrakeSoft y los contribuyentes de Mandrakelinux en todo el mundo."
+"PowerPack+ le proporcionará acceso a <b>Kolab</b>,un <b>servidor de grupos</"
+"b> lleno de características que, gracias al cliente <b>Kontact</b>, le "
+"permitirá:"
 
-#: share/advertising/ppp-02.pl:13
+#: share/advertising/23.pl:16
 #, c-format
-msgid "<b>PowerPack+</b>"
-msgstr "<b>PowerPack+</b>"
+msgid "\t* Send and receive your <b>e-mails</b>."
+msgstr "\t* Enviar y recibir <b>correo electrónico</b>."
 
-#: share/advertising/ppp-02.pl:15
+#: share/advertising/23.pl:17
+#, c-format
+msgid "\t* Share your <b>agendas</b> and your <b>address books</b>."
+msgstr "\t* Compartir sus <b>agendas</b> y sus <b>libretas de direcciones</b>."
+
+#: share/advertising/23.pl:18
+#, c-format
+msgid "\t* Manage your <b>memos</b> and <b>task lists</b>."
+msgstr "\t* Gestionar sus <b>notas</b> y <b>listas de tareas</b>."
+
+#: share/advertising/24.pl:13
+#, c-format
+msgid "<b>Servers</b>"
+msgstr "<b>Servidores</b>"
+
+#: share/advertising/24.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."
+"Empower your business network with <b>premier server solutions</b> including:"
 msgstr ""
-"PowerPack+ es una solución Linux completa para redes pequeñas a medianas. "
-"PowerPack+ incrementa el valor del PowerPack estándar añadiendo una "
-"selección completa de aplicaciones de servidor de primer nivel."
+"Potencie a su red de negocios con <b>soluciones de servidor de primer "
+"nivel<b> incluyendo:"
 
-#: share/advertising/ppp-02.pl:17
+#: share/advertising/24.pl:16
 #, c-format
-msgid "It is the only Mandrakelinux product that includes the groupware solution."
-msgstr "Es el único producto Mandrakelinux que incluye la solución groupware."
+msgid ""
+"\t* <b>Samba</b>: File and print services for Microsoft® Windows® clients."
+msgstr ""
+"\t* <b>Samba</b>: Servicios de archivos e impresoras para los clientes MS-"
+"Windows"
 
-#: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13
+#: share/advertising/24.pl:17
 #, c-format
-msgid "<b>Choose your graphical Desktop environment!</b>"
-msgstr "<b>¡Elija su entorno gráfico de escritorio!</b>"
+msgid "\t* <b>Apache</b>: The most widely used web server."
+msgstr "\t* <b>Apache</b>: El servidor web más ampliamente usado"
 
-#: share/advertising/ppp-03.pl:15 share/advertising/pwp-03.pl:15
+#: share/advertising/24.pl:18
 #, 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."
+"\t* <b>MySQL</b> and <b>PostgreSQL</b>: The world's most popular open source "
+"databases."
 msgstr ""
-"Cuando se conecta a su sistema Mandrakelinux por primera vez, puede elegir "
-"entre varios entornos de escritorio gráficos populares, incluyendo: KDE, "
-"GNOME, WindowMaker, IceWM, y otros."
+"\t* <b>MySQL</b> y <b>PostgreSQL</b>: La base de datos Open Source más "
+"popular del mundo."
 
-#: share/advertising/ppp-04.pl:13
+#: share/advertising/24.pl:19
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all "
-"tasks:"
+"\t* <b>CVS</b>: Concurrent Versions System, the dominant open source network-"
+"transparent version control system."
 msgstr ""
-"En el menú Mandrakelinux encontrará aplicaciones fáciles de usar para todas "
-"las tareas:"
+"\t* <b>CVS</b>: Sistema de versiones concurrentes, el sistema de control de "
+"versiones Open Source transparente para la red dominante"
 
-#: share/advertising/ppp-04.pl:15 share/advertising/pwp-04.pl:15
+#: share/advertising/24.pl:20
 #, c-format
-msgid "\t- Create, edit and share office documents with <b>OpenOffice.org</b>"
-msgstr "\t- Crear, editar y compartir documentos de oficina con <b>OpenOffice.org</b>"
+msgid ""
+"\t* <b>ProFTPD</b>: The highly configurable GPL-licensed FTP server software."
+msgstr ""
+"\t* <b>ProFTPD</b>: el software servidor FTP con licencia GPL altamente "
+"configurable"
 
-#: share/advertising/ppp-04.pl:16
+#: share/advertising/24.pl:21
 #, c-format
 msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites: <b>Kontact</b> and <b>Evolution</b>"
+"\t* <b>Postfix</b> and <b>Sendmail</b>: The popular and powerful mail "
+"servers."
 msgstr ""
-"\t- Administrar sus datos personales con programas integrados de información "
-"personal: <b>Kontact</b> y <b>Evolution</b>"
+"\t* <b>Postfix</b> y <b>Sendmail</b>: Los populares y potentes servidores de "
+"correo."
 
-#: share/advertising/ppp-04.pl:17
+#: share/advertising/25.pl:13
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla and Konqueror</b>"
-msgstr "\t- Navegar por la web con <b>Mozilla y Konqueror</b>"
+msgid "<b>Mandrakelinux Control Center</b>"
+msgstr "<b>Centro de control de Mandrakelinux</b>"
 
-#: share/advertising/ppp-04.pl:18 share/advertising/pwp-04.pl:18
+#: share/advertising/25.pl:15
 #, c-format
-msgid "\t- Participate in online chat with <b>Kopete</b>"
-msgstr "\t- Participar en charlas en línea con <b>Kopete</b>"
+msgid ""
+"The <b>Mandrakelinux Control Center</b> is an essential collection of "
+"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"your computer."
+msgstr ""
+"El <b>Centro de Control de Mandrakelinux</b> es una colección esencial de "
+"utilitarios específicos de Mandrakelinux para simplificar la configuración "
+"de su computadora."
 
-#: share/advertising/ppp-04.pl:19
+#: share/advertising/25.pl:17
 #, c-format
-msgid "\t- Listen to audio CDs and music files with <b>KsCD</b> and <b>Totem</b>"
-msgstr "\t- Escuchar CDs de audio y archivos musicales con <b>KsCD</b> y <b>Totem</b>"
+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 ""
+"Apreciará de inmediato esta colección de <b>más de 60</b> utilitarios para "
+"<b>configurar con facilidad su sistema</b>: los dispositivos de hardware, "
+"definir puntos de montaje, configurar la red y la Internet, ajustar el nivel "
+"de seguridad de su computadora, etc."
 
-#: share/advertising/ppp-04.pl:20 share/advertising/pwp-04.pl:20
+#: share/advertising/26.pl:13
 #, c-format
-msgid "\t- Edit images and photos with <b>The Gimp</b>"
-msgstr "\t- Editar imágenes y fotos con el <b>GIMP</b>"
+msgid "<b>The Open Source Model</b>"
+msgstr "<b>El modelo de Código Abierto</b>"
 
-#: share/advertising/ppp-05.pl:13
+#: share/advertising/26.pl:15
 #, c-format
 msgid ""
-"PowerPack+ includes everything needed for developing and creating your own "
-"software, including:"
+"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 ""
-"PowerPack+ incluye todo lo necesario para desarrollar y crear su propio "
-"software, incluyendo:"
+"Como todos los programas de ordenador, el software de código abierto "
+"<b>requiere tiempo y personas</b> para su desarrollo. Para continuar la "
+"filosofía del código abierto, Mandrakesoft vende productos de valor añadido "
+"y servicios para <b>seguir mejorando Mandrakelinux</b>. Si desea <b>apoyar a "
+"la filosofía de código abierto</b> y al desarrollo de Mandrakelinux, <b>por "
+"favor</b>, ¡considere el comprar uno de nuestros productos o servicios!"
 
-#: share/advertising/ppp-05.pl:15 share/advertising/pwp-05.pl:16
+#: share/advertising/27.pl:13
+#, c-format
+msgid "<b>Online Store</b>"
+msgstr "<b>Tienda en línea</b>"
+
+#: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"\t- <b>Kdevelop</b>: a full featured, easy to use Integrated Development "
-"Environment for C++ programming"
+"To learn more about Mandrakesoft products and services, you can visit our "
+"<b>e-commerce platform</b>."
 msgstr ""
-"\t- <b>Kdevelop</b>: un entorno de desarrollo integrado (IDE) completo y "
-"fácil de usar para programar en C++"
+"Para saber más sobre todos los productos y servicios Mandrakesoft, visite "
+"<b>Mandrakestore</b>, nuestra plataforma completa de servicios e-commerce."
 
-#: share/advertising/ppp-05.pl:16 share/advertising/pwp-05.pl:17
+#: share/advertising/27.pl:17
 #, c-format
-msgid "\t- <b>GCC</b>: the GNU Compiler Collection"
-msgstr "\t- <b>GCC</b>: la colección de compiladores GNU"
+msgid "There you can find all our products, services and third-party products."
+msgstr ""
+"Allí encontrará todos nuestros productos, servicios y productos de terceros."
 
-#: share/advertising/ppp-05.pl:17 share/advertising/pwp-05.pl:18
+#: share/advertising/27.pl:19
 #, c-format
-msgid "\t- <b>GDB</b>: the GNU Project debugger"
-msgstr "\t- <b>GDB</b>: el depurador del proyecto GNU"
+msgid ""
+"This platform has just been <b>redesigned</b> to improve its efficiency and "
+"usability."
+msgstr ""
+"Esta plataforma acaba de ser <b>rediseñada</b> de manera a mejorar su "
+"eficacidad y usabilidad."
 
-#: share/advertising/ppp-05.pl:18 share/advertising/pwp-06.pl:16
+#: share/advertising/27.pl:21
 #, c-format
-msgid "\t- <b>Emacs</b>: a customizable and real time display editor"
-msgstr "\t- <b>Emacs</b>: un editor personalizable"
+msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
+msgstr "Visítela hoy mismo en <b>store.mandrakesoft.com</b>"
 
-#: share/advertising/ppp-05.pl:19
+#: share/advertising/28.pl:13
 #, c-format
-msgid "\t- <b>Xemacs</b>: open source text editor and application development system"
+msgid "<b>Mandrakeclub</b>"
+msgstr "<b>Mandrakeclub</b>"
+
+#: share/advertising/28.pl:15
+#, c-format
+msgid ""
+"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"product.."
 msgstr ""
-"\t- <b>Xemacs</b>: un sistema de desarrollo de aplicaciones y editor de "
-"texto Open Source"
+"<b>Mandrakeclub</b> es el <b>compañero perfecto</b> de su producto "
+"Mandrakelinux ..."
 
-#: share/advertising/ppp-05.pl:20
+#: share/advertising/28.pl:17
 #, c-format
-msgid "\t- <b>Vim</b>: advanced text editor with more features than standard Vi"
+msgid ""
+"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
 msgstr ""
-"\t- <b>Vim</b>: editor de texto avanzado con más características que el Vi "
-"estándar"
+"Aproveche <b>beneficios, productos y servicios valiosos</b> uniéndose a "
+"Mandrakeclub, tales como:"
 
-#: share/advertising/ppp-06.pl:13
+#: share/advertising/28.pl:18
 #, c-format
-msgid "<b>Discover the full-featured groupware solution!</b>"
-msgstr "<b>¡Descubra la solución GroupWare completa!</b>"
+msgid ""
+"\t* <b>Special discounts</b> on products and services of our online store "
+"<b>store.mandrakesoft.com</b>."
+msgstr ""
+"\t* <b>Descuentos especiales</b> sobre productos y servicios en nuestra "
+"tienda en línea <b>store.mandrakesoft.com</b>."
 
-#: share/advertising/ppp-06.pl:15
+#: share/advertising/28.pl:19
 #, c-format
-msgid "It includes both server and client features for:"
-msgstr "Inlcluye funcionalidad de servidor y cliente para:"
+msgid ""
+"\t* Access to <b>commercial applications</b> (for example to NVIDIA® or ATI™ "
+"drivers)."
+msgstr ""
+"\t* Acceso a <b>aplicaciones comerciales</b> (por ejemplo, a drivers de "
+"NVIDIA® o ATI™)."
 
-#: share/advertising/ppp-06.pl:16
+#: share/advertising/28.pl:20
 #, c-format
-msgid "\t- Sending and receiving emails"
-msgstr "\t- Enviar y recibir correo electrónico"
+msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgstr "\t* Participar en los <b>foros de usuarios</b> de Mandrakelinux."
 
-#: share/advertising/ppp-06.pl:17
+#: share/advertising/28.pl:21
 #, c-format
 msgid ""
-"\t- Calendar, Task List, Memos, Contacts, Meeting Request (sending and "
-"receiving), Task Requests (sending and receiving)"
+"\t* <b>Early and privileged access</b>, before public release, to "
+"Mandrakelinux <b>ISO images</b>."
 msgstr ""
-"\t- Calendario, lista de tareas, memos, contactos, pedidos de reunión (envío "
-"y recepción), pedidos de tareas (envío y recepción)"
+"\t* <b>Acceso privilegiado y con anterioridad</b>, antes del lanzamiento "
+"público, de las <b>imágenes ISO</b> de Mandrakelinux ."
 
-#: share/advertising/ppp-06.pl:18
+#: share/advertising/29.pl:13
 #, c-format
-msgid "\t- Address Book (server and client)"
-msgstr "\t- Libreta de direcciones (servidor y cliente)"
+msgid "<b>Mandrakeonline</b>"
+msgstr "<b>Mandrakeonline</b>"
 
-#: share/advertising/ppp-07.pl:13
+#: share/advertising/29.pl:15
 #, c-format
-msgid "Empower your business network with <b>premier server solutions</b> including:"
+msgid ""
+"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"offer its customers!"
 msgstr ""
-"Potencie a su red de negocios con <b>soluciones de servidor de primer "
-"nivel<b> incluyendo:"
+"¡<b>Mandrakeonline</b> es un nuevo servicio premium que Mandrakesoft está "
+"orgulloso de ofrecer a sus clientes!"
 
-#: share/advertising/ppp-07.pl:15
+#: share/advertising/29.pl:17
 #, c-format
-msgid "\t- <b>Samba</b>: File and print services for MS-Windows clients"
+msgid ""
+"Mandrakeonline provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrakelinux systems:"
 msgstr ""
-"\t- <b>Samba</b>: Servicios de archivos e impresoras para los clientes MS-"
-"Windows"
+"Mandrakeonline aporta un amplio espectro de valiosos servicios para la "
+"<b>fácil actualización</b> de sus sistemas Mandrakelinux:"
 
-#: share/advertising/ppp-07.pl:16
+#: share/advertising/29.pl:18
 #, c-format
-msgid "\t- <b>Apache</b>: The most widely used Web server"
-msgstr "\t- <b>Apache</b>: El servidor web más ampliamente usado"
+msgid "\t* <b>Perfect</b> system security (automated software updates)."
+msgstr ""
+"\t* Seguridad <b>perfecta</b> de su sistema (actualizaciones automáticas del "
+"software)."
+
+#: share/advertising/29.pl:19
+#, c-format
+msgid ""
+"\t* <b>Notification</b> of updates (by e-mail or by an applet on the "
+"desktop)."
+msgstr ""
+"\t* <b>Notificación</b> de actualizaciones (por correo o a través de un "
+"applet en su escritorio)."
 
-#: share/advertising/ppp-07.pl:17
+#: share/advertising/29.pl:20
 #, c-format
-msgid "\t- <b>MySQL</b>: The world's most popular Open Source database"
-msgstr "\t- <b>MySQL</b>: La base de datos Open Source más popular del mundo"
+msgid "\t* Flexible <b>scheduled</b> updates."
+msgstr "\t* Flexibilidad en la <b>programación</b>de actualizaciones."
 
-#: share/advertising/ppp-07.pl:18
+#: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t- <b>CVS</b>: Concurrent Versions System, the dominant open-source network-"
-"transparent version control system"
+"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
 msgstr ""
-"\t- <b>CVS</b>: Sistema de versiones concurrentes, el sistema de control de "
-"versiones Open Source transparente para la red dominante"
+"\t* Gestión de <b>todos sus sistemas Mandrakelinux</b> con una única cuenta."
 
-#: share/advertising/ppp-07.pl:19
+#: share/advertising/30.pl:13
 #, c-format
-msgid "\t- <b>ProFTPD</b>: the highly configurable GPL-licensed FTP server software"
-msgstr ""
-"\t- <b>ProFTPD</b>: el software servidor FTP con licencia GPL altamente "
-"configurable"
+msgid "<b>Mandrakeexpert</b>"
+msgstr "<b>Mandrakeexpert</b>"
 
-#: share/advertising/ppp-07.pl:20
+#: share/advertising/30.pl:15
 #, c-format
-msgid "\t- And others"
-msgstr "\t- Y otros"
+msgid ""
+"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"<b>our technical support platform</b> www.mandrakeexpert.com."
+msgstr ""
+"¿Necesita <b>ayuda?</b> Encuentre técnicos expertos de Mandrakesoft "
+"en<b>nuestra plataforma de soporte técnico</b> www.mandrakeexpert.com."
 
-#: share/advertising/pwp-01.pl:17
+#: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Your new Mandrakelinux distribution is the result of collaborative efforts "
-"between MandrakeSoft developers and Mandrakelinux contributors throughout "
-"the world."
+"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"a lot of time."
 msgstr ""
-"Su sistema operativo Mandrakelinux nuevo y las muchas aplicaciones del mismo "
-"son el resultado de efuerzos conjuntos de los desarrolladores de "
-"MandrakeSoft y los contribuyentes de Mandrakelinux del mundo entero."
+"Gracias a la ayuda de <b>expertos qualificado en Mandrakelinux</b>, ahorrará "
+"mucho tiempo."
 
-#: share/advertising/pwp-01.pl:19
+#: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of our "
-"latest release."
+"For any question related to Mandrakelinux, you have the possibility to "
+"purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"Desearíamos agradecer a todos los que participaron en el desarrollo de "
-"nuestra última versión."
+"Para cualquier pregunta relacionada con Mandrakelinux, tiene la posibilidad "
+"de adquirir soporte de incidentes en <b>store.mandrakesoft.com</b>."
 
-#: share/advertising/pwp-02.pl:13
+#: share/compssUsers.pl:25
 #, c-format
-msgid "<b>PowerPack</b>"
-msgstr "<b>PowerPack</b>"
+msgid "Office Workstation"
+msgstr "Estación de trabajo de Oficina"
 
-#: share/advertising/pwp-02.pl:15
+#: share/compssUsers.pl:27
 #, 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."
+"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
+"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"PowerPack es el producto de escritorio 'permier' Mandrakelinux. Además de "
-"ser la distribución Linux más fácil y amigable con el usuario, el PowerPack "
-"incluye miles de aplicaciones - todas, desde la más popular hasta la más "
-"técnica."
+"Programas de Oficina: procesadores de texto (OpenOffice.org Writer, Kword), "
+"hojas de cálculo (OpenOffice.org Calc, Kspread), visualizadores PDF, etc"
 
-#: share/advertising/pwp-04.pl:13
+#: share/compssUsers.pl:28
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all of "
-"your tasks:"
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
-"En el menú Mandrakelinux encontrará aplicaciones fáciles de usar para todas "
-"sus tareas."
+"Programas de Oficina: procesadores de palabras (kword, abiword), plantillas "
+"de cálculo (kspread, gnumeric), visualizadores PDF, etc"
+
+#: share/compssUsers.pl:33
+#, c-format
+msgid "Game station"
+msgstr "Estación de Juegos"
+
+#: share/compssUsers.pl:34
+#, c-format
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Programas de entretenimiento: arcade, tableros, estrategia, etc"
+
+#: share/compssUsers.pl:37
+#, c-format
+msgid "Multimedia station"
+msgstr "Estación Multimedios"
+
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Sound and video playing/editing programs"
+msgstr "Programas de reproducción/edición de sonido y vídeo"
+
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Internet station"
+msgstr "Estación Internet"
 
-#: share/advertising/pwp-04.pl:16
+#: share/compssUsers.pl:44
 #, c-format
 msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites <b>Kontact</b> and <b>Evolution</b>"
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
 msgstr ""
-"\t- Administrar sus datos personales con programas integrados de información "
-"personal: <b>Kontact</b> y <b>Evolution</b>"
+"Conjunto de herramientas para leer y enviar correo y noticias (mutt, tin...) "
+"y para navegar por la Web"
 
-#: share/advertising/pwp-04.pl:17
+#: share/compssUsers.pl:49
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla</b> and <b>Konqueror</b>"
-msgstr "\t- Navegar por la web con <b>Mozilla</b> y <b>Konqueror</b>"
+msgid "Network Computer (client)"
+msgstr "Computadora de Red (cliente)"
 
-#: share/advertising/pwp-04.pl:19
+#: share/compssUsers.pl:50
 #, c-format
-msgid "\t- Listen to audio CDs and music files with KsCD and <b>Totem</b>"
-msgstr "\t- Escuchar CDs de audio y archivos musicales con KsCD y <b>Totem</b>"
+msgid "Clients for different protocols including ssh"
+msgstr "Clientes para los distintos protocolos incluyendo a ssh"
 
-#: share/advertising/pwp-05.pl:13 share/advertising/pwp-06.pl:13
+#: share/compssUsers.pl:54
 #, c-format
-msgid "<b>Development tools</b>"
-msgstr "<b>Herramientas de desarrollo</b>"
+msgid "Configuration"
+msgstr "Configuración"
+
+#: share/compssUsers.pl:55
+#, c-format
+msgid "Tools to ease the configuration of your computer"
+msgstr "Herramientas para facilitar la configuración de su computadora"
+
+#: share/compssUsers.pl:59
+#, c-format
+msgid "Console Tools"
+msgstr "Herramientas para la consola"
+
+#: share/compssUsers.pl:60
+#, c-format
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editores, shells, manipulación de archivos, terminales"
 
-#: share/advertising/pwp-05.pl:15
+#: share/compssUsers.pl:65 share/compssUsers.pl:165
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Bibliotecas de desarrollo C y C++, programas y archivos *.h"
+
+#: share/compssUsers.pl:69 share/compssUsers.pl:169
+#, c-format
+msgid "Documentation"
+msgstr "Documentación"
+
+#: share/compssUsers.pl:70 share/compssUsers.pl:170
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Libros y COMOs sobre Linux y Software Libre"
+
+#: 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 "Linux Standard Base. Soporte de aplicaciones de terceros"
+
+#: share/compssUsers.pl:85
+#, c-format
+msgid "Apache"
+msgstr "Apache"
+
+#: share/compssUsers.pl:88
+#, c-format
+msgid "Groupware"
+msgstr "Aplicaciones para grupos"
+
+#: share/compssUsers.pl:89
+#, c-format
+msgid "Kolab Server"
+msgstr "Servidor Kolab"
+
+#: share/compssUsers.pl:92 share/compssUsers.pl:133
+#, c-format
+msgid "Firewall/Router"
+msgstr "Servidor, Cortafuegos/Router"
+
+#: share/compssUsers.pl:93 share/compssUsers.pl:134
+#, c-format
+msgid "Internet gateway"
+msgstr "Pasarela de acceso a Internet"
+
+#: share/compssUsers.pl:96
+#, c-format
+msgid "Mail/News"
+msgstr "Correo/Noticias"
+
+#: share/compssUsers.pl:97
+#, c-format
+msgid "Postfix mail server, Inn news server"
+msgstr "Servidor de correo Postfix, servidor de noticias Inn"
+
+#: share/compssUsers.pl:100
+#, c-format
+msgid "Directory Server"
+msgstr "Servidor de directorios"
+
+#: share/compssUsers.pl:104
+#, c-format
+msgid "FTP Server"
+msgstr "Servidor FTP"
+
+#: share/compssUsers.pl:105
+#, c-format
+msgid "ProFTPd"
+msgstr "ProFTPd"
+
+#: share/compssUsers.pl:108
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: share/compssUsers.pl:109
+#, c-format
+msgid "Domain Name and Network Information Server"
+msgstr "Servidor de nombres de dominio y servidor de información de red"
+
+#: share/compssUsers.pl:112
+#, c-format
+msgid "File and Printer Sharing Server"
+msgstr "Servidor de ficheros e impresión"
+
+#: share/compssUsers.pl:113
+#, c-format
+msgid "NFS Server, Samba server"
+msgstr "Servidor NFS, servidor Samba"
+
+#: share/compssUsers.pl:116 share/compssUsers.pl:129
+#, c-format
+msgid "Database"
+msgstr "Servidor, Bases de Datos"
+
+#: share/compssUsers.pl:117
+#, c-format
+msgid "PostgreSQL and MySQL Database Server"
+msgstr "Servidor de base de datos PostgreSQL y MySQL"
+
+#: share/compssUsers.pl:121
+#, c-format
+msgid "Web/FTP"
+msgstr "Servidor, Web/FTP"
+
+#: share/compssUsers.pl:122
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache y Pro-ftpd"
+
+#: share/compssUsers.pl:125
+#, c-format
+msgid "Mail"
+msgstr "Correo"
+
+#: share/compssUsers.pl:126
+#, c-format
+msgid "Postfix mail server"
+msgstr "Servidor de correo Postfix"
+
+#: share/compssUsers.pl:130
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "Servidor de base de datos PostgreSQL o MySQL"
+
+#: share/compssUsers.pl:137
+#, c-format
+msgid "Network Computer server"
+msgstr "Computadora servidor de red"
+
+#: share/compssUsers.pl:138
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Servidor NFS, servidor SMB, servidor proxy, servidor SSH"
+
+#: share/compssUsers.pl:146
+#, c-format
+msgid "KDE Workstation"
+msgstr "Estación de trabajo KDE"
+
+#: share/compssUsers.pl:147
 #, c-format
 msgid ""
-"PowerPack includes everything needed for developing and creating your own "
-"software, including:"
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
 msgstr ""
-"PowerPack incluye todo lo necesario para desarrollar y crear su propio "
-"software, incluyendo:"
+"El K Desktop Environment, el entorno gráfico básico con una colección de "
+"herramientas que lo acompañan"
 
-#: share/advertising/pwp-06.pl:15
+#: share/compssUsers.pl:151
 #, c-format
-msgid "And of course the editors!"
-msgstr "¡Y por supuesto los editores!"
+msgid "GNOME Workstation"
+msgstr "Estación de trabajo GNOME"
 
-#: share/advertising/pwp-06.pl:17
+#: share/compssUsers.pl:152
 #, c-format
 msgid ""
-"\t- <b>Xemacs</b>: another open source text editor and application "
-"development system"
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
 msgstr ""
-"\t- <b>Xemacs</b>: otro editor de texto y sistema de desarrollo de "
-"aplicaciones de código abierto"
+"Entorno gráfico con un conjunto de herramientas de escritorio y aplicaciones "
+"amigables"
 
-#: share/advertising/pwp-06.pl:18
+#: share/compssUsers.pl:155
 #, c-format
-msgid "\t- <b>Vim</b>: an advanced text editor with more features than standard Vi"
+msgid "Other Graphical Desktops"
+msgstr "Otros entornos gráficos"
+
+#: share/compssUsers.pl:156
+#, c-format
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+
+#: share/compssUsers.pl:179
+#, c-format
+msgid "Utilities"
+msgstr "Utilidades"
+
+#: share/compssUsers.pl:181 share/compssUsers.pl:182 standalone/logdrake:381
+#, c-format
+msgid "SSH Server"
+msgstr "Servidor SSH"
+
+#: share/compssUsers.pl:186
+#, c-format
+msgid "Webmin"
+msgstr "Webmin"
+
+#: share/compssUsers.pl:187
+#, c-format
+msgid "Webmin Remote Configuration Server"
+msgstr "Servidor de configuración remota Webmin"
+
+#: share/compssUsers.pl:191
+#, c-format
+msgid "Network Utilities/Monitoring"
+msgstr "Utilidades/monitorización de red"
+
+#: share/compssUsers.pl:192
+#, c-format
+msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
-"\t- <b>Vim</b>: un editor de texto avanzado con más características que el "
-"Vi estándar"
+"Herramientas de monitorización, control de procesos, tcpdump, nmap, ..."
+
+#: share/compssUsers.pl:196
+#, c-format
+msgid "MandrakeSoft Wizards"
+msgstr "Asistentes de Mandrakesoft"
+
+#: share/compssUsers.pl:197
+#, c-format
+msgid "Wizards to configure server"
+msgstr "Asistentes para configurar servidor"
 
 #: standalone.pm:21
 #, c-format
@@ -16029,15 +16977,15 @@ 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 ""
 "[OPCIONES] [NOMBRE_PROGRAMA]\n"
 "\n"
 "OPCIONES:\n"
-"  --help            - imprime este mensaje.\n"
-"  --report          - programa debería ser una herramienta mandrake\n"
-"  --incident        - programa debería ser una herramienta mandrake"
+"  --help            - imprime este mensaje de ayuda.\n"
+"  --report          - programa debería ser una herramienta mandrakelinux\n"
+"  --incident        - programa debería ser una herramienta mandrakelinux"
 
 #: standalone.pm:63
 #, c-format
@@ -16065,7 +17013,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"
@@ -16094,7 +17042,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"
@@ -16108,7 +17056,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPCIONES]...\n"
-"Configurador del Servidor de Terminales de Mandrake (MTS)\n"
+"Configurador del Servidor de Terminales de Mandrakelinux\n"
 "--enable         : habilitar MTS\n"
 "--disable        : deshabilitar MTS\n"
 "--start          : iniciar MTS\n"
@@ -16200,7 +17148,7 @@ msgstr ""
 "       XFdrake [--noauto] monitor\n"
 "       XFdrake resolución"
 
-#: standalone.pm:128
+#: standalone.pm:133
 #, c-format
 msgid ""
 "\n"
@@ -16211,27 +17159,28 @@ msgstr ""
 "Uso: %s [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--testing] "
 "[-v|--version] "
 
-#: standalone/XFdrake:87
+#: standalone/XFdrake:85
 #, c-format
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Por favor salga de la sesión y luego pulse Ctrl-Alt-BackSpace"
 
-#: standalone/XFdrake:91
+#: standalone/XFdrake:89
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
-msgstr "Debe desconectarse y volver a conectarse para que los cambios tengan efecto"
+msgstr ""
+"Debe desconectarse y volver a conectarse para que los cambios tengan efecto"
 
-#: standalone/drakTermServ:79
+#: standalone/drakTermServ:76
 #, c-format
 msgid "Useless without Terminal Server"
 msgstr "Inútil sin un Servidor de terminales"
 
-#: standalone/drakTermServ:116 standalone/drakTermServ:123
+#: standalone/drakTermServ:108 standalone/drakTermServ:114
 #, c-format
 msgid "%s: %s requires a username...\n"
 msgstr "%s: %s necesita un nombre de usuario...\n"
 
-#: standalone/drakTermServ:136
+#: standalone/drakTermServ:125
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
@@ -16240,79 +17189,73 @@ msgstr ""
 "%s: %s necesita nombre del host, dirección MAC, IP, nbi-image, 0/1 para "
 "THIN_CLIENT, 0/1 para Local Config...\n"
 
-#: standalone/drakTermServ:143
+#: standalone/drakTermServ:131
 #, c-format
 msgid "%s: %s requires hostname...\n"
 msgstr "%s: %s necesita nombre del host...\n"
 
-#: standalone/drakTermServ:226 standalone/drakTermServ:500
-#: standalone/drakfont:575
-#, c-format
-msgid "OK"
-msgstr "Aceptar"
-
-#: standalone/drakTermServ:237 standalone/drakTermServ:240
+#: standalone/drakTermServ:213 standalone/drakTermServ:216
 #, c-format
 msgid "Terminal Server Configuration"
 msgstr "Configuración del Servidor de Terminales"
 
-#: standalone/drakTermServ:255
+#: standalone/drakTermServ:231
 #, c-format
 msgid "Enable Server"
 msgstr "Habiltar el Servidor"
 
-#: standalone/drakTermServ:261
+#: standalone/drakTermServ:237
 #, c-format
 msgid "Disable Server"
 msgstr "Deshabilitar el Servidor"
 
-#: standalone/drakTermServ:269
+#: standalone/drakTermServ:245
 #, c-format
 msgid "Start Server"
 msgstr "Iniciar el Servidor"
 
-#: standalone/drakTermServ:275
+#: standalone/drakTermServ:251
 #, c-format
 msgid "Stop Server"
 msgstr "Detener el Servidor"
 
-#: standalone/drakTermServ:283
+#: standalone/drakTermServ:259
 #, c-format
 msgid "Etherboot Floppy/ISO"
 msgstr "Disquete/ISO Etherboot"
 
-#: standalone/drakTermServ:287
+#: standalone/drakTermServ:263
 #, c-format
 msgid "Net Boot Images"
 msgstr "Imágenes de arranque por la red"
 
-#: standalone/drakTermServ:293
+#: standalone/drakTermServ:269
 #, c-format
 msgid "Add/Del Users"
 msgstr "Añadir/Quitar usuarios"
 
-#: standalone/drakTermServ:297
+#: standalone/drakTermServ:273
 #, c-format
 msgid "Add/Del Clients"
 msgstr "Añadir/Quitar clientes"
 
-#: standalone/drakTermServ:308 standalone/drakbug:54
+#: standalone/drakTermServ:284 standalone/drakbug:47
 #, c-format
 msgid "First Time Wizard"
 msgstr "Aisstente Inicial"
 
-#: 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 "%s definido como dm, añadiendo usuario gdm a /etc/passwd/$$CLIENT$$"
 
-#: 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"
@@ -16349,22 +17292,22 @@ msgstr ""
 "    f) Si es un cliente delgado, le preguntará si desea volver a iniciar "
 "KDM.\n"
 
-#: standalone/drakTermServ:392
+#: standalone/drakTermServ:367
 #, c-format
 msgid "Cancel Wizard"
 msgstr "Cancelar el Asistente"
 
-#: standalone/drakTermServ:404
+#: standalone/drakTermServ:379
 #, c-format
 msgid "Please save dhcpd config!"
 msgstr "¡Por favor, guarde la configuración DHCP!"
 
-#: standalone/drakTermServ:432
+#: standalone/drakTermServ:407
 #, c-format
 msgid "Use thin clients."
 msgstr "Usar clientes delgados."
 
-#: standalone/drakTermServ:434
+#: standalone/drakTermServ:409
 #, c-format
 msgid ""
 "Please select default client type.\n"
@@ -16378,35 +17321,35 @@ msgstr ""
 "    Los clientes 'gruesos' usan su propia CPU/RAM, pero el sistema de "
 "archivos del servidor."
 
-#: standalone/drakTermServ:446 standalone/drakTermServ:1061
+#: standalone/drakTermServ:421 standalone/drakTermServ:1034
 #, c-format
 msgid "Sync client X keyboard settings with server."
 msgstr "Sincronizar los ajustes de teclado del cliente X con el servidor."
 
-#: standalone/drakTermServ:453
+#: standalone/drakTermServ:428
 #, c-format
 msgid "Creating net boot images for all kernels"
 msgstr "Creando imágenes de arranque de red para todos los núcleos"
 
-#: 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 "Esto tomará algunos minutos."
 
-#: standalone/drakTermServ:458 standalone/drakTermServ:478
+#: standalone/drakTermServ:433 standalone/drakTermServ:452
 #, c-format
 msgid "Done!"
 msgstr "¡Hecho!"
 
-#: standalone/drakTermServ:464
+#: standalone/drakTermServ:438
 #, c-format
 msgid "Syncing server user list with client list, including root."
 msgstr ""
 "Sincronizando la lista de usuarios del servidor con la del cliente, "
 "incluyendo a root."
 
-#: standalone/drakTermServ:484
+#: standalone/drakTermServ:458
 #, c-format
 msgid ""
 "In order to enable changes made for thin clients, the display manager must "
@@ -16415,12 +17358,12 @@ msgstr ""
 "Para poder habilitar los cambios hechos a los clientes delgados, se debe "
 "reiniciar el administrador de conexión ¿Volver a iniciar ahora?"
 
-#: standalone/drakTermServ:519
+#: standalone/drakTermServ:493
 #, c-format
 msgid "Terminal Server Overview"
 msgstr "Generalidades del servidor de terminales"
 
-#: standalone/drakTermServ:520
+#: standalone/drakTermServ:494
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -16446,7 +17389,7 @@ msgstr ""
 "      \t\ten dhcpd.conf, debería crear las imágenes Etherboot para al menos\n"
 "      \t\tun núcleo completo."
 
-#: standalone/drakTermServ:526
+#: standalone/drakTermServ:500
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -16480,7 +17423,7 @@ msgstr ""
 "      \t\tUna entrada típica de dhcpd.conf para soportar un cliente sin "
 "disco luce así:"
 
-#: standalone/drakTermServ:544
+#: standalone/drakTermServ:518
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -16491,14 +17434,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"
@@ -16529,13 +17472,13 @@ msgstr ""
 "\t\t\tNota: La entrada \"#type\" sólo la utiliza drakTermServ.  Los clientes "
 "pueden ser \"thin\"*/\n"
 "\t\t\to 'fat'. Los clientes livianos corren la mayoría del software en el "
-"servidor por medio de xdmcp, mientras que los clientes pesados corren la "
+"servidor por medio de XDMCP, mientras que los clientes pesados corren la "
 "mayoría\n"
 "\t\t\tdel software en la máquina cliente. Un inittab especial,%s se\n"
 "\t\t\tescribe para los clientes livianos. Los archivos de configuración del "
 "sistema xdm-config, kdmrc, y gdm.conf se modifican\n"
-"\t\t\tsi se utilizan clientes livianos, para habilitar xdmcp. Debido a que "
-"hay problemas de seguridad al utilizar xdmcp,\n"
+"\t\t\tsi se utilizan clientes livianos, para habilitar XDMCP. Debido a que "
+"hay problemas de seguridad al utilizar XDMCP,\n"
 "\t\t\thosts.deny y hosts.allow se modifican para limitar el acceso a la "
 "subred local.\n"
 "\t\t\t\n"
@@ -16554,7 +17497,7 @@ msgstr ""
 "\t\t\tNota: Debe detener/iniciar el servidor luego de añadir o cambiar "
 "clientes."
 
-#: standalone/drakTermServ:564
+#: standalone/drakTermServ:538
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -16585,7 +17528,7 @@ msgstr ""
 "\t\t\t\n"
 "\t\t\tDonde SUBRED/MÁSCARA están definidas por su red."
 
-#: standalone/drakTermServ:576
+#: standalone/drakTermServ:550
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -16602,7 +17545,7 @@ msgstr ""
 "        \t\ten este aspecto añadiendo o quitando usuarios del sistema de "
 "este archivo."
 
-#: standalone/drakTermServ:580
+#: standalone/drakTermServ:554
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -16619,7 +17562,7 @@ msgstr ""
 "drakTermServ ayudará a crear\n"
 "        \t\testos archivos."
 
-#: standalone/drakTermServ:585
+#: standalone/drakTermServ:559
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -16654,7 +17597,7 @@ msgstr ""
 "      esto, conservando los archivos de configuración, una vez que configuró "
 "la máquina cliente."
 
-#: standalone/drakTermServ:594
+#: standalone/drakTermServ:568
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -16664,7 +17607,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"
@@ -16690,7 +17633,7 @@ msgstr ""
 "la imagen de arranque\n"
 "        \t\ta cada cliente sin disco.\n"
 "\n"
-"        \t\tUn archivo de configuración típico de tftp luce así:\n"
+"        \t\tUn archivo de configuración típico de TFTP luce así:\n"
 "        \t\t\n"
 "        \tservice tftp\n"
 "\t\t\t{\n"
@@ -16709,13 +17652,13 @@ msgstr ""
 "mkinitrd-net\n"
 "        \t\tpone sus imágenes."
 
-#: 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"
@@ -16740,62 +17683,62 @@ msgstr ""
 "        \t\t/usr/share/etherboot/start16.bin \\\t\t\t\n"
 "        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
 
-#: standalone/drakTermServ:650
+#: standalone/drakTermServ:624
 #, c-format
 msgid "Boot Floppy"
 msgstr "Disquete de arranque"
 
-#: standalone/drakTermServ:652
+#: standalone/drakTermServ:626
 #, c-format
 msgid "Boot ISO"
 msgstr "ISO de arranque"
 
-#: standalone/drakTermServ:654
+#: standalone/drakTermServ:628
 #, c-format
 msgid "PXE Image"
 msgstr "Imagen PXE"
 
-#: standalone/drakTermServ:723
+#: standalone/drakTermServ:696
 #, c-format
 msgid "Default kernel version"
 msgstr "Versión del núcleo predeterminada"
 
-#: standalone/drakTermServ:751
+#: standalone/drakTermServ:724
 #, c-format
 msgid "Build Whole Kernel -->"
 msgstr "Construir el núcleo completo -->"
 
-#: standalone/drakTermServ:758
+#: standalone/drakTermServ:731
 #, c-format
 msgid "No kernel selected!"
 msgstr "¡No se seleccionó núcleo!"
 
-#: standalone/drakTermServ:761
+#: standalone/drakTermServ:734
 #, c-format
 msgid "Build Single NIC -->"
 msgstr "Construir NIC única -->"
 
-#: standalone/drakTermServ:765
+#: standalone/drakTermServ:738
 #, c-format
 msgid "No NIC selected!"
 msgstr "¡No se seleccionó NIC!"
 
-#: standalone/drakTermServ:768
+#: standalone/drakTermServ:741
 #, c-format
 msgid "Build All Kernels -->"
 msgstr "Construir todos los núcleos -->"
 
-#: standalone/drakTermServ:776
+#: standalone/drakTermServ:749
 #, c-format
 msgid "<-- Delete"
 msgstr "<-- Borrar"
 
-#: standalone/drakTermServ:783
+#: standalone/drakTermServ:756
 #, c-format
 msgid "Delete All NBIs"
 msgstr "Borrar todos los NBI"
 
-#: standalone/drakTermServ:870
+#: standalone/drakTermServ:843
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -16806,27 +17749,27 @@ msgstr ""
 "de la de la base de datos del Servidor de Terminales.\n"
 "Quite/agregue el usuario al Servidor de Terminales para permitir conexión."
 
-#: standalone/drakTermServ:875
+#: standalone/drakTermServ:848
 #, c-format
 msgid "Add User -->"
 msgstr "Añadir usuario -->"
 
-#: standalone/drakTermServ:881
+#: standalone/drakTermServ:854
 #, c-format
 msgid "<-- Del User"
 msgstr "<-- Borrar usuario"
 
-#: standalone/drakTermServ:917
+#: standalone/drakTermServ:890
 #, c-format
 msgid "type: %s"
 msgstr "tipo: %s"
 
-#: standalone/drakTermServ:921
+#: standalone/drakTermServ:894
 #, c-format
 msgid "local config: %s"
 msgstr "configuración local: %s"
 
-#: standalone/drakTermServ:951
+#: standalone/drakTermServ:924
 #, c-format
 msgid ""
 "Allow local hardware\n"
@@ -16835,67 +17778,67 @@ msgstr ""
 "Permitir configuración del\n"
 "hardware local."
 
-#: standalone/drakTermServ:960
+#: standalone/drakTermServ:933
 #, c-format
 msgid "No net boot images created!"
 msgstr "¡No se crearon imágenes de arranque por red!"
 
-#: standalone/drakTermServ:978
+#: standalone/drakTermServ:951
 #, c-format
 msgid "Thin Client"
 msgstr "Cliente liviano"
 
-#: standalone/drakTermServ:982
+#: standalone/drakTermServ:955
 #, c-format
 msgid "Allow Thin Clients"
 msgstr "Permitir Clientes livianos"
 
-#: standalone/drakTermServ:983
+#: standalone/drakTermServ:956
 #, c-format
 msgid "Add Client -->"
 msgstr "Añadir cliente -->"
 
-#: standalone/drakTermServ:997
+#: standalone/drakTermServ:970
 #, c-format
 msgid "type: fat"
 msgstr "tipo: grueso"
 
-#: standalone/drakTermServ:998
+#: standalone/drakTermServ:971
 #, c-format
 msgid "type: thin"
 msgstr "tipo: delgado"
 
-#: standalone/drakTermServ:1005
+#: standalone/drakTermServ:978
 #, c-format
 msgid "local config: false"
 msgstr "configuración local: falso"
 
-#: standalone/drakTermServ:1006
+#: standalone/drakTermServ:979
 #, c-format
 msgid "local config: true"
 msgstr "configuración local: verdadero"
 
-#: standalone/drakTermServ:1014
+#: standalone/drakTermServ:987
 #, c-format
 msgid "<-- Edit Client"
 msgstr "<-- Editar cliente"
 
-#: standalone/drakTermServ:1040
+#: standalone/drakTermServ:1013
 #, c-format
 msgid "Disable Local Config"
 msgstr "Deshabilitar configuración local"
 
-#: standalone/drakTermServ:1047
+#: standalone/drakTermServ:1020
 #, c-format
 msgid "Delete Client"
 msgstr "Borrar cliente"
 
-#: standalone/drakTermServ:1056
+#: standalone/drakTermServ:1029
 #, c-format
 msgid "dhcpd Config..."
 msgstr "Configuración de dhcpd..."
 
-#: standalone/drakTermServ:1072
+#: standalone/drakTermServ:1045
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
@@ -16904,77 +17847,78 @@ msgstr ""
 "Debe reiniciar el Display Manager para que los cambios tengan efecto. \n"
 "(service dm restart - en la consola)"
 
-#: standalone/drakTermServ:1112
+#: standalone/drakTermServ:1085
 #, c-format
 msgid "Thin clients won't work with autologin. Disable autologin?"
-msgstr "Los clientes delgados no funcionan con conexión automática ¿Deshabilitarla?"
+msgstr ""
+"Los clientes delgados no funcionan con conexión automática ¿Deshabilitarla?"
 
-#: standalone/drakTermServ:1128
+#: standalone/drakTermServ:1101
 #, c-format
 msgid "All clients will use %s"
 msgstr "Todos los clientes usarán %s"
 
-#: standalone/drakTermServ:1160
+#: standalone/drakTermServ:1133
 #, c-format
 msgid "Subnet:"
 msgstr "Subred:"
 
-#: standalone/drakTermServ:1167
+#: standalone/drakTermServ:1140
 #, c-format
 msgid "Netmask:"
 msgstr "Máscara de red:"
 
-#: standalone/drakTermServ:1174
+#: standalone/drakTermServ:1147
 #, c-format
 msgid "Routers:"
 msgstr "Routers:"
 
-#: standalone/drakTermServ:1181
+#: standalone/drakTermServ:1154
 #, c-format
 msgid "Subnet Mask:"
 msgstr "Máscara de subred:"
 
-#: standalone/drakTermServ:1188
+#: standalone/drakTermServ:1161
 #, c-format
 msgid "Broadcast Address:"
 msgstr "Dirección de difusión:"
 
-#: standalone/drakTermServ:1195
+#: standalone/drakTermServ:1168
 #, c-format
 msgid "Domain Name:"
 msgstr "Nombre de dominio:"
 
-#: standalone/drakTermServ:1203
+#: standalone/drakTermServ:1176
 #, c-format
 msgid "Name Servers:"
 msgstr "Servidores de nombres:"
 
-#: standalone/drakTermServ:1214
+#: standalone/drakTermServ:1187
 #, c-format
 msgid "IP Range Start:"
 msgstr "Comienzo de rango IP:"
 
-#: standalone/drakTermServ:1215
+#: standalone/drakTermServ:1188
 #, c-format
 msgid "IP Range End:"
 msgstr "Fin de rango IP:"
 
-#: standalone/drakTermServ:1257
+#: standalone/drakTermServ:1230
 #, c-format
 msgid "Append TS Includes To Existing Config"
 msgstr "Añadir inclusiones de TS a la configuración existente"
 
-#: standalone/drakTermServ:1259
+#: standalone/drakTermServ:1232
 #, c-format
 msgid "Write Config"
 msgstr "Escribir configuración"
 
-#: standalone/drakTermServ:1275
+#: standalone/drakTermServ:1248
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr "Configuración del servidor dhcpd"
 
-#: standalone/drakTermServ:1276
+#: standalone/drakTermServ:1249
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -16985,103 +17929,97 @@ msgstr ""
 "de su sistema actual.\n"
 "Los puede modificar si es necesario."
 
-#: standalone/drakTermServ:1279
+#: standalone/drakTermServ:1252
 #, c-format
 msgid "Dynamic IP Address Pool:"
 msgstr "Disponibilidad de direcciones IP dinámicas:"
 
-#: standalone/drakTermServ:1426
+#: standalone/drakTermServ:1399
 #, c-format
 msgid "Please insert floppy disk:"
 msgstr "Por favor, inserte un disquete:"
 
-#: standalone/drakTermServ:1430
+#: standalone/drakTermServ:1403
 #, c-format
 msgid "Couldn't access the floppy!"
 msgstr "¡No se pudo acceder al disquete!"
 
-#: standalone/drakTermServ:1432
+#: standalone/drakTermServ:1405
 #, c-format
 msgid "Floppy can be removed now"
 msgstr "Ya se puede quitar el disquete"
 
-#: standalone/drakTermServ:1435
+#: standalone/drakTermServ:1408
 #, c-format
 msgid "No floppy drive available!"
 msgstr "¡Ninguna disquetera disponible!"
 
-#: standalone/drakTermServ:1440
+#: standalone/drakTermServ:1413
 #, c-format
 msgid "PXE image is %s/%s"
 msgstr "La imagen PXE es %s/%s"
 
-#: standalone/drakTermServ:1442
+#: standalone/drakTermServ:1415
 #, c-format
 msgid "Error writing %s/%s"
 msgstr "Error al escribir %s/%s"
 
-#: standalone/drakTermServ:1451
+#: standalone/drakTermServ:1424
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr "La imagen ISO Etherboot es %s"
 
-#: standalone/drakTermServ:1453
+#: standalone/drakTermServ:1426
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr "¡Ocurrió algo malo! - ¿Está instalado mkisofs?"
 
-#: standalone/drakTermServ:1475
+#: standalone/drakTermServ:1447
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr "¡Primero debe crear /etc/dhcpd.conf!"
 
-#: standalone/drakTermServ:1634
+#: standalone/drakTermServ:1602
 #, c-format
 msgid "%s passwd bad in Terminal Server - rewriting...\n"
 msgstr "contraseña %s incorrecta en Terminal Server - re-escribiendo...\n"
 
-#: standalone/drakTermServ:1647
+#: standalone/drakTermServ:1615
 #, c-format
 msgid "%s is not a user..\n"
 msgstr "%s no es un usuario...\n"
 
-#: standalone/drakTermServ:1648
+#: standalone/drakTermServ:1616
 #, c-format
 msgid "%s is already a Terminal Server user\n"
 msgstr "%s ya es un usuario del servidor de terminales\n"
 
-#: standalone/drakTermServ:1650
+#: standalone/drakTermServ:1618
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
 msgstr "¡Falló la adición de %s al Servidor de terminales!\n"
 
-#: standalone/drakTermServ:1652
+#: standalone/drakTermServ:1620
 #, c-format
 msgid "%s added to Terminal Server\n"
 msgstr "%s añadido al Servidor de terminales\n"
 
-#: standalone/drakTermServ:1698
+#: standalone/drakTermServ:1666
 #, c-format
 msgid "Deleted %s...\n"
 msgstr "Borrado %s...\n"
 
-#: standalone/drakTermServ:1700 standalone/drakTermServ:1773
+#: standalone/drakTermServ:1668 standalone/drakTermServ:1741
 #, c-format
 msgid "%s not found...\n"
 msgstr "%s no encontrado...\n"
 
-#: standalone/drakTermServ:1722 standalone/drakTermServ:1723
-#: standalone/drakTermServ:1724
-#, c-format
-msgid "%s already in use\n"
-msgstr "%s ya está en uso\n"
-
-#: standalone/drakTermServ:1801
+#: standalone/drakTermServ:1769
 #, c-format
 msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
 msgstr "/etc/hosts.allow y /etc/hosts.deny ya configurados - no se cambiaron"
 
-#: standalone/drakTermServ:1953
+#: standalone/drakTermServ:1921
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr "Configuración cambiada - ¿reiniciar clusternfs/dhcpd?"
@@ -17162,7 +18100,8 @@ msgstr "Creando el disquete de instalación automática"
 #: standalone/drakautoinst:90
 #, c-format
 msgid "Insert another blank floppy in drive %s (for drivers disk)"
-msgstr "Inserte otro disquete en blanco en la unidad %s (para los controladores)"
+msgstr ""
+"Inserte otro disquete en blanco en la unidad %s (para los controladores)"
 
 #: standalone/drakautoinst:91
 #, c-format
@@ -17183,8 +18122,8 @@ msgstr ""
 "Los parámetros de la instalación automáticas están disponibles en las "
 "secciones de la izquierda"
 
-#: 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 "¡Felicidades!"
@@ -17223,26 +18162,22 @@ msgstr "disco"
 msgid "tape"
 msgstr "cinta"
 
-#: standalone/drakbackup:112
-#, c-format
-msgid "No devices found"
-msgstr "No se encontraron dispositivos"
-
-#: 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 es una extensión al lenguaje de scripting Tcl que permite sesiones "
+"Expect es una extensión al lenguaje de scripting TCL que permite sesiones "
 "interactivas sin la intervención del usuario."
 
-#: standalone/drakbackup:153
+#: standalone/drakbackup:154
 #, c-format
 msgid "Store the password for this system in drakbackup configuration."
-msgstr "Almacenar la contraseña para este sistema en la configuración de drakbackup."
+msgstr ""
+"Almacenar la contraseña para este sistema en la configuración de drakbackup."
 
-#: standalone/drakbackup:154
+#: standalone/drakbackup:155
 #, c-format
 msgid ""
 "For a multisession CD, only the first session will erase the cdrw. Otherwise "
@@ -17251,7 +18186,7 @@ msgstr ""
 "Para un CD multisesión, sólo la primer sesión borrará el CDRW. De lo "
 "contrario, el CDRW se borra antes de cada respaldo."
 
-#: standalone/drakbackup:155
+#: standalone/drakbackup:156
 #, c-format
 msgid ""
 "This option will save files that have changed.  Exact behavior depends on "
@@ -17260,7 +18195,7 @@ msgstr ""
 "Esta opción guardará los archivos que cambiaron. El comportamiento exacto "
 "depende de si se utiliza el modo incremental o diferencial."
 
-#: standalone/drakbackup:156
+#: standalone/drakbackup:157
 #, c-format
 msgid ""
 "Incremental backups only save files that have changed or are new since the "
@@ -17269,7 +18204,7 @@ msgstr ""
 "Los respaldos incrementales sólo guardan archivos que cambiaron o que son "
 "nuevos desde el último respaldo."
 
-#: standalone/drakbackup:157
+#: standalone/drakbackup:158
 #, c-format
 msgid ""
 "Differential backups only save files that have changed or are new since the "
@@ -17278,17 +18213,17 @@ msgstr ""
 "Los respaldos diferenciales sólo guardan los archivos que cambiaron o son "
 "nuevos desde el respaldo 'base' original."
 
-#: 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 ""
 "Esto debería ser una dirección de correo-e o un usuario local al que desea "
 "enviar los resultados del respaldo. Necesitará tener funcionando un servidor "
 "de correo."
 
-#: standalone/drakbackup:159
+#: standalone/drakbackup:160
 #, c-format
 msgid ""
 "Files or wildcards listed in a .backupignore file at the top of a directory "
@@ -17297,7 +18232,7 @@ msgstr ""
 "Los archivos o comodines listados en un archivo .backupignore al principio "
 "de un árbol de directorios no se respaldarán."
 
-#: standalone/drakbackup:160
+#: standalone/drakbackup:161
 #, c-format
 msgid ""
 "For backups to other media, files are still created on the hard drive, then "
@@ -17308,7 +18243,7 @@ msgstr ""
 "rígido, luego se mueven a los soportes. Al habilitar esta opción se quitarán "
 "los archivos tar del disco luego del respaldo."
 
-#: standalone/drakbackup:161
+#: standalone/drakbackup:162
 #, c-format
 msgid ""
 "Some protocols, like rsync, may be configured at the server end.  Rather "
@@ -17319,7 +18254,7 @@ msgstr ""
 "En vez de usar una ruta de directorio, debería usar el nombre del 'módulo' "
 "para la ruta del servicio."
 
-#: standalone/drakbackup:162
+#: standalone/drakbackup:163
 #, c-format
 msgid ""
 "Custom allows you to specify your own day and time.  The other options use "
@@ -17328,27 +18263,27 @@ msgstr ""
 "Personalizado le permite especificar su propio día y hora.  Las otras "
 "opciones usan run-parts en /etc/crontab."
 
-#: standalone/drakbackup:326
+#: standalone/drakbackup:327
 #, c-format
 msgid "No media selected for cron operation."
 msgstr "No se seleccionó soporte para la operación cron."
 
-#: standalone/drakbackup:330
+#: standalone/drakbackup:331
 #, c-format
 msgid "No interval selected for cron operation."
 msgstr "No se seleccionó intervalo para la operación cron."
 
-#: standalone/drakbackup:377
+#: standalone/drakbackup:378
 #, c-format
 msgid "Interval cron not available as non-root"
 msgstr "Intervalo cron no disponible como no-root"
 
-#: 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\" no es un correo-e válido ni es un usuario local existente!"
 
-#: 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 "
@@ -17357,24 +18292,24 @@ msgstr ""
 "\"%s\" es un usuario local pero no seleccionó un SMTP local, ¡por lo que "
 "debe usar una dirección de correo-e completa!"
 
-#: standalone/drakbackup:475
+#: standalone/drakbackup:476
 #, c-format
 msgid "Valid user list changed, rewriting config file."
 msgstr ""
 "Cambió la lista de usuarios válidos, volviendo a escribir archivo de "
 "configuración."
 
-#: standalone/drakbackup:477
+#: standalone/drakbackup:478
 #, c-format
 msgid "Old user list:\n"
 msgstr "Lista de usuarios antigua:\n"
 
-#: standalone/drakbackup:479
+#: standalone/drakbackup:480
 #, c-format
 msgid "New user list:\n"
 msgstr "Lista de usuarios nueva:\n"
 
-#: standalone/drakbackup:524
+#: standalone/drakbackup:525
 #, c-format
 msgid ""
 "\n"
@@ -17383,7 +18318,7 @@ msgstr ""
 "\n"
 "                  Reporte de DrakBackup \n"
 
-#: standalone/drakbackup:525
+#: standalone/drakbackup:526
 #, c-format
 msgid ""
 "\n"
@@ -17392,7 +18327,7 @@ msgstr ""
 "\n"
 "               Reporte del servidor DrakBackup\n"
 
-#: standalone/drakbackup:531
+#: standalone/drakbackup:532
 #, c-format
 msgid ""
 "\n"
@@ -17405,13 +18340,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 "Progreso total"
 
-#: standalone/drakbackup:609
+#: standalone/drakbackup:610
 #, c-format
 msgid ""
 "%s exists, delete?\n"
@@ -17423,42 +18358,42 @@ msgstr ""
 "Si ya realizó este proceso probablemente deba purgar\n"
 "la entrada de authorized_keys en el servidor."
 
-#: standalone/drakbackup:618
+#: standalone/drakbackup:619
 #, c-format
 msgid "This may take a moment to generate the keys."
 msgstr "La generación de claves puede tardar unos momentos."
 
-#: standalone/drakbackup:625
+#: standalone/drakbackup:626
 #, c-format
 msgid "Cannot spawn %s."
 msgstr "No se puede lanzar %s."
 
-#: standalone/drakbackup:642
+#: standalone/drakbackup:643
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr "Sin pedido de contraseña en %s en el puerto %s"
 
-#: standalone/drakbackup:643
+#: standalone/drakbackup:644
 #, c-format
 msgid "Bad password on %s"
 msgstr "Contraseña incorrecta en %s"
 
-#: standalone/drakbackup:644
+#: standalone/drakbackup:645
 #, c-format
 msgid "Permission denied transferring %s to %s"
 msgstr "Permiso denegado transfiriendo %s a %s"
 
-#: standalone/drakbackup:645
+#: standalone/drakbackup:646
 #, c-format
 msgid "Can't find %s on %s"
 msgstr "No puedo encontrar %s en %s"
 
-#: standalone/drakbackup:649
+#: standalone/drakbackup:650
 #, c-format
 msgid "%s not responding"
 msgstr "%s no responde"
 
-#: standalone/drakbackup:653
+#: standalone/drakbackup:654
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -17475,47 +18410,47 @@ msgstr ""
 "\n"
 "sin que se le pida una contraseña."
 
-#: standalone/drakbackup:697
+#: standalone/drakbackup:698
 #, c-format
 msgid "WebDAV remote site already in sync!"
 msgstr "¡El sitio WebDAV remoto ya está sincronizado!"
 
-#: standalone/drakbackup:701
+#: standalone/drakbackup:702
 #, c-format
 msgid "WebDAV transfer failed!"
 msgstr "¡Falló la transferencia WebDAV!"
 
-#: standalone/drakbackup:722
+#: standalone/drakbackup:723
 #, c-format
 msgid "No CD-R/DVD-R in drive!"
 msgstr "¡No hay CDR/DVDR en la unidad!"
 
-#: standalone/drakbackup:726
+#: standalone/drakbackup:727
 #, c-format
 msgid "Does not appear to be recordable media!"
 msgstr "¡No parece ser un soporte grabable!"
 
-#: standalone/drakbackup:730
+#: standalone/drakbackup:732
 #, c-format
 msgid "Not erasable media!"
 msgstr "¡No es un soporte borrable!"
 
-#: standalone/drakbackup:771
+#: standalone/drakbackup:774
 #, c-format
 msgid "This may take a moment to erase the media."
 msgstr "Borrar el soporte puede tardar unos momentos."
 
-#: standalone/drakbackup:829
+#: standalone/drakbackup:832
 #, c-format
 msgid "Permission problem accessing CD."
 msgstr "Problema de permisos al acceder al CD."
 
-#: standalone/drakbackup:856
+#: standalone/drakbackup:859
 #, c-format
 msgid "No tape in %s!"
 msgstr "¡No hay cinta en %s!"
 
-#: standalone/drakbackup:956
+#: standalone/drakbackup:966
 #, c-format
 msgid ""
 "Backup quota exceeded!\n"
@@ -17524,37 +18459,37 @@ msgstr ""
 "¡Se excedió la cuota de respaldo!\n"
 "%d MB usados vs %d MB asignados."
 
-#: standalone/drakbackup:975 standalone/drakbackup:1008
+#: standalone/drakbackup:985 standalone/drakbackup:1018
 #, c-format
 msgid "Backup system files..."
 msgstr "Respaldar archivos del sistema..."
 
-#: standalone/drakbackup:1009 standalone/drakbackup:1050
+#: standalone/drakbackup:1019 standalone/drakbackup:1060
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr "Respaldar archivos del disco rígido..."
 
-#: standalone/drakbackup:1049
+#: standalone/drakbackup:1059
 #, c-format
 msgid "Backup User files..."
 msgstr "Respaldar archivos de usuario..."
 
-#: standalone/drakbackup:1084
+#: standalone/drakbackup:1094
 #, c-format
 msgid "Backup Other files..."
 msgstr "Respaldar otros archivos..."
 
-#: standalone/drakbackup:1085
+#: standalone/drakbackup:1095
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr "Progreso de respaldo del disco rígido..."
 
-#: standalone/drakbackup:1090
+#: standalone/drakbackup:1100
 #, c-format
 msgid "No changes to backup!"
 msgstr "¡No hay cambios para realizar respaldo!"
 
-#: standalone/drakbackup:1108 standalone/drakbackup:1132
+#: standalone/drakbackup:1118 standalone/drakbackup:1142
 #, c-format
 msgid ""
 "\n"
@@ -17565,7 +18500,7 @@ msgstr ""
 "Actividades de Drakbackup por medio de %s:\n"
 "\n"
 
-#: standalone/drakbackup:1117
+#: standalone/drakbackup:1127
 #, c-format
 msgid ""
 "\n"
@@ -17576,19 +18511,20 @@ msgstr ""
 " Problema en la conexión FTP: No fue posible enviar sus archivos de copia de "
 "respaldo por FTP.\n"
 
-#: standalone/drakbackup:1118
+#: standalone/drakbackup:1128
 #, c-format
-msgid "Error during sending file via FTP. Please correct your FTP configuration."
+msgid ""
+"Error during sending file via FTP. Please correct your FTP configuration."
 msgstr ""
 "Error enviando el archivo por FTP. Por favor, corrija su configuración de "
 "FTP."
 
-#: standalone/drakbackup:1120
+#: standalone/drakbackup:1130
 #, c-format
 msgid "file list sent by FTP: %s\n"
 msgstr "lista de archivos envíada por FTP: %s\n"
 
-#: standalone/drakbackup:1137
+#: standalone/drakbackup:1147
 #, c-format
 msgid ""
 "\n"
@@ -17599,7 +18535,7 @@ msgstr ""
 "Actividades de Drakbackup por medio de CD:\n"
 "\n"
 
-#: standalone/drakbackup:1142
+#: standalone/drakbackup:1152
 #, c-format
 msgid ""
 "\n"
@@ -17610,22 +18546,22 @@ msgstr ""
 "Actividades de Drakbackup por medio de cinta:\n"
 "\n"
 
-#: standalone/drakbackup:1151
+#: standalone/drakbackup:1161
 #, c-format
 msgid "Error sending mail. Your report mail was not sent."
 msgstr "Error enviando correo. Su correo de reporte no se envió."
 
-#: standalone/drakbackup:1152
+#: standalone/drakbackup:1162
 #, c-format
 msgid " Error while sending mail. \n"
 msgstr " Error durante el envío de correo. \n"
 
-#: standalone/drakbackup:1180
+#: standalone/drakbackup:1192
 #, c-format
 msgid "Can't create catalog!"
 msgstr "¡No se puede crear catálogo!"
 
-#: standalone/drakbackup:1393
+#: standalone/drakbackup:1414
 #, c-format
 msgid ""
 "\n"
@@ -17634,44 +18570,45 @@ msgstr ""
 "\n"
 "Por favor, marque todas las opciones que necesita.\n"
 
-#: standalone/drakbackup:1394
+#: standalone/drakbackup:1415
 #, c-format
-msgid "These options can backup and restore all files in your /etc directory.\n"
+msgid ""
+"These options can backup and restore all files in your /etc directory.\n"
 msgstr ""
 "Estas opciones pueden respaldar y restaurar todos los archivos en el "
 "directorio /etc.\n"
 
-#: standalone/drakbackup:1395
+#: standalone/drakbackup:1416
 #, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr "Respaldar sus archivos del sistema. (directorio /etc)"
 
-#: 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 ""
 "Usar respaldos incrementales/diferenciales  (no reemplazar respaldos "
 "antiguos)"
 
-#: 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 "Usar respaldos incrementales"
 
-#: 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 "Usar respaldos diferenciales"
 
-#: standalone/drakbackup:1400
+#: standalone/drakbackup:1421
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr "No incluir archivos críticos (passwd, group, fstab)"
 
-#: standalone/drakbackup:1401
+#: standalone/drakbackup:1422
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
@@ -17680,179 +18617,179 @@ msgstr ""
 "Con esta opción podrá restaurar cualquier versión de su\n"
 "directorio /etc."
 
-#: standalone/drakbackup:1432
+#: standalone/drakbackup:1453
 #, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr ""
 "Por favor, marque a todos los usuarios que desea incluir en la copia de "
 "respaldo"
 
-#: standalone/drakbackup:1459
+#: standalone/drakbackup:1480
 #, c-format
 msgid "Do not include the browser cache"
 msgstr "No incluir cache del navegador"
 
-#: standalone/drakbackup:1513
+#: standalone/drakbackup:1534
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr "Seleccione los archivos o directorios y haga clic sobre 'Aceptar'"
 
-#: standalone/drakbackup:1514 standalone/drakfont:656
+#: standalone/drakbackup:1535 standalone/drakfont:660
 #, c-format
 msgid "Remove Selected"
 msgstr "Quitar los seleccionados."
 
-#: standalone/drakbackup:1577
+#: standalone/drakbackup:1598
 #, c-format
 msgid "Users"
 msgstr "Usuarios"
 
-#: standalone/drakbackup:1597
+#: standalone/drakbackup:1618
 #, c-format
 msgid "Use network connection to backup"
 msgstr "Usar conexión de red para realizar copia de respaldo"
 
-#: standalone/drakbackup:1599
+#: standalone/drakbackup:1620
 #, c-format
 msgid "Net Method:"
 msgstr "Método de red:"
 
-#: standalone/drakbackup:1603
+#: standalone/drakbackup:1624
 #, c-format
 msgid "Use Expect for SSH"
 msgstr "Usar Expect para SSH"
 
-#: standalone/drakbackup:1604
+#: standalone/drakbackup:1625
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr "Crear/Transferir claves de respaldo para SSH"
 
-#: standalone/drakbackup:1606
+#: standalone/drakbackup:1627
 #, c-format
 msgid "Transfer Now"
 msgstr "Transferir ahora"
 
-#: standalone/drakbackup:1608
+#: standalone/drakbackup:1629
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr "Otras claves (no de drakbackup) ya están en su lugar"
 
-#: standalone/drakbackup:1611
+#: standalone/drakbackup:1632
 #, c-format
 msgid "Host name or IP."
 msgstr "Nombre de la máquina o IP."
 
-#: standalone/drakbackup:1616
+#: standalone/drakbackup:1637
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
 msgstr "Directorio (o módulo) para poner la copia de respaldo en este host."
 
-#: standalone/drakbackup:1621
-#, c-format
-msgid "Login name"
-msgstr "Nombre de conexión"
-
-#: standalone/drakbackup:1628
+#: standalone/drakbackup:1649
 #, c-format
 msgid "Remember this password"
 msgstr "Recordar esta contraseña"
 
-#: standalone/drakbackup:1644
+#: standalone/drakbackup:1665
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr "¡Necesita el nombre del host, el nombre de usuario y la contraseña!"
 
-#: standalone/drakbackup:1742
+#: standalone/drakbackup:1756
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr "Usar CD/DVDROM para la copia de respaldo"
 
-#: standalone/drakbackup:1745
+#: standalone/drakbackup:1759
 #, c-format
 msgid "Choose your CD/DVD device"
 msgstr "Inidique el dispositivo de su CD/DVD"
 
-#: standalone/drakbackup:1750
+#: standalone/drakbackup:1764
 #, c-format
 msgid "Choose your CD/DVD media size"
 msgstr "Indique el tamaño de soporte de su CD/DVD"
 
-#: standalone/drakbackup:1757
+#: standalone/drakbackup:1771
 #, c-format
 msgid "Multisession CD"
 msgstr "CD multisesión"
 
-#: standalone/drakbackup:1759
+#: standalone/drakbackup:1773
 #, c-format
 msgid "CDRW media"
 msgstr "Soporte CDRW"
 
-#: standalone/drakbackup:1765
+#: standalone/drakbackup:1779
 #, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr "Borrar su soporte regrabable (1er. sesión)"
 
-#: standalone/drakbackup:1766
+#: standalone/drakbackup:1780
 #, c-format
 msgid " Erase Now "
 msgstr " Borrar Ahora "
 
-#: standalone/drakbackup:1772
+#: standalone/drakbackup:1786
 #, c-format
 msgid "DVD+RW media"
 msgstr "Soporte DVD+RW"
 
-#: standalone/drakbackup:1774
+#: standalone/drakbackup:1788
 #, c-format
 msgid "DVD-R media"
 msgstr "Soporte DVD-R"
 
-#: standalone/drakbackup:1776
+#: standalone/drakbackup:1790
 #, c-format
 msgid "DVDRAM device"
 msgstr "Dispositivo DVDRAM"
 
-#: standalone/drakbackup:1807
+#: standalone/drakbackup:1821
 #, c-format
 msgid "No CD device defined!"
 msgstr "¡No se definió dispositivo de CD!"
 
-#: standalone/drakbackup:1854
+#: standalone/drakbackup:1863
 #, c-format
 msgid "Use tape to backup"
 msgstr "Usar cinta para realizar respaldo"
 
-#: standalone/drakbackup:1857
+#: standalone/drakbackup:1866
 #, c-format
 msgid "Device name to use for backup"
 msgstr "Nombre del dispositivo a utilizar para el respaldo"
 
-#: standalone/drakbackup:1863
+#: standalone/drakbackup:1872
+#, c-format
+msgid "Backup directly to tape"
+msgstr "Respaldar directamente a cinta"
+
+#: standalone/drakbackup:1878
 #, c-format
 msgid "Don't rewind tape after backup"
 msgstr "No rebobinar la cinta luego del respaldo"
 
-#: standalone/drakbackup:1869
+#: standalone/drakbackup:1884
 #, c-format
 msgid "Erase tape before backup"
 msgstr "Borrar la cinta antes del respaldo"
 
-#: standalone/drakbackup:1875
+#: standalone/drakbackup:1890
 #, c-format
 msgid "Eject tape after the backup"
 msgstr "Expulsar la cinta luego del respaldo"
 
-#: standalone/drakbackup:1942
+#: standalone/drakbackup:1962
 #, c-format
 msgid "Enter the directory to save to:"
 msgstr "Ingrese el directorio donde guardar:"
 
-#: standalone/drakbackup:1946
+#: standalone/drakbackup:1966
 #, c-format
 msgid "Directory to save to"
 msgstr "Directorio donde guardar"
 
-#: standalone/drakbackup:1951
+#: standalone/drakbackup:1971
 #, c-format
 msgid ""
 "Maximum size\n"
@@ -17861,309 +18798,310 @@ msgstr ""
 "Ingrese el tamaño máximo\n"
 " permitido para Drakbackup (MB)"
 
-#: standalone/drakbackup:2015
+#: standalone/drakbackup:2035
 #, c-format
 msgid "CD-R / DVD-R"
 msgstr "CDROM / DVDROM"
 
-#: standalone/drakbackup:2020
+#: standalone/drakbackup:2040
 #, c-format
 msgid "HardDrive / NFS"
 msgstr "Disco rígido / NFS"
 
-#: standalone/drakbackup:2036 standalone/drakbackup:2041
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2056
+#: standalone/drakbackup:2061
 #, c-format
 msgid "hourly"
 msgstr "cada hora"
 
-#: standalone/drakbackup:2037 standalone/drakbackup:2042
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2057
+#: standalone/drakbackup:2062
 #, c-format
 msgid "daily"
 msgstr "cada día"
 
-#: standalone/drakbackup:2038 standalone/drakbackup:2043
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2058
+#: standalone/drakbackup:2063
 #, c-format
 msgid "weekly"
 msgstr "cada semana"
 
-#: standalone/drakbackup:2039 standalone/drakbackup:2044
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2059
+#: standalone/drakbackup:2064
 #, c-format
 msgid "monthly"
 msgstr "cada mes"
 
-#: standalone/drakbackup:2040 standalone/drakbackup:2045
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2060
+#: standalone/drakbackup:2065
 #, c-format
 msgid "custom"
 msgstr "personalizada"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "January"
 msgstr "Enero"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "February"
 msgstr "Febrero"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "March"
 msgstr "Marzo"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "April"
 msgstr "Abril"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "May"
 msgstr "Mayo"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "June"
 msgstr "Junio"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "July"
 msgstr "Julio"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "August"
 msgstr "Agosto"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "September"
 msgstr "Septiembre"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "October"
 msgstr "Octubre"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "November"
 msgstr "Noviembre"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "December"
 msgstr "Diciembre"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Sunday"
 msgstr "Domingo"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Monday"
 msgstr "Lunes"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Tuesday"
 msgstr "Martes"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Thursday"
 msgstr "Jueves"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Friday"
 msgstr "Viernes"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Saturday"
 msgstr "Sábado"
 
-#: standalone/drakbackup:2094
+#: standalone/drakbackup:2107
 #, c-format
 msgid "Use daemon"
 msgstr "Usar servidor"
 
-#: standalone/drakbackup:2099
+#: standalone/drakbackup:2112
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr "Por favor, elija el intervalo de tiempo entre cada copia de respaldo"
 
-#: standalone/drakbackup:2105
+#: standalone/drakbackup:2118
 #, c-format
 msgid "Custom setup/crontab entry:"
 msgstr "Ajuste personalizado/entrada crontab:"
 
-#: standalone/drakbackup:2110
+#: standalone/drakbackup:2123
 #, c-format
 msgid "Minute"
 msgstr "Minuto"
 
-#: standalone/drakbackup:2114
+#: standalone/drakbackup:2127
 #, c-format
 msgid "Hour"
 msgstr "Hora"
 
-#: standalone/drakbackup:2118
+#: standalone/drakbackup:2131
 #, c-format
 msgid "Day"
 msgstr "Día"
 
-#: standalone/drakbackup:2122
+#: standalone/drakbackup:2135
 #, c-format
 msgid "Month"
 msgstr "Mes"
 
-#: standalone/drakbackup:2126
+#: standalone/drakbackup:2139
 #, c-format
 msgid "Weekday"
 msgstr "Día de semana"
 
-#: standalone/drakbackup:2132
+#: standalone/drakbackup:2145
 #, c-format
 msgid "Please choose the media for backup."
 msgstr "Por favor, elija el soporte para la copia de respaldo."
 
-#: standalone/drakbackup:2139
+#: standalone/drakbackup:2152
 #, c-format
 msgid "Please be sure that the cron daemon is included in your services."
-msgstr "Por favor, asegúrese que el servidor cron está incluído entre sus servicios."
+msgstr ""
+"Por favor, asegúrese que el servidor cron está incluído entre sus servicios."
 
-#: standalone/drakbackup:2140
+#: standalone/drakbackup:2153
 #, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
 msgstr ""
 "Note que, corrientemente, todos los soportes de \"red\" también utilizan el "
 "disco rígido."
 
-#: standalone/drakbackup:2190
+#: standalone/drakbackup:2201
 #, c-format
 msgid "Please choose the compression type"
 msgstr "Por favor, elija el tipo de compresión"
 
-#: standalone/drakbackup:2194
+#: standalone/drakbackup:2205
 #, c-format
 msgid "Use .backupignore files"
 msgstr "Usar archivos .backupignore"
 
-#: standalone/drakbackup:2196
+#: standalone/drakbackup:2207
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr "Enviar reporte por correo-e luego de cada respaldo a :"
 
-#: standalone/drakbackup:2202
+#: standalone/drakbackup:2213
 #, c-format
 msgid "SMTP server for mail:"
 msgstr "Servidor SMTP para el correo:"
 
-#: standalone/drakbackup:2207
+#: standalone/drakbackup:2218
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr "Borrar los archivos tar del disco luego de respaldar a otro soporte."
 
-#: standalone/drakbackup:2247
+#: standalone/drakbackup:2258
 #, c-format
 msgid "What"
 msgstr "Qué"
 
-#: standalone/drakbackup:2252
+#: standalone/drakbackup:2263
 #, c-format
 msgid "Where"
 msgstr "Dónde"
 
-#: standalone/drakbackup:2257
+#: standalone/drakbackup:2268
 #, c-format
 msgid "When"
 msgstr "Cuándo"
 
-#: standalone/drakbackup:2262
+#: standalone/drakbackup:2273
 #, c-format
 msgid "More Options"
 msgstr "Más opciones"
 
-#: standalone/drakbackup:2275
+#: standalone/drakbackup:2286
 #, c-format
 msgid "Backup destination not configured..."
 msgstr "No está configurado el destino del respaldo..."
 
-#: standalone/drakbackup:2293 standalone/drakbackup:4208
+#: standalone/drakbackup:2306 standalone/drakbackup:4229
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr "Configuración de Drakbackup"
 
-#: standalone/drakbackup:2309
+#: standalone/drakbackup:2322
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr "Por favor, elija dónde desea realizar la copia de respaldo"
 
-#: standalone/drakbackup:2311
+#: standalone/drakbackup:2325
 #, c-format
 msgid "Hard Drive used to prepare backups for all media"
 msgstr "Disco rígido usado para preparar los respaldos para todos los soportes"
 
-#: standalone/drakbackup:2319
+#: standalone/drakbackup:2325
 #, c-format
 msgid "Across Network"
 msgstr "a través de la red"
 
-#: standalone/drakbackup:2327
+#: standalone/drakbackup:2325
 #, c-format
 msgid "On CD-R"
 msgstr "en CDROM"
 
-#: standalone/drakbackup:2335
+#: standalone/drakbackup:2325
 #, c-format
 msgid "On Tape Device"
 msgstr "en Dispositivo de Cinta"
 
-#: standalone/drakbackup:2374
+#: standalone/drakbackup:2371
 #, c-format
 msgid "Backup Users"
 msgstr "Respaldar usuarios"
 
-#: standalone/drakbackup:2375
+#: standalone/drakbackup:2372
 #, c-format
 msgid " (Default is all users)"
 msgstr "(Todos los usuarios predeterminadamente)"
 
-#: standalone/drakbackup:2387
+#: standalone/drakbackup:2384
 #, c-format
 msgid "Please choose what you want to backup"
 msgstr "Por favor, elija qué desea respaldar"
 
-#: standalone/drakbackup:2388
+#: standalone/drakbackup:2385
 #, c-format
 msgid "Backup System"
 msgstr "Respaldar el sistema"
 
-#: standalone/drakbackup:2390
+#: standalone/drakbackup:2387
 #, c-format
 msgid "Select user manually"
 msgstr "Seleccionar manualmente el usuario"
 
-#: standalone/drakbackup:2419
+#: standalone/drakbackup:2416
 #, c-format
 msgid "Please select data to backup..."
 msgstr "Por favor, elija los datos a respaldar..."
 
-#: standalone/drakbackup:2491
+#: standalone/drakbackup:2488
 #, c-format
 msgid ""
 "\n"
@@ -18172,7 +19110,7 @@ msgstr ""
 "\n"
 "Fuentes de respaldo: \n"
 
-#: standalone/drakbackup:2492
+#: standalone/drakbackup:2489
 #, c-format
 msgid ""
 "\n"
@@ -18181,7 +19119,7 @@ msgstr ""
 "\n"
 "- Archivos del sistema:\n"
 
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2491
 #, c-format
 msgid ""
 "\n"
@@ -18190,7 +19128,7 @@ msgstr ""
 "\n"
 "- Archivos de usuario:\n"
 
-#: standalone/drakbackup:2496
+#: standalone/drakbackup:2493
 #, c-format
 msgid ""
 "\n"
@@ -18199,7 +19137,7 @@ msgstr ""
 "\n"
 "- Otros archivos:\n"
 
-#: standalone/drakbackup:2498
+#: standalone/drakbackup:2495
 #, c-format
 msgid ""
 "\n"
@@ -18208,12 +19146,12 @@ msgstr ""
 "\n"
 "- Guardar en el disco en la ruta: %s\n"
 
-#: standalone/drakbackup:2499
+#: standalone/drakbackup:2496
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr "\tLimitar uso de disco a %s MB\n"
 
-#: standalone/drakbackup:2502
+#: standalone/drakbackup:2499
 #, c-format
 msgid ""
 "\n"
@@ -18222,17 +19160,7 @@ msgstr ""
 "\n"
 "- Borrar los archivos tar del disco luego de la copia de respaldo.\n"
 
-#: standalone/drakbackup:2506
-#, c-format
-msgid "NO"
-msgstr "NO"
-
-#: standalone/drakbackup:2507
-#, c-format
-msgid "YES"
-msgstr "SÍ"
-
-#: standalone/drakbackup:2508
+#: standalone/drakbackup:2504
 #, c-format
 msgid ""
 "\n"
@@ -18241,22 +19169,22 @@ msgstr ""
 "\n"
 "- Grabar en 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 " en el dispositivo: %s"
 
-#: standalone/drakbackup:2511
+#: standalone/drakbackup:2507
 #, c-format
 msgid " (multi-session)"
 msgstr " (multi-sesión)"
 
-#: standalone/drakbackup:2512
+#: standalone/drakbackup:2508
 #, c-format
 msgid ""
 "\n"
@@ -18265,12 +19193,17 @@ msgstr ""
 "\n"
 "- Guardar en cinta en el dispositivo: %s"
 
-#: standalone/drakbackup:2513
+#: standalone/drakbackup:2509
 #, c-format
 msgid "\t\tErase=%s"
 msgstr "\t\tErase=%s"
 
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2511
+#, c-format
+msgid "\tBackup directly to Tape\n"
+msgstr "\tRespaldar directamente a Cinta\n"
+
+#: standalone/drakbackup:2513
 #, c-format
 msgid ""
 "\n"
@@ -18279,7 +19212,7 @@ msgstr ""
 "\n"
 "- Guardar usando %s en el host: %s\n"
 
-#: standalone/drakbackup:2517
+#: standalone/drakbackup:2514
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -18288,7 +19221,7 @@ msgstr ""
 "\t\t nombre de usuario: %s\n"
 "\t\t en ruta: %s \n"
 
-#: standalone/drakbackup:2518
+#: standalone/drakbackup:2515
 #, c-format
 msgid ""
 "\n"
@@ -18297,42 +19230,42 @@ msgstr ""
 "\n"
 "- Opciones:\n"
 
-#: standalone/drakbackup:2519
+#: standalone/drakbackup:2516
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr "\tNo incluir archivos del sistema\n"
 
-#: standalone/drakbackup:2521
+#: standalone/drakbackup:2518
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
 msgstr "\tRespaldar usando tar y bzip2\n"
 
-#: standalone/drakbackup:2522
+#: standalone/drakbackup:2519
 #, c-format
 msgid "\tBackups use tar and gzip\n"
 msgstr "\tRespaldar usando tar y gzip\n"
 
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2520
 #, c-format
 msgid "\tBackups use tar only\n"
 msgstr "\tLos respaldos sólo usan tar\n"
 
-#: standalone/drakbackup:2525
+#: standalone/drakbackup:2522
 #, c-format
 msgid "\tUse .backupignore files\n"
 msgstr "\tUsar archivos .backupignore\n"
 
-#: standalone/drakbackup:2526
+#: standalone/drakbackup:2523
 #, c-format
 msgid "\tSend mail to %s\n"
 msgstr "\tEnviar correo a %s\n"
 
-#: standalone/drakbackup:2527
+#: standalone/drakbackup:2524
 #, c-format
 msgid "\tUsing SMTP server %s\n"
 msgstr "\tUsando servidor SMTP %s\n"
 
-#: standalone/drakbackup:2529
+#: standalone/drakbackup:2526
 #, c-format
 msgid ""
 "\n"
@@ -18341,47 +19274,48 @@ msgstr ""
 "\n"
 "- Servidor (%s) via :\n"
 
-#: standalone/drakbackup:2530
+#: standalone/drakbackup:2527
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr "\t-Disco rígido.\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-Tape \n"
 
-#: standalone/drakbackup:2533
+#: standalone/drakbackup:2530
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr "\t-Red por FTP.\n"
 
-#: standalone/drakbackup:2534
+#: standalone/drakbackup:2531
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr "\t-Red por SSH.\n"
 
-#: standalone/drakbackup:2535
+#: standalone/drakbackup:2532
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr "\t-Red por rsync.\n"
 
-#: standalone/drakbackup:2536
+#: standalone/drakbackup:2533
 #, c-format
 msgid "\t-Network by webdav.\n"
 msgstr "\t-Red por webdav.\n"
 
-#: standalone/drakbackup:2538
+#: standalone/drakbackup:2535
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
-msgstr "Sin configuración, por favor haga clic sobre el Asistente o Avanzado.\n"
+msgstr ""
+"Sin configuración, por favor haga clic sobre el Asistente o Avanzado.\n"
 
-#: standalone/drakbackup:2543
+#: standalone/drakbackup:2540
 #, c-format
 msgid ""
 "List of data to restore:\n"
@@ -18390,27 +19324,27 @@ msgstr ""
 "Lista de datos a restaurar:\n"
 "\n"
 
-#: standalone/drakbackup:2545
+#: standalone/drakbackup:2542
 #, c-format
 msgid "- Restore System Files.\n"
 msgstr "- Restaurar archivos del sistema.\n"
 
-#: standalone/drakbackup:2547 standalone/drakbackup:2557
+#: standalone/drakbackup:2544 standalone/drakbackup:2554
 #, c-format
 msgid "   - from date: %s %s\n"
 msgstr "   - desde la fecha: %s %s\n"
 
-#: standalone/drakbackup:2550
+#: standalone/drakbackup:2547
 #, c-format
 msgid "- Restore User Files: \n"
 msgstr "- Restaurar archivos de usuario:\n"
 
-#: standalone/drakbackup:2555
+#: standalone/drakbackup:2552
 #, c-format
 msgid "- Restore Other Files: \n"
 msgstr "- Restaurar otros archivos:\n"
 
-#: standalone/drakbackup:2736
+#: standalone/drakbackup:2731
 #, c-format
 msgid ""
 "List of data corrupted:\n"
@@ -18419,131 +19353,131 @@ msgstr ""
 "Lista de datos corruptos:\n"
 "\n"
 
-#: standalone/drakbackup:2738
+#: standalone/drakbackup:2733
 #, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr "Por favor, desmarque o quítelo la próxima vez."
 
-#: standalone/drakbackup:2748
+#: standalone/drakbackup:2743
 #, c-format
 msgid "Backup files are corrupted"
 msgstr "Los archivos de respaldo están corruptos"
 
-#: standalone/drakbackup:2769
+#: standalone/drakbackup:2764
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr "          Todos los datos seleccionados han sido        "
 
-#: standalone/drakbackup:2770
+#: standalone/drakbackup:2765
 #, c-format
-msgid "          Successfuly Restored on %s       "
+msgid "          Successfully Restored on %s       "
 msgstr "       Recuperados satisfactoriamente en %s"
 
-#: standalone/drakbackup:2889
+#: standalone/drakbackup:2885
 #, c-format
 msgid "         Restore Configuration       "
 msgstr "    Configuración de la restauración"
 
-#: standalone/drakbackup:2917
+#: standalone/drakbackup:2913
 #, c-format
 msgid "OK to restore the other files."
 msgstr "Se pueden restaurar los otros archivos."
 
-#: standalone/drakbackup:2933
+#: standalone/drakbackup:2929
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr ""
 "Lista de usuarios a restaurar (sólo importa la fecha más reciente por "
 "usuario)"
 
-#: standalone/drakbackup:3000
+#: standalone/drakbackup:2994
 #, c-format
 msgid "Please choose the date to restore:"
 msgstr "Por favor, elija la fecha para restaurar:"
 
-#: standalone/drakbackup:3037
+#: standalone/drakbackup:3031
 #, c-format
 msgid "Restore from Hard Disk."
 msgstr "Restaurar desde el disco rígido."
 
-#: standalone/drakbackup:3039
+#: standalone/drakbackup:3033
 #, c-format
 msgid "Enter the directory where backups are stored"
 msgstr "Ingrese el directorio donde se almacenan las copias de respaldo"
 
-#: standalone/drakbackup:3043
+#: standalone/drakbackup:3037
 #, c-format
 msgid "Directory with backups"
 msgstr "Directorio con los respaldos"
 
-#: standalone/drakbackup:3097
+#: standalone/drakbackup:3091
 #, c-format
 msgid "Select another media to restore from"
 msgstr "Elija otro soporte desde el cual restaurar"
 
-#: standalone/drakbackup:3099
+#: standalone/drakbackup:3093
 #, c-format
 msgid "Other Media"
 msgstr "Otros soportes"
 
-#: standalone/drakbackup:3104
+#: standalone/drakbackup:3098
 #, c-format
 msgid "Restore system"
 msgstr "Restaurar archivos del sistema"
 
-#: standalone/drakbackup:3105
+#: standalone/drakbackup:3099
 #, c-format
 msgid "Restore Users"
 msgstr "Restaurar usuarios"
 
-#: standalone/drakbackup:3106
+#: standalone/drakbackup:3100
 #, c-format
 msgid "Restore Other"
 msgstr "Restaurar otros"
 
-#: standalone/drakbackup:3108
+#: standalone/drakbackup:3102
 #, c-format
 msgid "Select path to restore (instead of /)"
 msgstr "seleccione la ruta para restaurar (en vez de /)"
 
-#: standalone/drakbackup:3112 standalone/drakbackup:3394
+#: standalone/drakbackup:3106 standalone/drakbackup:3388
 #, c-format
 msgid "Path To Restore To"
 msgstr "Ruta a la cual restaurar"
 
-#: standalone/drakbackup:3115
+#: standalone/drakbackup:3109
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr ""
 "Realizar respaldo nuevo antes de restaurar (sólo para respaldos "
 "incrementales)"
 
-#: standalone/drakbackup:3117
+#: standalone/drakbackup:3111
 #, c-format
 msgid "Remove user directories before restore."
 msgstr "Borrar directorios de los usuarios antes de restaurar."
 
-#: standalone/drakbackup:3201
+#: standalone/drakbackup:3196
 #, c-format
 msgid "Filename text substring to search for (empty string matches all):"
 msgstr "Subcadena de nombre de archivo a buscar (vacía coincide con todos):"
 
-#: standalone/drakbackup:3204
+#: standalone/drakbackup:3199
 #, c-format
 msgid "Search Backups"
 msgstr "Buscar respaldos"
 
-#: standalone/drakbackup:3223
+#: standalone/drakbackup:3217
 #, c-format
 msgid "No matches found..."
 msgstr "No se encontraron coincidencias..."
 
-#: standalone/drakbackup:3227
+#: standalone/drakbackup:3221
 #, c-format
 msgid "Restore Selected"
 msgstr "Restaurar seleccionados"
 
-#: standalone/drakbackup:3362
+#: standalone/drakbackup:3356
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
@@ -18552,7 +19486,7 @@ msgstr ""
 "Haga clic sobre fecha/hora para ver los archivos de respaldo.\n"
 "Haga Ctrl-clic sobre los archivos para seleccionar varios."
 
-#: standalone/drakbackup:3368
+#: standalone/drakbackup:3362
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -18561,7 +19495,7 @@ msgstr ""
 "Restaurar entrada\n"
 "del Catálogo seleccionada"
 
-#: standalone/drakbackup:3377
+#: standalone/drakbackup:3371
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -18570,17 +19504,17 @@ msgstr ""
 "Restaurar los archivos\n"
 "seleccionados"
 
-#: standalone/drakbackup:3454
+#: standalone/drakbackup:3448
 #, c-format
 msgid "Backup files not found at %s."
 msgstr "Copiar archivos no encontrados en %s."
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid "Restore From CD"
 msgstr "Restaurar desde CD"
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
@@ -18589,17 +19523,17 @@ msgstr ""
 "Inserte el CD con la etiqueta de volumen %s\n"
 " en la unidad de CD bajo el punto de montaje /mnt/cdrom"
 
-#: standalone/drakbackup:3469
+#: standalone/drakbackup:3463
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr "No es el CD correcto. El disco está etiquetado %s."
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid "Restore From Tape"
 msgstr "Restaurar desde cinta"
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
@@ -18608,218 +19542,218 @@ msgstr ""
 "Inserte la cinta con la etiqueta de volumen %s\n"
 " en la unidad de cinta %s"
 
-#: standalone/drakbackup:3481
+#: standalone/drakbackup:3475
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr "No es la cinta adecuada. La cinta está etiquetada %s."
 
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore Via Network"
 msgstr "Restaurar por medio de la red"
 
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr "Restaurar por medio del protocolo de red: %s"
 
-#: standalone/drakbackup:3493
+#: standalone/drakbackup:3487
 #, c-format
 msgid "Host Name"
 msgstr "Nombre del host"
 
-#: standalone/drakbackup:3494
+#: standalone/drakbackup:3488
 #, c-format
 msgid "Host Path or Module"
 msgstr "Ruta del host o módulo"
 
-#: standalone/drakbackup:3501
+#: standalone/drakbackup:3495
 #, c-format
 msgid "Password required"
 msgstr "Se necesita contraseña"
 
-#: standalone/drakbackup:3507
+#: standalone/drakbackup:3501
 #, c-format
 msgid "Username required"
 msgstr "Se necesita nombre de usuario"
 
-#: standalone/drakbackup:3510
+#: standalone/drakbackup:3504
 #, c-format
 msgid "Hostname required"
 msgstr "Se necesita nombre del host"
 
-#: standalone/drakbackup:3515
+#: standalone/drakbackup:3509
 #, c-format
 msgid "Path or Module required"
 msgstr "Se necesita Ruta o Módulo"
 
-#: standalone/drakbackup:3528
+#: standalone/drakbackup:3522
 #, c-format
 msgid "Files Restored..."
 msgstr "Archivos restaurados..."
 
-#: standalone/drakbackup:3531
+#: standalone/drakbackup:3525
 #, c-format
 msgid "Restore Failed..."
 msgstr "Falló la restauración..."
 
-#: standalone/drakbackup:3549
+#: standalone/drakbackup:3543
 #, c-format
 msgid "%s not retrieved..."
 msgstr "%s no recuperado..."
 
-#: standalone/drakbackup:3748 standalone/drakbackup:3817
+#: standalone/drakbackup:3765 standalone/drakbackup:3834
 #, c-format
 msgid "Search for files to restore"
 msgstr "Buscando archivos para restaurar"
 
-#: standalone/drakbackup:3752
+#: standalone/drakbackup:3769
 #, c-format
 msgid "Restore all backups"
 msgstr "Restaurar todas las copias de respaldo"
 
-#: standalone/drakbackup:3760
+#: standalone/drakbackup:3777
 #, c-format
 msgid "Custom Restore"
 msgstr "Restauración personalizada"
 
-#: standalone/drakbackup:3764 standalone/drakbackup:3813
+#: standalone/drakbackup:3781 standalone/drakbackup:3830
 #, c-format
 msgid "Restore From Catalog"
 msgstr "Restaurar desde Catálogo"
 
-#: standalone/drakbackup:3785
+#: standalone/drakbackup:3802
 #, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr "No se pueden encontrar respaldos para restaurar...\n"
 
-#: standalone/drakbackup:3786
+#: standalone/drakbackup:3803
 #, c-format
 msgid "Verify that %s is the correct path"
 msgstr "Verifique que %s es la ruta correcta"
 
-#: standalone/drakbackup:3787
+#: standalone/drakbackup:3804
 #, c-format
 msgid " and the CD is in the drive"
 msgstr "y el CD está en la unidad de CD-ROM"
 
-#: standalone/drakbackup:3789
+#: standalone/drakbackup:3806
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr "Respaldos en soportes removibles - Usar catálogo para restaurar"
 
-#: standalone/drakbackup:3805
+#: standalone/drakbackup:3822
 #, c-format
 msgid "CD in place - continue."
 msgstr "CD en su lugar - continuar."
 
-#: standalone/drakbackup:3810
+#: standalone/drakbackup:3827
 #, c-format
 msgid "Browse to new restore repository."
 msgstr "Examinar un repositorio de restauración nuevo."
 
-#: standalone/drakbackup:3811
+#: standalone/drakbackup:3828
 #, c-format
 msgid "Directory To Restore From"
 msgstr "Directorio desde el cual restaurar"
 
-#: standalone/drakbackup:3847
+#: standalone/drakbackup:3864
 #, c-format
 msgid "Restore Progress"
 msgstr "Progreso de restauración"
 
-#: standalone/drakbackup:3898 standalone/drakbackup:3971
-#: standalone/logdrake:174
+#: standalone/drakbackup:3919 standalone/drakbackup:3992
+#: standalone/logdrake:173
 #, c-format
 msgid "Save"
 msgstr "Guardar"
 
-#: standalone/drakbackup:3954
+#: standalone/drakbackup:3975
 #, c-format
 msgid "Build Backup"
 msgstr "Realizar respaldo"
 
-#: standalone/drakbackup:3987 standalone/drakbackup:4307
+#: standalone/drakbackup:4008 standalone/drakbackup:4328
 #, c-format
 msgid "Restore"
 msgstr "Restaurar"
 
-#: standalone/drakbackup:4075
+#: standalone/drakbackup:4096
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "Se deben instalar los siguientes paquetes:\n"
 
-#: standalone/drakbackup:4102
+#: standalone/drakbackup:4123
 #, c-format
 msgid "Please select data to restore..."
 msgstr "Por favor, seleccione los datos a restaurar..."
 
-#: standalone/drakbackup:4142
+#: standalone/drakbackup:4163
 #, c-format
 msgid "Backup system files"
 msgstr "Respaldar archivos del sistema"
 
-#: standalone/drakbackup:4145
+#: standalone/drakbackup:4166
 #, c-format
 msgid "Backup user files"
 msgstr "Respaldar archivos de usuarios"
 
-#: standalone/drakbackup:4148
+#: standalone/drakbackup:4169
 #, c-format
 msgid "Backup other files"
 msgstr "Respaldar otros archivos"
 
-#: standalone/drakbackup:4151 standalone/drakbackup:4185
+#: standalone/drakbackup:4172 standalone/drakbackup:4206
 #, c-format
 msgid "Total Progress"
 msgstr "Progreso total"
 
-#: standalone/drakbackup:4177
+#: standalone/drakbackup:4198
 #, c-format
 msgid "Sending files by FTP"
 msgstr "Enviando archivos por FTP"
 
-#: standalone/drakbackup:4180
+#: standalone/drakbackup:4201
 #, c-format
 msgid "Sending files..."
 msgstr "Enviando archivos..."
 
-#: standalone/drakbackup:4250
+#: standalone/drakbackup:4271
 #, c-format
 msgid "Backup Now from configuration file"
 msgstr "Respaldar Ahora desde archivo de configuración"
 
-#: standalone/drakbackup:4255
+#: standalone/drakbackup:4276
 #, c-format
 msgid "View Backup Configuration."
 msgstr "Ver configuración del respaldo"
 
-#: standalone/drakbackup:4281
+#: standalone/drakbackup:4302
 #, c-format
 msgid "Wizard Configuration"
 msgstr "Configuración del Asistente"
 
-#: standalone/drakbackup:4286
+#: standalone/drakbackup:4307
 #, c-format
 msgid "Advanced Configuration"
 msgstr "Configuración avanzada"
 
-#: standalone/drakbackup:4291
+#: standalone/drakbackup:4312
 #, c-format
 msgid "View Configuration"
 msgstr "Ver configuración"
 
-#: standalone/drakbackup:4295
+#: standalone/drakbackup:4316
 #, c-format
 msgid "View Last Log"
 msgstr "Ver último registro"
 
-#: standalone/drakbackup:4300
+#: standalone/drakbackup:4321
 #, c-format
 msgid "Backup Now"
 msgstr "Respaldar Ahora"
 
-#: standalone/drakbackup:4304
+#: standalone/drakbackup:4325
 #, c-format
 msgid ""
 "No configuration file found \n"
@@ -18828,56 +19762,56 @@ msgstr ""
 "No se econtró el archivo de configuración,\n"
 " por favor haga clic sobre Asistente o Avanzado."
 
-#: standalone/drakbackup:4324 standalone/drakbackup:4327
+#: standalone/drakbackup:4345 standalone/drakbackup:4348
 #, c-format
 msgid "Drakbackup"
 msgstr "Drakbackup"
 
-#: standalone/drakboot:58
+#: standalone/drakboot:64
 #, c-format
 msgid "Graphical boot theme selection"
 msgstr "Selección del tema gráfico al arrancar"
 
-#: standalone/drakboot:58
+#: standalone/drakboot:64
 #, c-format
 msgid "System mode"
 msgstr "Modo del sistema"
 
-#: 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 "/_Archivo"
 
-#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/logdrake:77
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/logdrake:76
 #, c-format
 msgid "/File/_Quit"
 msgstr "/Archivo/_Salir"
 
-#: 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>S"
 
-#: standalone/drakboot:139
+#: standalone/drakboot:148
 #, c-format
 msgid "Install themes"
 msgstr "Instalar temas"
 
-#: standalone/drakboot:140
+#: standalone/drakboot:149
 #, c-format
 msgid "Create new theme"
 msgstr "Crear un tema nuevo"
 
-#: standalone/drakboot:152
+#: standalone/drakboot:161
 #, c-format
 msgid "Use graphical boot"
 msgstr "Usar arranque gráfico"
 
-#: standalone/drakboot:157
+#: standalone/drakboot:166
 #, c-format
 msgid ""
 "Your system bootloader is not in framebuffer mode. To activate graphical "
@@ -18887,12 +19821,17 @@ msgstr ""
 "activar el arranque gráfico, seleccione un modo de vídeo gráfico en la "
 "herramienta de configuración."
 
-#: standalone/drakboot:164
+#: standalone/drakboot:167
+#, c-format
+msgid "Do you want to configure it now?"
+msgstr "¿Desea configurarlo ahora?"
+
+#: standalone/drakboot:177
 #, c-format
 msgid "Theme"
 msgstr "Tema"
 
-#: standalone/drakboot:167
+#: standalone/drakboot:180
 #, c-format
 msgid ""
 "Display theme\n"
@@ -18901,155 +19840,134 @@ msgstr ""
 "Mostrar tema\n"
 "bajo la consola"
 
-#: standalone/drakboot:176
+#: standalone/drakboot:189
 #, c-format
 msgid "Launch the graphical environment when your system starts"
 msgstr "Lanzar el sistema X-Window al comenzar"
 
-#: standalone/drakboot:184
+#: standalone/drakboot:197
 #, c-format
 msgid "No, I don't want autologin"
 msgstr "No, no deseo entrada automática"
 
-#: standalone/drakboot:185
+#: standalone/drakboot:198
 #, c-format
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "Sí, deseo entrada automática con este (usuario, escritorio)"
 
-#: standalone/drakboot:191
+#: standalone/drakboot:201
 #, c-format
 msgid "Default user"
 msgstr "Usuario predeterminado"
 
-#: standalone/drakboot:192
+#: standalone/drakboot:202
 #, c-format
 msgid "Default desktop"
 msgstr "Escritorio predeterminado"
 
-#: standalone/drakboot:256
-#, c-format
-msgid "Installation of %s failed. The following error occured:"
-msgstr "Falló la instalación de %s. Ocurrió el siguiente error:"
-
-#: 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 ""
-"Para enviar un reporte de errores, haga clic sobre el botón Reporte.\n"
-"Esto abrirá una ventana del navegador web en %s\n"
-"donde encontrará un formulario para completar. La información que se\n"
-"muestra arriba será transferida a ese servidor."
+"Elija un modo de vídeo, el cual será aplicada a cada una de las entradas de "
+"arranque aquí debajo.\n"
+"Asegurese de que su tarjeta de video soporta el modo que eligió"
 
-#: standalone/drakbug:48
+#: standalone/drakbug:41
 #, c-format
-msgid "Mandrake Bug Report Tool"
-msgstr "Herramienta de Reporte de Errores de Mandrake"
+msgid "Mandrakelinux Bug Report Tool"
+msgstr "Herramienta de Reporte de Errores de Mandrakelinux"
 
-#: standalone/drakbug:53
+#: standalone/drakbug:46
 #, c-format
-msgid "Mandrake Control Center"
-msgstr "Centro de control de Mandrake"
+msgid "Mandrakelinux Control Center"
+msgstr "Centro de control de Mandrakelinux"
 
-#: standalone/drakbug:55
+#: standalone/drakbug:48
 #, c-format
 msgid "Synchronization tool"
 msgstr "Herramienta de sincronización"
 
-#: 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 "Herramientas 'standalone'"
 
-#: standalone/drakbug:57
+#: standalone/drakbug:50
 #, c-format
 msgid "HardDrake"
 msgstr "HardDrake"
 
-#: 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 "Menudrake"
 
-#: standalone/drakbug:60
+#: standalone/drakbug:53
 #, c-format
 msgid "Msec"
 msgstr "Msec"
 
-#: standalone/drakbug:61
+#: standalone/drakbug:54
 #, c-format
 msgid "Remote Control"
 msgstr "Control remoto"
 
-#: standalone/drakbug:62
+#: standalone/drakbug:55
 #, c-format
 msgid "Software Manager"
 msgstr "Administrador de software"
 
-#: 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 "Herramienta para migrar desde Windows"
 
-#: standalone/drakbug:65
+#: standalone/drakbug:58
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: standalone/drakbug:66
+#: standalone/drakbug:59
 #, c-format
 msgid "Configuration Wizards"
 msgstr "Asistentes de configuración"
 
-#: 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 ""
-"Para enviar un reporte de errores, haga clic sobre el botón Reporte, que "
-"abrirá su\n"
-"navegador predeterminado en Anthill donde podrá subir la información de "
-"arriba como un reporte de error."
-
-#: standalone/drakbug:102
+#: standalone/drakbug:83
 #, c-format
 msgid "Application:"
 msgstr "Aplicación:"
 
-#: standalone/drakbug:103 standalone/drakbug:115
+#: standalone/drakbug:84 standalone/drakbug:96
 #, c-format
 msgid "Package: "
 msgstr "Paquete:"
 
-#: standalone/drakbug:104
+#: standalone/drakbug:85
 #, c-format
 msgid "Kernel:"
 msgstr "Núcleo:"
 
-#: standalone/drakbug:105 standalone/drakbug:116
+#: standalone/drakbug:86 standalone/drakbug:97
 #, c-format
 msgid "Release: "
 msgstr "Versión:"
 
-#: standalone/drakbug:110
+#: standalone/drakbug:91
 #, c-format
 msgid ""
 "Application Name\n"
@@ -19058,117 +19976,131 @@ msgstr ""
 "Nombre de aplicación\n"
 "o ruta completa:"
 
-#: standalone/drakbug:113
+#: standalone/drakbug:94
 #, c-format
 msgid "Find Package"
 msgstr "Encontrar paquete"
 
-#: standalone/drakbug:117
+#: standalone/drakbug:98
 #, c-format
 msgid "Summary: "
 msgstr "Resumen: "
 
-#: standalone/drakbug:129
-#, c-format
-msgid "YOUR TEXT HERE"
-msgstr "SU TEXTO AQUÍ"
-
-#: standalone/drakbug:132
+#: standalone/drakbug:104
 #, c-format
 msgid "Bug Description/System Information"
 msgstr "Información del sistema/Descripción del error"
 
-#: standalone/drakbug:136
+#: standalone/drakbug:105
+#, c-format
+msgid "YOUR TEXT HERE"
+msgstr "SU TEXTO AQUÍ"
+
+#: standalone/drakbug:108
 #, c-format
 msgid "Submit kernel version"
 msgstr "Enviar versión del núcleo"
 
-#: standalone/drakbug:137
+#: standalone/drakbug:109
 #, c-format
 msgid "Submit cpuinfo"
 msgstr "Enviar cpuinfo"
 
-#: standalone/drakbug:138
+#: standalone/drakbug:110
 #, c-format
 msgid "Submit lspci"
 msgstr "Enviar lspci"
 
-#: 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 ""
+"Para enviar un reporte de errores, haga clic sobre el botón Reporte.\n"
+"Esto abrirá una ventana del navegador web en %s\n"
+"donde encontrará un formulario para completar. La información que se\n"
+"muestra arriba será transferida a ese servidor."
+
+#: standalone/drakbug:130
 #, c-format
 msgid "Report"
 msgstr "Reporte"
 
-#: standalone/drakbug:219
+#: standalone/drakbug:191
 #, c-format
 msgid "Not installed"
 msgstr "No instalado"
 
-#: standalone/drakbug:231
+#: standalone/drakbug:203
 #, c-format
 msgid "Package not installed"
 msgstr "Paquete no instalado"
 
-#: standalone/drakbug:248
+#: standalone/drakbug:220
 #, c-format
 msgid "NOT FOUND"
 msgstr "NO ENCONTRADO"
 
-#: standalone/drakbug:259
+#: standalone/drakbug:227
 #, c-format
-msgid "connecting to %s ..."
+msgid "connecting to %s..."
 msgstr "conectando a %s ..."
 
-#: standalone/drakbug:267
+#: standalone/drakbug:235
 #, c-format
 msgid "No browser available! Please install one"
 msgstr "¡No hay un navegador disponible! Por favor, instale uno"
 
-#: standalone/drakbug:286
+#: standalone/drakbug:254
 #, c-format
 msgid "Please enter a package name."
 msgstr "Por favor, ingrese el nombre de un paquete."
 
-#: standalone/drakbug:292
+#: standalone/drakbug:260
 #, c-format
 msgid "Please enter summary text."
 msgstr "Por favor ingrese el texto del resumen."
 
-#: standalone/drakclock:29
+#: standalone/drakclock:30
 #, c-format
 msgid "DrakClock"
 msgstr "DrakClock"
 
-#: standalone/drakclock:39
+#: standalone/drakclock:40
 #, c-format
 msgid "not defined"
 msgstr "no definido"
 
-#: standalone/drakclock:41
+#: standalone/drakclock:42
 #, c-format
 msgid "Change Time Zone"
 msgstr "Cambiar el huso horario"
 
-#: standalone/drakclock:45
+#: standalone/drakclock:46
 #, c-format
 msgid "Timezone - DrakClock"
 msgstr "Huso horario - DrakClock"
 
-#: standalone/drakclock:47
+#: standalone/drakclock:48
 #, c-format
 msgid "GMT - DrakClock"
 msgstr "GMT - DrakClock"
 
-#: standalone/drakclock:47
+#: standalone/drakclock:48
 #, c-format
 msgid "Is your hardware clock set to GMT?"
 msgstr "¿El reloj interno está puesto a GMT?"
 
-#: standalone/drakclock:79
+#: standalone/drakclock:76
 #, c-format
 msgid "Network Time Protocol"
 msgstr "Network Time Protocol"
 
-#: standalone/drakclock:81
+#: standalone/drakclock:78
 #, c-format
 msgid ""
 "Your computer can synchronize its clock\n"
@@ -19177,50 +20109,55 @@ msgstr ""
 "Su computadora puede sincronizar su reloj\n"
 "con un servidor remoto usando NTP"
 
-#: standalone/drakclock:82
+#: standalone/drakclock:79
 #, c-format
 msgid "Enable Network Time Protocol"
 msgstr "Habilitar el Protocolo de la Hora de Red (NTP)"
 
-#: standalone/drakclock:90
+#: standalone/drakclock:87
 #, c-format
 msgid "Server:"
 msgstr "Servidor:"
 
-#: standalone/drakclock:137 standalone/drakclock:149
+#: standalone/drakclock:125
+#, c-format
+msgid "Could not synchronize with %s."
+msgstr "No se ha podido sincronizar con %s"
+
+#: standalone/drakclock:147 standalone/drakclock:157
 #, c-format
 msgid "Reset"
 msgstr "Reset"
 
-#: 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 ""
 "Debemos instalar el paquete ntp\n"
 "para habilitar el Network Time Protocol\n"
 "\n"
 "¿Desea instalar ntp?"
 
-#: standalone/drakconnect:81
+#: standalone/drakconnect:85
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Configuración de la red (%d adaptadores)"
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Gateway:"
 msgstr "Pasarela:"
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Interface:"
 msgstr "Interfaz:"
 
-#: standalone/drakconnect:96 standalone/net_monitor:106
+#: standalone/drakconnect:100 standalone/net_monitor:122
 #, c-format
 msgid "Wait please"
 msgstr "Por favor, espere"
@@ -19230,12 +20167,8 @@ msgstr "Por favor, espere"
 msgid "Interface"
 msgstr "Interfaz"
 
-#: standalone/drakconnect:116 standalone/drakups:233
-#, c-format
-msgid "Driver"
-msgstr "Controlador"
-
-#: standalone/drakconnect:116
+#: standalone/drakconnect:116 standalone/printerdrake:218
+#: standalone/printerdrake:225
 #, c-format
 msgid "State"
 msgstr "Estado"
@@ -19250,7 +20183,7 @@ msgstr "Nombre de la máquina: "
 msgid "Configure hostname..."
 msgstr "Configurar nombre del host..."
 
-#: standalone/drakconnect:149 standalone/drakconnect:792
+#: standalone/drakconnect:149 standalone/drakconnect:843
 #, c-format
 msgid "LAN configuration"
 msgstr "Configuración de la red local"
@@ -19260,8 +20193,8 @@ msgstr "Configuración de la red local"
 msgid "Configure Local Area Network..."
 msgstr "Configurar la red de área local..."
 
-#: standalone/drakconnect:162 standalone/drakconnect:240
-#: standalone/drakconnect:244
+#: standalone/drakconnect:162 standalone/drakconnect:246
+#: standalone/drakconnect:250
 #, c-format
 msgid "Apply"
 msgstr "Aplicar"
@@ -19271,107 +20204,113 @@ msgstr "Aplicar"
 msgid "Manage connections"
 msgstr "Administrar conexiones"
 
-#: standalone/drakconnect:218
+#: standalone/drakconnect:224
 #, c-format
 msgid "Device selected"
 msgstr "Dispositivo seleccionado"
 
-#: standalone/drakconnect:314
+#: standalone/drakconnect:305
 #, c-format
 msgid "IP configuration"
 msgstr "Configuración IP"
 
-#: standalone/drakconnect:351
+#: standalone/drakconnect:342
 #, c-format
 msgid "DNS servers"
 msgstr "Servidores DNS"
 
-#: standalone/drakconnect:359
+#: standalone/drakconnect:350
 #, c-format
 msgid "Search Domain"
 msgstr "Dominio de búsqueda"
 
-#: standalone/drakconnect:367
+#: standalone/drakconnect:358
 #, c-format
 msgid "static"
 msgstr "estática"
 
-#: standalone/drakconnect:367
+#: standalone/drakconnect:358
 #, c-format
 msgid "DHCP"
 msgstr "DHCP"
 
-#: standalone/drakconnect:493
+#: standalone/drakconnect:436
+#, c-format
+msgid "Metric"
+msgstr "Métrica"
+
+#: standalone/drakconnect:491
 #, c-format
 msgid "Flow control"
 msgstr "Control de flujo"
 
-#: standalone/drakconnect:494
+#: standalone/drakconnect:492
 #, c-format
 msgid "Line termination"
 msgstr "Terminación de línea"
 
-#: standalone/drakconnect:505
+#: standalone/drakconnect:503
 #, c-format
 msgid "Modem timeout"
 msgstr "Tiempo de espera del módem"
 
-#: standalone/drakconnect:509
+#: standalone/drakconnect:507
 #, c-format
 msgid "Use lock file"
 msgstr "Usar archivo de traba"
 
-#: standalone/drakconnect:511
+#: standalone/drakconnect:509
 #, c-format
 msgid "Wait for dialup tone before dialing"
 msgstr "Esperar el tono de marcado antes de discar"
 
-#: standalone/drakconnect:514
+#: standalone/drakconnect:512
 #, c-format
 msgid "Busy wait"
 msgstr "Espera activa"
 
-#: standalone/drakconnect:519
+#: standalone/drakconnect:517
 #, c-format
 msgid "Modem sound"
 msgstr "Sonido del módem"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
 #, c-format
 msgid "Enable"
 msgstr "Activar"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
 #, c-format
 msgid "Disable"
 msgstr "Desactivar"
 
-#: standalone/drakconnect:571 standalone/harddrake2:62
+#: standalone/drakconnect:569 standalone/harddrake2:45
 #, c-format
 msgid "Media class"
 msgstr "Clase de soporte"
 
-#: standalone/drakconnect:572 standalone/drakfloppy:141
+#: standalone/drakconnect:570 standalone/drakfloppy:136
 #, c-format
 msgid "Module name"
 msgstr "Nombre del módulo"
 
-#: standalone/drakconnect:573
+#: standalone/drakconnect:571
 #, c-format
 msgid "Mac Address"
 msgstr "Dirección MAC"
 
-#: standalone/drakconnect:574 standalone/harddrake2:21
+#: standalone/drakconnect:572 standalone/harddrake2:23
+#: standalone/harddrake2:104
 #, c-format
 msgid "Bus"
 msgstr "Bus"
 
-#: standalone/drakconnect:575 standalone/harddrake2:29
+#: standalone/drakconnect:573 standalone/harddrake2:29
 #, c-format
 msgid "Location on the bus"
 msgstr "Ubicación en el bus"
 
-#: 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 "
@@ -19380,20 +20319,20 @@ msgstr ""
 "No se ha detectado ningún adaptador de red en su sistema. Por favor, ejecute "
 "la herramienta de configuración del hardware."
 
-#: standalone/drakconnect:651
+#: standalone/drakconnect:678
 #, c-format
 msgid "Remove a network interface"
 msgstr "Quitar una interfaz de red"
 
-#: standalone/drakconnect:655
+#: standalone/drakconnect:682
 #, c-format
 msgid "Select the network interface to remove:"
 msgstr "Seleccione la interfaz de red a quitar:"
 
-#: 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 ""
@@ -19401,52 +20340,54 @@ msgstr ""
 "\n"
 "%s"
 
-#: standalone/drakconnect:681
+#: standalone/drakconnect:715
 #, c-format
-msgid "Congratulations, the \"%s\" network interface has been succesfully deleted"
-msgstr "Felicidades, la interfaz de red \"%s\" ha sido eliminada satisfactoriamente."
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr ""
+"Felicidades, la interfaz de red \"%s\" ha sido eliminada satisfactoriamente."
 
-#: standalone/drakconnect:698
+#: standalone/drakconnect:732
 #, c-format
-msgid "No Ip"
+msgid "No IP"
 msgstr "Sin IP"
 
-#: standalone/drakconnect:699
+#: standalone/drakconnect:733
 #, c-format
 msgid "No Mask"
 msgstr "Ninguna máscara"
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
 #, c-format
 msgid "up"
 msgstr "activa"
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
 #, c-format
 msgid "down"
 msgstr "desactivada"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Connected"
 msgstr "Conectado"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Not connected"
 msgstr "No conectado"
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Disconnect..."
 msgstr "Desconectar..."
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Connect..."
 msgstr "Conectar..."
 
-#: standalone/drakconnect:772
+#: standalone/drakconnect:808
 #, c-format
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
@@ -19455,17 +20396,17 @@ msgstr ""
 "Atención, se ha detectado otra conexión con la Internet, tal vez está usando "
 "su red"
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, c-format
 msgid "Deactivate now"
 msgstr "Desactivar ahora"
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, c-format
 msgid "Activate now"
 msgstr "Activar ahora"
 
-#: standalone/drakconnect:796
+#: standalone/drakconnect:847
 #, c-format
 msgid ""
 "You don't have any configured interface.\n"
@@ -19474,82 +20415,103 @@ msgstr ""
 "No tiene configurada ninguna interfaz.\n"
 "Configure la primera haciendo clic sobre 'Configurar'"
 
-#: standalone/drakconnect:810
+#: standalone/drakconnect:861
 #, c-format
 msgid "LAN Configuration"
 msgstr "Configuración LAN"
 
-#: standalone/drakconnect:822
+#: standalone/drakconnect:873
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Adaptador %s: %s"
 
-#: standalone/drakconnect:831
+#: standalone/drakconnect:882
 #, c-format
 msgid "Boot Protocol"
 msgstr "Protocolo de arranque"
 
-#: standalone/drakconnect:832
+#: standalone/drakconnect:883
 #, c-format
 msgid "Started on boot"
 msgstr "Iniciado al arranque"
 
-#: 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 ""
 "Todavía no se ha configurado esta interfaz.\n"
 "Lance el asistente \"Añadir una interfaz\" desde el Centro de Control de "
-"Mandrake"
+"Mandrakelinux"
 
-#. -PO: here "Internet access" should be translated the same was as in control-center
-#: standalone/drakconnect:923
+#. -PO: here "Add Connection" should be translated the same was as in control-center
+#: standalone/drakconnect:974 standalone/net_applet:46
 #, 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 ""
-"No tiene conexión a Internet configurada.\n"
-"Por favor, ejecute \"Acceso a Internet\" en el centro de control."
+"Todavía no tiene nunguna conexión a Internet configurada.\n"
+"Lance el asistente \"Añadir una conexión\" desde el Centro de Control de "
+"Mandrakelinux"
 
-#: standalone/drakconnect:931
+#: standalone/drakconnect:982
 #, c-format
 msgid "Internet connection configuration"
 msgstr "Configuración de la conexión a Internet"
 
-#: standalone/drakconnect:949
+#: standalone/drakconnect:1000
 #, c-format
 msgid "Third DNS server (optional)"
 msgstr "Tercer servidor DNS (opcional)"
 
-#: standalone/drakconnect:971
+#: standalone/drakconnect:1022
 #, c-format
 msgid "Internet Connection Configuration"
 msgstr "Configuración de la conexión a Internet"
 
-#: standalone/drakconnect:972
+#: standalone/drakconnect:1023
 #, c-format
 msgid "Internet access"
 msgstr "Acceso a Internet"
 
-#: standalone/drakconnect:974 standalone/net_monitor:88
+#: standalone/drakconnect:1025 standalone/net_monitor:101
 #, c-format
 msgid "Connection type: "
 msgstr "Tipo de conexión: "
 
-#: standalone/drakconnect:977
+#: standalone/drakconnect:1028
 #, c-format
 msgid "Status:"
 msgstr "Estado:"
 
-#: standalone/drakedm:53
+#: standalone/drakedm:34
+#, c-format
+msgid "GDM (GNOME Display Manager)"
+msgstr "XDM (administrador de conexión GNOME)"
+
+#: standalone/drakedm:35
+#, c-format
+msgid "KDM (KDE Display Manager)"
+msgstr "XDM (administrador de conexión KDE)"
+
+#: standalone/drakedm:36
+#, c-format
+msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgstr "XDM (administrador de conexión Mandrakelinux)"
+
+#: standalone/drakedm:37
+#, c-format
+msgid "XDM (X Display Manager)"
+msgstr "XDM (administrador de conexión X11)"
+
+#: standalone/drakedm:55
 #, c-format
 msgid "Choosing a display manager"
 msgstr "Eligiendo un administrador de conexión"
 
-#: standalone/drakedm:54
+#: standalone/drakedm:56
 #, c-format
 msgid ""
 "X11 Display Manager allows you to graphically log\n"
@@ -19560,92 +20522,101 @@ msgstr ""
 "a su sistema con el X Window System corriendo y soporta correr varias\n"
 "sesiones X diferentes en su máquina local a la vez."
 
-#: 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 "Se realizó el cambio, ¿desea reiniciar el servicio dm?"
 
-#: 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 ""
+"Va a cerrar todos los programas que se están ejecutando y perder su sesión "
+"actual. ¿Realmente está seguro que desea volver a iniciar el servicio dm?"
+
+#: standalone/drakfloppy:41
 #, c-format
 msgid "drakfloppy"
 msgstr "drakfloppy"
 
-#: standalone/drakfloppy:83
+#: standalone/drakfloppy:78
 #, c-format
 msgid "Boot disk creation"
 msgstr "Creación de disquetes de arranque"
 
-#: standalone/drakfloppy:84
+#: standalone/drakfloppy:79
 #, c-format
 msgid "General"
 msgstr "General"
 
-#: standalone/drakfloppy:87
+#: standalone/drakfloppy:82 standalone/harddrake2:131
 #, c-format
 msgid "Device"
 msgstr "Dispositivo"
 
-#: standalone/drakfloppy:93
+#: standalone/drakfloppy:88
 #, c-format
 msgid "Kernel version"
 msgstr "Versión del núcleo"
 
-#: standalone/drakfloppy:108
+#: standalone/drakfloppy:103
 #, c-format
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: standalone/drakfloppy:122
+#: standalone/drakfloppy:117
 #, c-format
 msgid "Advanced preferences"
 msgstr "Preferencias avanzadas"
 
-#: standalone/drakfloppy:141
+#: standalone/drakfloppy:136
 #, c-format
 msgid "Size"
 msgstr "Tamaño"
 
-#: standalone/drakfloppy:144
+#: standalone/drakfloppy:139
 #, c-format
 msgid "Mkinitrd optional arguments"
 msgstr "Argumentos opcionales para mkinitrd"
 
-#: standalone/drakfloppy:146
+#: standalone/drakfloppy:141
 #, c-format
 msgid "force"
 msgstr "forzar"
 
-#: standalone/drakfloppy:147
+#: standalone/drakfloppy:142
 #, c-format
 msgid "omit raid modules"
 msgstr "omitir módulos raid"
 
-#: standalone/drakfloppy:148
+#: standalone/drakfloppy:143
 #, c-format
 msgid "if needed"
 msgstr "si es necesario"
 
-#: standalone/drakfloppy:149
+#: standalone/drakfloppy:144
 #, c-format
 msgid "omit scsi modules"
 msgstr "omitir módulos scsi"
 
-#: standalone/drakfloppy:152
+#: standalone/drakfloppy:147
 #, c-format
 msgid "Add a module"
 msgstr "Agregar un módulo"
 
-#: standalone/drakfloppy:161
+#: standalone/drakfloppy:156
 #, c-format
 msgid "Remove a module"
 msgstr "Quitar un módulo"
 
-#: standalone/drakfloppy:296
+#: standalone/drakfloppy:291
 #, c-format
 msgid "Be sure a media is present for the device %s"
 msgstr "Asegúrese que hay un soporte para el dispositivo %s"
 
-#: standalone/drakfloppy:302
+#: standalone/drakfloppy:297
 #, c-format
 msgid ""
 "There is no medium or it is write-protected for device %s.\n"
@@ -19655,22 +20626,23 @@ msgstr ""
 "s.\n"
 "Por favor, inserte uno."
 
-#: standalone/drakfloppy:306
+#: standalone/drakfloppy:301
 #, c-format
 msgid "Unable to fork: %s"
 msgstr "No se puede hacer fork: %s"
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, c-format
 msgid "Floppy creation completed"
 msgstr "Creación de disquete completada"
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, c-format
 msgid "The creation of the boot floppy has been successfully completed \n"
 msgstr "La creación del disquete de arranque se completó satisfactoriamente \n"
 
-#: standalone/drakfloppy:312
+#. -PO: Do not alter the <span ..> and </span> tags
+#: standalone/drakfloppy:309
 #, c-format
 msgid ""
 "Unable to properly close mkbootdisk:\n"
@@ -19814,7 +20786,7 @@ msgstr "Lista de tipografías"
 msgid "About"
 msgstr "Acerca de"
 
-#: standalone/drakfont:495 standalone/drakfont:687 standalone/drakfont:725
+#: standalone/drakfont:495 standalone/drakfont:691 standalone/drakfont:729
 #, c-format
 msgid "Uninstall"
 msgstr "Desinstalar"
@@ -19824,10 +20796,11 @@ msgstr "Desinstalar"
 msgid "Import"
 msgstr "Importar"
 
-#: 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"
@@ -19836,7 +20809,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright (C) 2001-2002 por MandrakeSoft \n"
+"Copyright (C) 2001-2002 por Mandrakesoft \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (versión original)\n"
@@ -19845,7 +20818,7 @@ msgstr ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 
-#: standalone/drakfont:521
+#: standalone/drakfont:523
 #, c-format
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
@@ -19880,7 +20853,7 @@ msgstr ""
 " junto con este programa; de no ser así, escriba a la Free Software\n"
 " Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: standalone/drakfont:537
+#: standalone/drakfont:539
 #, c-format
 msgid ""
 "Thanks:\n"
@@ -19912,12 +20885,12 @@ msgstr ""
 "             Convertir archivos de tipografías ttf font a tipografías afm y "
 "pfb.\n"
 
-#: standalone/drakfont:556
+#: standalone/drakfont:558
 #, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr "Elija las aplicaciones que soportarán las tipografías:"
 
-#: standalone/drakfont:557
+#: standalone/drakfont:559
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -19932,122 +20905,128 @@ msgstr ""
 "Puede instalar las tipografías usando la manera normal. En casos raros,\n"
 "puede ser que tipografías \"falsas\" congelen a su servidor X."
 
-#: 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 "Impresoras genéricas"
 
-#: standalone/drakfont:586
+#: standalone/drakfont:588
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
-msgstr "Seleccione el archivo o directorio de tipografías y haga clic sobre 'Agregar'"
+msgstr ""
+"Seleccione el archivo o directorio de tipografías y haga clic sobre 'Agregar'"
 
-#: standalone/drakfont:587
+#: standalone/drakfont:589
 #, c-format
 msgid "File Selection"
 msgstr "Selección de archivos."
 
-#: standalone/drakfont:600
+#: standalone/drakfont:604
 #, c-format
 msgid "You've not selected any font"
 msgstr "No seleccionó tipografía alguna"
 
-#: standalone/drakfont:652
+#: standalone/drakfont:656
 #, c-format
 msgid "Import fonts"
 msgstr "Importar tipografías"
 
-#: standalone/drakfont:657
+#: standalone/drakfont:661
 #, c-format
 msgid "Install fonts"
 msgstr "Instalar tipografías"
 
-#: standalone/drakfont:692
+#: standalone/drakfont:696
 #, c-format
 msgid "click here if you are sure."
 msgstr "haga clic aquí si está seguro."
 
-#: standalone/drakfont:694
+#: standalone/drakfont:698
 #, c-format
 msgid "here if no."
 msgstr "aquí si no lo está."
 
-#: standalone/drakfont:733
+#: standalone/drakfont:737
 #, c-format
 msgid "Unselected All"
 msgstr "Deseleccionar todas."
 
-#: standalone/drakfont:736
+#: standalone/drakfont:740
 #, c-format
 msgid "Selected All"
 msgstr "Seleccionar todas."
 
-#: standalone/drakfont:739
+#: standalone/drakfont:743
 #, c-format
 msgid "Remove List"
 msgstr "Quitar lista"
 
-#: standalone/drakfont:750 standalone/drakfont:769
+#: standalone/drakfont:754 standalone/drakfont:773
 #, c-format
 msgid "Importing fonts"
 msgstr "Importando tipografías"
 
-#: standalone/drakfont:754 standalone/drakfont:774
+#: standalone/drakfont:758 standalone/drakfont:778
 #, c-format
 msgid "Initial tests"
 msgstr "Pruebas iniciales"
 
-#: standalone/drakfont:755
+#: standalone/drakfont:759
 #, c-format
 msgid "Copy fonts on your system"
 msgstr "Copiar tipografías en su sistema"
 
-#: standalone/drakfont:756
+#: standalone/drakfont:760
 #, c-format
 msgid "Install & convert Fonts"
 msgstr "Instalar y convertir tipografías"
 
-#: standalone/drakfont:757
+#: standalone/drakfont:761
 #, c-format
 msgid "Post Install"
 msgstr "Post-instalación"
 
-#: standalone/drakfont:775
+#: standalone/drakfont:779
 #, c-format
 msgid "Remove fonts on your system"
 msgstr "Quitar tipografías de su sistema"
 
-#: standalone/drakfont:776
+#: standalone/drakfont:780
 #, c-format
 msgid "Post Uninstall"
 msgstr "Post-desinstalación"
 
-#: standalone/drakgw:58 standalone/drakgw:193
+#: standalone/drakgw:58 standalone/drakgw:194
 #, c-format
 msgid "Internet Connection Sharing"
 msgstr "Compartir la conexión a Internet"
 
-#: standalone/drakgw:124
+#: standalone/drakgw:114 standalone/drakvpn:51
+#, c-format
+msgid "Sorry, we support only 2.4 and above kernels."
+msgstr "Lo siento, sólo se soportan los núcleos 2.4 y superiores"
+
+#: standalone/drakgw:125
 #, c-format
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Ahora, la conexión compartida a Internet está desactivada"
 
-#: standalone/drakgw:125
+#: standalone/drakgw:126
 #, c-format
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
@@ -20061,39 +21040,39 @@ msgstr ""
 "\n"
 "¿Qué desea hacer?"
 
-#: standalone/drakgw:129 standalone/drakvpn:127
+#: standalone/drakgw:130 standalone/drakvpn:127
 #, c-format
 msgid "enable"
 msgstr "activar"
 
-#: 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 "reconfigurar"
 
-#: 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 "rechazar"
 
-#: standalone/drakgw:136
+#: standalone/drakgw:137
 #, c-format
 msgid "Enabling servers..."
 msgstr "Activando los servidores..."
 
-#: standalone/drakgw:148
+#: standalone/drakgw:149
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr "Ahora, la conexión compartida a Internet está activa."
 
-#: standalone/drakgw:151
+#: standalone/drakgw:152
 #, c-format
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Ahora, la conexión compartida a Internet está activada ahora"
 
-#: standalone/drakgw:152
+#: standalone/drakgw:153
 #, c-format
 msgid ""
 "The setup of Internet Connection Sharing has already been done.\n"
@@ -20106,22 +21085,22 @@ msgstr ""
 "\n"
 "¿Qué desea hacer?"
 
-#: standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:157 standalone/drakvpn:101
 #, c-format
 msgid "disable"
 msgstr "desactivar"
 
-#: standalone/drakgw:159
+#: standalone/drakgw:160
 #, c-format
 msgid "Disabling servers..."
 msgstr "Desactivando los servidores..."
 
-#: standalone/drakgw:174
+#: standalone/drakgw:175
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr "Ahora, la conexión compartida a Internet está inactiva."
 
-#: standalone/drakgw:194
+#: standalone/drakgw:195
 #, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -20145,27 +21124,27 @@ msgstr ""
 "Nota: necesita un adaptador de red dedicado para configurar una red de área "
 "local (LAN)."
 
-#: standalone/drakgw:237
+#: standalone/drakgw:239
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Interfaz %s (usando el módulo %s)"
 
-#: standalone/drakgw:238
+#: standalone/drakgw:240
 #, c-format
 msgid "Interface %s"
 msgstr "Interfaz %s"
 
-#: standalone/drakgw:247 standalone/drakpxe:137
+#: standalone/drakgw:249 standalone/drakpxe:137
 #, c-format
 msgid "No network adapter on your system!"
 msgstr "¡No hay adaptador de red alguno en su sistema!"
 
-#: standalone/drakgw:254
+#: standalone/drakgw:256
 #, c-format
 msgid "Network interface"
 msgstr "Interfaz de red"
 
-#: standalone/drakgw:255
+#: standalone/drakgw:257
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -20180,7 +21159,12 @@ msgstr ""
 "\n"
 "Se va a configurar su red de área local con ese adaptador."
 
-#: standalone/drakgw:262
+#: standalone/drakgw:263 standalone/drakpxe:142
+#, c-format
+msgid "Choose the network interface"
+msgstr "Elija la interfaz de red"
+
+#: standalone/drakgw:264
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
@@ -20189,12 +21173,12 @@ msgstr ""
 "Por favor, elija qué adaptador de red estará conectado a su red de área "
 "local."
 
-#: standalone/drakgw:291
+#: standalone/drakgw:293
 #, c-format
 msgid "Network interface already configured"
 msgstr "Interfaz de red ya configurada"
 
-#: standalone/drakgw:292
+#: standalone/drakgw:294
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -20209,27 +21193,27 @@ msgstr ""
 "\n"
 "Puede hacerlo manualmente pero necesita saber lo que está haciendo."
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "Automatic reconfiguration"
 msgstr "Volver a configurar automáticamente"
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "No (experts only)"
 msgstr "No (sólo expertos)"
 
-#: standalone/drakgw:298
+#: standalone/drakgw:300
 #, c-format
 msgid "Show current interface configuration"
 msgstr "Mostrar la configuración corriente de la interfaz"
 
-#: standalone/drakgw:299
+#: standalone/drakgw:301
 #, c-format
 msgid "Current interface configuration"
 msgstr "Configuración corriente de la interfaz"
 
-#: standalone/drakgw:300
+#: standalone/drakgw:302
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -20246,7 +21230,7 @@ msgstr ""
 "Atributo IP: %s\n"
 "Controlador: %s"
 
-#: standalone/drakgw:313
+#: standalone/drakgw:315
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
@@ -20274,12 +21258,12 @@ msgstr ""
 "configurar un servidor DHCP por Usted.\n"
 "\n"
 
-#: standalone/drakgw:320
+#: standalone/drakgw:322
 #, c-format
 msgid "Local Network adress"
 msgstr "Dirección de red local"
 
-#: standalone/drakgw:324
+#: standalone/drakgw:326
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -20293,74 +21277,75 @@ msgstr ""
 "servidor DHCP.\n"
 "Si no conoce el significado de una opción, simlpemente déjela como está."
 
-#: standalone/drakgw:328
+#: standalone/drakgw:330
 #, c-format
 msgid "(This) DHCP Server IP"
 msgstr "IP de (este) servidor DHCP"
 
-#: standalone/drakgw:329
+#: standalone/drakgw:331
 #, c-format
 msgid "The DNS Server IP"
 msgstr "La IP del servidor DNS"
 
-#: standalone/drakgw:330
+#: standalone/drakgw:332
 #, c-format
 msgid "The internal domain name"
 msgstr "El nombre de dominio interno"
 
-#: standalone/drakgw:331
+#: standalone/drakgw:333
 #, c-format
 msgid "The DHCP start range"
 msgstr "Comienzo del rango de DHCP"
 
-#: standalone/drakgw:332
+#: standalone/drakgw:334
 #, c-format
 msgid "The DHCP end range"
 msgstr "Fin del rango de DHCP"
 
-#: standalone/drakgw:333
+#: standalone/drakgw:335
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr "El \"lease\" predeterminado (en segundos)"
 
-#: standalone/drakgw:334
+#: standalone/drakgw:336
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr "El \"lease\" máximo (en segundos)"
 
-#: standalone/drakgw:335
+#: standalone/drakgw:337
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr "Volver a configurar la interfaz y el servidor DHCP"
 
-#: standalone/drakgw:342
+#: standalone/drakgw:344
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr "La red local no finalizó con `.0', saliendo."
 
-#: standalone/drakgw:352
+#: standalone/drakgw:354
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr ""
 "¡Se encontró un conflicto potencial de direcciones LAN en la configuración "
 "de %s!\n"
 
-#: standalone/drakgw:362
+#: standalone/drakgw:364
 #, c-format
 msgid "Configuring..."
 msgstr "Configurando..."
 
-#: standalone/drakgw:363
+#: standalone/drakgw:365
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
-msgstr "Configurando los scripts, instalando el software, iniciando los servidores..."
+msgstr ""
+"Configurando los scripts, instalando el software, iniciando los servidores..."
 
-#: 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 "Problemas al instalar el paquete %s"
 
-#: standalone/drakgw:599
+#: standalone/drakgw:601
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -20377,14 +21362,14 @@ 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"
 "Usage: \n"
 msgstr ""
 "drakhelp 0.1\n"
-"Copyright (C) 2003-2004 MandrakeSoft.\n"
+"Copyright (C) 2003-2004 Mandrakesoft.\n"
 "Esto es software libre y puede redistribuirse bajo los términos de la GNU "
 "GPL.\n"
 "\n"
@@ -20397,7 +21382,8 @@ msgstr " --help                - mostrar esta ayuda     \n"
 
 #: standalone/drakhelp:23
 #, c-format
-msgid " --id <id_label>       - load the html help page which refers to id_label\n"
+msgid ""
+" --id <id_label>       - load the html help page which refers to id_label\n"
 msgstr ""
 " --id <id_etiqueta>       - cargar el archivo de ayuda HTML que se refiere a "
 "id_etiqueta\n"
@@ -20411,7 +21397,12 @@ msgstr ""
 " --doc <enlace>          - enlazar a otra página web (para la interfaz de "
 "bienvenida de WM)\n"
 
-#: standalone/drakhelp:35
+#: standalone/drakhelp:36
+#, c-format
+msgid "Mandrakelinux Help Center"
+msgstr "Centro de ayuda de Mandrakelinux"
+
+#: standalone/drakhelp:36
 #, c-format
 msgid ""
 "%s cannot be displayed \n"
@@ -20420,7 +21411,7 @@ msgstr ""
 "no se puede mostrar %s\n"
 " No hay entrada de ayuda de este tipo\n"
 
-#: standalone/drakhelp:41
+#: standalone/drakhelp:42
 #, c-format
 msgid ""
 "No browser is installed on your system, Please install one if you want to "
@@ -20429,42 +21420,42 @@ msgstr ""
 "No se instaló navegador en su sistema, por favor instale uno si desea "
 "navegar el sistema de ayuda"
 
-#: standalone/drakperm:21
+#: standalone/drakperm:22
 #, c-format
 msgid "System settings"
 msgstr "Ajustes del sistema"
 
-#: standalone/drakperm:22
+#: standalone/drakperm:23
 #, c-format
 msgid "Custom settings"
 msgstr "Ajustes personalizados"
 
-#: standalone/drakperm:23
+#: standalone/drakperm:24
 #, c-format
 msgid "Custom & system settings"
 msgstr "Ajustes personalizados y del sistema"
 
-#: standalone/drakperm:43
+#: standalone/drakperm:44
 #, c-format
 msgid "Editable"
 msgstr "Editable"
 
-#: standalone/drakperm:48 standalone/drakperm:318
+#: standalone/drakperm:49 standalone/drakperm:321
 #, c-format
 msgid "Path"
 msgstr "Ruta"
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, c-format
 msgid "User"
 msgstr "Usuario"
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, c-format
 msgid "Group"
 msgstr "Grupo"
 
-#: standalone/drakperm:48 standalone/drakperm:330
+#: standalone/drakperm:49 standalone/drakperm:333
 #, c-format
 msgid "Permissions"
 msgstr "Permisos"
@@ -20526,9 +21517,9 @@ msgid "Delete selected rule"
 msgstr "Borrar la regla seleccionada"
 
 #. -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 "Editar"
@@ -20538,47 +21529,65 @@ msgstr "Editar"
 msgid "Edit current rule"
 msgstr "Editar regla corriente"
 
-#: standalone/drakperm:246
+#: standalone/drakperm:242
 #, c-format
 msgid "browse"
 msgstr "examinar"
 
-#: standalone/drakperm:256
+#: standalone/drakperm:247
+#, c-format
+msgid "user"
+msgstr "usuario"
+
+#: standalone/drakperm:247
+#, c-format
+msgid "group"
+msgstr "grupo"
+
+#: standalone/drakperm:247
+#, c-format
+msgid "other"
+msgstr "otros"
+
+#: standalone/drakperm:252
 #, c-format
 msgid "Read"
 msgstr "Lectura"
 
-#: 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 "Permitir a \"%s\" leer el archivo"
 
-#: standalone/drakperm:260
+#: standalone/drakperm:259
 #, c-format
 msgid "Write"
 msgstr "Escribir"
 
-#: 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 "Habilitar \"%s\" a escribir el archivo"
 
-#: standalone/drakperm:264
+#: standalone/drakperm:266
 #, c-format
 msgid "Execute"
 msgstr "Ejecutar"
 
-#: 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 "Habilitar \"%s\" a ejecutar el archivo"
 
-#: standalone/drakperm:267
+#: standalone/drakperm:272
 #, c-format
 msgid "Sticky-bit"
 msgstr "Bit pegajoso"
 
-#: standalone/drakperm:267
+#: standalone/drakperm:272
 #, c-format
 msgid ""
 "Used for directory:\n"
@@ -20587,52 +21596,52 @@ msgstr ""
 "Usado para directorio:\n"
 " sólo el dueño del directorio o archivo en este directorio lo puede borrar"
 
-#: standalone/drakperm:268
+#: standalone/drakperm:273
 #, c-format
 msgid "Set-UID"
 msgstr "Set-UID"
 
-#: standalone/drakperm:268
+#: standalone/drakperm:273
 #, c-format
 msgid "Use owner id for execution"
 msgstr "Usar ID del dueño para la ejecución"
 
-#: standalone/drakperm:269
+#: standalone/drakperm:274
 #, c-format
 msgid "Set-GID"
 msgstr "Set-GID"
 
-#: standalone/drakperm:269
+#: standalone/drakperm:274
 #, c-format
 msgid "Use group id for execution"
 msgstr "Usar ID del grupo para la ejecución"
 
-#: standalone/drakperm:287 standalone/drakxtv:87
+#: standalone/drakperm:290 standalone/drakxtv:89
 #, c-format
-msgid "User :"
+msgid "User:"
 msgstr "Usuario:"
 
-#: standalone/drakperm:289
+#: standalone/drakperm:292
 #, c-format
-msgid "Group :"
+msgid "Group:"
 msgstr "Grupo:"
 
-#: standalone/drakperm:293
+#: standalone/drakperm:296
 #, c-format
 msgid "Current user"
 msgstr "Usuario corriente"
 
-#: standalone/drakperm:294
+#: standalone/drakperm:297
 #, c-format
 msgid "When checked, owner and group won't be changed"
 msgstr "Cuando está marcado, el grupo y el dueño no se cambiarán"
 
-#: standalone/drakperm:304
+#: standalone/drakperm:307
 #, c-format
 msgid "Path selection"
 msgstr "Selección de ruta"
 
-#: standalone/drakperm:324
+#: standalone/drakperm:327
 #, c-format
 msgid "Property"
 msgstr "Propiedad"
@@ -20677,7 +21686,8 @@ msgstr ""
 #: standalone/drakpxe:143
 #, c-format
 msgid "Please choose which network interface will be used for the dhcp server."
-msgstr "Por favor, elija la interfaz de red que se utilizará para el servidor DHCP."
+msgstr ""
+"Por favor, elija la interfaz de red que se utilizará para el servidor DHCP."
 
 #: standalone/drakpxe:144
 #, c-format
@@ -20736,7 +21746,8 @@ msgstr "No se encontró imagen"
 
 #: standalone/drakpxe:197
 #, c-format
-msgid "No CD or DVD image found, please copy the installation program and rpm files."
+msgid ""
+"No CD or DVD image found, please copy the installation program and rpm files."
 msgstr ""
 "No se encontró imagen de CD o DVD, por favor copie el programa de "
 "instalación y los archivos rpm"
@@ -20759,54 +21770,42 @@ msgstr ""
 msgid "Location of auto_install.cfg file"
 msgstr "Ubicación del archivo auto_install.cfg"
 
-#: standalone/draksec:44
+#: standalone/draksec:49
 #, c-format
 msgid "ALL"
 msgstr "TODO"
 
-#: standalone/draksec:44
+#: standalone/draksec:50
 #, c-format
 msgid "LOCAL"
 msgstr "LOCAL"
 
-#: standalone/draksec:44 standalone/drakvpn:1146
+#: standalone/draksec:53
 #, c-format
-msgid "default"
-msgstr "predeterminado"
+msgid "Ignore"
+msgstr "Ignorar"
 
-#: standalone/draksec:44
-#, c-format
-msgid "ignore"
-msgstr "ignorar"
-
-#: standalone/draksec:44
-#, c-format
-msgid "no"
-msgstr "no"
-
-#: standalone/draksec:44
-#, c-format
-msgid "yes"
-msgstr "sí"
-
-#. -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 "
@@ -20843,10 +21842,10 @@ msgstr ""
 "Aquí puede configurar el nivel y administrador de seguridad de su máquina.\n"
 "\n"
 "\n"
-"El Administrador de Seguridad es quien recibirá las alertas de seguridad si "
-"está activa\n"
-"la opción 'Alertas de seguridad'. Puede ser un nombre de usuario o un correo-"
-"e.\n"
+"El '<span weight=\"bold\">Administrador de Seguridad</span>' es quien "
+"recibirá las alertas de seguridad si está activa\n"
+"la opción '<span weight=\"bold\">Alertas de seguridad</span>'. Puede ser un "
+"nombre de usuario o un correo-e.\n"
 "\n"
 "\n"
 "El menú Nivel de seguridad permite seleccionar uno de los seis niveles "
@@ -20888,62 +21887,56 @@ msgstr ""
 "seguridad\n"
 "están al máximo."
 
-#: standalone/draksec:129
+#: standalone/draksec:154 standalone/harddrake2:184
+#, c-format
+msgid ""
+"Description of the fields:\n"
+"\n"
+msgstr ""
+"Descripción de los campos:\n"
+"\n"
+
+#: standalone/draksec:168
 #, c-format
 msgid "(default value: %s)"
 msgstr " (valor predeterminado: %s)"
 
-#: standalone/draksec:170
+#: standalone/draksec:210
 #, c-format
 msgid "Security Level:"
 msgstr "Nivel de seguridad:"
 
-#: standalone/draksec:173
-#, c-format
-msgid "Security Alerts:"
-msgstr "Alertas de seguridad:"
-
-#: standalone/draksec:177
+#: standalone/draksec:217
 #, c-format
 msgid "Security Administrator:"
 msgstr "Administrador de seguridad:"
 
-#: standalone/draksec:179
+#: standalone/draksec:219
 #, c-format
 msgid "Basic options"
 msgstr "Opciones básicas"
 
-#: 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 ""
-"Se pueden configurar las opciones siguientes para personalizar\n"
-"la seguridad de su sistema. Si necesita explicación, mire la ayuda "
-"emergente.\n"
-
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "Network Options"
 msgstr "Opciones de red"
 
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "System Options"
 msgstr "Opciones de sistema"
 
-#: standalone/draksec:240
+#: standalone/draksec:268
 #, c-format
 msgid "Periodic Checks"
 msgstr "Verificaciones periódicas"
 
-#: standalone/draksec:258
+#: standalone/draksec:299
 #, c-format
 msgid "Please wait, setting security level..."
 msgstr "Por favor espere, configurando el nivel de seguridad..."
 
-#: standalone/draksec:264
+#: standalone/draksec:305
 #, c-format
 msgid "Please wait, setting security options..."
 msgstr "Por favor espere, configurando las opciones de seguridad..."
@@ -20953,7 +21946,8 @@ msgstr "Por favor espere, configurando las opciones de seguridad..."
 msgid "No Sound Card detected!"
 msgstr "¡No se detectó tarjeta de sonido!"
 
-#: 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-"
@@ -20974,7 +21968,7 @@ msgstr ""
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 
-#: standalone/draksound:55
+#: standalone/draksound:57
 #, c-format
 msgid ""
 "\n"
@@ -21115,15 +22109,15 @@ msgstr "Mostrar logo en la consola"
 msgid "Make kernel message quiet by default"
 msgstr "Predeterminadamente el mensaje del núcleo es \"silencioso\""
 
-#: standalone/draksplash:161 standalone/draksplash:319
-#: standalone/draksplash:464
+#: standalone/draksplash:161 standalone/draksplash:309
+#: standalone/draksplash:454
 #, c-format
 msgid "Notice"
 msgstr "Nota"
 
-#: 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 "¡Todavía este tema no tiene un bootsplash en %s!"
 
 #: standalone/draksplash:167
@@ -21136,102 +22130,116 @@ msgstr "elija imagen"
 msgid "saving Bootsplash theme..."
 msgstr "guardando tema de Bootsplash..."
 
-#: standalone/draksplash:445
+#: standalone/draksplash:435
 #, c-format
 msgid "ProgressBar color selection"
 msgstr "selección del color de la barra de progreso"
 
-#: standalone/draksplash:464
+#: standalone/draksplash:454
 #, c-format
 msgid "You must choose an image file first!"
 msgstr "¡Primero debe elegir un archivo de imagen!"
 
-#: standalone/draksplash:469
+#: standalone/draksplash:459
 #, c-format
-msgid "Generating preview ..."
+msgid "Generating preview..."
 msgstr "Generando previsualización..."
 
 #. -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 "Bootsplash de %s. No se puede crear la previsualización (%s)"
 
-#: 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 ""
+"La imagen \"%s\" no se puede cargar debido al problema siguiente:\n"
+"\n"
+"<span foreground=\"Red\">%s</span>"
+
+#: standalone/drakups:74
 #, c-format
 msgid "Connected through a serial port or an usb cable"
 msgstr "Conectado por medio de un puerto serie o cable USB"
 
-#: standalone/drakups:69
+#: standalone/drakups:80
 #, c-format
 msgid "Add an UPS device"
 msgstr "Añadir un dispositivo UPS"
 
-#: 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 ""
 "Bienvenido a la herramienta de configuración de la UPS.\n"
 "\n"
 "Aquí podrá añadir una UPS nueva a su sistema.\n"
 
-#: 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 ""
 "Se añadirá un dispositivo UPS.\n"
 "\n"
 "¿Desea detectar automáticamente los dispositivos UPS conectados a esta "
 "máquina?"
 
-#: standalone/drakups:82
+#: standalone/drakups:93
 #, c-format
 msgid "Autodetection"
 msgstr "Detección automática"
 
-#: standalone/drakups:90 standalone/harddrake2:140
+#: standalone/drakups:101 standalone/harddrake2:211
 #, c-format
 msgid "Detection in progress"
 msgstr "Detección en progreso"
 
-#: 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 "Felicidades"
 
-#: standalone/drakups:109
+#: standalone/drakups:121
 #, c-format
 msgid "The wizard successfully added the following UPS devices:"
-msgstr "El asistente añadió satisfactoriamente los siguientes dispositivos UPS:"
+msgstr ""
+"El asistente añadió satisfactoriamente los siguientes dispositivos UPS:"
 
-#: standalone/drakups:111
+#: standalone/drakups:123
 #, c-format
 msgid "No new UPS devices was found"
 msgstr "No se encontraron dispositivos UPS nuevos"
 
-#: standalone/drakups:116 standalone/drakups:128
+#: standalone/drakups:128 standalone/drakups:140
 #, c-format
 msgid "UPS driver configuration"
 msgstr "Configuración del controlador UPS"
 
-#: standalone/drakups:116
+#: standalone/drakups:128
 #, c-format
 msgid "Please select your UPS model."
 msgstr "Por favor, seleccione el modelo de su UPS."
 
-#: standalone/drakups:117
+#: standalone/drakups:129
 #, c-format
 msgid "Manufacturer / Model:"
 msgstr "Fabricante / Modelo:"
 
-#: standalone/drakups:128
+#: standalone/drakups:140
 #, c-format
 msgid ""
 "We are configuring the \"%s\" UPS from \"%s\".\n"
@@ -21240,88 +22248,89 @@ msgstr ""
 "Estamos configurando la UPS \"%s\" de \"%s\".\n"
 "Por favor, complete el nombre, controlador y puerto de la misma."
 
-#: standalone/drakups:133
+#: standalone/drakups:145
 #, c-format
 msgid "Name:"
 msgstr "Nombre:"
 
-#: standalone/drakups:133
+#: standalone/drakups:145
 #, c-format
 msgid "The name of your ups"
 msgstr "En nombre de su UPS"
 
-#: standalone/drakups:134
+#: standalone/drakups:146
 #, c-format
-msgid "The driver that manage your ups"
+msgid "The driver that manages your ups"
 msgstr "El controlador que maneja su UPS"
 
-#: standalone/drakups:135
+#: standalone/drakups:147
 #, c-format
 msgid "Port:"
 msgstr "Puerto:"
 
-#: standalone/drakups:137
+#: standalone/drakups:149
 #, c-format
 msgid "The port on which is connected your ups"
 msgstr "El puerto al cual está conectada su UPS"
 
-#: standalone/drakups:144
+#: standalone/drakups:156
 #, c-format
 msgid "The wizard successfully configured the new \"%s\" UPS device."
-msgstr "El asistente configuró satisfactoriamente el nuevo dispositivo UPS \"%s\"."
+msgstr ""
+"El asistente configuró satisfactoriamente el nuevo dispositivo UPS \"%s\"."
 
-#: standalone/drakups:232
+#: standalone/drakups:246
 #, c-format
 msgid "UPS devices"
 msgstr "Dispositivos UPS"
 
-#: 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 "Nombre"
 
-#: standalone/drakups:250
+#: standalone/drakups:265
 #, c-format
 msgid "UPS users"
 msgstr "Usuarios UPS"
 
-#: standalone/drakups:265
+#: standalone/drakups:281
 #, c-format
 msgid "Access Control Lists"
 msgstr "Listas de control de acceso"
 
-#: standalone/drakups:266
+#: standalone/drakups:282
 #, c-format
 msgid "IP mask"
 msgstr "Máscara IP"
 
-#: standalone/drakups:277
+#: standalone/drakups:294
 #, c-format
 msgid "Rules"
 msgstr "Reglas"
 
-#: standalone/drakups:278
+#: standalone/drakups:295
 #, c-format
 msgid "Action"
 msgstr "Acción"
 
-#: standalone/drakups:278 standalone/drakvpn:1146 standalone/harddrake2:61
+#: standalone/drakups:295 standalone/drakvpn:1146 standalone/harddrake2:77
 #, c-format
 msgid "Level"
 msgstr "Nivel"
 
-#: standalone/drakups:278
+#: standalone/drakups:295
 #, c-format
 msgid "ACL name"
 msgstr "Nombre de ACL"
 
-#: 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 "Bienvenido a las herramientas de configuración de la UPS"
@@ -21343,7 +22352,7 @@ msgid ""
 "\n"
 "It's currently enabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 "Ya se ha realizado la configuración de una conexión VPN.\n"
 "\n"
@@ -21373,7 +22382,7 @@ msgid ""
 "\n"
 "It's currently disabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 "Ya se ha realizado la configuración de una conexión VPN.\n"
 "\n"
@@ -21458,7 +22467,7 @@ msgstr "Módulo del núcleo."
 #: 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"
@@ -21488,13 +22497,13 @@ msgstr "Archivo de configuración"
 #: 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 ""
 "¡Paso de configuración!\n"
 "\n"
@@ -21528,12 +22537,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 ""
 "El contenido del archivo %s\n"
 "se divide en secciones.\n"
@@ -21590,7 +22599,7 @@ msgstr "entradas ipsec.conf"
 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"
@@ -21627,7 +22636,7 @@ msgstr "normal conn"
 
 #: standalone/drakvpn:382 standalone/drakvpn:423 standalone/drakvpn:510
 #, c-format
-msgid "Exists !"
+msgid "Exists!"
 msgstr "¡Existe!"
 
 #: standalone/drakvpn:383 standalone/drakvpn:424
@@ -21868,7 +22877,7 @@ msgstr "Nombres de sección"
 
 #: standalone/drakvpn:590
 #, c-format
-msgid "Can't edit !"
+msgid "Can't edit!"
 msgstr "¡No se puede editar!"
 
 #: standalone/drakvpn:591
@@ -21876,10 +22885,10 @@ msgstr "¡No se puede editar!"
 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 ""
 "No se puede editar esta sección.\n"
 "\n"
@@ -21934,7 +22943,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 ""
@@ -21968,7 +22977,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"
@@ -22010,7 +23019,7 @@ msgstr "entradas racoon.conf"
 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"
@@ -22066,23 +23075,23 @@ msgstr "tipo de 'path'"
 #: 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 ""
@@ -22250,7 +23259,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"
@@ -22296,7 +23305,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"
@@ -22336,7 +23345,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"
@@ -22382,7 +23391,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"
@@ -22417,7 +23426,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 ""
 "definir el grupo de exponenciaciones Diffie-Hellman.\n"
@@ -22436,11 +23445,11 @@ msgstr "Número 'lifetime'"
 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"
@@ -22479,18 +23488,18 @@ msgstr "Unidad 'lifetime'"
 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"
@@ -22547,7 +23556,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]"
@@ -22703,7 +23712,7 @@ msgstr "Mi identificador"
 #, 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"
@@ -22712,7 +23721,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"
@@ -22721,12 +23730,12 @@ 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 ""
 "especifica el identificador que se envía al host remoto y\n"
-"el tipo a usar en la fase 1.  Se pueden usar address, fqdn,\n"
+"el tipo a usar en la fase 1.  Se pueden usar address, FQDN,\n"
 "user_fqdn, keyid y asn1dn como tipo de identificador.\n"
 "los mismos se usan de la manera siguiente:\n"
 "\tmi_identificador address [dirección];\n"
@@ -22735,7 +23744,7 @@ msgstr ""
 "\tmi_identificador user_fqdn cadena;\n"
 "\t\tel tipo es un USER_FQDN (nombde de dominio\n"
 "\t\tcompletamente calificado de usuario).\n"
-"\tmi_identificador fqdn cadena;\n"
+"\tmi_identificador FQDN cadena;\n"
 "\t\tel tipo es un FQDN (nombre de dominio completamente calificado).\n"
 "\tmi_identificador keyid archivo;\n"
 "\t\tel tipo es un KEY_ID.\n"
@@ -22763,9 +23772,9 @@ msgstr "Propuesta"
 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 ""
@@ -22773,7 +23782,7 @@ msgstr ""
 "de la negociación. Esta directiva debe definirse. \n"
 "El algoritmo es uno de los siguientes: \n"
 "\n"
-"des, 3des, blowfish, cast128 for oakley.\n"
+"DES, 3DES, blowfish, cast128 for oakley.\n"
 "\n"
 "Para otras transformadas, no se debería usar esta declaración."
 
@@ -22869,6 +23878,11 @@ msgstr "requerir"
 
 #: standalone/drakvpn:1146
 #, c-format
+msgid "default"
+msgstr "predeterminado"
+
+#: standalone/drakvpn:1146
+#, c-format
 msgid "use"
 msgstr "usar"
 
@@ -22877,67 +23891,67 @@ msgstr "usar"
 msgid "unique"
 msgstr "único"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (broadcast)"
 msgstr "EEUU (difusión)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable)"
 msgstr "EEUU (cable)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable-hrc)"
 msgstr "EEUU (cable-hrc)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "Canada (cable)"
 msgstr "Canadá (cable)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (broadcast)"
 msgstr "Japón (difusión)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (cable)"
 msgstr "Japón (cable)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "China (broadcast)"
 msgstr "China (difusión)"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "West Europe"
 msgstr "Europa del oeste"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "East Europe"
 msgstr "Europa del este"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "France [SECAM]"
 msgstr "Francia [SECAM]"
 
-#: standalone/drakxtv:46
+#: standalone/drakxtv:48
 #, c-format
 msgid "Newzealand"
 msgstr "Nueva Zelanda"
 
-#: standalone/drakxtv:49
+#: standalone/drakxtv:51
 #, c-format
 msgid "Australian Optus cable TV"
 msgstr "Televisión por cable Australian Optus"
 
-#: standalone/drakxtv:83
+#: standalone/drakxtv:85
 #, c-format
 msgid ""
 "Please,\n"
@@ -22946,47 +23960,48 @@ msgstr ""
 "Por favor,\n"
 "teclee su norma de tv y país"
 
-#: standalone/drakxtv:85
+#: standalone/drakxtv:87
 #, c-format
 msgid "TV norm:"
 msgstr "Norma de TV:"
 
-#: standalone/drakxtv:86
+#: standalone/drakxtv:88
 #, c-format
 msgid "Area:"
 msgstr "Área:"
 
-#: standalone/drakxtv:91
+#: standalone/drakxtv:93
 #, c-format
-msgid "Scanning for TV channels in progress ..."
+msgid "Scanning for TV channels in progress..."
 msgstr "Buscando canales de TV, en progreso ..."
 
-#: standalone/drakxtv:101
+#: standalone/drakxtv:103
 #, c-format
 msgid "Scanning for TV channels"
 msgstr "Buscando canales de TV"
 
-#: standalone/drakxtv:105
+#: standalone/drakxtv:107
 #, c-format
 msgid "There was an error while scanning for TV channels"
 msgstr "Hubo un error mientras se buscaban canales de TV"
 
-#: standalone/drakxtv:108
+#: standalone/drakxtv:110
 #, c-format
 msgid "Have a nice day!"
 msgstr "¡Que tenga un buen día!"
 
-#: standalone/drakxtv:109
+#: standalone/drakxtv:111
 #, c-format
 msgid "Now, you can run xawtv (under X Window!) !\n"
 msgstr "¡Ahora, puede ejecutar xawtv (!bajo X Window!)!\n"
 
-#: standalone/drakxtv:132
+#: standalone/drakxtv:134
 #, c-format
 msgid "No TV Card detected!"
 msgstr "¡No se detectó tarjeta de TV!"
 
-#: 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-"
@@ -23007,50 +24022,25 @@ msgstr ""
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 
-#: standalone/harddrake2:18
+#: standalone/harddrake2:20
 #, c-format
 msgid "Alternative drivers"
 msgstr "Controladores alternativos"
 
-#: standalone/harddrake2:19
+#: standalone/harddrake2:21
 #, c-format
 msgid "the list of alternative drivers for this sound card"
 msgstr "la lista de controladores alternativos para esta tarjeta de sonido"
 
-#: standalone/harddrake2:22
-#, c-format
-msgid "this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
-msgstr ""
-"esto es el bus físico sobre el cual se conecta el dispositivo (ej.: PCI, "
-"USB, ...)"
-
-#: standalone/harddrake2:23
-#, c-format
-msgid "Channel"
-msgstr "Canal"
-
-#: standalone/harddrake2:23
-#, c-format
-msgid "EIDE/SCSI channel"
-msgstr "canal EIDE/SCSI"
-
-#: standalone/harddrake2:24
-#, c-format
-msgid "Bogomips"
-msgstr "Bogomips"
-
 #: 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 ""
-"el núcleo GNU/Linux necesita correr un lazo de cálculo al arrancar para "
-"inicializar un contador. El resultado se almacena como bogomips como una "
-"manera de hacer un \"benchmark\" de la CPU."
+"esto es el bus físico sobre el cual se conecta el dispositivo (ej.: PCI, "
+"USB, ...)"
 
-#: standalone/harddrake2:26
+#: standalone/harddrake2:26 standalone/harddrake2:130
 #, c-format
 msgid "Bus identification"
 msgstr "Identificación del bus"
@@ -23077,135 +24067,289 @@ msgstr ""
 
 #: standalone/harddrake2:33
 #, c-format
-msgid "Cache size"
-msgstr "Tamaño del caché"
-
-#: standalone/harddrake2:33
-#, c-format
-msgid "size of the (second level) cpu cache"
-msgstr "tamaño del caché de CPU (de 2do nivel)"
-
-#: standalone/harddrake2:34
-#, c-format
 msgid "Drive capacity"
 msgstr "Capacidad de la unidad"
 
-#: standalone/harddrake2:34
+#: standalone/harddrake2:33
 #, c-format
 msgid "special capacities of the driver (burning ability and or DVD support)"
 msgstr ""
 "capacidades especiales del controlador (posibilidad de grabar y/o soporte de "
 "DVD)"
 
-#. -PO: here "comas" is the medical coma, not the lexical coma!!
-#: standalone/harddrake2:37
+#: standalone/harddrake2:34
 #, c-format
-msgid "Coma bug"
-msgstr "Bug de la coma"
+msgid "this field describes the device"
+msgstr "este campo describe al dispositivo"
 
-#: standalone/harddrake2:37
+#: standalone/harddrake2:35
 #, c-format
-msgid "whether this cpu has the Cyrix 6x86 Coma bug"
-msgstr "si esta CPU tiene o no el bug de la coma de Cyrix 6x86"
+msgid "Old device file"
+msgstr "Archivo de dispositivo antiguo"
 
-#: standalone/harddrake2:38
+#: standalone/harddrake2:36
 #, c-format
-msgid "Cpuid family"
-msgstr "Familia de cpuid"
+msgid "old static device name used in dev package"
+msgstr "nombre antiguo de dispositivo estático utilizado en el paquete dev"
 
-#: standalone/harddrake2:38
+#: standalone/harddrake2:37
 #, c-format
-msgid "family of the cpu (eg: 6 for i686 class)"
-msgstr "familia de la CPU (ej: 6 para clase i686)"
+msgid "New devfs device"
+msgstr "Dispositivo devfs nuevo"
 
-#: standalone/harddrake2:39
+#: standalone/harddrake2:38
 #, c-format
-msgid "Cpuid level"
-msgstr "Nivel de cpuid"
+msgid "new dynamic device name generated by core kernel devfs"
+msgstr ""
+"dispositivo dinámico nuevo generado por el devfs incorporado del núcleo"
 
-#: standalone/harddrake2:39
+#. -PO: here "module" is the "jargon term" for a kernel driver
+#: standalone/harddrake2:41
 #, c-format
-msgid "information level that can be obtained through the cpuid instruction"
-msgstr "nivel de información que se puede obtener por medio de la instrucción cpuid"
+msgid "Module"
+msgstr "Módulo"
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:41
 #, c-format
-msgid "Frequency (MHz)"
-msgstr "Frecuencia (MHz)"
+msgid "the module of the GNU/Linux kernel that handles the device"
+msgstr "el módulo del núcleo GNU/Linux que maneja ese dispositivo"
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:42
 #, 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 ""
-"la frecuencia de la CPU en MHz (Megahertz que en una primera aproximación se "
-"puede considerar como la cantidad de millones instrucciones que la CPU puede "
-"ejecutar por segundo)"
+msgid "Extended partitions"
+msgstr "Particiones extendidas"
 
-#: standalone/harddrake2:41
+#: standalone/harddrake2:42
 #, c-format
-msgid "this field describes the device"
-msgstr "este campo describe al dispositivo"
+msgid "the number of extended partitions"
+msgstr "la cantidad de particiones extendidas"
 
-#: standalone/harddrake2:42
+#: standalone/harddrake2:43
 #, c-format
-msgid "Old device file"
-msgstr "Archivo de dispositivo antiguo"
+msgid "Geometry"
+msgstr "Geometría"
 
 #: standalone/harddrake2:43
 #, c-format
-msgid "old static device name used in dev package"
-msgstr "nombre antiguo de dispositivo estático utilizado en el paquete dev"
+msgid "Cylinder/head/sectors geometry of the disk"
+msgstr "Geometría cilindros/cabezas/sectores del disco"
 
 #: standalone/harddrake2:44
 #, c-format
-msgid "New devfs device"
-msgstr "Dispositivo devfs nuevo"
+msgid "Disk controller"
+msgstr "Controladora de disco"
+
+#: standalone/harddrake2:44
+#, c-format
+msgid "the disk controller on the host side"
+msgstr "la controladora de disco en el host"
 
 #: standalone/harddrake2:45
 #, c-format
-msgid "new dynamic device name generated by core kernel devfs"
-msgstr "dispositivo dinámico nuevo generado por el devfs incorporado del núcleo"
+msgid "class of hardware device"
+msgstr "clase de dispositivo de hardware"
+
+#: standalone/harddrake2:46 standalone/harddrake2:78
+#: standalone/printerdrake:218
+#, c-format
+msgid "Model"
+msgstr "Modelo"
+
+#: standalone/harddrake2:46
+#, c-format
+msgid "hard disk model"
+msgstr "modelo de disco rígido"
+
+#: standalone/harddrake2:47
+#, c-format
+msgid "network printer port"
+msgstr "puerto de impresora de red"
 
-#. -PO: here "module" is the "jargon term" for a kernel driver
 #: standalone/harddrake2:48
 #, c-format
-msgid "Module"
-msgstr "Módulo"
+msgid "Primary partitions"
+msgstr "Particiones primarias"
 
 #: standalone/harddrake2:48
 #, c-format
-msgid "the module of the GNU/Linux kernel that handles the device"
-msgstr "el módulo del núcleo GNU/Linux que maneja ese dispositivo"
+msgid "the number of the primary partitions"
+msgstr "la cantidad de particiones primarias"
 
 #: standalone/harddrake2:49
 #, c-format
-msgid "Extended partitions"
-msgstr "Particiones extendidas"
+msgid "the vendor name of the device"
+msgstr "el nombre del fabricante del dispositivo"
 
-#: standalone/harddrake2:49
+#: standalone/harddrake2:50
 #, c-format
-msgid "the number of extended partitions"
-msgstr "la cantidad de particiones extendidas"
+msgid "Bus PCI #"
+msgstr "Bus PCI #"
 
 #: standalone/harddrake2:50
 #, c-format
+msgid "the PCI bus on which the device is plugged"
+msgstr "el bus PCI sobre el cual se conecta el dispositivo"
+
+#: standalone/harddrake2:51
+#, c-format
+msgid "PCI device #"
+msgstr "Dispositivo PCI #"
+
+#: standalone/harddrake2:51
+#, c-format
+msgid "PCI device number"
+msgstr "Número del dispositivo PCI"
+
+#: standalone/harddrake2:52
+#, c-format
+msgid "PCI function #"
+msgstr "Función PCI #"
+
+#: standalone/harddrake2:52
+#, c-format
+msgid "PCI function number"
+msgstr "Número de la función PCI"
+
+#: standalone/harddrake2:53
+#, c-format
+msgid "Vendor ID"
+msgstr "ID del fabricante"
+
+#: standalone/harddrake2:53
+#, c-format
+msgid "this is the standard numerical identifier of the vendor"
+msgstr "este es un identificador numérico estándar del fabricante"
+
+#: standalone/harddrake2:54
+#, c-format
+msgid "Device ID"
+msgstr "ID del dispositivo"
+
+#: standalone/harddrake2:54
+#, c-format
+msgid "this is the numerical identifier of the device"
+msgstr "este es el identificador númerico del dispositivo"
+
+#: standalone/harddrake2:55
+#, c-format
+msgid "Sub vendor ID"
+msgstr "Sub-ID del fabricante"
+
+#: standalone/harddrake2:55
+#, c-format
+msgid "this is the minor numerical identifier of the vendor"
+msgstr "este es el identificador numérico menor del fabricante"
+
+#: standalone/harddrake2:56
+#, c-format
+msgid "Sub device ID"
+msgstr "Sub-ID del dispositivo"
+
+#: standalone/harddrake2:56
+#, c-format
+msgid "this is the minor numerical identifier of the device"
+msgstr "este es el identificador numérico menor del dispositivo"
+
+#: standalone/harddrake2:57
+#, c-format
+msgid "Device USB ID"
+msgstr "ID USB del dispositivo"
+
+#: standalone/harddrake2:57
+#, c-format
+msgid ".."
+msgstr ".."
+
+#: standalone/harddrake2:61
+#, c-format
+msgid "Bogomips"
+msgstr "Bogomips"
+
+#: standalone/harddrake2:61
+#, 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."
+msgstr ""
+"el núcleo GNU/Linux necesita correr un lazo de cálculo al arrancar para "
+"inicializar un contador. El resultado se almacena como bogomips como una "
+"manera de hacer un \"benchmark\" de la CPU."
+
+#: standalone/harddrake2:62
+#, c-format
+msgid "Cache size"
+msgstr "Tamaño del caché"
+
+#: standalone/harddrake2:62
+#, c-format
+msgid "size of the (second level) cpu cache"
+msgstr "tamaño del caché de CPU (de 2do nivel)"
+
+#. -PO: here "comas" is the medical coma, not the lexical coma!!
+#: standalone/harddrake2:65
+#, c-format
+msgid "Coma bug"
+msgstr "Bug de la coma"
+
+#: standalone/harddrake2:65
+#, c-format
+msgid "whether this cpu has the Cyrix 6x86 Coma bug"
+msgstr "si esta CPU tiene o no el bug de la coma de Cyrix 6x86"
+
+#: standalone/harddrake2:66
+#, c-format
+msgid "Cpuid family"
+msgstr "Familia de cpuid"
+
+#: standalone/harddrake2:66
+#, c-format
+msgid "family of the cpu (eg: 6 for i686 class)"
+msgstr "familia de la CPU (ej: 6 para clase i686)"
+
+#: standalone/harddrake2:67
+#, c-format
+msgid "Cpuid level"
+msgstr "Nivel de cpuid"
+
+#: standalone/harddrake2:67
+#, c-format
+msgid "information level that can be obtained through the cpuid instruction"
+msgstr ""
+"nivel de información que se puede obtener por medio de la instrucción cpuid"
+
+#: standalone/harddrake2:68
+#, c-format
+msgid "Frequency (MHz)"
+msgstr "Frecuencia (MHz)"
+
+#: standalone/harddrake2:68
+#, 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 ""
+"la frecuencia de la CPU en MHz (Megahertz que en una primera aproximación se "
+"puede considerar como la cantidad de millones instrucciones que la CPU puede "
+"ejecutar por segundo)"
+
+#: standalone/harddrake2:69
+#, c-format
 msgid "Flags"
 msgstr "Flags"
 
-#: standalone/harddrake2:50
+#: standalone/harddrake2:69
 #, c-format
 msgid "CPU flags reported by the kernel"
 msgstr "Flags del CPU reportados por el núcleo"
 
-#: standalone/harddrake2:51
+#: standalone/harddrake2:70
 #, c-format
 msgid "Fdiv bug"
 msgstr "Bug de Fdiv"
 
-#: standalone/harddrake2:52
+#: standalone/harddrake2:71
 #, c-format
 msgid ""
 "Early Intel Pentium chips manufactured have a bug in their floating point "
@@ -23216,56 +24360,46 @@ msgstr ""
 "coma flotante que no lograba la precisión deseada cuando se realizaba una "
 "división de coma flotante (FDIV)"
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
 #, c-format
 msgid "Is FPU present"
 msgstr "FPU está presente"
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
 #, c-format
 msgid "yes means the processor has an arithmetic coprocessor"
 msgstr "sí, significa que el procesador tiene un coprocesador matemático"
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
 #, c-format
 msgid "Whether the FPU has an irq vector"
 msgstr "Si la FPU tiene o no un vector de irq"
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
 #, c-format
 msgid "yes means the arithmetic coprocessor has an exception vector attached"
 msgstr ""
 "sí, siginfica que el coprocesador matemático tiene adjunto un vector de "
 "excepciones"
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
 #, c-format
 msgid "F00f bug"
 msgstr "Bug F00F"
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
 #, c-format
 msgid "early pentiums were buggy and freezed when decoding the F00F bytecode"
 msgstr ""
 "los primeros Pentium eran defectuosos y se colgaban decodificando el código "
 "de bytes F00F"
 
-#: standalone/harddrake2:56
-#, c-format
-msgid "Geometry"
-msgstr "Geometría"
-
-#: standalone/harddrake2:56
-#, c-format
-msgid "Cylinder/head/sectors geometry of the disk"
-msgstr "Geometría cilindros/cabezas/sectores del disco"
-
-#: standalone/harddrake2:57
+#: standalone/harddrake2:75
 #, c-format
 msgid "Halt bug"
 msgstr "Bug de Halt"
 
-#: standalone/harddrake2:58
+#: standalone/harddrake2:76
 #, c-format
 msgid ""
 "Some of the early i486DX-100 chips cannot reliably return to operating mode "
@@ -23274,187 +24408,259 @@ msgstr ""
 "Algunos de los primeros chips i486DX-100 no pueden volver a modo operativo "
 "sin problemas luego que se ejecuta la instrucción \"halt\""
 
-#: standalone/harddrake2:60
+#: standalone/harddrake2:77
+#, c-format
+msgid "sub generation of the cpu"
+msgstr "sub-generación de la CPU"
+
+#: standalone/harddrake2:78
+#, c-format
+msgid "generation of the cpu (eg: 8 for Pentium III, ...)"
+msgstr "generación de la CPU (ej: 8 para Pentium III, ...)"
+
+#: standalone/harddrake2:79
+#, c-format
+msgid "Model name"
+msgstr "Nombre del modelo"
+
+#: standalone/harddrake2:79
+#, c-format
+msgid "official vendor name of the cpu"
+msgstr "nombre oficial del fabricante de la CPU"
+
+#: standalone/harddrake2:80
+#, c-format
+msgid "the name of the CPU"
+msgstr "el nombre de la CPU"
+
+#: standalone/harddrake2:81
+#, c-format
+msgid "Processor ID"
+msgstr "ID del procesador"
+
+#: standalone/harddrake2:81
+#, c-format
+msgid "the number of the processor"
+msgstr "el número del procesador"
+
+#: standalone/harddrake2:82
+#, c-format
+msgid "Model stepping"
+msgstr "Paso del modelo"
+
+#: standalone/harddrake2:82
+#, c-format
+msgid "stepping of the cpu (sub model (generation) number)"
+msgstr "stepping de la CPU (número de sub-modelo - generación)"
+
+#: standalone/harddrake2:83
+#, c-format
+msgid "the vendor name of the processor"
+msgstr "el nombre del fabricante del procesador"
+
+#: standalone/harddrake2:84
+#, c-format
+msgid "Write protection"
+msgstr "Protección contra escritura"
+
+#: standalone/harddrake2:84
+#, c-format
+msgid ""
+"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 ""
+"el indicador WP en el registro CR0 fuerza protección contra escritura al "
+"nivel de página de memoria, permitiendo así que el procesador evite accesos "
+"del núcleo (es decir, esto es una protección contra los bugs)"
+
+#: standalone/harddrake2:88
 #, c-format
 msgid "Floppy format"
 msgstr "Formato del disquete"
 
-#: standalone/harddrake2:60
+#: standalone/harddrake2:88
 #, c-format
 msgid "format of floppies supported by the drive"
 msgstr "formatos de disquete que acepta la disquetera"
 
-#: standalone/harddrake2:61
+#: standalone/harddrake2:92
 #, c-format
-msgid "sub generation of the cpu"
-msgstr "sub-generación de la CPU"
+msgid "Channel"
+msgstr "Canal"
 
-#: standalone/harddrake2:62
+#: standalone/harddrake2:92
 #, c-format
-msgid "class of hardware device"
-msgstr "clase de dispositivo de hardware"
+msgid "EIDE/SCSI channel"
+msgstr "canal EIDE/SCSI"
 
-#: standalone/harddrake2:63 standalone/harddrake2:64
-#: standalone/printerdrake:212
+#: standalone/harddrake2:93
 #, c-format
-msgid "Model"
-msgstr "Modelo"
+msgid "Disk identifier"
+msgstr "Identificador de disco"
 
-#: standalone/harddrake2:63
+#: standalone/harddrake2:93
 #, c-format
-msgid "hard disk model"
-msgstr "modelo de disco rígido"
+msgid "usually the disk serial number"
+msgstr "por lo general, el número de serie del disco"
 
-#: standalone/harddrake2:64
+#: standalone/harddrake2:94
 #, c-format
-msgid "generation of the cpu (eg: 8 for PentiumIII, ...)"
-msgstr "generación de la CPU (ej: 8 para PentiumIII, ...)"
+msgid "Logical unit number"
+msgstr "Número de unidad lógica"
 
-#: standalone/harddrake2:65
+#: standalone/harddrake2:94
 #, c-format
-msgid "Model name"
-msgstr "Nombre del modelo"
+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 ""
+"el número de objetivo SCSI (LUN). Los dispositivos SCSI conectados a un host "
+"se identifican\n"
+"de manera única por un número de canal, un id de objetivo y un número de "
+"unidad lógica"
 
-#: standalone/harddrake2:65
+#: standalone/harddrake2:99
 #, c-format
-msgid "official vendor name of the cpu"
-msgstr "nombre oficial del fabricante de la CPU"
+msgid "Device file"
+msgstr "Archivo de dispositivo"
 
-#: standalone/harddrake2:66
+#: standalone/harddrake2:99
 #, c-format
-msgid "Number of buttons"
-msgstr "Cantidad de botones"
+msgid ""
+"the device file used to communicate with the kernel driver for the mouse"
+msgstr ""
+"el archivo de dispositivo usado para comunicarse con el controlador para el "
+"ratón"
 
-#: standalone/harddrake2:66
+#: standalone/harddrake2:100
 #, c-format
-msgid "the number of buttons the mouse has"
-msgstr "la cantidad de botones que tiene el ratón"
+msgid "Emulated wheel"
+msgstr "Rueda emulada"
 
-#: standalone/harddrake2:67
+#: standalone/harddrake2:100
 #, c-format
-msgid "the name of the CPU"
-msgstr "el nombre de la CPU"
+msgid "whether the wheel is emulated or not"
+msgstr "Si se emula o no la rueda"
 
-#: standalone/harddrake2:68
+#: standalone/harddrake2:101
 #, c-format
-msgid "network printer port"
-msgstr "puerto de impresora de red"
+msgid "the type of the mouse"
+msgstr "el tipo de ratón"
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:102
 #, c-format
-msgid "Processor ID"
-msgstr "ID del procesador"
+msgid "the name of the mouse"
+msgstr "el nombre del ratón"
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:103
 #, c-format
-msgid "the number of the processor"
-msgstr "el número del procesador"
+msgid "Number of buttons"
+msgstr "Cantidad de botones"
 
-#: standalone/harddrake2:70
+#: standalone/harddrake2:103
 #, c-format
-msgid "Primary partitions"
-msgstr "Particiones primarias"
+msgid "the number of buttons the mouse has"
+msgstr "la cantidad de botones que tiene el ratón"
 
-#: standalone/harddrake2:70
+#: standalone/harddrake2:104
 #, c-format
-msgid "the number of the primary partitions"
-msgstr "la cantidad de particiones primarias"
+msgid "the type of bus on which the mouse is connected"
+msgstr "el tipo de bus sobre el que está conectado el ratón"
 
-#: standalone/harddrake2:71
+#: standalone/harddrake2:105
 #, c-format
-msgid "Model stepping"
-msgstr "Paso del modelo"
+msgid "Mouse protocol used by X11"
+msgstr "El protocolo de ratón que utiliza X11"
 
-#: standalone/harddrake2:71
+#: standalone/harddrake2:105
 #, c-format
-msgid "stepping of the cpu (sub model (generation) number)"
-msgstr "stepping de la CPU (número de sub-modelo - generación)"
+msgid "the protocol that the graphical desktop use with the mouse"
+msgstr "el protocolo que usa el entorno gráfico con el ratón"
 
-#: standalone/harddrake2:72
+#: standalone/harddrake2:112 standalone/harddrake2:121
+#: standalone/harddrake2:128 standalone/harddrake2:136
+#: standalone/harddrake2:309
 #, c-format
-msgid "the type of bus on which the mouse is connected"
-msgstr "el tipo de bus sobre el que está conectado el ratón"
+msgid "Identification"
+msgstr "Identificación"
 
-#: standalone/harddrake2:73
+#: standalone/harddrake2:113 standalone/harddrake2:129
 #, c-format
-msgid "the vendor name of the device"
-msgstr "el nombre del fabricante del dispositivo"
+msgid "Connection"
+msgstr "Conexión"
 
-#: standalone/harddrake2:74
+#: standalone/harddrake2:122
 #, c-format
-msgid "the vendor name of the processor"
-msgstr "el nombre del fabricante del procesador"
+msgid "Performances"
+msgstr "Rendimiento"
 
-#: standalone/harddrake2:75
+#: standalone/harddrake2:123
 #, c-format
-msgid "Write protection"
-msgstr "Protección contra escritura"
+msgid "Bugs"
+msgstr "Bugs"
 
-#: standalone/harddrake2:75
+#: standalone/harddrake2:124
 #, c-format
-msgid ""
-"the WP flag in the CR0 register of the cpu enforce write proctection at the "
-"memory page level, thus enabling the processor to prevent unchecked kernel "
-"accesses to user memory (aka this is a bug guard)"
-msgstr ""
-"el indicador WP en el registro CR0 fuerza protección contra escritura al "
-"nivel de página de memoria, permitiendo así que el procesador evite accesos "
-"del núcleo (es decir, esto es una protección contra los bugs)"
+msgid "FPU"
+msgstr "FPU"
+
+#: standalone/harddrake2:132
+#, c-format
+msgid "Partitions"
+msgstr "Particiones"
 
-#. -PO: please keep all "/" charaters !!!
-#: standalone/harddrake2:90 standalone/logdrake:78 standalone/printerdrake:146
-#: standalone/printerdrake:159
+#: standalone/harddrake2:137
+#, c-format
+msgid "Features"
+msgstr "Características"
+
+#. -PO: please keep all "/" characters !!!
+#: standalone/harddrake2:158 standalone/logdrake:77
+#: standalone/printerdrake:152 standalone/printerdrake:165
 #, c-format
 msgid "/_Options"
 msgstr "/_Opciones"
 
-#: 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 "/A_yuda"
 
-#: standalone/harddrake2:95
+#: standalone/harddrake2:163
 #, c-format
 msgid "/Autodetect _printers"
 msgstr "/Autodetectar im_presoras"
 
-#: standalone/harddrake2:96
+#: standalone/harddrake2:164
 #, c-format
 msgid "/Autodetect _modems"
 msgstr "/Autodetectar _módems"
 
-#: standalone/harddrake2:97
+#: standalone/harddrake2:165
 #, c-format
 msgid "/Autodetect _jaz drives"
 msgstr "/Autodetectar unidades _jaz"
 
-#: standalone/harddrake2:104 standalone/printerdrake:152
+#: standalone/harddrake2:172 standalone/printerdrake:158
 #, c-format
 msgid "/_Quit"
 msgstr "/_Salir"
 
-#: standalone/harddrake2:113
+#: standalone/harddrake2:181
 #, c-format
 msgid "/_Fields description"
 msgstr "/_Descripción de los campos"
 
-#: standalone/harddrake2:115
+#: standalone/harddrake2:183
 #, c-format
 msgid "Harddrake help"
 msgstr "Ayuda de Harddrake"
 
-#: standalone/harddrake2:116
-#, c-format
-msgid ""
-"Description of the fields:\n"
-"\n"
-msgstr ""
-"Descripción de los campos:\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 "
@@ -23463,176 +24669,189 @@ msgstr ""
 "Una vez que seleccionó un dispositivo, podrá ver información sobre el mismo "
 "en los campos mostrados en el marco derecho (\"Información\")"
 
-#: standalone/harddrake2:126 standalone/printerdrake:173
+#: standalone/harddrake2:197 standalone/printerdrake:179
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Reportar un error"
 
-#: standalone/harddrake2:127 standalone/printerdrake:174
+#: standalone/harddrake2:198 standalone/printerdrake:180
 #, c-format
 msgid "/_About..."
 msgstr "/_Acerca..."
 
-#: standalone/harddrake2:128
+#: standalone/harddrake2:199
 #, c-format
 msgid "About Harddrake"
 msgstr "Acerca de Harddrake"
 
 #. -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 ""
 "Este es HardDrake, una herramienta de configuración de hardware de "
-"Mandrake.\n"
+"Mandrakelinux.\n"
 "<span foreground=\"royalblue3\">Versión:</span> %s\n"
 "<span foreground=\"royalblue3\">Autor:</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 
-#: standalone/harddrake2:147
+#: standalone/harddrake2:218
 #, c-format
-msgid "Harddrake2 version %s"
-msgstr "Harddrake2 versión %s"
+msgid "Harddrake2"
+msgstr "Harddrake2"
 
-#: standalone/harddrake2:163
+#: standalone/harddrake2:234
 #, c-format
 msgid "Detected hardware"
 msgstr "Hardware detectado"
 
-#: standalone/harddrake2:168
+#: standalone/harddrake2:239
 #, c-format
 msgid "Configure module"
 msgstr "Configurar módulo"
 
-#: standalone/harddrake2:175
+#: standalone/harddrake2:246
 #, c-format
 msgid "Run config tool"
 msgstr "Ejecutar herramienta de configuración"
 
-#: standalone/harddrake2:222
+#: standalone/harddrake2:296 standalone/net_monitor:108
+#: standalone/net_monitor:109 standalone/net_monitor:114
 #, c-format
 msgid "unknown"
 msgstr "desconocido"
 
-#: standalone/harddrake2:223
+#: standalone/harddrake2:297 standalone/printerdrake:308
+#: standalone/printerdrake:346
 #, c-format
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: standalone/harddrake2:241
+#: standalone/harddrake2:317
 #, c-format
-msgid "Click on a device in the left tree in order to display its information here."
+msgid "Misc"
+msgstr "Misc"
+
+#: standalone/harddrake2:332
+#, c-format
+msgid ""
+"Click on a device in the left tree in order to display its information here."
 msgstr ""
 "Haga clic sobre un dispositivo en el árbol de la izquierda para obtener aquí "
 "información sobre el mismo."
 
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
 #, c-format
 msgid "secondary"
 msgstr "secundario"
 
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
 #, c-format
 msgid "primary"
 msgstr "primario"
 
-#: standalone/harddrake2:303
+#: standalone/harddrake2:388
 #, c-format
 msgid "burner"
 msgstr "grabadora"
 
-#: 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 "Por favor, seleccione la distribución de su teclado."
 
-#: standalone/keyboarddrake:33
+#: standalone/keyboarddrake:34
 #, c-format
 msgid "Do you want the BackSpace to return Delete in console?"
 msgstr "¿Desea que la tecla BackSpace envíe un Delete en la consola?"
 
-#: 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 "Se ha realizado el cambio, pero no se hará efectivo hasta que salga"
 
-#: standalone/logdrake:51
+#: standalone/logdrake:50
 #, c-format
-msgid "Mandrake Tools Logs"
-msgstr "Registros de las Herramientas"
+msgid "Mandrakelinux Tools Logs"
+msgstr "Registros de las Herramientas Mandrakelinux"
 
-#: standalone/logdrake:52
+#: standalone/logdrake:51
 #, c-format
 msgid "Logdrake"
 msgstr "Logdrake"
 
-#: standalone/logdrake:65
+#: standalone/logdrake:64
 #, c-format
 msgid "Show only for the selected day"
 msgstr "Mostrar sólo para el día seleccionado"
 
-#: standalone/logdrake:72
+#: standalone/logdrake:71
 #, c-format
 msgid "/File/_New"
 msgstr "/Archivo/_Nuevo"
 
-#: 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 "/Archivo/_Abrir"
 
-#: standalone/logdrake:73
+#: standalone/logdrake:72
 #, c-format
 msgid "<control>O"
 msgstr "<control>A"
 
-#: standalone/logdrake:74
+#: standalone/logdrake:73
 #, c-format
 msgid "/File/_Save"
 msgstr "/Archivo/_Guardar"
 
-#: standalone/logdrake:74
+#: standalone/logdrake:73
 #, c-format
 msgid "<control>S"
 msgstr "<control>G"
 
-#: standalone/logdrake:75
+#: standalone/logdrake:74
 #, c-format
 msgid "/File/Save _As"
 msgstr "/Archivo/Guardar _Como"
 
-#: standalone/logdrake:76
+#: standalone/logdrake:75
 #, c-format
 msgid "/File/-"
 msgstr "/Archivo/-"
 
-#: standalone/logdrake:79
+#: standalone/logdrake:78
 #, c-format
 msgid "/Options/Test"
 msgstr "/Opciones/Prueba"
 
-#: standalone/logdrake:81
+#: standalone/logdrake:80
 #, c-format
 msgid "/Help/_About..."
 msgstr "/Ayuda/_Acerca..."
 
-#: standalone/logdrake:110
+#: standalone/logdrake:109
 #, c-format
 msgid ""
 "_:this is the auth.log log file\n"
@@ -23641,7 +24860,7 @@ msgstr ""
 "_: este es el archivo de registro auth.log\n"
 "Autenticación"
 
-#: standalone/logdrake:111
+#: standalone/logdrake:110
 #, c-format
 msgid ""
 "_:this is the user.log log file\n"
@@ -23650,7 +24869,7 @@ msgstr ""
 "_: este es el archivo de registro user.log\n"
 "Usuario"
 
-#: standalone/logdrake:112
+#: standalone/logdrake:111
 #, c-format
 msgid ""
 "_:this is the /var/log/messages log file\n"
@@ -23659,7 +24878,7 @@ msgstr ""
 "_: Este es el archivo de registro /var/log/messages\n"
 "Mensajes"
 
-#: standalone/logdrake:113
+#: standalone/logdrake:112
 #, c-format
 msgid ""
 "_:this is the /var/log/syslog log file\n"
@@ -23668,54 +24887,54 @@ msgstr ""
 "_: este es el archivo de registro /var/log/syslog\n"
 "Syslog"
 
-#: standalone/logdrake:117
+#: standalone/logdrake:116
 #, c-format
 msgid "search"
 msgstr "buscar"
 
-#: standalone/logdrake:129
+#: standalone/logdrake:128
 #, c-format
 msgid "A tool to monitor your logs"
 msgstr "Una herramienta para ver sus archivos de registro (logs)"
 
-#: standalone/logdrake:130 standalone/net_monitor:86
+#: standalone/logdrake:129 standalone/net_monitor:99
 #, c-format
 msgid "Settings"
 msgstr "Configuración"
 
-#: standalone/logdrake:135
+#: standalone/logdrake:134
 #, c-format
 msgid "Matching"
 msgstr "Coincidencia"
 
-#: standalone/logdrake:136
+#: standalone/logdrake:135
 #, c-format
 msgid "but not matching"
 msgstr "pero no hay coincidencias"
 
-#: standalone/logdrake:140
+#: standalone/logdrake:139
 #, c-format
 msgid "Choose file"
 msgstr "Elija un archivo"
 
-#: standalone/logdrake:149
+#: standalone/logdrake:148
 #, c-format
 msgid "Calendar"
 msgstr "Calendario"
 
-#: standalone/logdrake:159
+#: standalone/logdrake:158
 #, c-format
 msgid "Content of the file"
 msgstr "Contenido del archivo"
 
-#: standalone/logdrake:163 standalone/logdrake:429
+#: standalone/logdrake:162 standalone/logdrake:399
 #, c-format
 msgid "Mail alert"
 msgstr "Alerta por correo"
 
-#: standalone/logdrake:170
+#: standalone/logdrake:169
 #, c-format
-msgid "The alert wizard had unexpectly failled:"
+msgid "The alert wizard has failed unexpectedly:"
 msgstr "El asistente de alerta falló inesperadamente:"
 
 #: standalone/logdrake:221
@@ -23723,62 +24942,57 @@ msgstr "El asistente de alerta falló inesperadamente:"
 msgid "please wait, parsing file: %s"
 msgstr "por favor, espere, analizando el archivo: %s"
 
-#: standalone/logdrake:406
+#: standalone/logdrake:376
 #, c-format
 msgid "Apache World Wide Web Server"
 msgstr "Servidor de World Wide Web Apache"
 
-#: standalone/logdrake:407
+#: standalone/logdrake:377
 #, c-format
 msgid "Domain Name Resolver"
 msgstr "Nombres de dominio"
 
-#: standalone/logdrake:408
+#: standalone/logdrake:378
 #, c-format
 msgid "Ftp Server"
 msgstr "Servidor FTP"
 
-#: standalone/logdrake:409
+#: standalone/logdrake:379
 #, c-format
 msgid "Postfix Mail Server"
 msgstr "Servidor de correo Postfix"
 
-#: standalone/logdrake:410
+#: standalone/logdrake:380
 #, c-format
 msgid "Samba Server"
 msgstr "Servidor Samba"
 
-#: standalone/logdrake:411
-#, c-format
-msgid "SSH Server"
-msgstr "Servidor SSH"
-
-#: standalone/logdrake:412
+#: standalone/logdrake:382
 #, c-format
 msgid "Webmin Service"
 msgstr "Servicio Webmin"
 
-#: standalone/logdrake:413
+#: standalone/logdrake:383
 #, c-format
 msgid "Xinetd Service"
 msgstr "Servicio Xinetd"
 
-#: standalone/logdrake:424
+#: standalone/logdrake:394
 #, c-format
 msgid "Configure the mail alert system"
 msgstr "Configurar el sistema de alertas por correo"
 
-#: standalone/logdrake:425
+#: standalone/logdrake:395
 #, c-format
 msgid "Stop the mail alert system"
 msgstr "Detener el sistema de alertas por correo"
 
-#: standalone/logdrake:432
+#: standalone/logdrake:402
 #, c-format
 msgid "Mail alert configuration"
 msgstr "Configuración de alerta por correo"
 
-#: standalone/logdrake:433
+#: standalone/logdrake:403
 #, c-format
 msgid ""
 "Welcome to the mail configuration utility.\n"
@@ -23789,17 +25003,17 @@ msgstr ""
 "\n"
 "Aquí podrá configurar su sistema de alerta.\n"
 
-#: standalone/logdrake:436
+#: standalone/logdrake:406
 #, c-format
 msgid "What do you want to do?"
 msgstr "¿Qué desea hacer?"
 
-#: standalone/logdrake:443
+#: standalone/logdrake:413
 #, c-format
 msgid "Services settings"
 msgstr "Configuración de los servicios"
 
-#: standalone/logdrake:444
+#: standalone/logdrake:414
 #, c-format
 msgid ""
 "You will receive an alert if one of the selected services is no longer "
@@ -23808,49 +25022,49 @@ msgstr ""
 "Recibirá una alerta si alguno de los servicios seleccionados ya no está "
 "corriendo"
 
-#: standalone/logdrake:451
+#: standalone/logdrake:421
 #, c-format
 msgid "Load setting"
 msgstr "Cargar ajuste"
 
-#: standalone/logdrake:452
+#: standalone/logdrake:422
 #, c-format
 msgid "You will receive an alert if the load is higher than this value"
 msgstr "Recibirá una alerta si la carga es mayor que este valor"
 
-#: standalone/logdrake:453
+#: standalone/logdrake:423
 #, c-format
 msgid ""
 "_: load here is a noun, the load of the system\n"
 "Load"
 msgstr "Carga"
 
-#: standalone/logdrake:458
+#: standalone/logdrake:428
 #, c-format
 msgid "Alert configuration"
 msgstr "Configuración de alerta"
 
-#: standalone/logdrake:459
+#: standalone/logdrake:429
 #, c-format
 msgid "Please enter your email address below "
 msgstr "Por favor, ingrese su dirección de correo electrónico debajo "
 
-#: 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 "e ingrese el nombre (o la IP) del servidor SMTP que desea usar"
 
-#: standalone/logdrake:479
+#: standalone/logdrake:449
 #, c-format
 msgid "The wizard successfully configured the mail alert."
 msgstr "El asistente configuró satisfactoriamente la alerta por correo."
 
-#: standalone/logdrake:485
+#: standalone/logdrake:455
 #, c-format
 msgid "The wizard successfully disabled the mail alert."
 msgstr "El asistente deshabilitó satisfactoriamente la alerta por correo."
 
-#: standalone/logdrake:544
+#: standalone/logdrake:514
 #, c-format
 msgid "Save as.."
 msgstr "Guardar como..."
@@ -23875,27 +25089,75 @@ msgstr "Prueba del ratón"
 msgid "Please test your mouse:"
 msgstr "Por favor, pruebe su ratón:"
 
-#: standalone/net_monitor:52 standalone/net_monitor:57
+#: standalone/net_applet:30
+#, c-format
+msgid "Network is up on interface %s"
+msgstr "La red está activa en la interfaz %s"
+
+#. -PO: keep the "Configure Network" substring synced with the "Configure Network" message below
+#: standalone/net_applet:38
+#, c-format
+msgid "Network is down on interface %s. Click on \"Configure Network\""
+msgstr ""
+"La red está inactiva en la interfaz %s. Haga clic sobre \"Configurar la red\""
+
+#: standalone/net_applet:53 standalone/net_monitor:471
+#, c-format
+msgid "Connect %s"
+msgstr "Conectar %s"
+
+#: standalone/net_applet:54 standalone/net_monitor:471
+#, c-format
+msgid "Disconnect %s"
+msgstr "Desconectar %s"
+
+#: standalone/net_applet:55
+#, c-format
+msgid "Monitor Network"
+msgstr "Monitorear la red"
+
+#: standalone/net_applet:56
+#, c-format
+msgid "Configure Network"
+msgstr "Configurar la red"
+
+#. -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 "Refrescar"
+
+#: standalone/net_applet:58
+#, c-format
+msgid "Get Online Help"
+msgstr "Obtener ayuda en línea"
+
+#: standalone/net_applet:158
+#, c-format
+msgid "Always launch on startup"
+msgstr "Iniciar siempre al arrancar"
+
+#: standalone/net_monitor:61 standalone/net_monitor:66
 #, c-format
 msgid "Network Monitoring"
 msgstr "Monitoreo de la red"
 
-#: standalone/net_monitor:92
+#: standalone/net_monitor:104
 #, c-format
 msgid "Global statistics"
 msgstr "Estadísticas globales"
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Instantaneous"
 msgstr "Instantáneo"
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Average"
 msgstr "Promedio"
 
-#: standalone/net_monitor:96
+#: standalone/net_monitor:108
 #, c-format
 msgid ""
 "Sending\n"
@@ -23904,7 +25166,7 @@ msgstr ""
 "Velocidad\n"
 "de envío:"
 
-#: standalone/net_monitor:97
+#: standalone/net_monitor:109
 #, c-format
 msgid ""
 "Receiving\n"
@@ -23913,7 +25175,7 @@ msgstr ""
 "Velocidad\n"
 "de recepción:"
 
-#: standalone/net_monitor:100
+#: standalone/net_monitor:113
 #, c-format
 msgid ""
 "Connection\n"
@@ -23922,81 +25184,76 @@ msgstr ""
 "Tiempo\n"
 "de conexión: "
 
-#: standalone/net_monitor:122
+#: standalone/net_monitor:120
+#, c-format
+msgid "Use same scale for received and transmitted"
+msgstr "Usar la misma escala para recibido y transmitido"
+
+#: standalone/net_monitor:139
 #, c-format
 msgid "Wait please, testing your connection..."
 msgstr "Por favor espere, probando su conexión..."
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, c-format
 msgid "Disconnecting from Internet "
 msgstr "Desconectando desde la Internet "
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, c-format
 msgid "Connecting to Internet "
 msgstr "Conectando a la Internet "
 
-#: standalone/net_monitor:194
+#: standalone/net_monitor:232
 #, c-format
 msgid "Disconnection from Internet failed."
 msgstr "Falló la desconexión desde la Internet."
 
-#: standalone/net_monitor:195
+#: standalone/net_monitor:233
 #, c-format
 msgid "Disconnection from Internet complete."
 msgstr "Desconexión desde la Internet completada."
 
-#: standalone/net_monitor:197
+#: standalone/net_monitor:235
 #, c-format
 msgid "Connection complete."
 msgstr "Conexión completa."
 
-#: 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 ""
 "Falló la conexión.\n"
-"Verifique su configuración en el Centro de Control de Mandrake."
+"Verifique su configuración en el Centro de Control de Mandrakelinux."
 
-#: standalone/net_monitor:299
+#: standalone/net_monitor:341
 #, c-format
 msgid "Color configuration"
 msgstr "Configuración del color"
 
-#: standalone/net_monitor:347 standalone/net_monitor:367
+#: standalone/net_monitor:389 standalone/net_monitor:409
 #, c-format
 msgid "sent: "
 msgstr "enviado: "
 
-#: standalone/net_monitor:354 standalone/net_monitor:371
+#: standalone/net_monitor:396 standalone/net_monitor:413
 #, c-format
 msgid "received: "
 msgstr "recibido: "
 
-#: standalone/net_monitor:361
+#: standalone/net_monitor:403
 #, c-format
 msgid "average"
 msgstr "promedio"
 
-#: standalone/net_monitor:364
+#: standalone/net_monitor:406
 #, c-format
 msgid "Local measure"
 msgstr "Medida local"
 
-#: standalone/net_monitor:396
-#, c-format
-msgid "transmitted"
-msgstr "transmitido"
-
-#: standalone/net_monitor:397
-#, c-format
-msgid "received"
-msgstr "recibido"
-
-#: standalone/net_monitor:415
+#: standalone/net_monitor:464
 #, c-format
 msgid ""
 "Warning, another internet connection has been detected, maybe using your "
@@ -24005,173 +25262,168 @@ msgstr ""
 "Atención, se ha detectado otra conexión con la Internet, tal vez usando su "
 "red"
 
-#: standalone/net_monitor:421
-#, c-format
-msgid "Disconnect %s"
-msgstr "Desconectar %s"
-
-#: standalone/net_monitor:421
-#, c-format
-msgid "Connect %s"
-msgstr "Conectar %s"
-
-#: standalone/net_monitor:426
+#: standalone/net_monitor:475
 #, c-format
 msgid "No internet connection configured"
 msgstr "No se configuró conexión con la Internet"
 
-#: standalone/printerdrake:70
+#: standalone/printerdrake:69
 #, c-format
 msgid "Loading printer configuration... Please wait"
 msgstr "Cargando configuración de la impresora... Por favor, espere"
 
-#: standalone/printerdrake:86
+#: standalone/printerdrake:85
 #, c-format
 msgid "Reading data of installed printers..."
 msgstr "Leyendo datos de impresoras instaladas..."
 
-#: standalone/printerdrake:129
+#: standalone/printerdrake:134
 #, c-format
 msgid "%s Printer Management Tool"
 msgstr "Herramienta de administración de impresoras %s"
 
-#: 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 "/_Acciones"
 
-#: standalone/printerdrake:143
+#: standalone/printerdrake:148 standalone/printerdrake:160
+#, c-format
+msgid "/_Add Printer"
+msgstr "/_Añadir Impresora"
+
+#: standalone/printerdrake:149
 #, c-format
 msgid "/Set as _Default"
 msgstr "/Configurar como pre_Determinada"
 
-#: standalone/printerdrake:144
+#: standalone/printerdrake:150
 #, c-format
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: standalone/printerdrake:145
+#: standalone/printerdrake:151
 #, c-format
 msgid "/_Delete"
 msgstr "/_Borrar"
 
-#: standalone/printerdrake:146
+#: standalone/printerdrake:152
 #, c-format
 msgid "/_Expert mode"
 msgstr "/Modo _Experto"
 
-#: standalone/printerdrake:151
+#: standalone/printerdrake:157
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Refrescar"
 
-#: standalone/printerdrake:154
-#, c-format
-msgid "/_Add Printer"
-msgstr "/_Añadir Impresora"
-
-#: standalone/printerdrake:158
+#: standalone/printerdrake:164
 #, c-format
 msgid "/_Configure CUPS"
 msgstr "/_Configurar CUPS"
 
-#: standalone/printerdrake:191
+#: standalone/printerdrake:197
 #, c-format
 msgid "Search:"
 msgstr "Buscar:"
 
-#: standalone/printerdrake:194
+#: standalone/printerdrake:200
 #, c-format
 msgid "Apply filter"
 msgstr "Aplicar filtro"
 
-#: 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 "Nombre de la impresora"
 
-#: standalone/printerdrake:212
+#: standalone/printerdrake:218
 #, c-format
 msgid "Connection Type"
 msgstr "Tipo de conexión"
 
-#: standalone/printerdrake:219
+#: standalone/printerdrake:225
 #, c-format
 msgid "Server Name"
 msgstr "Nombre del servidor"
 
 #. -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 "Añadir Impresora"
 
-#: standalone/printerdrake:227
+#: standalone/printerdrake:233
 #, c-format
 msgid "Add a new printer to the system"
 msgstr "Añadir una impresora nueva al sistema"
 
 #. -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 "Predeterminar"
 
-#: standalone/printerdrake:230
+#: standalone/printerdrake:236
 #, c-format
 msgid "Set selected printer as the default printer"
 msgstr "Configurar esta impresora como la predeterminada"
 
-#: standalone/printerdrake:233
+#: standalone/printerdrake:239
 #, c-format
 msgid "Edit selected printer"
 msgstr "Editar impresora seleccionada"
 
-#: standalone/printerdrake:236
+#: standalone/printerdrake:242
 #, c-format
 msgid "Delete selected printer"
 msgstr "Borrar la impresora seleccionada"
 
-#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:239
-#, c-format
-msgid "Refresh"
-msgstr "Refrescar"
-
-#: standalone/printerdrake:239
+#: standalone/printerdrake:245
 #, c-format
 msgid "Refresh the list"
 msgstr "Refrescar la 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 "Configurar CUPS"
 
-#: standalone/printerdrake:242
+#: standalone/printerdrake:248
 #, c-format
 msgid "Configure CUPS printing system"
 msgstr "Configurar el sistema de impresión CUPS"
 
-#: standalone/printerdrake:528
+#: standalone/printerdrake:309 standalone/printerdrake:347
+#, c-format
+msgid "Enabled"
+msgstr "Habilitada"
+
+#: standalone/printerdrake:310 standalone/printerdrake:348
+#, c-format
+msgid "Disabled"
+msgstr "Deshabilitada"
+
+#: standalone/printerdrake:572
 #, c-format
 msgid "Authors: "
 msgstr "Autores: "
 
-#: standalone/printerdrake:534
+#: standalone/printerdrake:578
 #, c-format
 msgid "Printer Management \n"
 msgstr "Administración de impresoras \n"
 
-#: standalone/scannerdrake:50
+#: standalone/scannerdrake:51
 #, c-format
 msgid ""
 "SANE packages need to be installed to use scanners.\n"
@@ -24182,90 +25434,81 @@ msgstr ""
 "\n"
 "¿Desea instalar los paquetes SANE?"
 
-#: standalone/scannerdrake:54
+#: standalone/scannerdrake:55
 #, c-format
 msgid "Aborting Scannerdrake."
 msgstr "Abortando Scannerdrake."
 
-#: standalone/scannerdrake:59
+#: standalone/scannerdrake:60
 #, c-format
-msgid "Could not install the packages needed to set up a scanner with Scannerdrake."
+msgid ""
+"Could not install the packages needed to set up a scanner with Scannerdrake."
 msgstr ""
 "No se pueden instalar los paquetes necesarios para configurar un escáner con "
 "Scannerdrake."
 
-#: standalone/scannerdrake:60
+#: standalone/scannerdrake:61
 #, c-format
 msgid "Scannerdrake will not be started now."
 msgstr "Scannerdrake no se iniciará ahora."
 
-#: 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 "Buscando escáneres configurados ..."
 
-#: 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 "Buscando escáneres nuevos..."
 
-#: 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 "Regenerando lista de escáneres configurados ..."
 
-#: 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 "El %s no está soportado por esta versión de %s."
 
-#: standalone/scannerdrake:103
+#: standalone/scannerdrake:104
 #, c-format
 msgid "%s found on %s, configure it automatically?"
 msgstr "se encontró %s en %s, ¿configurarlo automáticamente?"
 
-#: standalone/scannerdrake:115
+#: standalone/scannerdrake:116
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
-msgstr "%s no está en la base de datos de escáneres, ¿configurarlo manualmente?"
+msgstr ""
+"%s no está en la base de datos de escáneres, ¿configurarlo manualmente?"
 
-#: standalone/scannerdrake:130
+#: standalone/scannerdrake:131
 #, c-format
 msgid "Select a scanner model"
 msgstr "Seleccione un modelo de escáner"
 
-#: standalone/scannerdrake:131
+#: standalone/scannerdrake:132
 #, c-format
 msgid " ("
 msgstr " ("
 
-#: standalone/scannerdrake:132
+#: standalone/scannerdrake:133
 #, c-format
 msgid "Detected model: %s"
 msgstr "Modelo detectado: %s"
 
-#: standalone/scannerdrake:134
-#, c-format
-msgid ", "
-msgstr ", "
-
-#: standalone/scannerdrake:135
+#: standalone/scannerdrake:136
 #, c-format
 msgid "Port: %s"
 msgstr "Puerto: %s"
 
-#: standalone/scannerdrake:161
-#, c-format
-msgid "The %s is not known by this version of Scannerdrake."
-msgstr "Esta versión de Scannerdrake desconoce al %s."
-
-#: standalone/scannerdrake:169 standalone/scannerdrake:183
+#: standalone/scannerdrake:165 standalone/scannerdrake:179
 #, c-format
 msgid "Do not install firmware file"
 msgstr "No instalar archivo de firmware"
 
-#: 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 "
@@ -24274,12 +25517,12 @@ msgstr ""
 "Es posible que su %s necesite que se le envíe el firmware cada vez que se "
 "encienda."
 
-#: 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 "Si este es el caso, puede hacer que esto se realice automáticamente."
 
-#: 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 "
@@ -24288,7 +25531,7 @@ msgstr ""
 "Para esto, necesita proporcionar el archivo de firmware para su escáner de "
 "forma tal que se lo pueda instalar."
 
-#: 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 "
@@ -24297,22 +25540,22 @@ msgstr ""
 "Encontrará el archivo en el CD o disquete que viene con el escáner, en la "
 "página web del fabricante, o en su partición Windows."
 
-#: standalone/scannerdrake:178 standalone/scannerdrake:237
+#: standalone/scannerdrake:174 standalone/scannerdrake:233
 #, c-format
 msgid "Install firmware file from"
 msgstr "Instalar archivo de firmware desde"
 
-#: standalone/scannerdrake:198
+#: standalone/scannerdrake:194
 #, c-format
 msgid "Select firmware file"
 msgstr "Seleccione archivo de firmware"
 
-#: 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 "¡El archivo de firmware %s no existe o no se puede leer!"
 
-#: standalone/scannerdrake:224
+#: standalone/scannerdrake:220
 #, c-format
 msgid ""
 "It is possible that your scanners need their firmware to be uploaded "
@@ -24321,7 +25564,7 @@ msgstr ""
 "Es posible que sus escáneres necesiten que se le envíe el firmware cada vez "
 "que se enciendan."
 
-#: 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 "
@@ -24330,7 +25573,7 @@ msgstr ""
 "Para esto, necesita proporcionar los archivos de firmware para sus escáneres "
 "de forma tal que se lo pueda instalar."
 
-#: standalone/scannerdrake:231
+#: standalone/scannerdrake:227
 #, c-format
 msgid ""
 "If you have already installed your scanner's firmware you can update the "
@@ -24339,32 +25582,32 @@ msgstr ""
 "Si ya tiene instalado el firmware de su escáner, aquí puede actualizar el "
 "firmware proporcionando el archivo de firmware nuevo."
 
-#: standalone/scannerdrake:233
+#: standalone/scannerdrake:229
 #, c-format
 msgid "Install firmware for the"
 msgstr "Instalar firmware para el"
 
-#: standalone/scannerdrake:256
+#: standalone/scannerdrake:252
 #, c-format
 msgid "Select firmware file for the %s"
 msgstr "Seleccione archivo de firmware para el %s"
 
-#: standalone/scannerdrake:274
+#: standalone/scannerdrake:270
 #, c-format
 msgid "Could not install the firmware file for the %s!"
 msgstr "¡No se pudo instalar archivo de firmware para el %s!"
 
-#: standalone/scannerdrake:287
+#: standalone/scannerdrake:283
 #, c-format
 msgid "The firmware file for your %s was successfully installed."
 msgstr "Se instaló satisfactoriamente el archivo de firmware para su %s."
 
-#: standalone/scannerdrake:297
+#: standalone/scannerdrake:293
 #, c-format
 msgid "The %s is unsupported"
 msgstr "El %s no está soportado"
 
-#: standalone/scannerdrake:302
+#: standalone/scannerdrake:298
 #, c-format
 msgid ""
 "The %s must be configured by printerdrake.\n"
@@ -24374,33 +25617,33 @@ msgstr ""
 "Puede lanzar printerdrake desde el Centro de control de %s en la sección "
 "Hardware."
 
-#: 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 "/Autodetectar puertos disponibles"
 
-#: 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 "Por favor, seleccione el dispositivo donde está conectado su %s"
 
-#: standalone/scannerdrake:309
+#: standalone/scannerdrake:305
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
 msgstr "(Nota: no se pueden detectar automáticamente los puertos paralelo)"
 
-#: standalone/scannerdrake:311 standalone/scannerdrake:356
+#: standalone/scannerdrake:307 standalone/scannerdrake:352
 #, c-format
 msgid "choose device"
 msgstr "elija el dispositivo"
 
-#: standalone/scannerdrake:345
+#: standalone/scannerdrake:341
 #, c-format
-msgid "Searching for scanners ..."
+msgid "Searching for scanners..."
 msgstr "Buscando escáneres..."
 
-#: standalone/scannerdrake:380
+#: standalone/scannerdrake:376
 #, c-format
 msgid ""
 "Your %s has been configured.\n"
@@ -24411,7 +25654,7 @@ msgstr ""
 "Ahora puede escanear documentos usando \"XSane\" o \"Kooka\" desde "
 "Multimedios/Gráficos en el menú de aplicaciones."
 
-#: standalone/scannerdrake:404
+#: standalone/scannerdrake:400
 #, c-format
 msgid ""
 "The following scanners\n"
@@ -24424,7 +25667,7 @@ msgstr ""
 "%s\n"
 "están disponibles en su sistema.\n"
 
-#: standalone/scannerdrake:405
+#: standalone/scannerdrake:401
 #, c-format
 msgid ""
 "The following scanner\n"
@@ -24437,42 +25680,42 @@ msgstr ""
 "%s\n"
 "está disponible en su sistema.\n"
 
-#: 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 "No se encontraron escáneres disponibles en su sistema.\n"
 
-#: standalone/scannerdrake:425
+#: standalone/scannerdrake:421
 #, c-format
 msgid "Search for new scanners"
 msgstr "Buscar escáneres nuevos"
 
-#: standalone/scannerdrake:431
+#: standalone/scannerdrake:427
 #, c-format
 msgid "Add a scanner manually"
 msgstr "Añadir un escáner manualmente"
 
-#: standalone/scannerdrake:438
+#: standalone/scannerdrake:434
 #, c-format
 msgid "Install/Update firmware files"
 msgstr "Instalar/Actualizar archivo de firmware"
 
-#: standalone/scannerdrake:444
+#: standalone/scannerdrake:440
 #, c-format
 msgid "Scanner sharing"
 msgstr "Compartir escáner"
 
-#: standalone/scannerdrake:503 standalone/scannerdrake:668
+#: standalone/scannerdrake:499 standalone/scannerdrake:664
 #, c-format
 msgid "All remote machines"
 msgstr "Todas las máquinas remotas"
 
-#: standalone/scannerdrake:515 standalone/scannerdrake:818
+#: standalone/scannerdrake:511 standalone/scannerdrake:814
 #, c-format
 msgid "This machine"
 msgstr "Esta máquina"
 
-#: standalone/scannerdrake:555
+#: standalone/scannerdrake:551
 #, c-format
 msgid ""
 "Here you can choose whether the scanners connected to this machine should be "
@@ -24481,7 +25724,7 @@ msgstr ""
 "Aquí puede elegir si los escáneres conectados a esta máquina deberían poder "
 "accederse desde máquinas remotas y desde qué máquinas remotas."
 
-#: standalone/scannerdrake:556
+#: standalone/scannerdrake:552
 #, c-format
 msgid ""
 "You can also decide here whether scanners on remote machines should be made "
@@ -24490,33 +25733,34 @@ msgstr ""
 "También puede decidir aquí si los escáneres en las máquinas remotas deberían "
 "estar disponibles automáticamente en esta máquina."
 
-#: standalone/scannerdrake:559
+#: standalone/scannerdrake:555
 #, c-format
 msgid "The scanners on this machine are available to other computers"
-msgstr "Los escáneres en esta máquina están disponibles para otras computadoras"
+msgstr ""
+"Los escáneres en esta máquina están disponibles para otras computadoras"
 
-#: standalone/scannerdrake:561
+#: standalone/scannerdrake:557
 #, c-format
 msgid "Scanner sharing to hosts: "
 msgstr "Compartir escáneres en hosts: "
 
-#: standalone/scannerdrake:575
+#: standalone/scannerdrake:571
 #, c-format
 msgid "Use scanners on remote computers"
 msgstr "Usar los escáneres en computadoras remotas"
 
-#: standalone/scannerdrake:578
+#: standalone/scannerdrake:574
 #, c-format
 msgid "Use the scanners on hosts: "
 msgstr "Usar los escáneres en los hosts:"
 
-#: 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 "Compartir escáneres locales"
 
-#: standalone/scannerdrake:606
+#: standalone/scannerdrake:602
 #, c-format
 msgid ""
 "These are the machines on which the locally connected scanner(s) should be "
@@ -24525,55 +25769,57 @@ msgstr ""
 "Estas son las máquinas en las cuales deberían estar disponibles los "
 "escáneres conectados localmente:"
 
-#: standalone/scannerdrake:617 standalone/scannerdrake:767
+#: standalone/scannerdrake:613 standalone/scannerdrake:763
 #, c-format
 msgid "Add host"
 msgstr "Añadir host"
 
-#: standalone/scannerdrake:623 standalone/scannerdrake:773
+#: standalone/scannerdrake:619 standalone/scannerdrake:769
 #, c-format
 msgid "Edit selected host"
 msgstr "Editar host seleccionado"
 
-#: standalone/scannerdrake:632 standalone/scannerdrake:782
+#: standalone/scannerdrake:628 standalone/scannerdrake:778
 #, c-format
 msgid "Remove selected host"
 msgstr "Quitar host seleccionado"
 
-#: 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 "Nombre/dirección IP del host:"
 
-#: 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 "Elija el host donde se deberían hacer disponibles los escáneres locales:"
+msgstr ""
+"Elija el host donde se deberían hacer disponibles los escáneres locales:"
 
-#: 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 "Debe ingresar el nombre o la IP del host.\n"
 
-#: 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 "Este host ya está en la lista, no se puede volver a añadir.\n"
 
-#: standalone/scannerdrake:755
+#: standalone/scannerdrake:751
 #, c-format
 msgid "Usage of remote scanners"
 msgstr "Uso de escáneres remotos"
 
-#: standalone/scannerdrake:756
+#: standalone/scannerdrake:752
 #, c-format
 msgid "These are the machines from which the scanners should be used:"
-msgstr "Estas son las máquinas desde las cuales deberían utilizarse los escáneres:"
+msgstr ""
+"Estas son las máquinas desde las cuales deberían utilizarse los escáneres:"
 
-#: standalone/scannerdrake:913
+#: standalone/scannerdrake:909
 #, c-format
 msgid ""
 "saned needs to be installed to share the local scanner(s).\n"
@@ -24584,32 +25830,32 @@ msgstr ""
 "\n"
 "¿Desea instalar el paquete saned?"
 
-#: 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 "Sus escáneres no estarán disponibles en la red."
 
-#: standalone/service_harddrake:62
+#: standalone/service_harddrake:104
 #, c-format
 msgid "Some devices in the \"%s\" hardware class were removed:\n"
 msgstr "Se quitaron algunos dispositivos en la clase de hardware \"%s\":\n"
 
-#: standalone/service_harddrake:63
+#: standalone/service_harddrake:105
 #, c-format
 msgid "- %s was removed\n"
 msgstr "- se quitó %s\n"
 
-#: standalone/service_harddrake:66
+#: standalone/service_harddrake:108
 #, c-format
 msgid "Some devices were added: %s\n"
 msgstr "Se agregaron algunos dispositivos: %s\n"
 
-#: standalone/service_harddrake:67
+#: standalone/service_harddrake:109
 #, c-format
 msgid "- %s was added\n"
 msgstr "- se añadió %s\n"
 
-#: standalone/service_harddrake:126
+#: standalone/service_harddrake:199
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "Detección de hardware en progreso"
@@ -24621,7 +25867,7 @@ msgstr "Cambios de hardware en la clase \"%s\" (%s segundos para responder)"
 
 #: 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 "¿Desea ejecutar la herramienta de configuración apropiada?"
 
 #: steps.pm:14
@@ -24714,22 +25960,22 @@ msgstr "Instalar actualizaciones"
 msgid "Exit install"
 msgstr "Salir de la instalación"
 
-#: ugtk2.pm:1084
+#: ugtk2.pm:1122
 #, c-format
 msgid "Is this correct?"
 msgstr "¿Es correcto?"
 
-#: ugtk2.pm:1212
+#: ugtk2.pm:1250
 #, c-format
 msgid "Expand Tree"
 msgstr "Expandir el árbol"
 
-#: ugtk2.pm:1213
+#: ugtk2.pm:1251
 #, c-format
 msgid "Collapse Tree"
 msgstr "Contraer el árbol"
 
-#: ugtk2.pm:1214
+#: ugtk2.pm:1252
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr "Cambiar entre vista plana y ordenada por grupos"
@@ -24747,166 +25993,3 @@ msgstr ""
 #, c-format
 msgid "Installation failed"
 msgstr "Falló la instalación"
-
-#: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Estación de trabajo de Oficina"
-
-#: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Programas de Oficina: procesadores de palabras (kword, abiword), plantillas "
-"de cálculo (kspread, gnumeric), visualizadores PDF, etc"
-
-#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Estación de Juegos"
-
-#: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Programas de entretenimiento: arcade, tableros, estrategia, etc"
-
-#: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Estación Multimedios"
-
-#: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programas de reproducción/edición de sonido y vídeo"
-
-#: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Estación Internet"
-
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
-"Web"
-msgstr ""
-"Conjunto de herramientas para leer y enviar correo y noticias (mutt, tin...) "
-"y para navegar por la Web"
-
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Computadora de Red (cliente)"
-
-#: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Clientes para los distintos protocolos incluyendo a ssh"
-
-#: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Configuración"
-
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Herramientas para facilitar la configuración de su computadora"
-
-#: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Herramientas para la consola"
-
-#: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editores, shells, manipulación de archivos, terminales"
-
-#: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Estación de trabajo KDE"
-
-#: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"El K Desktop Environment, el entorno gráfico básico con una colección de "
-"herramientas que lo acompañan"
-
-#: ../../share/compssUsers:999
-msgid "GNOME Workstation"
-msgstr "Estación de trabajo GNOME"
-
-#: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Entorno gráfico con un conjunto de herramientas de escritorio y aplicaciones "
-"amigables"
-
-#: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Otros entornos gráficos"
-
-#: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Bibliotecas de desarrollo C y C++, programas y archivos *.h"
-
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documentación"
-
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Libros y COMOs sobre Linux y Software Libre"
-
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Soporte de aplicaciones de terceros"
-
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Servidor, Web/FTP"
-
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache y Pro-ftpd"
-
-#: ../../share/compssUsers:999
-msgid "Mail"
-msgstr "Correo"
-
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Servidor de correo Postfix"
-
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Servidor, Bases de Datos"
-
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Servidor de base de datos PostgreSQL o MySQL"
-
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Servidor, Cortafuegos/Router"
-
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Pasarela de acceso a Internet"
-
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Computadora servidor de red"
-
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Servidor NFS, servidor SMB, servidor proxy, servidor SSH"
-
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Conjunto de herramientas para leer y enviar correo y noticias y para navegar "
-"por la Web"
-
diff --git a/perl-install/share/po/nb.po b/perl-install/share/po/nb.po
index 9fa63617d..0242aa2ef 100644
--- a/perl-install/share/po/nb.po
+++ b/perl-install/share/po/nb.po
@@ -7,21 +7,90 @@
 # Kenneth Rørvik <kenneth@argon.no-ip.com>, 2003.
 # Per Øyvind Karlsen <peroyvind@sintrax.net>, 2003, 2004.
 # Keld Simonsen <keld@dkuug.dk>, 2004.
+# Per Øyvind Karlsen <peroyvind@linux-mandrake.com>, 2004.
+# Eskild Hustvedt <eskild@goldenfiles.com>, 2004.
+# Eskild Hustvedt <zerodogg@skolelinux.no>, 2004.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-nb\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-14 15:48+0200\n"
-"PO-Revision-Date: 2004-06-13 15:28+0200\n"
-"Last-Translator: Per Øyvind Karlsen <peroyvind@sintrax.net>\n"
-"Language-Team: Norwegian Bokmål <nb@li.org>\n"
+"POT-Creation-Date: 2004-10-07 21:57+0200\n"
+"PO-Revision-Date: 2004-10-08 14:05+0100\n"
+"Last-Translator: Eskild Hustvedt <eskild@goldenfiles.com>\n"
+"Language-Team: Norwegian Bokmål <i18n-nb@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.1\n"
 
-#: ../move/move.pm:402
+#: ../move/move.pm:292
+#, c-format
+msgid "Which USB key do you want to format?"
+msgstr "Hvilken USB-nøkkel ønsker du å formatere?"
+
+#: ../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 ""
+"Du er på vei til å formatere en USB-enhet \"%s\". Dette vil slette alle "
+"dataene på den.\n"
+"Vær sikker på at dn valgte drivere er USB-nøkkelen du ønsker å formatere. \n"
+"Vi råder deg til å koble ut alle andre USB-lagringsmedier når du gjør dette. "
+
+#: ../move/move.pm:448 ../move/move.pm:460
+#, c-format
+msgid "Key isn't writable"
+msgstr "Nøkkel er ikke 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 ser ut til å ha skrivebeskyttelse aktivert. Vennligst\n"
+"plugg den ut, skru av skrivebeskyttelsen og plugg den 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 "Fortsett uten 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 ser ut til å ha skrivebeskyttelse aktivert, men vi ka ikke "
+"trygt\n"
+"plugge den ut nå.\n"
+"\n"
+"\n"
+"Klikk knappen for å restarte din maskin, plugg den ut, fjern "
+"skrivebeskyttelsen,\n"
+"plugg i nøkkelen igjen og last Mandrake Move på nytt."
+
+#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1353
+#, c-format
+msgid "Reboot"
+msgstr "Restart"
+
+#: ../move/move.pm:473
 #, c-format
 msgid ""
 "Your USB key doesn't have any valid Windows (FAT) partitions.\n"
@@ -46,7 +115,7 @@ msgstr ""
 "i stand til å bruke Mandrake Move som et normalt live Mandrake\n"
 "Operativsystem."
 
-#: ../move/move.pm:412
+#: ../move/move.pm:483
 #, c-format
 msgid ""
 "We didn't detect any USB key on your system. If you\n"
@@ -73,148 +142,100 @@ msgstr ""
 "i stand til å bruke Mandrake Move som et normal live Mandrake\n"
 "Operativsystem."
 
-#: ../move/move.pm:423
+#: ../move/move.pm:494
 #, c-format
 msgid "Need a key to save your data"
 msgstr "Trenger en nøkkel for å lagre dine data"
 
-#: ../move/move.pm:425
+#: ../move/move.pm:496
 #, c-format
 msgid "Detect USB key again"
 msgstr "Oppdag USB-nøkkel på nytt"
 
-#: ../move/move.pm:426 ../move/move.pm:456
-#, c-format
-msgid "Continue without USB key"
-msgstr "Fortsett uten USB-nøkkel"
-
-#: ../move/move.pm:437 ../move/move.pm:451
-#, c-format
-msgid "Key isn't writable"
-msgstr "Nøkkel er ikke 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 ser ut til å ha skrivebeskyttelse aktivert, men vi ka ikke "
-"trygt\n"
-"plugge den ut nå.\n"
-"\n"
-"\n"
-"Klikk knappen for å restarte din maskin, plugg den ut, fjern "
-"skrivebeskyttelsen,\n"
-"plugg i nøkkelen igjen og last Mandrake Move på nytt."
-
-#: ../move/move.pm:445 help.pm:418 install_steps_interactive.pm:1306
-#, c-format
-msgid "Reboot"
-msgstr "Restart"
-
-#: ../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 ser ut til å ha skrivebeskyttelse aktivert. Vennligst\n"
-"plugg den ut, skru av skrivebeskyttelsen og plugg den 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 "Setter 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 "Vennligst vent, setter opp konfigurasjonsfiler på USB-nøkkel..."
 
-#: ../move/move.pm:488
+#: ../move/move.pm:546
 #, c-format
 msgid "Enter your user information, password will be used for screensaver"
 msgstr ""
 "Skriv inn din brukerinformasjon, passord vil bli brukt for skjermbeskytter"
 
-#: ../move/move.pm:498
+#: ../move/move.pm:556
 #, c-format
 msgid "Auto configuration"
 msgstr "Automatisk konfigurasjon"
 
-#: ../move/move.pm:498
+#: ../move/move.pm:556
 #, c-format
 msgid "Please wait, detecting and configuring devices..."
 msgstr "Vennligst vent, oppdager og konfigurerer tjenester.."
 
-#: ../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"
@@ -224,12 +245,12 @@ msgstr ""
 "pen måte.\n"
 "Fortsett på eget 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 "En feil oppsto"
 
-#: ../move/move.pm:607
+#: ../move/move.pm:666
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -264,32 +285,39 @@ msgstr ""
 "til og med ta en kikk på loggfilene i konsoll #3 og #4 for å\n"
 "finne ut hva som skjer."
 
-#: ../move/move.pm:622
+#: ../move/move.pm:681
 #, c-format
 msgid "Remove system config files"
 msgstr "Fjern systemkonfigurasjonsfiler"
 
-#: ../move/move.pm:623
+#: ../move/move.pm:682
 #, c-format
 msgid "Simply reboot"
 msgstr "Simpelthen restart"
 
-#: ../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 bare kjøre uten CDROM-støtte"
 
-#: ../move/tree/mdk_totem:81
+#: ../move/tree/mdk_totem:71
 #, c-format
 msgid "Kill those programs"
 msgstr "Drep de programmene"
 
-#: ../move/tree/mdk_totem:82
+#: ../move/tree/mdk_totem:72
 #, c-format
 msgid "No CDROM support"
 msgstr "Ingen CDROM-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"
@@ -348,22 +376,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB eller mer"
 
-#: Xconfig/card.pm:151
+#: Xconfig/card.pm:155
 #, c-format
 msgid "X server"
 msgstr "X-tjener"
 
-#: Xconfig/card.pm:152
+#: Xconfig/card.pm:156
 #, c-format
 msgid "Choose an X server"
 msgstr "Velg en X-tjener"
 
-#: Xconfig/card.pm:184
+#: Xconfig/card.pm:188
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Multi-hode konfigurasjon"
 
-#: Xconfig/card.pm:185
+#: Xconfig/card.pm:189
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -372,80 +400,80 @@ msgstr ""
 "Systemet ditt støtter konfigurasjon for flere hoder.\n"
 "Hva ønsker du å gjøre?"
 
-#: Xconfig/card.pm:251
+#: Xconfig/card.pm:255
 #, c-format
-msgid "Can't install XFree package: %s"
-msgstr "Kan ikke installere XFree-pakke: %s"
+msgid "Can't install Xorg package: %s"
+msgstr "Kan ikke installere Xorg-pakke: %s"
 
-#: Xconfig/card.pm:261
+#: Xconfig/card.pm:265
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Velg minnestørrelsen til grafikk-kortet ditt"
 
-#: Xconfig/card.pm:332
+#: Xconfig/card.pm:352
 #, c-format
-msgid "XFree configuration"
-msgstr "XFree konfigurasjon"
+msgid "Xorg configuration"
+msgstr "Xorg konfigurasjon"
 
-#: Xconfig/card.pm:334
+#: Xconfig/card.pm:354
 #, c-format
-msgid "Which configuration of XFree do you want to have?"
-msgstr "Hvilken konfigurasjon av XFree vil du ha?"
+msgid "Which configuration of Xorg do you want to have?"
+msgstr "Hvilken konfigurasjon av Xorg vil du ha?"
 
-#: Xconfig/card.pm:367
+#: Xconfig/card.pm:387
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Konfigurere all hoder uavhengig"
 
-#: Xconfig/card.pm:368
+#: Xconfig/card.pm:388
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Bruk Xinerama utvidelse"
 
-#: Xconfig/card.pm:373
+#: Xconfig/card.pm:393
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Konfigurer bare kort \"%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 maskinvare 3D akselerasjon"
+msgid "Xorg %s with 3D hardware acceleration"
+msgstr "Xorg %s med maskinvare 3D akselerasjon"
 
-#: Xconfig/card.pm:394
+#: Xconfig/card.pm:414
 #, c-format
-msgid "Your card can have 3D hardware acceleration support with XFree %s."
-msgstr "Kortet ditt kan ha støtte for maskinvare 3D akselerasjon med XFree %s."
+msgid "Your card can have 3D hardware acceleration support with Xorg %s."
+msgstr "Kortet ditt kan ha støtte for maskinvare 3D akselerasjon 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 maskinvare 3D akselerasjon"
+msgid "Xorg %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "Xorg %s med EKSPERIMENTELL maskinvare 3D akselerasjon"
 
-#: 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 ditt kan ha støtte for maskinvare 3D akselerasjon med XFree %s,\n"
+"Kortet ditt kan ha støtte for maskinvare 3D akselerasjon med Xorg %s,\n"
 "MERK AT DETTE ER EKSPERIMENTELL STØTTE OG KAN 'FRYSE' MASKINEN DIN."
 
-#: 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 "Skreddersydd"
 
-#: 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"
@@ -455,12 +483,12 @@ msgstr "Avslutt"
 msgid "Graphic Card"
 msgstr "Grafikk-kort"
 
-#: 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øsning"
@@ -470,14 +498,19 @@ msgstr "Oppløsning"
 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 "Valg"
 
-#: Xconfig/main.pm:177
+#: Xconfig/main.pm:167
+#, c-format
+msgid "Your Xorg configuration file is broken, we will ignore it."
+msgstr "Din Xorg konfigurasjonsfil er ødelagt, vi vil ignorere den."
+
+#: Xconfig/main.pm:184
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -490,38 +523,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: Xconfig/monitor.pm:107
+#: Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Velg en skjerm for hode #%d"
 
-#: Xconfig/monitor.pm:107
+#: Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Velg en monitor"
 
-#: Xconfig/monitor.pm:113
+#: Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: Xconfig/monitor.pm:114 mouse.pm:49
+#: Xconfig/monitor.pm:118 mouse.pm:49
 #, c-format
 msgid "Generic"
 msgstr "Generisk"
 
-#: 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 "Selger"
 
-#: Xconfig/monitor.pm:125
+#: Xconfig/monitor.pm:129
 #, c-format
 msgid "Plug'n Play probing failed. Please select the correct monitor"
 msgstr "Plug'n Play-søking mislykket. Vennligst velg rett skjerm"
 
-#: Xconfig/monitor.pm:130
+#: Xconfig/monitor.pm:134
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -546,12 +579,12 @@ msgstr ""
 "skjermen din.\n"
 " Hvis du er usikker, velg en konservativ innstilling."
 
-#: Xconfig/monitor.pm:137
+#: Xconfig/monitor.pm:141
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Horisontal oppfrisknings-rate"
 
-#: Xconfig/monitor.pm:138
+#: Xconfig/monitor.pm:142
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Vertikal oppfrisknings-rate"
@@ -576,58 +609,60 @@ msgstr "65 tusen farger (16 bits)"
 msgid "16 million colors (24 bits)"
 msgstr "16 millioner farger (24 bits)"
 
-#: Xconfig/resolution_and_depth.pm:130
+#: Xconfig/resolution_and_depth.pm:135
 #, c-format
 msgid "Resolutions"
 msgstr "Oppløsninger"
 
-#: Xconfig/resolution_and_depth.pm:264
+#: Xconfig/resolution_and_depth.pm:270
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Velg oppløsning og fargedybde"
 
-#: Xconfig/resolution_and_depth.pm:265
+#: Xconfig/resolution_and_depth.pm:271
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Grafikk-kort: %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"
@@ -720,8 +755,8 @@ msgstr "Oppløsning: %s\n"
 
 #: Xconfig/various.pm:43
 #, c-format
-msgid "XFree86 driver: %s\n"
-msgstr "XFree86-driver: %s\n"
+msgid "Xorg driver: %s\n"
+msgstr "Xorg-driver: %s\n"
 
 #: Xconfig/various.pm:72
 #, c-format
@@ -732,8 +767,8 @@ msgstr "X ved 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 ""
 "Jeg kan sette opp maskinen din til å automatisk starte X ved oppstart.\n"
 "Vil du at X skal starte når du starter maskinen på nytt?"
@@ -764,20 +799,60 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr "Hva slags norm bruker TV'en din?"
 
-#: 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 "Vennligst vent"
 
-#: any.pm:103
+#: any.pm:116
 #, c-format
 msgid "Bootloader installation in progress"
 msgstr "Installasjon av oppstartslaster i gang"
 
-#: 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 ""
+"LILO vil tildele en ny Volum ID til lagringsenhet %s. Men, å bytte\n"
+"Volum ID-en til en Windows NT, 2000 eller XP oppstartsenhet er en fatal\n"
+"Windows feil. Denne advarselen er ikke gyldig for Windows 95 eller 98, "
+"eller\n"
+"til NT dataenheter.\n"
+"\n"
+"Tildel ny Volum ID?"
+
+#: any.pm:138
+#, c-format
+msgid "Installation of bootloader failed. The following error occurred:"
+msgstr "Installasjon av oppstartslaster mislykket. Følgende feil oppsto:"
+
+#: 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 ""
+"Du må muligens endre din Open Firmware oppstartsenhet for å\n"
+" aktivere oppstartslasteren. Hvis du ikke ser oppstartslasteren ved\n"
+" omstart, hold nede Command-Option-O-F ved omstart og skriv:\n"
+" setenv boot-device %s,\\\\:tbxi\n"
+" Skriv så: shut-down\n"
+"Ved din neste oppstart burde du se oppstartslasteren."
+
+#: any.pm:181
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -792,275 +867,260 @@ msgstr ""
 "\n"
 "Hvilken disk starter du fra?"
 
-#: 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 av disk (MBR)"
 
-#: any.pm:166
+#: any.pm:205
 #, c-format
 msgid "First sector of the root partition"
 msgstr "Første sektor av root-partisjon"
 
-#: any.pm:168
+#: any.pm:207
 #, c-format
 msgid "On Floppy"
 msgstr "På 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-installasjon"
-
-#: any.pm:175
+#: any.pm:213
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "LILO/grub-installasjon"
 
-#: any.pm:176
+#: any.pm:214
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "Hvor ønsker du installere oppstartslasteren?"
 
-#: any.pm:197
-#, c-format
-msgid "First sector of boot partition"
-msgstr "Første sektor av oppstartspartisjon"
-
-#: any.pm:209
+#: any.pm:239 standalone/drakboot:307
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "Oppstartsstilkonfigurasjon"
 
-#: any.pm:211 any.pm:248
+#: any.pm:241 any.pm:275
 #, c-format
 msgid "Bootloader main options"
 msgstr "Hovedopsjoner for oppstartslaster"
 
-#: any.pm:215
+#: any.pm:245
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "Oppgi ram-størrelsen i MB"
 
-#: any.pm:217
+#: any.pm:247
 #, c-format
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "Opsjon ``Begrense kommandolinje-opsjoner'' kan ikke brukes uten et 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 "Passordene stemmer ikke overens"
 
-#: 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 "Vennligst 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 "Oppstartslaster som skal brukes"
 
-#: any.pm:225
-#, c-format
-msgid "Bootloader installation"
-msgstr "Installasjon oppstartslaster"
-
-#: any.pm:227 any.pm:253 help.pm:768
+#: any.pm:255 any.pm:280
 #, c-format
 msgid "Boot device"
 msgstr "Oppstartsenhet"
 
-#: any.pm:229
+#: any.pm:257
 #, c-format
 msgid "Delay before booting default image"
 msgstr "Forsinkelse før man starter opp med standard imagefil"
 
-#: any.pm:230 help.pm:768
+#: any.pm:258
 #, c-format
 msgid "Enable ACPI"
 msgstr "Aktiver ACPI"
 
-#: any.pm:232 help.pm:768
+#: any.pm:260
 #, c-format
 msgid "Force no APIC"
 msgstr "Tving ingen APIC"
 
-#: any.pm:234
+#: any.pm:262
 #, c-format
 msgid "Force No Local APIC"
 msgstr "Tving ingen 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 (igjen)"
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "Restrict command line options"
 msgstr "Begrense kommandolinje-opsjoner"
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "restrict"
 msgstr "begrense"
 
-#: any.pm:240
+#: any.pm:268
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "Tøm /tmp ved hver oppstart"
 
-#: any.pm:241
+#: any.pm:269
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Presiser RAM-størrelse hvis det trengs (funnet %d MB)"
 
-#: any.pm:243
-#, c-format
-msgid "Enable multiple profiles"
-msgstr "Slå på multiprofiler"
-
-#: any.pm:252
+#: any.pm:279
 #, c-format
 msgid "Init Message"
 msgstr "Initmelding"
 
-#: any.pm:254
+#: any.pm:281
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "Åpne firmwareforsinkelse"
 
-#: any.pm:255
+#: any.pm:282
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "Kernel Boot Timeout"
 
-#: any.pm:256
+#: any.pm:283
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "Skal det være mulig å boote fra CD?"
 
-#: any.pm:257
+#: any.pm:284
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "Skal det være mulig å boote fra OF?"
 
-#: any.pm:258
+#: any.pm:285
 #, c-format
 msgid "Default OS?"
 msgstr "Standard operativsystem?"
 
-#: any.pm:302
+#: any.pm:338
 #, c-format
 msgid "Image"
 msgstr "Bilde"
 
-#: any.pm:303 any.pm:312
+#: any.pm:339 any.pm:349
 #, c-format
 msgid "Root"
 msgstr "Root"
 
-#: any.pm:304 any.pm:325
+#: any.pm:340 any.pm:362
 #, c-format
 msgid "Append"
 msgstr "Tilføye"
 
-#: any.pm:306
+#: any.pm:342 standalone/drakboot:309 standalone/drakboot:313
 #, c-format
 msgid "Video mode"
 msgstr "Skjermmodus"
 
-#: 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 "Etikett"
 
-#: 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 "Initrdstørrelse"
 
-#: 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 "Tom etikett er ikke tillatt"
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "Du må velge ett kjernebilde"
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a root partition"
 msgstr "Du må ha en rootpartisjon"
 
-#: any.pm:341
+#: any.pm:378
 #, c-format
 msgid "This label is already used"
 msgstr "Denne etiketten er allerede i bruk"
 
-#: any.pm:354
+#: any.pm:392
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "Hvilken oppføringstype vil du legge 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 "Andre OS (SunOS...)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "Andre OS (MacOS...)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "Andre OS (Windows...)"
 
-#: any.pm:384
+#: any.pm:422
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -1069,73 +1129,73 @@ msgstr ""
 "Her er de forskjellige oppføringene.\n"
 "Du kan legge til flere eller endre de eksisterende."
 
-#: any.pm:516
+#: any.pm:572
 #, c-format
 msgid "access to X programs"
 msgstr "tilgang til X-programmer"
 
-#: any.pm:517
+#: any.pm:573
 #, c-format
 msgid "access to rpm tools"
 msgstr "tilgang til rpmverktøy"
 
-#: any.pm:518
+#: any.pm:574
 #, c-format
 msgid "allow \"su\""
 msgstr "tilgang til \"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 "(allerede lagt til %s)"
 
-#: any.pm:532
+#: any.pm:587
 #, c-format
 msgid "This password is too simple"
 msgstr "Dette passordet er for enkelt"
 
-#: any.pm:533
+#: any.pm:588
 #, c-format
 msgid "Please give a user name"
 msgstr "Vennligst oppgi et brukernavn"
 
-#: any.pm:534
+#: any.pm:589
 #, c-format
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Brukernavnet kan kun innholde små bokstaver, tall, `-' og `_'"
 
-#: any.pm:535
+#: any.pm:590
 #, c-format
 msgid "The user name is too long"
 msgstr "Dette brukernavnet er for langt"
 
-#: any.pm:536
+#: any.pm:591
 #, c-format
 msgid "This user name has already been added"
 msgstr "Denne brukeren er allerede lagt til"
 
-#: any.pm:540
+#: any.pm:595
 #, c-format
 msgid "Add user"
 msgstr "Legg til bruker"
 
-#: any.pm:541
+#: any.pm:596
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -1144,73 +1204,77 @@ msgstr ""
 "Entre en bruker\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 bruker"
 
-#: any.pm:556
+#: any.pm:611
 #, c-format
 msgid "Real name"
 msgstr "Virkelig navn"
 
-#: 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 "Brukernavn"
+msgid "Login name"
+msgstr "Innloggingsnavn"
 
-#: any.pm:560
+#: any.pm:615
 #, c-format
 msgid "Shell"
 msgstr "Skall"
 
-#: 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 "Autoinnlogging"
 
-#: any.pm:604
+#: any.pm:665
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr "Jeg kan sette opp maskinen din til å automatisk logge på en bruker."
 
-#: any.pm:605 help.pm:52
+#: any.pm:666 help.pm:51
 #, c-format
 msgid "Do you want to use this feature?"
 msgstr "Ønsker du å bruke denne finessen?"
 
-#: any.pm:606
+#: any.pm:667
 #, c-format
 msgid "Choose the default user:"
 msgstr "Velg standard bruker:"
 
-#: any.pm:607
+#: any.pm:668
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "Velg vindushåndtereren som skal kjøres:"
 
-#: any.pm:619
+#: any.pm:680
 #, c-format
 msgid "Please choose a language to use."
 msgstr "Vennligst velg språk som skal brukes."
 
-#: any.pm:640
+#: any.pm:681
+#, c-format
+msgid "Language choice"
+msgstr "Spåkvalg"
+
+#: any.pm:707
 #, c-format
 msgid ""
 "Mandrakelinux can support multiple languages. Select\n"
@@ -1218,48 +1282,57 @@ msgid ""
 "when your installation is complete and you restart your system."
 msgstr "Du kan velge andre språk som vil være tilgjengelige etter installasjon"
 
-#: 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"
 
-#: any.pm:699
+#: any.pm:766
 #, c-format
 msgid "Please choose your country."
 msgstr "Vennligst velg ditt land."
 
-#: any.pm:701
+#: any.pm:768
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "Her er den komplette lista over tilgjengelige 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 "Mer"
+msgid "Other Countries"
+msgstr "Andre land"
 
-#: any.pm:833
+#: any.pm:777
+#, c-format
+msgid "Input method:"
+msgstr "Inndata-metode:"
+
+#: any.pm:778 install_any.pm:420 printer/printerdrake.pm:99
+#, c-format
+msgid "None"
+msgstr "Ingen"
+
+#: any.pm:912
 #, c-format
 msgid "No sharing"
 msgstr "Ingen deling"
 
-#: any.pm:833
+#: any.pm:912
 #, c-format
 msgid "Allow all users"
 msgstr "Tillat alle brukere"
 
-#: any.pm:837
+#: any.pm:916
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1274,7 +1347,7 @@ msgstr ""
 "\n"
 "\"Egendefiner\"tillater egne oppsett per bruker.\n"
 
-#: any.pm:849
+#: any.pm:928
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
@@ -1283,7 +1356,7 @@ msgstr ""
 "NFS: Det tradisjonelle Unix fildelingssystemet, med mindre støtte 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 "
@@ -1292,19 +1365,29 @@ msgstr ""
 "SMB: et fildelingssystem brukt av Windows, Mac OS X og mange moderne Linux "
 "systemer"
 
-#: 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 eksportere med NFS eller SMB. Vennligst velg den du ønsker å   bruke."
 
-#: any.pm:883
+#: any.pm:964
 #, c-format
 msgid "Launch userdrake"
 msgstr "Start userdrake"
 
-#: 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"
@@ -1313,92 +1396,200 @@ msgstr ""
 "Per-bruker deling benytter gruppen \"fileshare\". \n"
 "Du kan bruke userdrake til å legge til en bruker i denne gruppen."
 
-#: 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 with SFU"
+msgstr "Aktiv Directory med SFU"
+
+#: authentication.pm:21
+#, c-format
+msgid "Active Directory with Winbind"
+msgstr "Aktiv 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 ""
+"Bruk lokal for all autentifisering og informasjon bruker oppgir i lokal fil"
+
+#: 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 ""
+"Forteller din maskin til å bruke LDAP til noe eller all autentisering. LDAP "
+"forener noen typer informasjon innen din organisasjon."
+
+#: 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 ""
+"Lar deg kjøre en gruppe av maskiner i samme Nettverks Informasjonstjeneste "
+"domene (Network Information Service domain) med en felles passord og gruppe."
+"fil."
+
+#: 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 ""
+"Winbind lar systemet motta informasjon og autentisere brukere i et Windows "
+"domene."
+
+#: authentication.pm:34
+#, c-format
+msgid "Active Directory with SFU:"
+msgstr "Active Directory med SFU:"
+
+#: authentication.pm:34 authentication.pm:35
 #, c-format
-msgid "Active Directory"
+msgid ""
+"Kerberos is a secure system for providing network authentication services."
 msgstr ""
+"Kerberos er et sikkert system for å tilby nettverksautentiseringstjenester."
+
+#: authentication.pm:35
+#, c-format
+msgid "Active Directory with Winbind:"
+msgstr "Active Directory med Winbind:"
 
-#: authentication.pm:38
+#: authentication.pm:60
 #, c-format
 msgid "Authentication LDAP"
 msgstr "Autentisering LDAP"
 
-#: authentication.pm:39
+#: authentication.pm:61
 #, c-format
 msgid "LDAP Base dn"
 msgstr "LDAP grunnleggende dn"
 
-#: authentication.pm:40
+#: authentication.pm:62 share/compssUsers.pl:101
 #, c-format
 msgid "LDAP Server"
 msgstr "LDAP-tjener"
 
-#: authentication.pm:50
-#, fuzzy, c-format
+#: 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 "sikkerhetsoppsett (SASL/Kerberos)"
+
+#: authentication.pm:85 authentication.pm:123
+#, c-format
 msgid "Authentication Active Directory"
-msgstr "Autentiseringsmetode"
+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 "Tjener"
 
-#: authentication.pm:53
+#: authentication.pm:89
 #, c-format
 msgid "LDAP users database"
-msgstr ""
+msgstr "LDAP-brukerdatabase"
+
+#: authentication.pm:90
+#, c-format
+msgid "Use Anonymous BIND "
+msgstr "Bruk anonym BIND"
 
-#: authentication.pm:54
+#: authentication.pm:91
 #, c-format
 msgid "LDAP user allowed to browse the Active Directory"
-msgstr ""
+msgstr "LDAP-bruker som får søke i Active Directory"
 
-#: authentication.pm:55
-#, fuzzy, c-format
+#: authentication.pm:92
+#, c-format
 msgid "Password for user"
-msgstr "Passord trengs"
+msgstr "Passord for bruker"
 
-#: authentication.pm:62
+#: authentication.pm:93
+#, c-format
+msgid "Encryption"
+msgstr "Kryptering"
+
+#: authentication.pm:104
 #, c-format
 msgid "Authentication NIS"
 msgstr "Autentisering NIS"
 
-#: 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-tjener"
 
-#: 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 "
@@ -1429,28 +1620,38 @@ msgstr ""
 "Kommandoen 'wbinfo -t' sjekker om autentiseringspassordene er "
 "tilstrekkelige. "
 
-#: authentication.pm:71
+#: authentication.pm:123
 #, c-format
 msgid "Authentication Windows Domain"
 msgstr "Autentisering Windows Domene"
 
-#: authentication.pm:73
+#: authentication.pm:128
 #, c-format
 msgid "Domain Admin User Name"
 msgstr "Domeneadministrator-brukernavn"
 
-#: authentication.pm:74
+#: authentication.pm:129
 #, c-format
 msgid "Domain Admin Password"
 msgstr "Domeneadministratorpassord"
 
-#: authentication.pm:149
+#: authentication.pm:130
+#, c-format
+msgid "Use Idmap for store UID/SID "
+msgstr "Bruk ldmap for store UID/SID"
+
+#: authentication.pm:131
+#, c-format
+msgid "Default Idmap "
+msgstr "Standard ldmap "
+
+#: authentication.pm:231
 #, c-format
 msgid "Can't use broadcast with no NIS domain"
 msgstr "Kan ikke bruke broadcast med intet 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"
@@ -1465,42 +1666,37 @@ msgstr ""
 "vent for standard oppstart.\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 "ikke nok plass i /boot"
 
-#: bootloader.pm:1170
+#: bootloader.pm:1266
 #, c-format
 msgid "You can't install the bootloader on a %s partition\n"
 msgstr "Du kan ikke installere oppstartslasteren på en %s partisjon\n"
 
-#: bootloader.pm:1214
+#: bootloader.pm:1311
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
@@ -1509,7 +1705,7 @@ msgstr ""
 "Din oppstartslasterkonfigurasjon trenger å oppdateres pga. rekkefølgen på "
 "dine partisjoner har blitt endret"
 
-#: bootloader.pm:1221
+#: bootloader.pm:1326
 #, c-format
 msgid ""
 "The bootloader can't be installed correctly. You have to boot rescue and "
@@ -1518,7 +1714,7 @@ msgstr ""
 "Oppstartslasteren kan ikke bli installert korrekt. Du må gjøre nødoppstart "
 "og velge \"%s\""
 
-#: bootloader.pm:1222
+#: bootloader.pm:1327
 #, c-format
 msgid "Re-install Boot Loader"
 msgstr "Installer oppstartslaster på nytt"
@@ -1578,76 +1774,79 @@ msgstr "kdesu mangler"
 msgid "consolehelper missing"
 msgstr "Konsollhjelper mangler"
 
-#: 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 "Tjekkia"
 
-#: 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 "Germany"
 
-#: 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 "Norge"
 
-#: 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 "Netherlands"
 
-#: 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 "Østerrike"
 
-#: 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"
@@ -1660,66 +1859,60 @@ msgstr ""
 "som\n"
 "WebDAV-tjener). Hvis du vil legge til WebDAV monteringspunkter, velg \"Ny\""
 
-#: 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 "Demonter"
 
-#: 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 "Vennligst tast inn WebDAV-tjeners URL"
 
-#: diskdrake/dav.pm:89
+#: diskdrake/dav.pm:87
 #, c-format
 msgid "The URL must begin with http:// or https://"
 msgstr "URL'en må begynne med http:// eller https://"
 
-#: diskdrake/dav.pm:111
+#: diskdrake/dav.pm:109
 #, c-format
 msgid "Server: "
 msgstr "Tjener: "
 
-#: 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 "Valg: %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 "Vennligst ta sikkerhetskopi av din 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 "
@@ -1730,17 +1923,17 @@ msgstr ""
 "sektorer er nok)\n"
 "ved begynnelsen av disken"
 
-#: diskdrake/hd_gtk.pm:156 help.pm:544
+#: diskdrake/hd_gtk.pm:155 help.pm:530
 #, c-format
 msgid "Wizard"
 msgstr "Wizard"
 
-#: diskdrake/hd_gtk.pm:189
+#: diskdrake/hd_gtk.pm:188
 #, c-format
 msgid "Choose action"
 msgstr "Velg handling"
 
-#: diskdrake/hd_gtk.pm:193
+#: diskdrake/hd_gtk.pm:192
 #, c-format
 msgid ""
 "You have one big Microsoft Windows partition.\n"
@@ -1752,179 +1945,185 @@ msgstr ""
 "Jeg forslår at du først endrer størrelsen på denne partisjonen\n"
 "(klikk på den, klikk så på \"Endre størrelse\")"
 
-#: diskdrake/hd_gtk.pm:195
+#: diskdrake/hd_gtk.pm:194
 #, c-format
 msgid "Please click on a partition"
 msgstr "Vennligst klikk på en 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 "Detaljer"
 
-#: diskdrake/hd_gtk.pm:255
+#: diskdrake/hd_gtk.pm:254
 #, c-format
 msgid "No hard drives found"
 msgstr "Ingen harddisker funnet"
 
-#: 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 "Journal filsystem"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Swap"
 msgstr "Veksel"
 
-#: 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 "Andre"
 
-#: 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 "Filsystemtyper:"
 
-#: 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'' istedet"
 
-#: 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 ``Demonter'' først"
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose another partition"
 msgstr "Velg en annen partisjon"
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose a partition"
 msgstr "Velg en 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 "Angre"
 
-#: 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 "Fortsette likevel?"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without saving"
 msgstr "Avslutt uten å lagre"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without writing the partition table?"
 msgstr "Avslutt uten å skrive partisjonstabellen?"
 
-#: diskdrake/interactive.pm:275
+#: diskdrake/interactive.pm:278
 #, c-format
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "Ønsker du å lagre modifiseringen av /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å starte maskinen på nytt for at modifiseringene skal tre 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 "Automatisk allokering"
 
-#: 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 "Mer"
+
+#: diskdrake/interactive.pm:305
 #, c-format
 msgid "Hard drive information"
 msgstr "Harddisk informasjon"
 
-#: diskdrake/interactive.pm:334
+#: diskdrake/interactive.pm:337
 #, c-format
 msgid "All primary partitions are used"
 msgstr "Alle primære partisjoner er i bruk"
 
-#: diskdrake/interactive.pm:335
+#: diskdrake/interactive.pm:338
 #, c-format
 msgid "I can't add any more partitions"
 msgstr "Jeg kan ikke legge til flere partisjoner"
 
-#: 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 "
@@ -1933,37 +2132,37 @@ msgstr ""
 "For å ha flere partisjoner vennligst slett en for å kunne opprette en "
 "utvidet partisjon"
 
-#: diskdrake/interactive.pm:347 help.pm:544
+#: diskdrake/interactive.pm:350 help.pm:530
 #, c-format
 msgid "Save partition table"
 msgstr "Lagre partisjonstabeller"
 
-#: diskdrake/interactive.pm:348 help.pm:544
+#: diskdrake/interactive.pm:351 help.pm:530
 #, c-format
 msgid "Restore partition table"
 msgstr "Redde partisjonstabell"
 
-#: diskdrake/interactive.pm:349 help.pm:544
+#: diskdrake/interactive.pm:352 help.pm:530
 #, c-format
 msgid "Rescue partition table"
 msgstr "Nødpartisjonstabell"
 
-#: 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 "Fjernbart media automontering"
 
-#: diskdrake/interactive.pm:362 diskdrake/interactive.pm:382
+#: diskdrake/interactive.pm:365 diskdrake/interactive.pm:385
 #, c-format
 msgid "Select file"
 msgstr "Velg fil"
 
-#: diskdrake/interactive.pm:369
+#: diskdrake/interactive.pm:372
 #, c-format
 msgid ""
 "The backup partition table has not the same size\n"
@@ -1972,23 +2171,23 @@ msgstr ""
 "Kopien av partisjonstabellen har ikke samme størrelse\n"
 "Fortsette for det?"
 
-#: 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 "Advarsel"
 
-#: diskdrake/interactive.pm:384
+#: diskdrake/interactive.pm:387
 #, c-format
 msgid ""
 "Insert a floppy in drive\n"
@@ -1997,92 +2196,92 @@ msgstr ""
 "Sett inn en diskett i stasjonen\n"
 "Alle data på denne disketten vil gå tapt"
 
-#: diskdrake/interactive.pm:395
+#: diskdrake/interactive.pm:398
 #, c-format
 msgid "Trying to rescue partition table"
 msgstr "Prøver å redde 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 "Endre størrelse"
 
-#: 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 RAID"
 
-#: diskdrake/interactive.pm:421
+#: diskdrake/interactive.pm:424
 #, c-format
 msgid "Add to LVM"
 msgstr "Legg til LVM"
 
-#: diskdrake/interactive.pm:424
+#: diskdrake/interactive.pm:427
 #, c-format
 msgid "Remove from RAID"
 msgstr "Fjern fra RAID"
 
-#: diskdrake/interactive.pm:425
+#: diskdrake/interactive.pm:428
 #, c-format
 msgid "Remove from LVM"
 msgstr "Fjern fra LVM"
 
-#: diskdrake/interactive.pm:426
+#: diskdrake/interactive.pm:429
 #, c-format
 msgid "Modify RAID"
 msgstr "Modifiser RAID"
 
-#: diskdrake/interactive.pm:427
+#: diskdrake/interactive.pm:430
 #, c-format
 msgid "Use for loopback"
 msgstr "Bruk for loopback"
 
-#: diskdrake/interactive.pm:467
+#: diskdrake/interactive.pm:472
 #, c-format
 msgid "Create a new partition"
 msgstr "Opprette en ny partisjon"
 
-#: diskdrake/interactive.pm:470
+#: diskdrake/interactive.pm:475
 #, c-format
 msgid "Start sector: "
 msgstr "Start sektor: "
 
-#: diskdrake/interactive.pm:472 diskdrake/interactive.pm:881
+#: diskdrake/interactive.pm:477 diskdrake/interactive.pm:884
 #, c-format
 msgid "Size in MB: "
 msgstr "Størrelse i MB: "
 
-#: 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 "Valg: "
 
-#: diskdrake/interactive.pm:481
+#: diskdrake/interactive.pm:486
 #, c-format
 msgid "Logical volume name "
 msgstr "Lokalt volumnavn"
 
-#: diskdrake/interactive.pm:510
+#: diskdrake/interactive.pm:515
 #, c-format
 msgid ""
 "You can't create a new partition\n"
@@ -2093,12 +2292,12 @@ msgstr ""
 "ettersom du har nådd det maksimale antallet primære partisjoner.\n"
 "Du må først fjerne en primær partisjon og lage en utvidet partisjon."
 
-#: diskdrake/interactive.pm:540
+#: diskdrake/interactive.pm:545
 #, c-format
 msgid "Remove the loopback file?"
 msgstr "Fjern loopbackfilen?"
 
-#: 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"
@@ -2106,32 +2305,32 @@ msgstr ""
 "Etter endring av type på partisjon %s, vil alle data på denne partisjonen gå "
 "tapt"
 
-#: diskdrake/interactive.pm:570
+#: diskdrake/interactive.pm:576
 #, c-format
 msgid "Change partition type"
 msgstr "Endre 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 "Hvilket filsystem ønsker du?"
 
-#: diskdrake/interactive.pm:579
+#: diskdrake/interactive.pm:585
 #, c-format
 msgid "Switching from ext2 to ext3"
 msgstr "Bytter fra 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 "Hvor vil du montere loopback-filen %s?"
 
-#: diskdrake/interactive.pm:609
+#: diskdrake/interactive.pm:615
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Hvor vil du montere %s enheten?"
 
-#: 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"
@@ -2140,50 +2339,50 @@ msgstr ""
 "Kan ikke fjerne monteringspunkt da denne partisjonen blir brukt til\n"
 "loopback. Fjern loopback først"
 
-#: diskdrake/interactive.pm:639
+#: diskdrake/interactive.pm:645
 #, c-format
 msgid "Where do you want to mount %s?"
 msgstr "Hvor vil du montere %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 "Endrer størrelse"
 
-#: diskdrake/interactive.pm:663
+#: diskdrake/interactive.pm:669
 #, c-format
 msgid "Computing FAT filesystem bounds"
 msgstr "Beregner fat filsystemgrense"
 
-#: diskdrake/interactive.pm:699
+#: diskdrake/interactive.pm:705
 #, c-format
 msgid "This partition is not resizeable"
 msgstr "Denne partisjonen kan ikke størrelsen forandres på"
 
-#: diskdrake/interactive.pm:704
+#: diskdrake/interactive.pm:710
 #, c-format
 msgid "All data on this partition should be backed-up"
 msgstr "Alle data på denne partisjonen burde sikkerhetskopieres"
 
-#: diskdrake/interactive.pm:706
+#: diskdrake/interactive.pm:712
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr ""
 "Etter endring av størrelse for partisjon %s, vil alle data på denne\n"
 "partisjonen vil gå tapt"
 
-#: diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:717
 #, c-format
 msgid "Choose the new size"
 msgstr "Velg den nye størrelsen"
 
-#: diskdrake/interactive.pm:712
+#: diskdrake/interactive.pm:718
 #, c-format
 msgid "New size in MB: "
 msgstr "Ny størrelse i MB: "
 
-#: 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"
@@ -2192,149 +2391,144 @@ msgstr ""
 "For å sikre dataintegritet etter at partisjonen(e) har blitt endret, \n"
 "vil kontroll av filsystemene kjøres neste gang du starter Windows(TM)"
 
-#: diskdrake/interactive.pm:780
+#: diskdrake/interactive.pm:784
 #, c-format
 msgid "Which disk do you want to move it to?"
 msgstr "Hvilken disk vil du flytte 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 "Hvilken sektor vil du flytte til?"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving"
 msgstr "Flytter"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving partition..."
 msgstr "Flytter partisjon..."
 
-#: diskdrake/interactive.pm:807
+#: diskdrake/interactive.pm:810
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Velg en eksisterende RAID for å legge til"
 
-#: 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 "Velg en eksisterende LVM for å legge til"
 
-#: diskdrake/interactive.pm:829
+#: diskdrake/interactive.pm:832
 #, c-format
 msgid "LVM name?"
 msgstr "LVM navn?"
 
-#: diskdrake/interactive.pm:866
+#: diskdrake/interactive.pm:869
 #, c-format
 msgid "This partition can't be used for loopback"
 msgstr "Denne partisjonen kan ikke brukes for loopback"
 
-#: diskdrake/interactive.pm:879
+#: diskdrake/interactive.pm:882
 #, c-format
 msgid "Loopback"
 msgstr "Loopback"
 
-#: diskdrake/interactive.pm:880
+#: diskdrake/interactive.pm:883
 #, c-format
 msgid "Loopback file name: "
 msgstr "Loopback filnavn: "
 
-#: diskdrake/interactive.pm:885
+#: diskdrake/interactive.pm:888
 #, c-format
 msgid "Give a file name"
 msgstr "Gi et filnavn"
 
-#: diskdrake/interactive.pm:888
+#: diskdrake/interactive.pm:891
 #, c-format
 msgid "File is already used by another loopback, choose another one"
 msgstr "Filen blir allerede brukt av en annen loopback, velg en annen"
 
-#: diskdrake/interactive.pm:889
+#: diskdrake/interactive.pm:892
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "Filen eksisterer allerede. Bruke denne?"
 
-#: diskdrake/interactive.pm:912
+#: diskdrake/interactive.pm:915
 #, c-format
 msgid "Mount options"
 msgstr "Monteringsvalg:"
 
-#: diskdrake/interactive.pm:919
+#: diskdrake/interactive.pm:922
 #, c-format
 msgid "Various"
 msgstr "Diverse"
 
-#: diskdrake/interactive.pm:983
+#: diskdrake/interactive.pm:987
 #, c-format
 msgid "device"
 msgstr "enhet"
 
-#: 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 "skivestørrelse"
+msgid "chunk size in KiB"
+msgstr "skivestørrelse i KB"
 
-#: diskdrake/interactive.pm:1001
+#: diskdrake/interactive.pm:1006
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "Vær forsiktig: denne operasjonen er farlig."
 
-#: diskdrake/interactive.pm:1016
+#: diskdrake/interactive.pm:1021
 #, c-format
 msgid "What type of partitioning?"
 msgstr "Hva slags type partisjonering?"
 
-#: diskdrake/interactive.pm:1032
-#, c-format
-msgid "The package %s is needed. Install it?"
-msgstr "Pakken %s trengs. Installere den?"
-
-#: 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å starte maskinen på nytt for at modifiseringene skal tre 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 på disk %s blir nå skrevet til disk!"
 
-#: diskdrake/interactive.pm:1083
+#: diskdrake/interactive.pm:1081
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
 "Etter formatering av partisjon %s vil alle data på denne partisjonen\n"
 "gå tapt"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Move files to the new partition"
 msgstr "Flytt filer til en ny partisjon"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Hide files"
 msgstr "Gjem filer"
 
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1102
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
@@ -2343,53 +2537,53 @@ msgstr ""
 "Katalogen %s innholder allerede noe data\n"
 "(%s)"
 
-#: diskdrake/interactive.pm:1112
+#: diskdrake/interactive.pm:1113
 #, c-format
 msgid "Moving files to the new partition"
 msgstr "Flytt filer til en 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 "Fjerner %s"
 
-#: diskdrake/interactive.pm:1134
+#: diskdrake/interactive.pm:1135
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr "partisjon %s er nå kjent som %s"
 
-#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1217
+#: diskdrake/interactive.pm:1156 diskdrake/interactive.pm:1217
 #, c-format
 msgid "Device: "
 msgstr "Enhet: "
 
-#: diskdrake/interactive.pm:1156
+#: diskdrake/interactive.pm:1157
 #, c-format
 msgid "Devfs name: "
 msgstr "Devfs Vertsnavn: "
 
-#: diskdrake/interactive.pm:1157
+#: diskdrake/interactive.pm:1158
 #, c-format
 msgid "Volume label: "
 msgstr "Volum "
 
-#: diskdrake/interactive.pm:1158
+#: diskdrake/interactive.pm:1159
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS diskbokstav: %s (bare en gjetning)\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 "Navn: "
@@ -2436,8 +2630,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
@@ -2464,8 +2658,8 @@ msgstr "Nivå %s\n"
 
 #: diskdrake/interactive.pm:1190
 #, c-format
-msgid "Chunk size %s\n"
-msgstr "Skivestørrelse %s\n"
+msgid "Chunk size %d KiB\n"
+msgstr "Skivestørrelse %d i KB\n"
 
 #: diskdrake/interactive.pm:1191
 #, c-format
@@ -2539,38 +2733,38 @@ msgstr "Type partisjonstabell: %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 "Filsystemkrypteringsnøkkel"
 
-#: diskdrake/interactive.pm:1258
+#: diskdrake/interactive.pm:1257
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Velg din filsystemkrypteringsnøkkel"
 
-#: 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 "Denne krypteringsnøkkelen er for enkel (må være minst %d tegn lang)"
 
-#: diskdrake/interactive.pm:1262
+#: diskdrake/interactive.pm:1261
 #, c-format
 msgid "The encryption keys do not match"
 msgstr "Krypteringsnøkkelene stemmer ikke overens"
 
-#: 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 (igjen)"
 
-#: diskdrake/removable.pm:47
+#: diskdrake/removable.pm:46
 #, c-format
 msgid "Change type"
 msgstr "Endre type"
@@ -2603,7 +2797,7 @@ msgstr ""
 "Vennligst tast inn brukernavnet ditt, passordet og domenenavnet for å få "
 "tilgang til denne verten."
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3495
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3489
 #, c-format
 msgid "Username"
 msgstr "Brukernavn"
@@ -2618,27 +2812,72 @@ msgstr "Søk igjennom tjenere"
 msgid "Search new servers"
 msgstr "Søk nye tjenere"
 
-#: 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å installeres. Vil du installere den?"
 
-#: do_pkgs.pm:26
+#: do_pkgs.pm:21 do_pkgs.pm:36
 #, c-format
 msgid "Mandatory package %s is missing"
 msgstr "Obligatorisk pakke %s mangler"
 
-#: do_pkgs.pm:143
+#: do_pkgs.pm:172
 #, c-format
 msgid "Installing packages..."
 msgstr "Installerer pakke..."
 
-#: do_pkgs.pm:217
+#: do_pkgs.pm:216
 #, c-format
 msgid "Removing packages..."
 msgstr "Fjerner pakekr..."
 
-#: fs.pm:416
+#: fs.pm:445 fs.pm:494
+#, c-format
+msgid "Mounting partition %s"
+msgstr "Monterer partisjon %s"
+
+#: fs.pm:446 fs.pm:495
+#, c-format
+msgid "mounting partition %s in directory %s failed"
+msgstr "montere partisjon %s i katalog %s gikk ikke"
+
+#: fs.pm:466 fs.pm:473
+#, c-format
+msgid "Checking %s"
+msgstr "Sjekker %s"
+
+#: fs.pm:511 partition_table.pm:387
+#, c-format
+msgid "error unmounting %s: %s"
+msgstr "feil ved demontering av %s: %s"
+
+#: fs.pm:543
+#, c-format
+msgid "Enabling swap partition %s"
+msgstr "Aktiverer swap-partisjon %s"
+
+#: fs/format.pm:39 fs/format.pm:46
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formaterer partisjon %s"
+
+#: fs/format.pm:43
+#, c-format
+msgid "Creating and formatting file %s"
+msgstr "Lager of formaterer fila %s"
+
+#: fs/format.pm:78
+#, c-format
+msgid "I don't know how to format %s in type %s"
+msgstr "Jeg vet ikke hvordan formatere %s i type %s"
+
+#: fs/format.pm:80
+#, c-format
+msgid "%s formatting of %s failed"
+msgstr "%s formatering av %s mislykket"
+
+#: fs/mount_options.pm:112
 #, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
@@ -2648,7 +2887,7 @@ msgstr ""
 "(feks. for kjappere tilgang til nyhetskøen for å øke hastigheten på "
 "nyhetstjenere)."
 
-#: fs.pm:419
+#: fs/mount_options.pm:115
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
@@ -2657,12 +2896,12 @@ msgstr ""
 "Kan bare bli eksplisitt monter (feks.,\n"
 "-a-opsjonen vil ikke forårsake at filsystemet blir montert)."
 
-#: fs.pm:422
+#: fs/mount_options.pm:118
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
 msgstr "Ikke tyd tegn- eller blokkspesialenheter på filsystemet."
 
-#: fs.pm:424
+#: fs/mount_options.pm:120
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2673,7 +2912,7 @@ msgstr ""
 "Denne opsjonen kan være nyttig på en tjener som har filsystem som\n"
 "innholder binære filer for andre arkitekturer enn sin egen."
 
-#: fs.pm:428
+#: fs/mount_options.pm:124
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2684,17 +2923,17 @@ msgstr ""
 "å trå i effekt. (Dette ser trygt ut, men er faktisk rimelig utrygt hvis du\n"
 "har suidperl(1) installert.)"
 
-#: fs.pm:432
+#: fs/mount_options.pm:128
 #, c-format
 msgid "Mount the file system read-only."
 msgstr "Monter filsystemet som read-only."
 
-#: fs.pm:434
+#: fs/mount_options.pm:130
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr "All I/O til filsystemet bør gjøres synkront."
 
-#: fs.pm:438
+#: fs/mount_options.pm:134
 #, c-format
 msgid ""
 "Allow an ordinary user to mount the file system. The\n"
@@ -2711,65 +2950,25 @@ msgstr ""
 "opsjonslinjen\n"
 "user,exec,dev,suid )."
 
-#: fs.pm:446
+#: fs/mount_options.pm:142
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr "Gi skrivetilgang til ordinære brukere"
 
-#: fs.pm:448
+#: fs/mount_options.pm:144
 #, c-format
 msgid "Give read-only access to ordinary users"
 msgstr "Gi lesetilgang til ordinære brukere"
 
-#: fs.pm:588 fs.pm:598 fs.pm:602 fs.pm:606 fs.pm:610 fs.pm:614 swap.pm:12
+#: fs/type.pm:364
 #, c-format
-msgid "%s formatting of %s failed"
-msgstr "%s formatering av %s mislykket"
-
-#: fs.pm:655
-#, c-format
-msgid "I don't know how to format %s in type %s"
-msgstr "Jeg vet ikke hvordan formatere %s i type %s"
-
-#: fs.pm:662 fs.pm:669
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formaterer partisjon %s"
-
-#: fs.pm:666
-#, c-format
-msgid "Creating and formatting file %s"
-msgstr "Lager of formaterer fila %s"
-
-#: fs.pm:726 fs.pm:775
-#, c-format
-msgid "Mounting partition %s"
-msgstr "Monterer partisjon %s"
-
-#: fs.pm:727 fs.pm:776
-#, c-format
-msgid "mounting partition %s in directory %s failed"
-msgstr "montere partisjon %s i katalog %s gikk ikke"
-
-#: fs.pm:747 fs.pm:754
-#, c-format
-msgid "Checking %s"
-msgstr "Sjekker %s"
-
-#: fs.pm:792 partition_table.pm:639
-#, c-format
-msgid "error unmounting %s: %s"
-msgstr "feil ved demontering av %s: %s"
-
-#: fs.pm:824
-#, c-format
-msgid "Enabling swap partition %s"
-msgstr "Aktiverer swap-partisjon %s"
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "Du kan ikke bruke JFS for partisjoner mindre enn 16 MB"
 
-#: 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 ikke bruke ReiserFS for partisjoner mindre enn 32MB"
 
 #: fsedit.pm:25
 #, c-format
@@ -2781,7 +2980,7 @@ msgstr "med /usr"
 msgid "server"
 msgstr "server"
 
-#: 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"
@@ -2798,32 +2997,22 @@ msgstr ""
 "\n"
 "Vil du miste alle partisjonene?\n"
 
-#: fsedit.pm:524
-#, c-format
-msgid "You can't use JFS for partitions smaller than 16MB"
-msgstr "Du kan ikke bruke JFS for partisjoner mindre enn 16 MB"
-
-#: fsedit.pm:525
-#, c-format
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "Du kan ikke bruke ReiserFS for partisjoner mindre enn 32MB"
-
-#: fsedit.pm:544
+#: fsedit.pm:385
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "Monteringspunkter må begynne med /"
 
-#: fsedit.pm:545
+#: fsedit.pm:386
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
 msgstr "Monteringspunkt burde innholde alfanumeriske tegn"
 
-#: fsedit.pm:546
+#: fsedit.pm:387
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Det finnes allerede en partisjon med monteringspunkt %s\n"
 
-#: fsedit.pm:548
+#: fsedit.pm:389
 #, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
@@ -2834,12 +3023,12 @@ msgstr ""
 "Ingen oppstartslaster kan håndtere dette uten en /boot partisjon.\n"
 "Så vær nøye med å legge til en /boot partisjon"
 
-#: fsedit.pm:551
+#: fsedit.pm:392
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr "Du kan ikke bruke LVM logisk volum som monteringspunkt %s"
 
-#: fsedit.pm:553
+#: fsedit.pm:394
 #, c-format
 msgid ""
 "You've selected a LVM Logical Volume as root (/).\n"
@@ -2850,7 +3039,7 @@ msgstr ""
 "Oppstartslasteren kan ikke håndtere dette uten en /boot-partisjon.\n"
 "Så vær nøye med å legge til en /boot partisjon"
 
-#: 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 "
@@ -2859,12 +3048,12 @@ msgstr ""
 "Det kan være at du ikke kan installere lilo (siden lilo ikke håndterer  en "
 "LV på flere PVer)"
 
-#: 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 katalogen bør forbli i root filsystemet"
 
-#: 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 "
@@ -2873,133 +3062,127 @@ msgstr ""
 "Du trenger et virkelig filsystem (ext2, 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 ikke bruke ett kryptert filsystem som monteringspunkt %s"
 
-#: fsedit.pm:628
+#: fsedit.pm:469
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "Ikke nok plass for auto-allokering"
 
-#: fsedit.pm:630
+#: fsedit.pm:471
 #, c-format
 msgid "Nothing to do"
 msgstr "Ingenting å gjøre"
 
-#: fsedit.pm:726
+#: fsedit.pm:569
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Feil ved åpning av %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 "CDROM"
 
-#: harddrake/data.pm:94
+#: harddrake/data.pm:100
 #, c-format
 msgid "CD/DVD burners"
 msgstr "CD/DVD-brennere"
 
-#: 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 "Bånd"
 
-#: 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 "TV-kort"
 
-#: harddrake/data.pm:142
+#: harddrake/data.pm:148
 #, c-format
 msgid "Other MultiMedia devices"
 msgstr "Andre multimediaenheter"
 
-#: 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 "Prosessorer"
 
-#: harddrake/data.pm:183
+#: harddrake/data.pm:191
 #, c-format
 msgid "ISDN adapters"
 msgstr "ISDN-adaptere"
 
-#: harddrake/data.pm:192
+#: harddrake/data.pm:201
 #, c-format
 msgid "Ethernetcard"
 msgstr "Ethernettkort"
 
-#: 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-adaptere"
 
-#: harddrake/data.pm:230
+#: harddrake/data.pm:243
 #, c-format
 msgid "AGP controllers"
 msgstr "AGPkontrollere"
 
-#: harddrake/data.pm:239
+#: harddrake/data.pm:252
 #, c-format
 msgid "Bridges and system controllers"
 msgstr "Broer og systemkontrollere"
 
-#: 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 "Skriver"
 
-#: 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"
@@ -3022,50 +3205,73 @@ msgstr "Firewire-kontrollere"
 
 #: harddrake/data.pm:308
 #, c-format
+msgid "PCMCIA controllers"
+msgstr "PCMCIA-kontrollere"
+
+#: harddrake/data.pm:321
+#, c-format
 msgid "SCSI controllers"
 msgstr "SCSI-kontrollere"
 
-#: harddrake/data.pm:317
+#: harddrake/data.pm:330
 #, c-format
 msgid "USB controllers"
 msgstr "USB-kontrollere"
 
-#: harddrake/data.pm:326
+#: harddrake/data.pm:339
 #, c-format
 msgid "USB ports"
 msgstr "USB-porter"
 
-#: harddrake/data.pm:335
+#: harddrake/data.pm:348
 #, c-format
 msgid "SMBus controllers"
 msgstr "SMBus-kontrollere"
 
-#: harddrake/data.pm:344
+# #fikset
+#: 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 "Scanner"
 
-#: harddrake/data.pm:354 standalone/harddrake2:336
+#: harddrake/data.pm:403 standalone/harddrake2:431
 #, c-format
 msgid "Unknown/Others"
 msgstr "Ukjent/Andre"
 
-#: harddrake/data.pm:374
+#: harddrake/data.pm:431
 #, c-format
 msgid "cpu # "
 msgstr "cpu nr. "
 
-#: 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 "Vennligst vent . . . Setter konfigurasjonen på plass"
 
-#: harddrake/sound.pm:186
+#: harddrake/sound.pm:206
 #, c-format
 msgid "No alternative driver"
 msgstr "Ingen alternativ driver"
 
-#: 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 "
@@ -3074,12 +3280,12 @@ msgstr ""
 "Det er ingen OSS/ALSA alternative drivere for lydkortet ditt (%s) som nå "
 "bruker \"%s\""
 
-#: harddrake/sound.pm:193
+#: harddrake/sound.pm:213
 #, c-format
 msgid "Sound configuration"
 msgstr "Lydkonfigurasjon"
 
-#: harddrake/sound.pm:195
+#: harddrake/sound.pm:215
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
@@ -3088,7 +3294,7 @@ msgstr ""
 "Her kan du velge en alternativ driver (enten OSS eller ALSA) for lydkortet "
 "ditt (%s)."
 
-#: harddrake/sound.pm:197
+#: harddrake/sound.pm:217
 #, c-format
 msgid ""
 "\n"
@@ -3101,7 +3307,7 @@ msgstr ""
 "Kortet ditt bruker nå %s\"%s\" driveren (standard driver for kortet ditt 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 "
@@ -3133,24 +3339,24 @@ msgstr ""
 "eller det nye ALSA-APIet som tilbyr mange forbedringer men som krever at\n"
 "ALSA-bibliotekene er installert.\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 "Driver:"
 
-#: harddrake/sound.pm:218
+#: harddrake/sound.pm:238
 #, c-format
 msgid "Trouble shooting"
 msgstr "Feilsøking"
 
-#: 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\" driveren er svartelistet.\n"
 "\n"
@@ -3158,12 +3364,12 @@ msgstr ""
 "\n"
 "Den nye \"%s\" driveren vil bare bli brukt på neste bootstrap."
 
-#: harddrake/sound.pm:234
+#: harddrake/sound.pm:254
 #, c-format
 msgid "No open source driver"
 msgstr "Ingen kjent open source driver"
 
-#: 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 "
@@ -3172,32 +3378,33 @@ msgstr ""
 "Det er ingen frie drivere for lydkortet ditt (%s), men det er en proprietær "
 "driver på \"%s\"."
 
-#: harddrake/sound.pm:238
+#: harddrake/sound.pm:258
 #, c-format
 msgid "No known driver"
 msgstr "Ingen kjent driver"
 
-#: harddrake/sound.pm:239
+#: harddrake/sound.pm:259
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
 msgstr "Det er ingen kjent driver for lydkortet ditt (%s)"
 
-#: harddrake/sound.pm:243
+#: harddrake/sound.pm:263
 #, c-format
 msgid "Unknown driver"
 msgstr "Ukjent driver"
 
-#: harddrake/sound.pm:244
+#: harddrake/sound.pm:264
 #, c-format
 msgid "Error: The \"%s\" driver for your sound card is unlisted"
 msgstr "Feil: \"%s\" driveren for lydkortet ditt er ikke i listen"
 
-#: harddrake/sound.pm:257
+#: harddrake/sound.pm:278
 #, c-format
 msgid "Sound trouble shooting"
 msgstr "Feilsøking 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"
@@ -3238,17 +3445,18 @@ msgstr ""
 "- \"/sbin/fuser -v /dev/dsp\" vil vise hvilke programmer som bruker "
 "lydkortet\n"
 
-#: harddrake/sound.pm:284
+#: harddrake/sound.pm:307
 #, c-format
 msgid "Let me pick any driver"
 msgstr "La meg velge driver"
 
-#: harddrake/sound.pm:287
+#: harddrake/sound.pm:310
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr "Valg av en annen driver"
 
-#: 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 "
@@ -3335,9 +3543,9 @@ msgstr "aktiver 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 ""
 "Før du går videre bør du lese betingelsene i lisensen nøye. Den dekker hele\n"
 "Mandrakelinux-distribusjonen. Hvis du er enig med alle betingelsene,\n"
@@ -3345,8 +3553,8 @@ msgstr ""
 "gstarte\n"
 "din maskin 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"
@@ -3354,42 +3562,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 ett flerbrukersystem, og dette betyr at hver bruker kan ha\n"
 "sine egne instillinger, sine egne filer osv. Du kan lese ``Starter "
@@ -3437,23 +3644,28 @@ msgstr ""
 "så velg den ønskede brukeren og vindushåndtereren, så klikk på \"%s\".\n"
 "Hvis du ikke er interessert i denne finessen, sjekk ut \"%s\"-boksen."
 
-#: 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 "Brukernavn"
+
+#: 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"
@@ -3521,36 +3733,46 @@ msgstr ""
 "Med SCSI-harddisker, en \"a\" betyr \"laveste SCSI-ID\", en \"b\" betyr "
 "\"nest laveste SCSI-ID\", etc."
 
-#: 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 installasjonen er spredd ut over flere CDROMer. \n"
-"Hvis en valgt pakke er på en annen CDROM, vil DrakX spytte ut den nåværende\n"
-"CD og be deg sette i en den rette CD'en som kreves."
+"Mandrakelinux installasjonen er spredd ut over flere CD-ROMer. \n"
+"Hvis en valgt pakke er på en annen CDROM, vil DrakX løse ut den nåværende\n"
+"CD og be deg sette i en den rette CD'en som kreves. Hvis du ikke har den "
+"som\n"
+"trengs nå, bare klikk på «%s», pakken(e) vil da ikke bli installert."
 
-#: 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"
@@ -3560,9 +3782,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"
@@ -3572,19 +3804,10 @@ 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 er nå tpåi tide å spesifisere hvilke programmer du ønsker å installere "
-"på\n"
+"Det er nå på tide å spesifisere hvilke programmer du ønsker å installere på\n"
 "systemet ditt. Det er tusenvis av pakker tilgjengelig for Mandrakelinux, "
 "for\n"
 "å gjøre det enklere å håndtere pakkene så har de blitt plassert i grupper "
@@ -3593,10 +3816,7 @@ msgstr ""
 "\n"
 "Pakkene er delt inn i grupper som svarer til forskjellig typisk bruk av din "
 "maskin.\n"
-"Mandrakelinux har fire forhåndsdefinerte installasjoner tilgjengelige. Du "
-"kan\n"
-"tenke på disse installasjonsklassene som kontainere for forskjellige "
-"pakker.\n"
+"Mandrakelinux har fire forhåndsdefinerte installasjoner tilgjengelige.\n"
 "Du kan mikse og matche applikasjoner fra forskjellige grupper, så en\n"
 "``Arbeidsstasjon''-installasjon kan fortsatt ha applikasjoner fra\n"
 "``Utvikling''-gruppa installert.\n"
@@ -3604,23 +3824,34 @@ msgstr ""
 " * \"%s\": hvis du planlagger å bruke din maskin som arbeidsstasjon, velg\n"
 "en eller flere av applikasjonene som er i arbeidsstasjon-gruppen.\n"
 "\n"
-" * \"%s\": hvis maskinen skal brukes til programmering, velg de ønskede\n"
-"pakkene fra den gruppen.\n"
+" * \"%s\": hvis du planlegger å bruke maskinen til programmering, velg\n"
+"ønskede grupper fra den kategorien. Den spesielle «LSB»-gruppen vil\n"
+"sette opp systemet ditt slik at den samsvarer mest mulig med\n"
+"Linux Standard Base spesifikasjonene.\n"
 "\n"
 " * \"%s\": hvis maskinen skal brukes som tjener, velg hvilke av de mer "
 "vanlige\n"
-"tjenester som du ønsker installert på din maskin.\n"
+"tjenestene som du ønsker installert på din maskin.\n"
 "\n"
 " * \"%s\": det er her du kan velge ditt ønskede grafiske miljø. Du\n"
 "må velge minst ett hvis du ønsker å ha ett grafisk grensesnitt "
 "tilgjengelig.\n"
 "\n"
 "Ved å flytte musepekeren over et gruppenavn vil en kort forklarende tekst\n"
-"dukke opp over den gruppen. Hvis du velger bort alle grupper under en "
-"vanlig\n"
-"installasjon (og du ikke oppgraderer), så vil en dialog dukke opp med "
-"forslag\n"
-"til forskjellige valg for en minimal installasjon.\n"
+"dukke opp over den gruppen.\n"
+"\n"
+"Du kan merke av i «%s»-boksen, som er nyttig hvis du er kjent med\n"
+"pakkene som blir tilbudt, ellr du vil ha total kontroll over hva som vil "
+"bli\n"
+"installert.\n"
+"Hvis du starter installasjonen i «%s»-modus trenger du ikke å velge noen "
+"grupper\n"
+"og hindre installasjon av alle nye pakker. Dette er nyttig for å reparere\n"
+"eller oppdatere et allerede installert system.\n"
+"\n"
+"Hvis du ikke velger noen grupper når du utfører en normal installasjon (i\n"
+"motsetning til en oppgradering) vil en dialokboks poppe opp og foreslå\n"
+"forskjellige valg for en minimal installasjon:\n"
 "\n"
 "* \"%s\": installer et minimum av pakker som trengs for å ha et fungerende\n"
 "grafisk skrivebord.\n"
@@ -3631,93 +3862,84 @@ msgstr ""
 " * \"%s\" vil installere det absolutte minimum som er nødvendig for å få\n"
 "Linux systemet opp og gå. Med denne installasjonen så vil du\n"
 "kun ha et kommandolinje-grensesnitt. Denne installasjonen er på rundt 65 "
-"megabyte.\n"
-"\n"
-"Du kan sjekke av \"%s\"-boksen, som er nyttig hvis du kjenner\n"
-"til pakkene som blir tilbydt eller hvis du ønsker å ha total kontroll over "
-"hva som\n"
-"vil bli installert.\n"
-"\n"
-"Hvis du startet installasjonen i \"%s\"-modus, kan du velge vekk alle\n"
-"grupper for å unngå å installere noen nye pakker. Dette er nyttig for\n"
-"reparasjon eller oppdatering av et eksisterende system."
+"megabyte."
 
-#: 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 "Individuelt pakkevalg"
+
+#: 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 grunnleggende dokumentasjon"
 
-#: help.pm:137
+#: help.pm:146
 #, c-format
 msgid "Truly minimal install"
 msgstr "Virkelig minimal installasjon"
 
-#: help.pm:137 install_steps_gtk.pm:272 install_steps_interactive.pm:598
-#, c-format
-msgid "Individual package selection"
-msgstr "Individuelt pakkevalg"
-
-#: help.pm:137 help.pm:602
-#, c-format
-msgid "Upgrade"
-msgstr "Oppgrader"
-
-#: help.pm:140
+#: help.pm:149
 #, 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 ""
 "Hvis du fortalte installasjonsrutinen at du ønsket å velge enkeltpakker,\n"
 "så vil du få se ett tre som innholder alle pakkene sortert etter grupper\n"
@@ -3733,168 +3955,94 @@ msgstr ""
 "bekrefte at du\n"
 "virkelig ønsker å installere de valgte tjenerne.\n"
 "Som standard i Mandrakelinux vil alle installerte tjenere bli startet ved "
-"oppstart. Selv om de\n"
-"er sikre og ikke har noen kjente sikkerhetshull når denne distribusjonen ble "
-"sluppet,\n"
+"oppstart.\n"
+"Selv om de er sikre og ikke har noen kjente sikkerhetshull når denne "
+"distribusjonen\n"
+"ble sluppet,\n"
 "så kan det mye vel være at sikkerhetshull ble oppdaget etter at denne "
-"versjonen av\n"
-"Mandrakelinux ble ferdiggjort. Hvis du ikke vet hva en type tjener gjør, "
-"eller hvorfor den\n"
-"blir installert, klikk \"%s\".\n"
-" \"%s\" vil installere de listede tjenerene og de vil bli\n"
+"versjonen\n"
+"av Mandrakelinux ble ferdiggjort. Hvis du ikke vet hva en type tjener gjør, "
+"eller\n"
+"hvorfor den blir installert, klikk «%s».\n"
+"«%s» vil installere de listede tjenerene og de vil bli\n"
 "startet automatisk som standard under oppstart. !!\n"
 "\n"
-"Når du er ferdig med å velge, klikk \"Installer\"-knappen som da vil starte\n"
-"installasjonsprosessen. Avhengig av hastigheten på din maskin, og antall\n"
-"pakker som skal installeres, kan det ta en stund å gjøre ferdig "
-"installasjonen.\n"
-"Et estimat på hvor lang tid det vil ta vises på skjermen for å hjelpe deg å\n"
-"avgjøre om du har tid til en kopp kaffe.\n"
-"\n"
-"\"%s\"-valget blir brukt for å fjerne advarselsdialogboksen som\n"
-"kommer når installasjonsprogrammet automatisk velger en pakke for å "
-"tilfredsstile en\n"
-"avhengighet. Noen pakker er avhengige av hverandre slik at installasjonen av "
-"en\n"
-"pakke krever at et annet program også er installert. Installasjonsrutinen "
-"kan finne ut av hvilke\n"
-" pakker som trengs for å tilfredsstille en avhengighet for å gjennomføre "
-"installasjonen korrekt.\n"
-"\n"
-"Det lille diskett-ikonet på bunnen av listen lar deg laste pakkelisten som "
-"du valgte\n"
-"under en tidligere installasjon. Dette er nyttig om du har flere maskiner "
-"som du vil konfigurere\n"
-"likt. Når du klikker på dette ikonet vil du bli bedt om å sette inn "
-"disketten som ble laget\n"
-"under avslutningen av en annen installasjon. Se det andre tipset for det "
-"siste skrittet for å\n"
-"se hvordan du lager en slik diskett."
-
-#: 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
+"«%s» valget er brukt for å deaktivere advarselsdialogen som vises\n"
+"når installasjonen automatisk velger en pakke for å løse avhengigheter.\n"
+"Noen pakker er avhengig av at andre pakker er installert.\n"
+"Installasjonsprogrammet kan finne ut hvilke pakke som trengs for å\n"
+"møte avhengigheten til en pakke for å utføre en vellykket installasjon.\n"
+"\n"
+"Det lille diskett-ikonet på bunnen av denne listen lar deg laste en\n"
+"pakkeliste lagd under en tidligere installasjon. Dette er nyttig hvis du\n"
+"har flere maskiner som du vil sette opp identisk. Ved å klikke på dette\n"
+"ikonet vil du bli bedt om å sette inn disketten laget ved slutten av\n"
+"en annen installasjon. Se det andre tipset i det siste steget om hvordan du\n"
+"kan lage en slik diskett."
+
+#: 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 "Automatiske avhengigheter"
 
-#: 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 nå sette opp din internett/nettverksforbindelse. Hvis du ønsker\n"
-"å koble maskinen din til internett eller et lokalt nettverk, klikk \"%s\".\n"
-"Mandrakelinux vil forsøke å automatisk oppdage dine nettverksenheter og\n"
-"modem. Dersom oppdagelsen ikke fungerer, fjern haken i \"%s\"-boksen.\n"
-"Du kan også velge å ikke sette opp nettverket, eller gjøre det senere, du "
-"kan da klikke\n"
-"\"%s\"-knappen for å gå videre til neste steg.\n"
-"\n"
-"Når du setter opp nettverket ditt, er de tilgjengelige valgene:\n"
-" Vanlig modemforbindelse, Winmodem-forbindelse, \n"
-"ISDN-modem, ADSL-forbindelse, Kabelmodem, og til slutt vanlig\n"
-"LAN-forbindelse (Ethernet).\n"
-"\n"
-"Vi vil ikke gå i detalj på hver enkelt opsjon, men du må sørge for at du "
-"har\n"
-"alle tilgjengelige parametre, slik som IP adresse, gateway, DNS-servere, "
-"etc.\n"
-"fra din tjenesteleverandør eller systemadministrator.\n"
-"\n"
-"Om Winmodem-forbindelser: Winmodemer er spesielle integrerte low-end\n"
-"modemer, som krever yterligere programvare for å fungere sammenlignet\n"
-"med vanlige modemer. Noen av disse modemer fungerer faktisk under \n"
-"Mandrakelinux, andre virker ikke. Du kan konsultere listen av modemer, \n"
-"som er støttet, på LinModems.\n"
-"\n"
-"Du kan konsultere oppstartsguidens kapittel om internettforbindelse for "
-"flere\n"
-"detaljer, eller vente til systemet er installert og bruke programmet som er\n"
-"beskrevet der for å sette opp din forbindelse. "
-
-#: help.pm:197
-#, c-format
-msgid "Use auto detection"
-msgstr "Bruk automatisk oppdagelse"
-
-#: 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\": Klikk på \"%s\"-knappen for å åpne skriverveiviseren.\n"
+"«%s»: Klikk på «%s»-knappen for å åpne skriverveiviseren.\n"
 "Konsulter det korresponderende kapitlet i oppstartsguiden for mer\n"
 "informasjon om hvordan du setter opp en skriver. Grensesnittet som\n"
 "brukes her er tilsvarende det som benyttes under installasjon."
 
-#: 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 "Konfigurer"
 
-#: help.pm:206
+#: help.pm:189
 #, 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 ""
 "Denne dialogen benyttes til å velge hvilke tjenester som skal startes når\n"
-"maskinen startes.\n"
+"maskinen startes opp.\n"
 "\n"
 "DrakX vil liste opp alle tjenestene som er tilgjengelige i den gjeldende "
 "installasjonen.\n"
@@ -3915,7 +4063,7 @@ msgstr ""
 "trenger.\n"
 "!!"
 
-#: help.pm:224
+#: help.pm:206
 #, c-format
 msgid ""
 "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to\n"
@@ -3923,24 +4071,23 @@ 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 passer tiden i GMT (Greenwich Mean Time), og oversetter denne\n"
 "til lokal tid avhengig av tidssonen du valgte. Dersom klokka på ditt "
 "hovedkort\n"
-"er satt til lokal tid, kan du deaktivere dette ved å velge bort \"%s\",\n"
+"er satt til lokal tid, kan du deaktivere dette ved å velge bort «%s»,\n"
 "som lar GNU/Linux vite at systemklokka og maskinvareklokka\n"
 "er i samme tidssone. Dette er nyttig når maskinen din har andre\n"
 "operativsystemer slik som Windows.\n"
 "\n"
-"\"%s\"-opsjonen vil stille klokka di ved å koble seg til en ekstern "
-"tidstjener\n"
+"«%s»-valget vil stille klokka di ved å koble seg til en ekstern tidstjener\n"
 "på internett. For at dette skal fungere, må du ha en internettforbindelse "
 "som\n"
 "fungerer. Det er best å velge en tidstjener som er i nærheten av deg. Denne\n"
@@ -3948,27 +4095,27 @@ msgstr ""
 "maskiner\n"
 "på ditt lokale nettverk."
 
-#: 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 "Maskinvareklokken din satt 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"
@@ -3984,39 +4131,41 @@ msgstr ""
 "3D-akselerasjon, blir du bedt om å velge tjeneren som passer dine behov\n"
 "best."
 
-#: help.pm:249
+#: help.pm:231
 #, 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"
@@ -4025,21 +4174,21 @@ 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 (for X Window System) er hjertet i GNU/Linux sitt grafiske grensesnitt "
 "som\n"
@@ -4110,14 +4259,14 @@ msgstr ""
 "konfigurert\n"
 "det grafiske grensesnittet riktig."
 
-#: 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"
@@ -4125,14 +4274,14 @@ msgstr ""
 "skjermen som er koblet til maskinen din. Dersom dette ikke fungerer, kan\n"
 "du velge fra denne lista hvilken skjerm du faktisk har tilkobliet din maskin."
 
-#: 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øsning\n"
@@ -4142,91 +4291,92 @@ msgstr ""
 "forandre dette etter installasjon). En prøve av den valgte konfigurasjonen\n"
 "er vist i skjermen."
 
-#: help.pm:319
+#: help.pm:303
 #, 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 ""
 "I tilfelle det er flere tjenere tilgjengelig for ditt kort, med eller uten\n"
 "3D-akselerasjon, blir du så spurt om å velge den tjeneren som best\n"
 "passer dine behov."
 
-#: help.pm:324
+#: help.pm:308
 #, 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 ""
 "Valg\n"
 "\n"
-"   Her kan du velge om du vil automatiske svitsje over til et grafisk "
-"grensesnitt\n"
-"under oppstart. Du vil selvsagt ønske å svare \"%s\" dersom maskinen skal\n"
+"  Dette steget lar deg velge om du vil starte et grafisk skrivebord "
+"automatisk\n"
+"under oppstart. Du vil selvsagt ønske å svare «%s» dersom maskinen skal\n"
 "fungere som tjener, eller hvis du ikke kunne konfigurere det grafiske "
 "grensesnittet."
 
-#: help.pm:332
+#: help.pm:316
 #, 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"
@@ -4242,7 +4392,8 @@ msgstr ""
 "logiske enheter for å skape plassen som trengs for å installere ditt nye\n"
 "Mandrakelinux-system.\n"
 "\n"
-"Ettersom partisjoneringsprosessen ikke er reversibel, og kan føre til tapte\n"
+"Ettersom partisjoneringsprosessen ikke kan tilbakestilles, og kan føre til "
+"tapte\n"
 "data hvis det allerede finnes et operativsystem på disken, kan "
 "partisjonering\n"
 "virke skremmendes dersom du er en uerfaren bruker. Heldigvis har DrakX en\n"
@@ -4252,10 +4403,10 @@ msgstr ""
 "\n"
 "Avhengig av din harddiskkonfigurasjon, er flere valg tilgjengelige:\n"
 "\n"
-" * \"%s\": dette valget utfører automatisk partisjonering av dine\n"
+" *«%s»: dette valget utfører automatisk partisjonering av dine\n"
 "harddisker. Dersom du velger dette, vil det ikke ble stilt flere spørsmål.\n"
 "\n"
-" * \"%s\": veiviseren har funnet en eller flere linux-partisjoner på "
+" * «%s»: veiviseren har funnet en eller flere linux-partisjoner på "
 "harddisken\n"
 "din. Hvis du vil bruke disse, velg denne opsjonen. Du vil bli spurt om å "
 "angi\n"
@@ -4306,52 +4457,53 @@ msgstr ""
 "verktøyet\n"
 "se kapittelet ``Managing Your Partitions''-seksjonen i ``Starter Guide''."
 
-#: 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 eksisterende 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 den ledige plassen på Windows-partisjonen"
 
-#: help.pm:389 install_interactive.pm:211
+#: help.pm:374 install_interactive.pm:213
 #, c-format
 msgid "Erase entire disk"
 msgstr "Slette hele 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 "Egendefinert diskpartisjonering"
 
-#: help.pm:392
+#: help.pm:377
 #, 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"
@@ -4359,35 +4511,38 @@ 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.\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"
-" * \"%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\" <<."
+"(*) 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 nå ferdig og ditt flunkende nye GNU/Linux system\n"
-"er nå klart til bruk. Bare klikk \"%s\" for å restarte systemet. Ikke glem "
-"å\n"
+"er nå klart til bruk. Bare klikk «%s» for å restarte systemet. Ikke glem å\n"
 "fjerne installasjonsmediet (CDROM eller diskette). Det første du vil\n"
 "se etter at maskinen er ferdig med maskinvaretestene er oppstartslasterens\n"
 "meny, som lar deg velge hvilket operativsystem du vil starte.\n"
 "\n"
-"\"%s\"-knappen vil vise to nye knapper:\n"
+"«%s»-knappen vil vise to nye knapper:\n"
 "\n"
-" * \"%s\": for å lage en installasjonsdiskett som automatisk vil utføre en\n"
+" * «%s»: for å lage en installasjonsdiskett som automatisk vil utføre en\n"
 "hel installasjon uten operatørhjelp, helt lik den installasjonen du nettopp "
 "har utført.\n"
 "\n"
 "   Merk at to forskjellige valg vil være tilgjengelige etter at knappen  "
 "trykkes:\n"
 "\n"
-"    * \"%s\": Dette er en delvis automatisert installasjon. Partisjonering "
-"er\n"
+"    * «%s»: Dette er en delvis automatisert installasjon. Partisjonering er\n"
 "den eneste interaktive prosedyren.\n"
 "\n"
-"    * \"%s\": Dette er en fullstendig automatisert installasjon: harddisken "
+"    * «%s»: Dette er en fullstendig automatisert installasjon: harddisken "
 "vil bli\n"
 "helt overskrevet, og alle data vil bli overskrevet.\n"
 "\n"
@@ -4395,7 +4550,7 @@ msgstr ""
 "maskiner.\n"
 "Se Auto-installasjonsavsnittet på våre websider for mer informasjon.\n"
 "\n"
-" * \"%s\" (*): lagrer en liste over pakkene som er blitt installert under "
+" * «%s» (*): lagrer en liste over pakkene som er blitt installert under "
 "denne\n"
 "installasjonen. For å benytte denne listen under en annen installasjon, sett "
 "inn\n"
@@ -4405,139 +4560,134 @@ msgstr ""
 "\n"
 "(*) Du trenger en FAT-formatert diskett (for å lage en under GNU/Linux, "
 "skriv\n"
-"\"mformat a:\". "
+"«mformat a:», eller «fdformat /dev/fd0» etterfulgt av «mkfs.vfat\n"
+"/dev/fd0»."
 
-#: help.pm:418
+#: help.pm:409
 #, c-format
 msgid "Generate auto-install floppy"
 msgstr "Generer autoinstallasjonsdiskett"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Replay"
 msgstr "Gjør igjen"
 
-#: 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 "Lagre pakkevalg"
 
-#: help.pm:421
+#: help.pm:412
 #, 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 partisjoner må formateres før de kan brukes (formatering betyr\n"
-"å lage et filsystem).\n"
-"\n"
-"På dette tidspunktet kan det hende du ønsker å reformatere enkelte\n"
+"Hvis du valgte å bruke noen gamle GNU/Linux partisjoner, kan det\n"
+" hende du ønsker å reformatere enkelte\n"
 "eksisterende partisjoner for å slette data på disse. Hvis du ønsker å\n"
 "gjøre dette, kan du velge disse partisjonene også.\n"
+"(å formatere betyr å opprette ett filsystem)\n"
 "\n"
 "Legg merke til at det ikke er nødvendig å formatere alle eksisterende\n"
 "partisjoner. Du må reformatere partisjonene som skal innholde\n"
-"operativsystemet (som \"/\", \"/usr\" eller \"/var\"), men du trenger ikke\n"
+"operativsystemet (som «/», «/usr» eller «/var»), men du trenger ikke\n"
 "å reformatere partisjoner som innholder data du vil beholde\n"
-"(typisk \"/home\").\n"
+"(typisk «/home»).\n"
 "\n"
 "Vær forsiktig når du velger partisjoner. Etter formatering vil alle data\n"
 "på de valgte partisjonene bli slettet uten at du kan hente dataene\n"
 "tilbake.\n"
 "\n"
-"Klikk \"%s\" når du er klar til å formatere partisjonene.\n"
+"Klikk «%s» når du er klar til å formatere partisjonene.\n"
 "\n"
-"Klikk \"%s\" om du vil velge andre partisjoner for din nye\n"
+"Klikk «%s» om du vil velge andre partisjoner for din nye\n"
 "Mandrakelinux-operativsysteminstallasjon. \n"
 "\n"
-"Klikk på \"%s\" hvis du ønsker å velge partisjoner som skal sjekkes for\n"
+"Klikk på «%s» hvis du ønsker å velge partisjoner som skal sjekkes for\n"
 "ødelagte blokker på disken."
 
-#: 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 "Forrige"
 
-#: help.pm:447
+#: help.pm:434
 #, 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 ""
 "Når du installerer Mandrakelinux, er det sannsynlig at enkelte pakker\n"
 "er blitt oppdatert siden denne versjonen ble sluppet. Noen feil kan ha\n"
 "blitt fikset, eller sikkerhetsproblemer løst. For at du skal få utnytte\n"
-"disse forbedringene kan du nå laste dem ned fra internett. Sjekk av  \"%s\"\n"
-"dersom du har en fungerende internettforbindelse, eller \"%s\" dersom\n"
+"disse forbedringene kan du nå laste dem ned fra internett. Kryss av  «%s»\n"
+"dersom du har en fungerende internettforbindelse, eller «%s» dersom\n"
 "du heller vil installere oppdateringene senere.\n"
 "\n"
-"Når du velger \"%s\" får du en liste over tjenere som oppdateringene kan\n"
+"Når du velger «%s» får du en liste over tjenere som oppdateringene kan\n"
 "lastes ned fra. Velg en som er nærmest deg. Et pakkevalgstre vil da\n"
-"dukke opp. Gå gjennom valgene, og klikk \"%s\" for å hente og installere\n"
-"de(n) valgte pakkene(ne), eller \"%s\" for å avbryte."
+"dukke opp. Gå gjennom valgene, og klikk «%s» for å hente og installere\n"
+"de(n) valgte pakkene(ne), eller «%s» for å avbryte."
 
-#: 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
+#: help.pm:447
 #, 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 ""
 "På dette punktet vil DrakX la deg velge sikkerhetsnivået som er ønsket for\n"
 "maskinen. Som en tommelfingerregel bør sikkerhetsnivået settes høyere,\n"
@@ -4546,19 +4696,19 @@ msgstr ""
 "gjerne på bekostning av brukervennligheten.\n"
 "\n"
 "Hvis du ikke vet hva du skal velge, behold standardvalget. Du vil kunne\n"
-"endre sikkerhetsnivået senere med verktøyet draksec fra Mandrake\n"
+"endre sikkerhetsnivået senere med verktøyet draksec fra Mandrakelinux\n"
 "Kontrollsenter.\n"
 "\n"
 "'%s'-feltet kan informere systemet om den bruker på systemet som\n"
 "vil være ansvarlig for sikkerheten. Sikkerhetsbeskjeder vil bli sendt til\n"
 "denne adressen."
 
-#: help.pm:472
+#: help.pm:458
 #, c-format
 msgid "Security Administrator"
 msgstr "Sikkerhetsadministrator"
 
-#: 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"
@@ -4712,17 +4862,17 @@ msgstr ""
 "la oss si 50 MB, så kan du lagre en ekstra kjene og ramdiskbilde for "
 "nødsituasjoner."
 
-#: help.pm:544
+#: help.pm:530
 #, c-format
 msgid "Removable media auto-mounting"
 msgstr "Fjernbart media automontering"
 
-#: help.pm:544
+#: help.pm:530
 #, c-format
 msgid "Toggle between normal/expert mode"
 msgstr "Skift mellom normal-/ekspert-modus"
 
-#: help.pm:547
+#: help.pm:533
 #, c-format
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
@@ -4787,41 +4937,40 @@ msgstr ""
 "\"Windows-navn\" er bokstaven på harddisken din under Windows (den første\n"
 "disken eller partisjonen er kalt \"C:\")."
 
-#: help.pm:578
+#: help.pm:564
 #, 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\": Sjekk ditt valg av land. Dersom du ikke befinner deg i dette "
-"landet,\n"
-"Klikk på \"%s\"-knappen og velg et annet. Dersom ditt land ikke er i\n"
-"den første lista, klikk på \"%s\"-knappen for å få den fullstendige lista "
-"over land."
+"«%s»: Sjekk ditt valg av land. Dersom du ikke befinner deg i dette landet,\n"
+"Klikk på «%s»-knappen og velg et annet. Dersom ditt land ikke er i\n"
+"den første lista, klikk på «%s»\"-knappen for å få den fullstendige lista\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 ""
 "Dette trinnet blir bare aktivert dersom det blir funnet en eksisterende\n"
@@ -4831,42 +4980,40 @@ msgstr ""
 "oppgradering\n"
 "av et eksisterende Mandrakelinux-system:\n"
 "\n"
-" * \"%s\": Dette vil stort sett slette hele det gamle systemet. Dersom du\n"
+" * «%s»: Dette vil stort sett slette hele det gamle systemet. Dersom du\n"
 "ønsker å forandre hvordan harddiskene blir partisjonert, eller forandre på\n"
 "filsystemene, bør du velge dette. Men avhengig av hvordan du partisjonerer "
 "kan\n"
 "du avverge at noen av de gamle dataene blir overskrevet.\n"
 "\n"
-" * \"%s\": Denne installasjonsklassen lar deg oppgradere pakkene som\n"
+" * «%s»: Denne installasjonsklassen lar deg oppgradere pakkene som\n"
 "er installert på ditt nåværende Mandrakelinux-system. Dine nåværende\n"
 "partisjonsoppdelinger og brukerdata blir ikke berørt. De fleste andre "
 "konfigurasjonstrinn\n"
 "forblir tilgjengelige, i likhet med en standard installasjon.\n"
 "\n"
-"\"Oppgrader\"-valget bør fungere fint på Mandrakelinux systemer som kjører\n"
-"versjon \"8.1\" eller nyere. Oppgradering av versjoner tidligere enn \"8.1\" "
-"er\n"
+"«Oppgrader»-valget bør fungere fint på Mandrakelinux systemer som kjører\n"
+"versjon «8.1» eller nyere. Oppgradering av versjoner tidligere enn «8.1» er\n"
 " ikke anbefalt. "
 
-#: help.pm:605
+#: help.pm:591
 #, 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 ""
 "Avhengig av standardspråket du har valgt, vil DrakX automatisk velge\n"
@@ -4883,32 +5030,33 @@ msgstr ""
 "dette\n"
 "installasjonstrinnet la deg velge et passende tastatur fra en liste.\n"
 "\n"
-"Klikk på \"%s\"-knappen for å få en komplett liste over støttede "
-"tastaturer.\n"
+"Klikk på «%s»-knappen for å få en komplett liste over støttede tastaturer.\n"
 "\n"
 "Hvis du velger et tastatur som ikke er basert på det latinske alfabetet,\n"
 "vil den neste dialogen tillate at du setter opp en tastekombinasjon\n"
 "som vil bytte mellom latin og ikke-latinsk tastaturoppsett."
 
-#: 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"
@@ -4917,30 +5065,32 @@ 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 ""
+"Det første trinnet er å velge ditt foretrukkne språk.\n"
+"\n"
 "Ditt valg av foretrukket språk vil påvirke språket til dokumentasjonen,\n"
 "installasjonsrutinen og systemet generelt. Velg først regionen du befinner\n"
 "deg i, og deretter språket du bruker.\n"
 "\n"
-"Om du klikker på \"%s\"-knappen får du mulighet til å velge andre\n"
+"Om du klikker på «%s»-knappen får du mulighet til å velge andre\n"
 "språk som du ønsker å installere på din arbeidsstasjon. Du installerer da\n"
 "samtidig de språkspesifikke filene for systemdokumentasjon og\n"
 "applikasjoner. Hvis du ønsker norsk som standardspråk, men også\n"
 "ønsker å tilrettelegge for spanske brukere på maskinen, kan du velge\n"
-"norsk som standardspråk i trevisningen, og \"%s\" i det avanserte avsnitt.\n"
+"norsk som standardspråk i trevisningen, og «%s» i det avanserte avsnitt.\n"
 "\n"
 "Om UTF-8 (ISO 10646) støtte. ISO 10646 er en ny tegnsettskoding det\n"
 "er ment til å dekke alle eksisterende språk. Men full støtte for det i GNU/"
@@ -4959,56 +5109,59 @@ msgstr ""
 "koding,\n"
 "vil ISO 10646 bli brukt for hele systemet;\n"
 "\n"
-" * Endelig kan ISO 10646 også bli gpå tvunget systemet ved brukervalg\n"
+" * Endelig kan ISO 10646 også bli påtvunget systemet ved brukervalg\n"
 "ved å velge opsjon '%s' uavhengig av hvilke språk som er valgt.\n"
 "\n"
 "Legg merke til at du ikke er begrenset til et enkelt tilleggsspråk. Du\n"
-"kan velge flere, eller til og med alle ved å sjekke av i \"%s\"-boksen.\n"
+"kan velge flere, eller til og med alle ved å sjekke av i «%s»-boksen.\n"
 "Valg av språkstøtte betyr at oversettelser, skrifttyper, stavekontroller,\n"
 "osv. for språket også vil bli installert.\n"
 "\n"
 "For å bytte mellom de installerte språkene på systemet, kan du starte\n"
-"programmet \"/usr/sbin/localedrake\" som \"root\" for å bytte språket som\n"
+"programmet «/usr/sbin/localedrake» som «root» for å bytte språket som\n"
 "systemet bruker. Dersom dette programmet kjøres under en vanlig bruker,\n"
 "vil bare språket for denne brukeren endres."
 
-#: 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 ""
 "DrakX oppdager vanligvis antall knapper på musen din. Hvis ikke, så vil det\n"
 "antas at du har en to-knappers mus og det vil settes opp treknappers-"
@@ -5018,13 +5171,16 @@ msgstr ""
 "automatisk oppdage om din mus bruker PS/2-, seriell- eller USB-grensesnitt.\n"
 "\n"
 "Hvis du har en 3-knappsmus uten hjul, kan du velge musen\n"
-"'%s'. DrakX vil så konfugurere musen din så du kan simulere hjulet med den;\n"
+"«%s». DrakX vil så konfugurere musen din så du kan simulere hjulet med den;\n"
 "for å gjøre dette skal du trykke på den tredje knappen og flytte musen din\n"
 "opp og ned.\n"
 "\n"
 "Hvis du ønsker å spepesifisere en annerledes musetype, velg den passende\n"
 "typen fra listen du blir vist.\n"
 "\n"
+"Du kan velge «%s» eller velge en ``generisk\" mus-type som vil fungere\n"
+"med alle mus.\n"
+"\n"
 "Hvis du velger en annen mus enn hva som er forhåndsvalgt, så vil en\n"
 "testskjerm bli vist. Bruk knappene og musehjulet for å sjekke at\n"
 "oppsettet er riktig, og at musa virker ordentlig. Hvis musa ikke virker "
@@ -5035,7 +5191,7 @@ msgstr ""
 "Noen ganger så blir ikke musehjulet automatisk oppdaget. Du vil da måtte\n"
 "velge manuelt fra listen. Vær sikker på at du velger en som er på riktig "
 "port.\n"
-"Etter at du har klikket på \"%s\"-knappen, så vil et musebilde bli vist på "
+"Etter at du har klikket på «%s»-knappen, så vil et musebilde bli vist på "
 "skjermen.\n"
 "Du må da bevege musehjulet for å aktivere det riktig. Når du ser at "
 "musehjulet på\n"
@@ -5043,12 +5199,17 @@ msgstr ""
 "og\n"
 "at musepekeren på skjermen beveger seg når du flytter på musa."
 
-#: 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 "Universal | Alle PS/2- & USB-mus"
+
+#: help.pm:684
 #, c-format
 msgid ""
 "Please select the correct port. For example, the \"COM1\" port under\n"
@@ -5057,16 +5218,16 @@ msgstr ""
 "Vennligst velg den riktige porten. F.eks., \"COM1\" porten under\n"
 "Windows blir kalt \"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"
@@ -5075,43 +5236,42 @@ 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 ""
 "Dette er det mest kritisike valget med hensyn til sikkerheten på ditt\n"
-"GNU/Linux-system: du må skrive inn \"root\"-passordet. \"Root\" er\n"
+"GNU/Linux-system: du må skrive inn «root»-passordet. «Root» er\n"
 "systemadministratoren og er den eneste som er autorisert til å gjøre\n"
 "oppdateringer, legge til brukere, endre på generell konfigurasjon, etc.\n"
-"Kort sagt, \"root\" kan gjøre alt! Derfor er det viktig at du velger et\n"
+"Kort sagt, «root» kan gjøre alt! Derfor er det viktig at du velger et\n"
 "root-passord som er vanskelig å gjette -- DrakX vil si i fra hvis det er\n"
 "for enkelt. Som du ser, så kan du velge å ikke skrive inn noe passord,\n"
 "men det er noe vi anbefaler på det sterkeste å ikke gjøre. Man kan lage\n"
 "feil på GNU/Linux så lett som på ethvert annet operativsystem.\n"
-"Siden \"root\" kan omgå alle begrensninger og ved uhell kan slette\n"
-"alle data på en partisjon ved ubetenksomt bare åÅ rø re partisjonene selv,\n"
-"så er det viktig å gjøre det vanskelig å bli \"root\".\n"
+"Siden «root» kan omgå alle begrensninger og ved uhell kan slette\n"
+"alle data på en partisjon ved ubetenksomt bare å røre partisjonene selv,\n"
+"så er det viktig å gjøre det vanskelig å bli «root».\n"
 "\n"
 "Passordet bør være en blanding av alfanummeriske tegn og være på minst 8\n"
-"tegn. Aldri skriv ned \"root\"-passordet -- det gjør det for enkelt å bryte "
+"tegn. Aldri skriv ned «roo»\"-passordet -- det gjør det for enkelt å bryte "
 "seg\n"
 "inn på systemet ditt. \n"
 "\n"
@@ -5125,211 +5285,57 @@ msgstr ""
 "bli brukt første gang du logger inn.\n"
 "\n"
 "Hvis du ønsker å autentisere deg via en autentiserings-tjener, klikk på\n"
-"\"%s\"-knappen.\n"
+"«%s»-knappen.\n"
 "\n"
 "Hvis nettverket ditt bruker enten LDAP, NIS eller PDC Windows\n"
 "domenepåloggingstjeneste, så vennligst velg det tilsvarende til\n"
-"\"%s\". Har du ingen anelse, så spørr nettverksadministratoren din.\n"
+"«%s». Har du ingen anelse, så spørr nettverksadministratoren din.\n"
 "\n"
 "Hvis du skulle ha problemer med å huske passord, hvis maskinen din aldri "
 "vil\n"
 "brukes for å koble til internett, eller at du stoler på absolutt alle som "
 "bruker din\n"
-"maskin, så kan du velge \"%s\"."
+"maskin, så kan du velge «%s»."
 
-#: 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 "Intet passord"
 
-#: help.pm:736
-#, 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 ""
-"Denne dialogen lar deg finjustere din oppstartslaster:\n"
-"\n"
-" * \"%s\": du har tre valg for din oppstartslaster:\n"
-"\n"
-"    * \"%s\": hvis du foretrekker grub (tekstmeny);\n"
-"\n"
-"    * \"%s\": hvis du foretrekker LILO med et grafisk grensesnitt;\n"
-"\n"
-"    * \"%s\": hvis du foretrekker lilo med tekstmeny-grensesnitt.\n"
-"\n"
-" * \"%s\": I de fleste tilfeller, så vil du ikke endre standard (\"%s\"),\n"
-"men hvis du foretrekker det, så kan oppstartslasteren installeres på en\n"
-"annen harddisk (feks. \"%s\"), eller til og med. på en diskett (\"%s\");\n"
-"\n"
-" * \"%s\": når du restarter maskinen, så er dette hvor lang tid brukeren "
-"har\n"
-"på å velge et annet valg enn det som er standard.\n"
-"\n"
-" * \"%s\": ACPI er en ny standard (kom til i år 2002) for strømstyring,\n"
-"især for bærbare. Hvis du vet at din maskinvare støtter det og\n"
-"du har bruk for dette, så  kryss av i denne boksen.\n"
-"\n"
-" * \"%s\": Hvis du har erfart maskinvare-problemer på din maskin (IRQ "
-"konflikter,\n"
-"ustabilitet, maskinen fryser, ...) bør du prøve å deaktivere APIC ved\n"
-"å  krysse av i denne boksen.\n"
-"\n"
-"!! Vær obs på at hvis du velger å ikke installere en oppstartslaster\n"
-"(ved å velge \"%s\"), så må du være sikker på at du har en måte å starte "
-"ditt\n"
-"Mandrakelinux-system! Vær også sikker på at du vet hva du gjør før du "
-"endrer\n"
-"noen av valgene. !!\n"
-"\n"
-"Ved å velge \"%s\" i denne menyen så vil du få mange avanserte valg, \n"
-"som vanligvis er reservert for ekspertbrukere."
-
-#: 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 "Forsinkelse før man starter opp med standard imagefil"
-
-#: help.pm:771
+#: help.pm:725
 #, 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 ""
-"Etter at du har konfigurert de generelle oppstartslaster-parametrene, så "
-"vil\n"
-"listen over oppstartsvalg som vil være tilgjengelige under oppstart bli "
-"vist.\n"
-"\n"
-"Hvis det er andre operativsystem installer på din maskin, så vil de "
-"automatisk\n"
-"bli lagt til i oppstartsmenyen. Du kan finjustere de eksisterende valgene "
-"ved å\n"
-"klikke \"%s\" for å lage en ny oppføring; velg en oppføring og klikk\n"
-"\"%s\" eller \"%s\" for å endren den eller fjerne den. Ved å klikke \"%s\"\n"
-"så godkjenner du dine forandringer.\n"
-"\n"
-"Du vil kanskje ikke gi tilgang til disse andre operativsystemene til noen "
-"som\n"
-"måtte gå til konsolet og restarte maskinen. Du kan slette oppføringene for\n"
-"operativsystemet for å fjerne dem fra oppstartslasteren, men du vil da "
-"trenge\n"
-"en oppstartsdiskett for å kunne starte opp disse andre operativsystemene!"
-
-#: 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 "Modifiser"
-
-#: 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 ""
-"LILO og grub er oppstartslastere for GNU/Linux. Vanligvis er dette trinnet\n"
-"helt automatisk. DrakX vil analysere oppstartssektoren på harddisken og\n"
-"bli satt opp ut i fra det som finnes der.\n"
+"En oppstartslaster er et lite program som er startet av datamaskinen\n"
+"når den starter opp. Den er ansvarlig for å starte hele systemet. Vanligvis\n"
+"er oppstartslaster-installasjonen helg automatisk. DrakX vil analysere\n"
+"oppstartssektoren på harddisken og sette oppstartslasteren opp etter hva\n"
+"den finner der.\n"
 "\n"
 " * Hvis en oppstartssektor for Windows blir funnet, vil den erstatte denne "
 "med\n"
-"en grub- eller LILO-oppstartsektor. På denne måten kan du laste enten\n"
+"en GRUB- eller LILO-oppstartsektor. På denne måten kan du laste enten\n"
 "GNU/Linux eller ethvert annet operativsystem installert på din maskin.\n"
 "\n"
 " * Hvis en oppstartsektor for GRUB eller LILO blir funnet, vil den bli "
@@ -5338,79 +5344,83 @@ msgstr ""
 "\n"
 "Dersom det ikke er mulig å avgjøre dette automatisk, vil DrakX spørre deg "
 "hvor\n"
-"oppstartslasteren skal installeres. Vanligvis er '%s' det sikreste stedet.\n"
-"Valg av '%s' vil ikke installere noen oppstartslaster. Bruk kun dette\n"
-"hvis du vet hva du lager."
+"oppstartslasteren skal installeres. Vanligvis er «%s» det sikreste stedet.\n"
+"Valg av «%s» vil ikke installere noen oppstartslaster. Bruk kun dette\n"
+"hvis du vet hva du gjør."
 
-#: 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 ""
-"Nå er det pÅ tide å velge utskriftsystemet for din maskin. Andre\n"
+"Nå er det på tide å velge utskriftsystemet for din maskin. Andre\n"
 "operativsystemer tilbyr kanskje en, men Mandrakelinux tilbyr to.\n"
 "Hvert av systemene er best for en spesiell type konfigurasjon.\n"
 "\n"
-" * \"%s\" -- som står for ``print, don't queue'', er valget hvis du har en\n"
+" * «%s» -- som står for ``print, don't queue'', er valget hvis du har en\n"
 "direkte tilkobling til din printer og du vil ha muligheten til å flykte fra\n"
-"printerkræsj, og du ikke har nettverksskrivere. (\"%s\" vil bare håndtere\n"
+"printerkræsj, og du ikke har nettverksskrivere. («%s» vil bare håndtere\n"
 "veldig enkle nettverkstilfeller og er nogenlunde treg for nettverk.) Det er\n"
-"anbefalt at du bruker \"pdq\" hvis dette er din første erfaring med GNU/"
+"anbefalt at du bruker «pdq» hvis dette er din første erfaring med GNU/"
 "Linux.\n"
 "\n"
-" * \"%s\" -- ``Common Unix Printing System'', er perfekt til å skrive til\n"
+" * «%s» står for ``Common Unix Printing System'', er perfekt til å skrive "
+"til\n"
 "din egen lokale skriver, og også til skrivere på andre siden av kloden.\n"
 "Den er simpel og kan opptrå som både skriver og klient for det "
 "forhistoriske\n"
-"\"lpd\"-utskriftssystemet, så den er kompatibel med de eldre "
-"operativsystemer\n"
+"«lpd»-utskriftssystemet, så den er kompatibel med de eldre operativsystemer\n"
 "som fortsatt trenger utskriftstjenester. Selv om den er ganske kraftig, så "
 "er\n"
-"basisoppsettet nesten like enkelt som \"pdq\". Hvis du trenger å emulere en\n"
-"\"lpd\"-server, må du slå på \"cups-lpd\"-demonen. \"%s\" inkluderer et "
-"grafisk grensesnitt for utskrift eller oppsett av skriver og styring av "
-"skriver.\n"
+"basisoppsettet nesten like enkelt som «pdq». Hvis du trenger å emulere en\n"
+"«lpd»-tjener, må du slå på «cups-lpd»-demonen. «%s» inkluderer et grafisk "
+"grensesnitt for utskrift eller oppsett av skriver og styring av skriver.\n"
 "\n"
 "Hvis du gjør et valg nå, og så senere finner ut at du ikke liker ditt "
 "utskriftssystem,\n"
-"så kan du endre det ved å kjøre PrinterDrake fra ra Mandrake Kontrollsenter "
-"og\n"
-"klikke på ekspert-knappen. "
+"så kan du endre det ved å kjøre PrinterDrake fra Mandrakelinux "
+"Kontrollsenter og\n"
+"klikke på «%s»-knappen. "
 
-#: 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"
@@ -5449,234 +5459,75 @@ msgstr ""
 "Hvis DrakX ikke er i stand til å oppdage de riktige parametrene som trengs\n"
 "for din maskinvare, så må du manuelt konfigurere driveren."
 
-#: 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 ""
-"Du kan legge til flere oppføringer i yaboot, enten for andre "
-"operativsystemer,\n"
-"alternative kjerner, eller for et nødbootimage.\n"
-"\n"
-"For andre OS består oppføringen bare av et navn og \"root\"-partisjonen.\n"
-"\n"
-"For Linux er det noen enkelte muligheter:\n"
-"\n"
-" * Label: Dette er navnet du vil skrive ved yaboot klartegnet for å velge\n"
-"dette oppstartsvalget.\n"
-"\n"
-" * Image: Dette er navnet på kjernen for oppstart. Typisk vmlinux\n"
-"eller en variasjon av vmlinux med en utvidelse.\n"
-"\n"
-" * Root: \"root\"-enheten eller \"/\" for Linux-installasjonen din.\n"
-"\n"
-" * Append: På Apple maskinvare er kjerneopsjonen append ofte brukt til\n"
-"å assistere i initialisering av videomaskinvare, eller for å aktivere\n"
-"tastatur-museknapp-emulering for de ofte manglende andre og tredje\n"
-"museknappene på en Apple mus. Her er noen eksempler:\n"
-"\n"
-"         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
-"hda=autotune\n"
-"\n"
-"         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
-"\n"
-" * Initrd: Dette valget kan brukes enten til å laste initielle moduler, før\n"
-"oppstartsenheten er tilgengelig, eller til å laste et ramdisk-bilde for en\n"
-"nødoppstartsituasjon.\n"
-"\n"
-" * Initrd-size: Standard ramdisk-størrelse er vanligvis 4096 Kbyte. Hvis du\n"
-"trenger å allokere en større ramdisk, kan dette valget brukes for å "
-"spesifisere\n"
-"en ramdisk som er større enn hva som er standard.\n"
-"\n"
-" * Read-write: Normalt kommer \"root\"-partisjonen opp som read-only for å\n"
-"la et filsystem sjekkes før systemet blir ``live''.\n"
-"Her kan du overstyre standard-valget med denne opsjonen.\n"
-"\n"
-" * NoVideo: Skulle Apple-videomaskinvaren vise seg å være veldig\n"
-"problematisk, kan du velge dette valget for å starte i ``novideo''-modus, "
-"med innebygget framebuffer-støtte.\n"
-"\n"
-" * Default: velger denne oppføringen som standard Linux-valg, og kan velges\n"
-"ved å trykke ENTER ved yaboot klartegnet. Denne oppføringen vil også bli\n"
-"fremhevet med en ``*'', hvis du trykker [Tab] for å se oppstartsvalgene."
-
-#: 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 ""
-"Yaboot er en oppstartslaster for NewWorld MacIntosh-maskinvare. Den kan\n"
-"starte enten GNU/Linux, MacOS eller MacOSX. Vanligvis blir MacOS og MacOSX\n"
-"oppdaget riktig og installert. Hvis dette ikke skulle være tilfelle kan du "
-"legge til\n"
-"endringer her selv. Vær forsiktig så du velger de korrekte parametrene.\n"
-"\n"
-"Yaboots hovedvalg er:\n"
-"\n"
-" * Init beskjed: en enkel melding som vises før oppstartsprosessen starter.\n"
-"\n"
-" * Oppstartsenhet: indikerer hvor du ønsker å plassere informasjonen som\n"
-"trengs for å starte GNU/Linux. Du vil generelt ha satt opp en\n"
-"bootstrap-partisjon tidligere for å ta vare på denne informasjonen.\n"
-"\n"
-" * Open Firmwareforsinkelse: ulikt LILO så er det to forsinkelser som er\n"
-"tilgjengelig med yaboot. Den første forsinkelsen blir målt i sekunder og\n"
-"du kan ved det punktet velge mellom CD, OF-boot, MacOS eller Linux.\n"
-"\n"
-" * Kjerneboot Tidsavbrudd: denne er lik LILO's oppstartsforsinkelse.\n"
-"Etter å ha valgt Linux, vil du ha denne forsinkelsen målt i 0,1 sekunders\n"
-"størrelser før standard kjerne blir valgt.\n"
-"\n"
-" * Aktiver CD-Boot?: hvis du velger denne mulighet vil du kunne\n"
-"trykke ``C'' for CD ved det første oppstartsklartegnet.\n"
-"\n"
-" * Aktiver OF- Boot?: hvis du velger denne mulighet vil du kunne trykke\n"
-"``N'' for Open Firmware ved det første oppstartsklartegnet.\n"
-"\n"
-" * Standard OS: Du kan velge hvilket OS som skal lastes når Open\n"
-"Firmwareforsinkelsen er utløpt."
-
-#: 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\": hvis et lydkort blir oppdaget på systemet ditt, blir det vist her.\n"
+"«%s»: hvis et lydkort blir oppdaget på systemet ditt, blir det vist her.\n"
 "Hvis du oppdager at lydkortet som blir vist her ikke er det som\n"
 "faktisk er til stede på ditt system, så kan du klikke på denne knappen for\n"
 "å velge en annen driver."
 
-#: 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 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 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 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"
@@ -5686,10 +5537,12 @@ 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 ""
@@ -5698,25 +5551,23 @@ msgstr ""
 "eller flere av de følgende punktene. Hvert punkt består av en overskrift "
 "fulgt\n"
 "av en kort oppsummering av den nåværende konfigurasjonen. Klikk på\n"
-"den korresponderende \"%s\"-knappen for å endre på det.\n"
+"den korresponderende «%s»-knappen for å endre på det.\n"
 "\n"
-" * \"%s\": sjekk ditt gjeldende tastaturoppsett og endre om nødvendig.\n"
+" * «%s»: sjekk ditt gjeldende tastaturoppsett og endre om nødvendig.\n"
 "\n"
-" * \"%s\": sjekk ditt gjeldende valg av land. Hvis du ikke er i dette "
-"landet,\n"
-"klikk på \"%s\"-knappen og velg et annet land. Hvis landet ditt ikke er i\n"
-"den først viste listen, klikk \"%s\"-knappen for å få en fullstendig liste "
+" * «%s»: sjekk ditt gjeldende valg av land. Hvis du ikke er i dette landet,\n"
+"klikk på «%s»-knappen og velg et annet land. Hvis landet ditt ikke er i\n"
+"den først viste listen, klikk «%s»-knappen for å få en fullstendig liste "
 "over land.\n"
 "\n"
-" ' \"%s\": som standard bestemmer DrakX din tidssone ut i fra hvilket land "
+" ' «%s»\": som standard bestemmer DrakX din tidssone ut i fra hvilket land "
 "du\n"
-"har valgt. Du kan klikke på \"%s\"-knappen her om dette ikke er korrekt.\n"
+"har valgt. Du kan klikke på «%s»-knappen her om dette ikke er korrekt.\n"
 "\n"
-" * \"%s\" :sjekk det gjeldende museoppsettet og klikk på knappen for å "
-"endre\n"
+" * «%s» :sjekk det gjeldende museoppsettet og klikk på knappen for å endre\n"
 "om nødvendig.\n"
 "\n"
-" * \"%s\": ved å klikke på \"%s\"-knappen åpnes skriveroppsett-veiviseren.\n"
+" * «%s»: ved å klikke på «%s»-knappen åpnes skriveroppsett-veiviseren.\n"
 "Konsulter det tilhørende kapittelet i oppstartsguiden for mer\n"
 "informasjon om hvordan en skriver kan settes opp. Grensesnittet som er vist\n"
 "der er likt det som benyttes under installasjonen.\n"
@@ -5727,90 +5578,103 @@ msgstr ""
 "er\n"
 "installert i din maskin, kan du klikke på knappen og velge en annen driver.\n"
 "\n"
-" * \"%s\": som standard vil DrakX sette opp ditt grafiske grensesnitt i "
-"oppløsning\n"
-"\"800x600\" eller \"1024x768\". Hvis det ikke passer dine behov, klikk på \"%"
-"s\"\n"
-"for å omkonfigurere ditt grafiske grensesnitt.\n"
+" * «%s»: hvis du har ett TV kort, dette er der informasjonen om oppsettet "
+"til det\n"
+"vil blir vist. Hvis du har et TV kort og det ikke er oppdaget, klikk på «%"
+"s»\n"
+"for å forsøke å sette det opp manuelt\n"
 "\n"
-" * \"%s\": hvis et TV-kort er funnet i din maskin, er det vist her. Hvis du "
-"har\n"
-"et TV-kort som ikke er funnet, klikk på \"%s\" for å prøve å konfigurere det "
-"manuelt.\n"
+" * «%s»: Du kan klikke på «%s» for å forandre parameterene til kortet hvis "
+"du\n"
+"syntes at oppsettet er feil.\n"
 "\n"
-" * \"%s\": hvis det er oppdaget et ISDN kort, er det vist her. Du kan "
-"klikke\n"
-"på \"%s\" for å endre på parameterne til kortet.\n"
+" * «%s»: Vanligvis setter DrakX opp ditt grafiske grensesnitt i\n"
+"«800x600» eller «1024x768» oppløsning. Hvis det ikke er det du vil ha\n"
+"klikk på «%s« for å sette opp dit grafiske grensesnitt.\n"
 "\n"
-" * \"%s\": hvis du vil konfigurere din internett- eller lokale "
-"nettverkstilkobling nå.\n"
+" * «%s»: hvis du vil sette oppp din internett eller lokale "
+"nettverkstilkobling\n"
+"kan du gjøre det nå. Sjekk den utskrevne dokumentasjonen eller bruk\n"
+"Mandrakelinux Kontrollsenter etter installasjonen er ferdig for å\n"
+"få full hjelp med oppsettet.\n"
 "\n"
-" * \"%s\": du kan her endre på sikkerhetsnivået som er definert tidligere"
-"().\n"
+" * «%s»: lar deg sette opp HTTP og FTP mellomtjener-adresser hvis maskinen\n"
+"du installerer på er bak en mellomtjener.\n"
 "\n"
-" * \"%s\": hvis du skal koble maskinen din direkte til internett, er det "
-"lurt\n"
-"å beskytte seg mot angrep med en brannmur. Oppstartsguiden har mer om\n"
-"dette brannmuroppsett.\n"
+" * «%s»: dette valget lar deg redefinere sikkerhetsnivået som ple satt i et "
+"tidligere\n"
+"steg ().\n"
 "\n"
-" * \"%s\": hvis du vil endre på konfigurasjonen til oppstartslasteren,\n"
-"klikk på denne knappen. Dette bør forbeholdes avanserte brukere.\n"
+" * «%s»: hvis du planlegger å koble din maskin til internett er det en god "
+"ide\n"
+"å beskytte deg selv fra inntrengere ved å sette opp en brannmur. Se den\n"
+"korresponderende seksjonen i ``Starter Guiden\" for detaljer om brannmur\n"
+"innstillinger.\n"
 "\n"
-" * \"%s\": her kan du kontrollere hvilke tjenester som skal kjøre på din\n"
-"maskin. Hvis du skal bruke maskinen som tjener er det lurt å sjekke dette."
-
-#: help.pm:991 install_steps_interactive.pm:110
-#: install_steps_interactive.pm:887 standalone/keyboarddrake:23
-#, c-format
-msgid "Keyboard"
-msgstr "Tastatur"
+" * «%s»: dersom du ønsker å endre ditt oppstartslaster-oppsett, klikk på "
+"denne\n"
+"knappen. Dette er kun for avanserte brukere. Sjekk den utskrevne "
+"dokumentasjonen\n"
+"eller innebygd hjelp om oppstartslaster-oppsettet i Mandrakelinux "
+"Kontrollsenter.\n"
+"\n"
+" * «%s»: igjennom dette valget kan du finjustere hvilke tjenester som skal "
+"kjøre på din\n"
+"maskin. Hvis du planlegger å bruke maskinen som en tjener er det en god ide "
+"å se\n"
+"igjennom dette."
 
-#: 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 "TV-kort"
 
-#: 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 "Proxyer"
+
+#: help.pm:855 install_steps_interactive.pm:1096
 #, c-format
 msgid "Security Level"
 msgstr "Sikkerhetsnivå"
 
-#: 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 "Oppstartslaster"
 
-#: 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 "Tjenester"
 
-#: help.pm:994
+#: help.pm:858
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
@@ -5821,7 +5685,7 @@ msgstr ""
 "Linux-partisjon. Vær forsiktig, alle data på denne partisjonen vil gå tapt\n"
 "og vil ikke kunne gjenopprettes!"
 
-#: help.pm:999
+#: help.pm:863
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
@@ -5840,7 +5704,17 @@ msgstr ""
 "Klikk på \"%s\" for å avslutte denne operasjonen uten å miste data og\n"
 "partisjoner på denne harddisken."
 
-#: install2.pm:119
+#: help.pm:869
+#, c-format
+msgid "Next ->"
+msgstr "Neste ->"
+
+#: help.pm:869
+#, c-format
+msgid "<- Previous"
+msgstr "<- Forrige"
+
+#: install2.pm:117
 #, c-format
 msgid ""
 "Can't access kernel modules corresponding to your kernel (file %s is "
@@ -5851,12 +5725,85 @@ msgstr ""
 "dette betyr vanligvis at oppstartsdisketten din ikke er i synk med "
 "installasjonsmediet (vennligst opprett en nyere diskett)"
 
-#: install2.pm:169
+#: install2.pm:167
 #, c-format
 msgid "You must also format %s"
 msgstr "Du må også formatere %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 ""
+"Følgende installasjonsmedia har blitt funnet.\n"
+"Hvis du vill hoppe over noen av de kan du velge de vekk nå."
+
+#: install_any.pm:411
+#, c-format
+msgid "Do you have further supplementary media?"
+msgstr "Har du flere ekstra medier?"
+
+#. -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 ""
+"De følgende mediene har blitt funnet og vil bli brukt under installasjonen: %"
+"s\n"
+"\n"
+"\n"
+"Har du flere installasjonsmedier du vil sette 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 "Inget enheter funnet"
+
+#: install_any.pm:468
+#, c-format
+msgid "Insert the CD"
+msgstr "Sett inn CDen"
+
+#: 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 "Nettadresse til speilet?"
+
+#: install_any.pm:532
+#, c-format
+msgid "Can't find hdlist file on this mirror"
+msgstr "Kan ikke finne hdliste på dette speilet"
+
+#. -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"
@@ -5879,7 +5826,8 @@ msgstr ""
 "\n"
 "Ønsker du virkelig å installere disse tjenerene?\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"
@@ -5893,17 +5841,17 @@ msgstr ""
 " \n"
 "Ønsker du å fjerne disse pakkene?\n"
 
-#: install_any.pm:818
+#: install_any.pm:1116
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Sett inn en FAT-formatert diskett i stasjon %s"
 
-#: install_any.pm:822
+#: install_any.pm:1120
 #, c-format
 msgid "This floppy is not FAT formatted"
 msgstr "Denne disketten er ikke FAT-formatert"
 
-#: install_any.pm:834
+#: install_any.pm:1132
 #, c-format
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
@@ -5912,12 +5860,17 @@ msgstr ""
 "For å bruke dette valget av pakker, start installasjonen med'linux "
 "defcfg=floppy'"
 
-#: install_any.pm:862 partition_table.pm:848
+#: install_any.pm:1160 partition_table.pm:595
 #, c-format
 msgid "Error reading file %s"
 msgstr "Feil ved lesing av fil %s"
 
-#: install_any.pm:987
+#: install_any.pm:1361
+#, c-format
+msgid "%s (was %s)"
+msgstr "%s (var %s)"
+
+#: install_any.pm:1396
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
@@ -5926,12 +5879,12 @@ msgstr ""
 "En feil har oppstått - ingen gyldige enheter ble funnet for å opprette nye "
 "filsystemer. Vennligst sjekk maskinvaren din for årsaken til dette problemet"
 
-#: install_gtk.pm:161
+#: install_gtk.pm:160
 #, c-format
 msgid "System installation"
 msgstr "Systeminstallasjon"
 
-#: install_gtk.pm:164
+#: install_gtk.pm:163
 #, c-format
 msgid "System configuration"
 msgstr "Systemkonfigurasjon"
@@ -5967,7 +5920,7 @@ msgstr ""
 "\n"
 "Fortsette likevel?"
 
-#: 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 en FAT-parisjonen montert under /boot/efi"
@@ -6028,7 +5981,7 @@ msgstr "Hvilken partisjonstype ønsker du å forandre størrelse 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 ""
 "Størrelsesendreren for FAT greide ikke å håndtere din partisjon, \n"
 "følgende feil oppsto: %s"
@@ -6047,7 +6000,8 @@ msgid ""
 msgstr ""
 "Windows-partisjonen din er for fragmentert, vennligst kjør ``defrag'' først"
 
-#: 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"
@@ -6073,54 +6027,54 @@ msgstr ""
 "også ta sikkerhetskopi av dine data.\n"
 "Når du er sikker, trykk Ok."
 
-#: install_interactive.pm:176
+#: install_interactive.pm:178
 #, c-format
 msgid "Which size do you want to keep for Windows on"
 msgstr "Hvilken størrelse ønsker du å beholde vinduer 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 "Beregner Windows filsystemgrense"
 
-#: install_interactive.pm:191
+#: install_interactive.pm:193
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "Krymping/forstørring av FAT feilet: %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 ""
 "Det finnes ingen FAT partisjon å forandre størrelsen på(eller ikke nok plass "
 "igjen)"
 
-#: install_interactive.pm:211
+#: install_interactive.pm:213
 #, c-format
 msgid "Remove Windows(TM)"
 msgstr "Fjern Windows(TM)"
 
-#: 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 mer enn en harddisk, hvilken ønsker du å installere 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 eksisterende partisjoner og deres data vil være tapt på disk %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"
@@ -6129,32 +6083,33 @@ msgstr ""
 "Du kan nå partisjonere %s.\n"
 "Når du er ferdig ikke glem å lagre med `w'"
 
-#: install_interactive.pm:269
+#: install_interactive.pm:271
 #, c-format
 msgid "I can't find any room for installing"
 msgstr "Jeg kan ikke finne noe rom for installering"
 
-#: install_interactive.pm:273
+#: install_interactive.pm:275
 #, c-format
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "DrakX partisjonsveiviseren fant følgende løsninger:"
 
-#: install_interactive.pm:279
+#: install_interactive.pm:281
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Partisjonering feilet: %s"
 
-#: install_interactive.pm:286
+#: install_interactive.pm:288
 #, c-format
 msgid "Bringing up the network"
 msgstr "Henter opp nettverket"
 
-#: install_interactive.pm:291
+#: install_interactive.pm:293
 #, c-format
 msgid "Bringing down the network"
 msgstr "Tar ned 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"
@@ -6172,7 +6127,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 "
@@ -6194,7 +6149,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"
@@ -6202,14 +6157,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"
@@ -6239,10 +6194,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"
@@ -6253,11 +6208,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"
@@ -6273,7 +6228,7 @@ 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 ""
 "Introduksjon\n"
 "\n"
@@ -6391,7 +6346,7 @@ msgstr ""
 "spørsmål om dette dokumentet,\n"
 "vennligst kontakt Mandrakesoft S.A. \n"
 
-#: install_messages.pm:89
+#: install_messages.pm:90
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -6408,7 +6363,8 @@ msgstr ""
 "(se http://www.mp3licensing.com for flere detaljer). Er du usikker om\n"
 "en patent kan gjelde deg, sjekk dine lokale lover."
 
-#: 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"
@@ -6472,7 +6428,7 @@ msgstr ""
 "respektive opphavsmenn og er beskyttet av intellektuel eiendom og \n"
 "opphavsrettslover som gjelder programvare.\n"
 
-#: install_messages.pm:128
+#: install_messages.pm:131
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
@@ -6505,30 +6461,30 @@ msgstr ""
 "Informasjon om konfigurering av systemet ditt finnes i post\n"
 "install-kapittelet i Official Mandrakelinux User's Guide."
 
-#: 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 "Dupliser monteringspunkt %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 ""
 "Noen viktige pakker ble ikke installert ordentlig.\n"
 "Det er noe galt enten med CD-rom'en eller CD-platen.\n"
-"Sjekk cd-platen på en installert maskin med \"rpm -qpl Mandrake/RPMS/*.rpm"
-"\"\n"
+"Sjekk cd-platen på en installert maskin med \"rpm -qpl media/main/*.rpm\"\n"
 
-#: install_steps.pm:533
+#: install_steps.pm:603
 #, c-format
 msgid "No floppy drive available"
 msgstr "Ingen diskettstasjon tilgjengelig"
@@ -6538,7 +6494,7 @@ msgstr "Ingen diskettstasjon tilgjengelig"
 msgid "Entering step `%s'\n"
 msgstr "Entrer trinn `%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"
@@ -6551,67 +6507,67 @@ msgstr ""
 "installering\n"
 "i stedet. Trykk `F1' ved oppstart av CD-ROM, skriv så `text'."
 
-#: 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 "Valg pakkegruppe"
 
-#: 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 "Total størrelse: %d / %d MB"
 
-#: 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 "Størrelse: "
 
-#: install_steps_gtk.pm:343
+#: install_steps_gtk.pm:312
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: install_steps_gtk.pm:344
+#: install_steps_gtk.pm:313
 #, c-format
 msgid "Importance: "
 msgstr "Viktighet: "
 
-#: install_steps_gtk.pm:377
+#: install_steps_gtk.pm:346
 #, c-format
 msgid "You can't select/unselect this package"
 msgstr "Du kan ikke velge/fjerne denne pakken"
 
-#: install_steps_gtk.pm:381
+#: install_steps_gtk.pm:350
 #, c-format
 msgid "due to missing %s"
 msgstr "pga manglende %s"
 
-#: install_steps_gtk.pm:382
+#: install_steps_gtk.pm:351
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "pga. utilfredsstilt %s"
 
-#: install_steps_gtk.pm:383
+#: install_steps_gtk.pm:352
 #, c-format
 msgid "trying to promote %s"
 msgstr "prøver å promotere %s"
 
-#: install_steps_gtk.pm:384
+#: install_steps_gtk.pm:353
 #, c-format
 msgid "in order to keep %s"
 msgstr "for å beholde %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"
@@ -6619,27 +6575,27 @@ msgstr ""
 "Du kan ikke velge denne pakken da det ikke er igjen nok plass til å "
 "installere denne"
 
-#: install_steps_gtk.pm:392
+#: install_steps_gtk.pm:361
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Følgende pakker vil bli installert"
 
-#: install_steps_gtk.pm:393
+#: install_steps_gtk.pm:362
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Følgende pakker vil bli fjernet"
 
-#: 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 en bestemt pakke, den kan ikke fjernes"
 
-#: 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 ikke fjerne denne pakken, den er allerede installert"
 
-#: install_steps_gtk.pm:422
+#: install_steps_gtk.pm:391
 #, c-format
 msgid ""
 "This package must be upgraded.\n"
@@ -6648,82 +6604,81 @@ msgstr ""
 "Denne pakken må oppgraderes\n"
 "Er du sikker på at du ikke vil velge denne?"
 
-#: install_steps_gtk.pm:425
+#: install_steps_gtk.pm:394
 #, c-format
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "Du kan ikke fjerne denne pakken. Den må oppgraderes"
 
-#: install_steps_gtk.pm:430
+#: install_steps_gtk.pm:399
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Vis automatisk valgte pakker"
 
-#: install_steps_gtk.pm:435
+#: install_steps_gtk.pm:404
 #, c-format
 msgid "Load/Save on floppy"
 msgstr "Lagre på/hente fra diskett"
 
-#: install_steps_gtk.pm:436
+#: install_steps_gtk.pm:405
 #, c-format
 msgid "Updating package selection"
 msgstr "Oppdaterer pakkevalg"
 
-#: install_steps_gtk.pm:441
+#: install_steps_gtk.pm:410
 #, c-format
 msgid "Minimal install"
 msgstr "Minimal installasjon"
 
-#: 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 "Velg pakkene du ønsker å installere"
 
-#: 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 "Ingen detaljer"
-
-#: install_steps_gtk.pm:478
+#: install_steps_gtk.pm:447
 #, c-format
 msgid "Estimating"
 msgstr "Beregner"
 
-#: install_steps_gtk.pm:484
+#: install_steps_gtk.pm:453
 #, c-format
 msgid "Time remaining "
 msgstr "Tid som gjenstår "
 
-#: install_steps_gtk.pm:496
+#: install_steps_gtk.pm:464
 #, c-format
 msgid "Please wait, preparing installation..."
 msgstr "Vennligst vent, forbereder installasjon"
 
-#: install_steps_gtk.pm:557
+#: install_steps_gtk.pm:474
+#, c-format
+msgid "No details"
+msgstr "Ingen detaljer"
+
+#: install_steps_gtk.pm:527
 #, c-format
 msgid "%d packages"
 msgstr "%d pakker"
 
-#: install_steps_gtk.pm:562
+#: install_steps_gtk.pm:532
 #, c-format
 msgid "Installing package %s"
 msgstr "Installerer pakke %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 "Nekte"
 
-#: 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."
@@ -6734,134 +6689,139 @@ msgstr ""
 "ferdig.\n"
 "Hvis du ikke har den trykk Avbryt for å unngå installasjon fra denne CD'en."
 
-#: 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 "Det var en feil ved endring av pakkenes rekkefølge:"
 
-#: 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 "Fortsette uansett?"
 
-#: 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 "Det var en feil ved installering av pakkene:"
 
-#: 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 "ikke konfigurert"
 
-#: install_steps_interactive.pm:81
+#: install_steps_interactive.pm:86
 #, c-format
 msgid "Do you want to recover your system?"
 msgstr "Ønsker du å redde ditt system?"
 
-#: install_steps_interactive.pm:82
+#: install_steps_interactive.pm:87
 #, c-format
 msgid "License agreement"
 msgstr "License agreement"
 
-#: install_steps_interactive.pm:111
+#: install_steps_interactive.pm:91
+#, c-format
+msgid "Release Notes"
+msgstr "Versjonsnotater"
+
+#: install_steps_interactive.pm:121
 #, c-format
 msgid "Please choose your keyboard layout."
 msgstr "Vennligst velg tastatur-oppsettet ditt."
 
-#: install_steps_interactive.pm:113
+#: install_steps_interactive.pm:123
 #, c-format
 msgid "Here is the full list of available keyboards"
 msgstr "Her er den komplette lista over tilgjengelige tastatur"
 
-#: 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 en installering eller en 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 "Vennligst velg din musetype."
 
-#: install_steps_interactive.pm:186 standalone/mousedrake:46
+#: install_steps_interactive.pm:196 standalone/mousedrake:46
 #, c-format
 msgid "Mouse Port"
 msgstr "Port mus"
 
-#: 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 "Vennligst velg hvilken serieport musen din koblet til."
 
-#: install_steps_interactive.pm:197
+#: install_steps_interactive.pm:207
 #, c-format
 msgid "Buttons emulation"
 msgstr "Emulering knapper"
 
-#: install_steps_interactive.pm:199
+#: install_steps_interactive.pm:209
 #, c-format
 msgid "Button 2 Emulation"
 msgstr "Emulering 2 knapper"
 
-#: install_steps_interactive.pm:200
+#: install_steps_interactive.pm:210
 #, c-format
 msgid "Button 3 Emulation"
 msgstr "Emulering 3 knapper"
 
-#: 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 "Konfigurerer PCMCIA 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 "Konfigurerer 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 tilgjengelige partisjoner"
 
-#: install_steps_interactive.pm:251
+#: install_steps_interactive.pm:261
 #, c-format
 msgid "Scanning partitions to find mount points"
 msgstr "Skanner partisjoner for å finne monteringspunkter"
 
-#: install_steps_interactive.pm:258
+#: install_steps_interactive.pm:268
 #, c-format
 msgid "Choose the mount points"
 msgstr "Velg monteringspunktene"
 
-#: 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 "
@@ -6870,17 +6830,17 @@ msgstr ""
 "Det er ikke plass for 1 MB bootstrap! Installasjonen vil fortsette, but for "
 "åboote systemet ditt, må du lage en bootstrap partisjon i DiskDrake"
 
-#: install_steps_interactive.pm:325
+#: install_steps_interactive.pm:337
 #, c-format
 msgid "Choose the partitions you want to format"
 msgstr "Velg partisjonene du ønsker å formatere"
 
-#: install_steps_interactive.pm:327
+#: install_steps_interactive.pm:339
 #, c-format
 msgid "Check bad blocks?"
 msgstr "Sjekke for dårlige blokker?"
 
-#: 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, "
@@ -6889,34 +6849,46 @@ msgstr ""
 "Klarte ikke å sjekke filsystemet %s. Vil du forsøke å reparere feilene? "
 "(Advarsel! Du kan miste 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 ""
 "Det er ikke nok SWAP til å fullføre installasjonen, vennligst legg til litt "
 "mer"
 
-#: install_steps_interactive.pm:369
+#: install_steps_interactive.pm:381
 #, c-format
 msgid "Looking for available packages and rebuilding rpm database..."
 msgstr "Søker etter tilgjengelige pakker og bygger om igjen rpm-databasen..."
 
-#: 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 "Søker etter tilgjengelige pakker"
 
-#: install_steps_interactive.pm:373
+#: install_steps_interactive.pm:385
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Ser på pakker som allerede er installert..."
 
-#: install_steps_interactive.pm:377
+#: install_steps_interactive.pm:389
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Finner pakker som skal oppgraderes"
 
-#: 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 ""
+"Kontakter Mandrakelinux web-sted for å få en liste over tilgjengelige speil"
+
+#: install_steps_interactive.pm:411 install_steps_interactive.pm:839
+#, c-format
+msgid "Choose a mirror from which to get the packages"
+msgstr "Velg et speil som pakkene kan hentes fra"
+
+#: install_steps_interactive.pm:451
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%d "
@@ -6925,7 +6897,7 @@ msgstr ""
 "Ditt system har ikke nok plass igjen for installasjon 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"
@@ -6934,42 +6906,42 @@ msgstr ""
 "Vennligst velg lagre eller hente pakkevalg på diskett.\n"
 "Formatet er det samme som for auto_install genererte disketter."
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Load from floppy"
 msgstr "Hent fra diskett"
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Save on floppy"
 msgstr "Lagre på diskett"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Package selection"
 msgstr "Pakkevalg"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Loading from floppy"
 msgstr "Henter fra disketten"
 
-#: install_steps_interactive.pm:450
+#: install_steps_interactive.pm:504
 #, c-format
 msgid "Insert a floppy containing package selection"
 msgstr "Sett inn en diskett med pakkevalget"
 
-#: install_steps_interactive.pm:533
+#: install_steps_interactive.pm:581
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Valgt størrelse er større enn tilgjengelig plass"
 
-#: install_steps_interactive.pm:548
+#: install_steps_interactive.pm:596
 #, c-format
 msgid "Type of install"
 msgstr "Type av installasjon"
 
-#: install_steps_interactive.pm:549
+#: install_steps_interactive.pm:597
 #, c-format
 msgid ""
 "You haven't selected any group of packages.\n"
@@ -6978,22 +6950,22 @@ msgstr ""
 "Du har ikke valgt noen pakkegrupper.\n"
 "Vennligst velg den minimale installasjonen du ønsker:"
 
-#: install_steps_interactive.pm:553
+#: install_steps_interactive.pm:601
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Med grunnleggende dokumentasjon (anbefalt!)"
 
-#: install_steps_interactive.pm:554
+#: install_steps_interactive.pm:602
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Virkelig minimal installasjon (uten 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"
@@ -7004,17 +6976,17 @@ msgstr ""
 "Hvis du ikke har noen av disse CDene, klikk Avbryt.\n"
 "Hvis bare noen av CDene mangler, fjern disse, klikk så Ok."
 
-#: install_steps_interactive.pm:646
+#: install_steps_interactive.pm:699
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "CD-ROMen ved navnet \"%s\""
 
-#: install_steps_interactive.pm:666
+#: install_steps_interactive.pm:720
 #, c-format
 msgid "Preparing installation"
 msgstr "Forbereder installasjon"
 
-#: install_steps_interactive.pm:675
+#: install_steps_interactive.pm:729
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -7023,17 +6995,17 @@ msgstr ""
 "Installerer pakke %s\n"
 "%d%%"
 
-#: install_steps_interactive.pm:721
+#: install_steps_interactive.pm:778
 #, c-format
 msgid "Post-install configuration"
 msgstr "Konfigurasjon postinstallering"
 
-#: install_steps_interactive.pm:727
+#: install_steps_interactive.pm:784
 #, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
 msgstr "Sett inn oppdater moduler disketten 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"
@@ -7043,7 +7015,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 har nå muligheten til å laste ned oppdaterte pakker. Dette er pakker som\n"
 "har blitt sluppet etter at distribusjonen ble sluppet. Dette kan være enten\n"
@@ -7054,84 +7026,72 @@ msgstr ""
 "\n"
 "Ønsker du å installere oppdateringene ?"
 
-#: install_steps_interactive.pm:769
-#, c-format
-msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
-msgstr ""
-"Kontakter Mandrakelinux web-sted for å få en liste over tilgjengelige speil"
-
-#: install_steps_interactive.pm:774
-#, c-format
-msgid "Choose a mirror from which to get the packages"
-msgstr "Velg et speil som pakkene kan hentes fra"
-
-#: install_steps_interactive.pm:788
+#: install_steps_interactive.pm:853
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr "Kontakter speilet for å få en liste over tilgjengelige pakker"
 
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "Kan ikke kontakte mirror %s"
 
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
 #, c-format
 msgid "Would you like to try again?"
 msgstr "Ønsker du å prøve 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 "Hva er din tidsone?"
 
-#: install_steps_interactive.pm:823
+#: install_steps_interactive.pm:888
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "Automatisk tidssynkronisering (ved hjelp av NTP)"
 
-#: install_steps_interactive.pm:831
+#: install_steps_interactive.pm:896
 #, c-format
 msgid "NTP Server"
 msgstr "NTP-tjener"
 
-#: install_steps_interactive.pm:873 steps.pm:30
+#: install_steps_interactive.pm:938 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "Oppsummering"
 
-#: 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 "Fjern-CUPS-tjener"
 
-#: install_steps_interactive.pm:932
+#: install_steps_interactive.pm:997
 #, c-format
 msgid "No printer"
 msgstr "Ingen skriver"
 
-#: install_steps_interactive.pm:974
+#: install_steps_interactive.pm:1039
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Har du et 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 "
@@ -7140,97 +7100,92 @@ msgstr ""
 "Kjør \"alsaconf\" eller \"sndconfig\" etter installasjonen for å konfigurere "
 "lydkortet ditt"
 
-#: install_steps_interactive.pm:978
+#: install_steps_interactive.pm:1043
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Lydkort ikke oppdaget. Prøv \"harddrake\" etter installasjonen"
 
-#: 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 & internett"
 
-#: install_steps_interactive.pm:1020
-#, c-format
-msgid "Proxies"
-msgstr "Proxyer"
-
-#: install_steps_interactive.pm:1021
+#: install_steps_interactive.pm:1086
 #, c-format
 msgid "configured"
 msgstr "konfigurert"
 
-#: 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 "Sikkerhet"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, c-format
 msgid "activated"
 msgstr "aktivert"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, c-format
 msgid "disabled"
 msgstr "deaktiver"
 
-#: install_steps_interactive.pm:1058
+#: install_steps_interactive.pm:1123
 #, c-format
 msgid "Boot"
 msgstr "Oppstart"
 
 #. -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 "Tjenester: %d aktivert for %d registrert"
 
-#: 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 ikke konfigurert det grafiske grensesnittet X. Er du sikker på at du "
 "vil gjøre dette?"
 
-#: install_steps_interactive.pm:1141
+#: install_steps_interactive.pm:1205
 #, c-format
 msgid "Set root password and network authentication methods"
 msgstr "Sett root-passord og nettverksautentiseringsmetoder"
 
-#: install_steps_interactive.pm:1142
+#: install_steps_interactive.pm:1206
 #, c-format
 msgid "Set root password"
 msgstr "Sett 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 "Dette passordet er for enkelt (må være minst %d tegn langt)"
 
-#: 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 "Autentifikasjon"
 
-#: install_steps_interactive.pm:1188
+#: install_steps_interactive.pm:1254
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Klargjør oppstartslaster"
 
-#: install_steps_interactive.pm:1198
+#: install_steps_interactive.pm:1264
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
@@ -7243,12 +7198,12 @@ msgstr ""
 "Installasjonen vil fortsette, men du må\n"
 "bruke BootX eller andre måter for å starte din maskin."
 
-#: install_steps_interactive.pm:1204
+#: install_steps_interactive.pm:1270
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "Ønsker du å bruke aboot?"
 
-#: install_steps_interactive.pm:1207
+#: install_steps_interactive.pm:1273
 #, c-format
 msgid ""
 "Error installing aboot, \n"
@@ -7257,34 +7212,7 @@ msgstr ""
 "Feil ved installasjon av aboot, \n"
 "prøve å installere selv om det ødelegger den første partisjonen?"
 
-#: install_steps_interactive.pm:1218
-#, c-format
-msgid "Installing bootloader"
-msgstr "Installer oppstartslaster"
-
-#: install_steps_interactive.pm:1225
-#, c-format
-msgid "Installation of bootloader failed. The following error occured:"
-msgstr "Installasjon av oppstartslaster mislykket. Følgende feil oppsto:"
-
-#: 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 ""
-"Du må muligens endre din Open Firmware oppstartsenhet for å\n"
-" aktivere oppstartslasteren. Hvis du ikke ser oppstartslasteren ved\n"
-" omstart, hold nede Command-Option-O-F ved omstart og skriv:\n"
-" setenv boot-device %s,\\\\:tbxi\n"
-" Skriv så: shut-down\n"
-"Ved din neste oppstart burde du se oppstartslasteren."
-
-#: 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 "
@@ -7293,22 +7221,22 @@ msgstr ""
 "I dette er sikkerhetsnivået er tilgang til Windows-partisjonen forbeholdt "
 "administratoren."
 
-#: 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 "Sett inn en 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 "Vennligst set inn en annen diskett med drivere."
 
-#: install_steps_interactive.pm:1282
+#: install_steps_interactive.pm:1329
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Oppretter diskett for autoinstallasjon"
 
-#: install_steps_interactive.pm:1294
+#: install_steps_interactive.pm:1341
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -7319,12 +7247,12 @@ msgstr ""
 "\n"
 "Ønsker du virkelig å avslutte nå?"
 
-#: install_steps_interactive.pm:1309
+#: install_steps_interactive.pm:1356
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "Oppretter diskett for autoinstallasjon"
 
-#: install_steps_interactive.pm:1311
+#: install_steps_interactive.pm:1358
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -7344,7 +7272,8 @@ msgstr ""
 msgid "Mandrakelinux Installation %s"
 msgstr "Mandrakelinux installasjon %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 "
@@ -7356,17 +7285,37 @@ msgstr ""
 msgid "Choose a file"
 msgstr "Velg en 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 "Modifiser"
+
+#: 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 "Grunnleggende"
 
-#: 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 "Gjør"
@@ -7445,572 +7394,765 @@ msgstr ""
 msgid "Re-submit"
 msgstr "Re-submit"
 
-#: 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 "UK-tastatur"
 
-#: keyboard.pm:173 keyboard.pm:279
+#: keyboard.pm:175 keyboard.pm:288
 #, c-format
 msgid "US keyboard"
 msgstr "US-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 (gammel)"
 
-#: 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 (fonétisk)"
 
-#: 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 "Azerbaidjansk (latin)"
 
-#: 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 "Bengalsk"
 
-#: keyboard.pm:184
+#: keyboard.pm:185
 #, c-format
-msgid "Bulgarian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (phonetic)"
 msgstr "Bulgarsk (fonétisk)"
 
-#: 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 "Brasiliansk (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 "Belarusian"
 
 #: keyboard.pm:191
 #, c-format
-msgid "Swiss (German layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (German layout)"
 msgstr "Sveisisk (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 (ingen døde taster)"
 
-#: 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 (US)"
 
-#: 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 "Estlandsk"
 
-#: 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)"
+msgid ""
+"_: keyboard\n"
+"Greek (polytonic)"
 msgstr "Gresk (polytonisk)"
 
-#: 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 (Phonetic)"
 
-#: 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 "Islansk"
 
-#: 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 "Inuktitut"
 
-#: keyboard.pm:225
+#: keyboard.pm:229
 #, c-format
-msgid "Japanese 106 keys"
+msgid ""
+"_: keyboard\n"
+"Japanese 106 keys"
 msgstr "Japansk 106 taster"
 
-#: 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 "Kyrgyz-tastatur"
 
-#: keyboard.pm:231
+#: keyboard.pm:235
 #, c-format
-msgid "Latin American"
+msgid ""
+"_: keyboard\n"
+"Latin American"
 msgstr "Latinamerikansk"
 
-#: keyboard.pm:232
+#: keyboard.pm:236
 #, c-format
-msgid "Laotian"
+msgid ""
+"_: keyboard\n"
+"Laotian"
 msgstr "Laot"
 
-#: keyboard.pm:233
+#: keyboard.pm:238
 #, c-format
-msgid "Lithuanian AZERTY (old)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (old)"
 msgstr "Liauisk AZERTY (gammel)"
 
-#: keyboard.pm:235
+#: keyboard.pm:241
 #, c-format
-msgid "Lithuanian AZERTY (new)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (new)"
 msgstr "Liauisk AZERTY (ny)"
 
-#: keyboard.pm:236
+#: keyboard.pm:243
 #, c-format
-msgid "Lithuanian \"number row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"number row\" QWERTY"
 msgstr "Litauisk \"nummer-rekke\" QWERTY"
 
-#: keyboard.pm:237
+#: keyboard.pm:245
 #, c-format
-msgid "Lithuanian \"phonetic\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"phonetic\" QWERTY"
 msgstr "Litauisk \"fonétisk\" QWERTY"
 
-#: keyboard.pm:238
+#: keyboard.pm:246
 #, c-format
-msgid "Latvian"
+msgid ""
+"_: keyboard\n"
+"Latvian"
 msgstr "Lotvisk"
 
-#: keyboard.pm:239
+#: keyboard.pm:247
 #, c-format
-msgid "Malayalam"
+msgid ""
+"_: keyboard\n"
+"Malayalam"
 msgstr "Malaysisk"
 
-#: 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 "Myanmar (Burmesisk)"
 
-#: keyboard.pm:242
+#: keyboard.pm:250
 #, c-format
-msgid "Mongolian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Mongolian (cyrillic)"
 msgstr "Mongolsk (cyrillic)"
 
-#: keyboard.pm:243
+#: keyboard.pm:251
 #, c-format
-msgid "Maltese (UK)"
+msgid ""
+"_: keyboard\n"
+"Maltese (UK)"
 msgstr "Maltesisk (UK)"
 
-#: keyboard.pm:244
+#: keyboard.pm:252
 #, c-format
-msgid "Maltese (US)"
+msgid ""
+"_: keyboard\n"
+"Maltese (US)"
 msgstr "Maltesisk (US)"
 
-#: keyboard.pm:245
+#: keyboard.pm:253
 #, c-format
-msgid "Dutch"
+msgid ""
+"_: keyboard\n"
+"Dutch"
 msgstr "Hollansk"
 
-#: 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 "Romansk (qwertz)"
 
-#: keyboard.pm:254
+#: keyboard.pm:263
 #, c-format
-msgid "Romanian (qwerty)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwerty)"
 msgstr "Romansk (qwerty)"
 
-#: keyboard.pm:256
+#: keyboard.pm:265
 #, c-format
-msgid "Russian (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Russian (phonetic)"
 msgstr "Russisk (Phonetic)"
 
-#: 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 (svensk/finsk)"
 
-#: 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 "Slovakisk (QWERTZ)"
 
-#: keyboard.pm:262
+#: keyboard.pm:271
 #, c-format
-msgid "Slovakian (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTY)"
 msgstr "Slovakisk (QWERTY)"
 
-#: keyboard.pm:264
+#: keyboard.pm:273
 #, c-format
-msgid "Serbian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Serbian (cyrillic)"
 msgstr "Serbisk (cyrillic)"
 
-#: 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 (fonétisk)"
 
-#: 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 "Tamilsk (ISCII-layout)"
 
-#: keyboard.pm:270
+#: keyboard.pm:279
 #, c-format
-msgid "Tamil (Typewriter-layout)"
+msgid ""
+"_: keyboard\n"
+"Tamil (Typewriter-layout)"
 msgstr "Tamilsk (skrivemaskin-layout)"
 
-#: 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 "Tajik-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 "US-tastatur (internasjonalt)"
 
-#: keyboard.pm:281
+#: keyboard.pm:290
 #, c-format
-msgid "Uzbek (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Uzbek (cyrillic)"
 msgstr "Usbekistansk (cyrillic)"
 
-#: keyboard.pm:282
+#: keyboard.pm:292
 #, c-format
-msgid "Vietnamese \"numeric row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamesisk \"nummer-rekke\" QWERTY"
 
-#: keyboard.pm:283
+#: keyboard.pm:293
 #, c-format
-msgid "Yugoslavian (latin)"
+msgid ""
+"_: keyboard\n"
+"Yugoslavian (latin)"
 msgstr "Jugoslavisk (latin)"
 
-#: keyboard.pm:290
+#: keyboard.pm:300
 #, c-format
 msgid "Right Alt key"
 msgstr "Høyre Alt-tast"
 
-#: keyboard.pm:291
+#: keyboard.pm:301
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Begge Shift-taster samtidig"
 
-#: keyboard.pm:292
+#: keyboard.pm:302
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Control- og Shift-taster samtidig"
 
-#: keyboard.pm:293
+#: keyboard.pm:303
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock-tast"
 
-#: keyboard.pm:294
+#: keyboard.pm:304
+#, c-format
+msgid "Shift and CapsLock keys simultaneously"
+msgstr "Shift- og CapsLock-taster samtidig"
+
+#: keyboard.pm:305
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl- og Alt-taster samtidig"
 
-#: keyboard.pm:295
+#: keyboard.pm:306
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt- og Shift-taster samtidig"
 
-#: keyboard.pm:296
+#: keyboard.pm:307
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\" Menu\"-tast"
 
-#: 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øyre \"Windows\"-tast"
 
-#: keyboard.pm:299
+#: keyboard.pm:310
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Begge Control-taster samtidig"
 
-#: keyboard.pm:300
+#: keyboard.pm:311
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Begge Alt-taster 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øyre 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 Control-tast"
 
-#: keyboard.pm:305
+#: keyboard.pm:316
 #, c-format
 msgid "Right Control key"
 msgstr "Høyre Control-tast"
 
-#: keyboard.pm:336
+#: keyboard.pm:347
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -8021,7 +8163,7 @@ msgstr ""
 "å bytte mellom forskjellige tastaturoppsett.\n"
 "(for eksempel latin og ikke-latin)"
 
-#: keyboard.pm:341
+#: keyboard.pm:352
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -8032,1164 +8174,1188 @@ msgstr ""
 "Under installasjonen så vil du måtte bruke høyre CTRL-tast\n"
 "for å svitsje mellom de forskjellige tastaturoppsettene."
 
-#: 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 "United Arab Emirates"
 
-#: lang.pm:172
+#: lang.pm:184
+#, c-format
+msgid "Afghanistan"
+msgstr "Afghanistan"
+
+#: lang.pm:185
 #, c-format
 msgid "Antigua and Barbuda"
 msgstr "Antigua and 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 "Netherlands Antilles"
 
-#: lang.pm:177
+#: lang.pm:190
 #, c-format
 msgid "Angola"
 msgstr "Angola"
 
-#: lang.pm:178
+#: lang.pm:191
 #, c-format
 msgid "Antarctica"
 msgstr "Antarktis"
 
-#: 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 "Azerbaijan"
 
-#: lang.pm:185
+#: lang.pm:198
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnia og Herzegovina"
 
-#: 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 Darussalam"
 
-#: 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 "Hviterussland"
 
-#: lang.pm:203
+#: lang.pm:216
 #, c-format
 msgid "Belize"
 msgstr "Belize"
 
-#: lang.pm:204
+#: lang.pm:217
 #, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: lang.pm:205
+#: lang.pm:218
 #, c-format
 msgid "Cocos (Keeling) Islands"
 msgstr "Cocos (Keeling) Islands"
 
-#: lang.pm:206
+#: lang.pm:219
 #, c-format
 msgid "Congo (Kinshasa)"
 msgstr "Kongo (Kinshasa)"
 
-#: lang.pm:207
+#: lang.pm:220
 #, c-format
 msgid "Central African Republic"
 msgstr "Central African Republic"
 
-#: lang.pm:208
+#: lang.pm:221
 #, c-format
 msgid "Congo (Brazzaville)"
 msgstr "Kongo (Brazzaville)"
 
-#: 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 "Cote d'Ivoire"
 
-#: lang.pm:211
+#: lang.pm:224
 #, c-format
 msgid "Cook Islands"
 msgstr "Cook Islands"
 
-#: 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 & Montenegro"
+
+#: lang.pm:231
 #, c-format
 msgid "Cuba"
 msgstr "Kuba"
 
-#: lang.pm:218
+#: lang.pm:232
 #, c-format
 msgid "Cape Verde"
 msgstr "Cape Verde"
 
-#: lang.pm:219
+#: lang.pm:233
 #, c-format
 msgid "Christmas Island"
 msgstr "Christmas Island"
 
-#: 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 "Dominikanske republikk"
 
-#: lang.pm:226
+#: lang.pm:240
 #, c-format
 msgid "Dominican Republic"
 msgstr "Dominikanske republikk"
 
-#: 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 "Western 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 "Ethiopia"
 
-#: 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øyene (Malvinas)"
 
-#: lang.pm:238
+#: lang.pm:252
 #, c-format
 msgid "Micronesia"
 msgstr "Mikronesia"
 
-#: lang.pm:239
+#: lang.pm:253
 #, c-format
 msgid "Faroe Islands"
 msgstr "Faroe Islands"
 
-#: 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 "United Kingdom"
 
-#: 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 "French Guiana"
 
-#: 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 "Equatorial Guinea"
 
-#: lang.pm:254
+#: lang.pm:268
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "Sør Georgia og Sør Sandwich øyene"
 
-#: 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 (Hong Kong)"
 
-#: lang.pm:260
+#: lang.pm:274
 #, c-format
 msgid "Heard and McDonald Islands"
 msgstr "Heard- and McDonald-øyene"
 
-#: 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 "Hungarn"
 
-#: 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 "British Indian Ocean Territory"
 
-#: 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 "Kyrgyzstan"
 
-#: lang.pm:279
+#: lang.pm:293
 #, c-format
 msgid "Cambodia"
 msgstr "Cambodia"
 
-#: lang.pm:280
+#: lang.pm:294
 #, c-format
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: lang.pm:281
+#: lang.pm:295
 #, c-format
 msgid "Comoros"
 msgstr "Comoros"
 
-#: lang.pm:282
+#: lang.pm:296
 #, c-format
 msgid "Saint Kitts and Nevis"
 msgstr "Saint Kitts and Nevis"
 
-#: lang.pm:283
+#: lang.pm:297
 #, c-format
 msgid "Korea (North)"
 msgstr "Nordkorea"
 
-#: lang.pm:284
+#: lang.pm:298
 #, c-format
 msgid "Korea"
 msgstr "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 Islands"
 
-#: lang.pm:287
+#: lang.pm:301
 #, c-format
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
-#: lang.pm:288
+#: lang.pm:302
 #, c-format
 msgid "Laos"
 msgstr "Laos"
 
-#: lang.pm:289
+#: lang.pm:303
 #, c-format
 msgid "Lebanon"
 msgstr "Lebanon"
 
-#: lang.pm:290
+#: lang.pm:304
 #, c-format
 msgid "Saint Lucia"
 msgstr "Saint 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 "Liberia"
 
-#: lang.pm:299
+#: lang.pm:313 network/adsl_consts.pm:487
 #, c-format
 msgid "Morocco"
 msgstr "Morocco"
 
-#: 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 Islands"
 
-#: 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 "Northern Mariana Islands"
 
-#: 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 "Maldivene"
 
-#: 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 "Mozambique"
 
-#: lang.pm:319
+#: lang.pm:333
 #, c-format
 msgid "Namibia"
 msgstr "Namibia"
 
-#: lang.pm:320
+#: lang.pm:334
 #, c-format
 msgid "New Caledonia"
 msgstr "New 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 Island"
 
-#: 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 "French Polynesia"
 
-#: lang.pm:335
+#: lang.pm:349
 #, c-format
 msgid "Papua New Guinea"
 msgstr "Papua New Guinea"
 
-#: lang.pm:336
+#: lang.pm:350
 #, c-format
 msgid "Philippines"
 msgstr "Philippines"
 
-#: 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 and 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 "Palestinsk"
 
-#: 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 "Reunion"
 
-#: 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 "Solomon Islands"
 
-#: lang.pm:353
+#: lang.pm:367
 #, c-format
 msgid "Seychelles"
 msgstr "Seychelles"
 
-#: 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 "Saint 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 "Suriname"
 
-#: lang.pm:366
+#: lang.pm:380
 #, c-format
 msgid "Sao Tome and Principe"
 msgstr "Sao Tome and Principe"
 
-#: 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 and Caicos Islands"
 
-#: lang.pm:371
+#: lang.pm:385
 #, c-format
 msgid "Chad"
 msgstr "Chad"
 
-#: lang.pm:372
+#: lang.pm:386
 #, c-format
 msgid "French Southern Territories"
 msgstr "French Southern Territories"
 
-#: 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 "Tajikistan"
 
-#: lang.pm:376
+#: lang.pm:390
 #, c-format
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: lang.pm:377
+#: lang.pm:391
 #, c-format
 msgid "East Timor"
 msgstr "Øst 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 "Tyrkia"
 
-#: lang.pm:382
+#: lang.pm:396
 #, c-format
 msgid "Trinidad and Tobago"
 msgstr "Trinidad and 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 "United States Minor Outlying Islands"
 
-#: lang.pm:390
+#: lang.pm:404
 #, c-format
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: lang.pm:391
+#: lang.pm:405
 #, c-format
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: lang.pm:392
+#: lang.pm:406
 #, c-format
 msgid "Vatican"
 msgstr "Vatikanstatene"
 
-#: lang.pm:393
+#: lang.pm:407
 #, c-format
 msgid "Saint Vincent and the Grenadines"
 msgstr "Saint Vincent and the Grenadines"
 
-#: 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 "Virgin Islands (British)"
 
-#: lang.pm:396
+#: lang.pm:410
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr "Jomfruøyene (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 and Futuna"
 
-#: lang.pm:400
+#: lang.pm:414
 #, c-format
 msgid "Samoa"
 msgstr "Samoa"
 
-#: lang.pm:401
+#: lang.pm:415
 #, c-format
 msgid "Yemen"
 msgstr "Yemen"
 
-#: lang.pm:402
+#: lang.pm:416
 #, c-format
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: lang.pm:403
-#, c-format
-msgid "Serbia & Montenegro"
-msgstr "Serbia & Montenegro"
-
-#: lang.pm:404 standalone/drakxtv:47
+#: lang.pm:417 standalone/drakxtv:49
 #, c-format
 msgid "South Africa"
 msgstr "South Africa"
 
-#: 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 burde installere de følgene pakkene. %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 "Rund monterer %s\n"
 
-#: lvm.pm:115
+#: lvm.pm:116
 #, c-format
 msgid "Remove the logical volumes first\n"
 msgstr "Fjern de logiske partisjoner først\n"
 
-#: modules/interactive.pm:21 standalone/drakconnect:982
+#: modules/interactive.pm:21 standalone/drakconnect:1033
 #, c-format
 msgid "Parameters"
 msgstr "Parametre"
 
-#: modules/interactive.pm:21 standalone/draksec:44
+#: modules/interactive.pm:21 standalone/draksec:51
 #, c-format
 msgid "NONE"
 msgstr "NONE"
@@ -9206,8 +9372,8 @@ msgstr "Du kan konfigurere hvert parameter av modulen her."
 
 #: modules/interactive.pm:63
 #, c-format
-msgid "Found %s %s interfaces"
-msgstr "Fant %s %s grensesnitt"
+msgid "Found %s interfaces"
+msgstr "Fant %s grensesnitt"
 
 #: modules/interactive.pm:64
 #, c-format
@@ -9262,12 +9428,12 @@ msgid "Module options:"
 msgstr "Modulopsjoner:"
 
 #. -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 "Hvilken %s driver skal jeg prøve?"
 
-#: 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"
@@ -9286,17 +9452,17 @@ msgstr ""
 "burde\n"
 "ikke forårsake noen skader."
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Autoprobe"
 msgstr "Automatisk sondering"
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Specify options"
 msgstr "Spesifiser opsjoner"
 
-#: modules/interactive.pm:143
+#: modules/interactive.pm:144
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -9355,11 +9521,11 @@ msgstr "Generisk PS2 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"
@@ -9504,50 +9670,55 @@ msgstr "Universiell"
 msgid "Any PS/2 & USB mice"
 msgstr "Alle PS/2 & 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 "Synaptics Touchpad"
+
+#: 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 "Ingen mus"
 
-#: mouse.pm:514
+#: mouse.pm:546
 #, c-format
 msgid "Please test the mouse"
 msgstr "Vennligst test musen."
 
-#: mouse.pm:516
+#: mouse.pm:548
 #, c-format
 msgid "To activate the mouse,"
 msgstr "For å aktivere musen,"
 
-#: mouse.pm:517
+#: mouse.pm:549
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "BEVEG HJULET DITT!"
 
 #: 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-modem"
 
 #: network/adsl.pm:22 network/adsl.pm:23 network/adsl.pm:24
 #, c-format
@@ -9556,36 +9727,36 @@ msgstr " - oppdaget"
 
 #: network/adsl.pm:23
 #, c-format
-msgid "Sagem (using pppoa) usb"
+msgid "Sagem (using PPPoA) USB"
 msgstr "Sagem (med PPPoA) USB"
 
 #: network/adsl.pm:24
 #, c-format
-msgid "Sagem (using dhcp) usb"
-msgstr "Sagem (med dhcp) USB"
+msgid "Sagem (using DHCP) USB"
+msgstr "Sagem (med DHCP) USB"
 
-#: network/adsl.pm:35 network/netconnect.pm:761
+#: network/adsl.pm:35 network/netconnect.pm:799
 #, c-format
 msgid "Connect to the Internet"
 msgstr "Koble opp mot 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 mest vanlige måten å koble opp med adsl er pppoe.\n"
-"Noen oppkoblinger bruker pptp, noen få bruker dhcp.\n"
-"Hvis du ikke vet, velg 'bruk pppoe'"
+"Noen oppkoblinger bruker PPTP, noen få bruker DHCP.\n"
+"Hvis du ikke vet, velg 'bruk PPPoE'"
 
-#: 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-tilkoblingstype :"
 
-#: network/drakfirewall.pm:12
+#: network/drakfirewall.pm:12 share/compssUsers.pl:84
 #, c-format
 msgid "Web Server"
 msgstr "Webtjener"
@@ -9715,106 +9886,107 @@ msgstr "Alt (Ingen brannmur)"
 msgid "Other ports"
 msgstr "Andre porter"
 
-#: 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 "Ulistet - endre manuelt"
 
-#: 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 "Jeg vet ikke"
 
-#: 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 "Manuell"
 
-#: 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 valg"
 
-#: network/netconnect.pm:88
+#: network/netconnect.pm:89
 #, c-format
 msgid "Internal ISDN card"
 msgstr "Internt 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 "Håndtert"
 
-#: network/netconnect.pm:99
+#: network/netconnect.pm:100
 #, c-format
 msgid "Master"
 msgstr "Mester"
 
-#: network/netconnect.pm:100
+#: network/netconnect.pm:101
 #, c-format
 msgid "Repeater"
 msgstr "Repeterer"
 
-#: 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 "Auto"
 
-#: 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 "Manuell konfigurasjon"
 
-#: 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 verden"
 
-#: network/netconnect.pm:113 standalone/drakconnect:541
+#: network/netconnect.pm:114 standalone/drakconnect:539
 #, c-format
 msgid "European protocol (EDSS1)"
 msgstr "Europaprotokollen (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"
@@ -9823,163 +9995,168 @@ msgstr ""
 "Resten av verden \n"
 " ingen D-kanal (leid 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 PCI-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 "Dynamic Host Configuration Protocol (DHCP)"
 
-#: network/netconnect.pm:155
+#: network/netconnect.pm:159
 #, c-format
 msgid "Manual TCP/IP configuration"
 msgstr "Manuell TCP/IP-konfigurasjon"
 
-#: network/netconnect.pm:156
+#: network/netconnect.pm:160
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr "Point to Point Tunneling Protocol (PPTP)"
 
-#: network/netconnect.pm:157
+#: network/netconnect.pm:161
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr "PPP over Ethernet (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 "DSL over CAPI"
+
+#: network/netconnect.pm:167
 #, c-format
 msgid "Bridged Ethernet LLC"
 msgstr "Ethernett over bro LLC"
 
-#: network/netconnect.pm:163
+#: network/netconnect.pm:168
 #, c-format
 msgid "Bridged Ethernet VC"
 msgstr "Ethernett over bro VC"
 
-#: network/netconnect.pm:164
+#: network/netconnect.pm:169
 #, c-format
 msgid "Routed IP LLC"
 msgstr "Routed IP LLC"
 
-#: network/netconnect.pm:165
+#: network/netconnect.pm:170
 #, c-format
 msgid "Routed IP VC"
 msgstr "Routed 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 "Scriptbasert"
 
-#: 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 "Nettverk- og internettkonfigurasjon"
 
-#: network/netconnect.pm:234
+#: network/netconnect.pm:242
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(oppdaget på port %s)"
 
 #. -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 "(oppdaget %s)"
 
-#: network/netconnect.pm:236
+#: network/netconnect.pm:244
 #, c-format
 msgid "(detected)"
 msgstr "(oppdaget)"
 
-#: network/netconnect.pm:238
+#: network/netconnect.pm:246
 #, c-format
 msgid "Modem connection"
 msgstr "Modemtilkobling"
 
-#: network/netconnect.pm:239
+#: network/netconnect.pm:247
 #, c-format
 msgid "ISDN connection"
 msgstr "ISDN-tilkobling"
 
-#: network/netconnect.pm:240
+#: network/netconnect.pm:248
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL oppkobling"
 
-#: network/netconnect.pm:241
+#: network/netconnect.pm:249
 #, c-format
 msgid "Cable connection"
 msgstr "Kabeltilkobling"
 
-#: network/netconnect.pm:242
+#: network/netconnect.pm:250
 #, c-format
 msgid "LAN connection"
 msgstr "Lokalt nettverksoppkobling"
 
-#: network/netconnect.pm:243 network/netconnect.pm:257
+#: network/netconnect.pm:251 network/netconnect.pm:265
 #, c-format
 msgid "Wireless connection"
 msgstr "Trådløs tilkobling"
 
-#: network/netconnect.pm:253
+#: network/netconnect.pm:261
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "Velg oppkoblingen du ønsker å konfigurere"
 
-#: network/netconnect.pm:270
+#: network/netconnect.pm:279
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -9992,131 +10169,130 @@ msgstr ""
 "\n"
 "Trykk \"%s\" for å fortsette."
 
-#: network/netconnect.pm:278 network/netconnect.pm:788
+#: network/netconnect.pm:287 network/netconnect.pm:839
 #, c-format
 msgid "Connection Configuration"
-msgstr "Konfigurasjon tilknytning."
+msgstr "Tilkoblingskonfigurasjon"
 
-#: 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 "Vennnligst fyll eller merk 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 "Kort mem (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 "Ditt 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 "Navn tilbyder (f.eks. tilbyder.net)"
 
-#: network/netconnect.pm:293 standalone/drakconnect:473
+#: network/netconnect.pm:302 standalone/drakconnect:469
 #, c-format
 msgid "Provider phone number"
 msgstr "Telefonnummer tilbyder"
 
-#: network/netconnect.pm:294
+#: network/netconnect.pm:303
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "Tilbyder DNS 1 (valgfri)"
 
-#: network/netconnect.pm:295
+#: network/netconnect.pm:304
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "Tilbyder DNS 2 (valgfri)"
 
-#: network/netconnect.pm:296 standalone/drakconnect:429
+#: network/netconnect.pm:305 standalone/drakconnect:420
 #, c-format
 msgid "Dialing mode"
 msgstr "Oppringningsmodus"
 
-#: 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 "Oppkoblingshastighet"
 
-#: network/netconnect.pm:298 standalone/drakconnect:439
+#: network/netconnect.pm:307 standalone/drakconnect:430
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "Oppkoblingens timout (i sekunder)"
 
-#: 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 "Konto logginn (brukernavn)"
 
-#: 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 "Kontopassord"
 
-#: 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 "Velg nettverksgrensesnittet som skal konfigureres:"
 
-#: 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 "Nett-enhet"
 
-#: network/netconnect.pm:335 network/netconnect.pm:343
+#: network/netconnect.pm:331 network/netconnect.pm:339
 #, c-format
 msgid "External ISDN modem"
 msgstr "Eksternt 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 "Velg en enhet !"
 
-#: 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-konfigurasjon"
 
-#: network/netconnect.pm:384
+#: network/netconnect.pm:387
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "Hva slags kort har du?"
 
-#: network/netconnect.pm:394
+#: network/netconnect.pm:397
 #, c-format
 msgid ""
 "\n"
@@ -10130,34 +10306,51 @@ msgstr ""
 "\n"
 "Hvis du har et PCMCIA kort må du vite irq og io for kortet.\n"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Continue"
 msgstr "Fortsett"
 
-#: 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 "Hvilket av de følgende er ditt ISDN-kort?"
 
-#: 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 ""
+"En CAPI driver er tilgjengelig for dette modemet. Denne CAPI driveren kan "
+"tilby flere muligheter enn den frie driveren (som å sende fakser). Hvilken "
+"driver vil du bruke?"
+
+#: network/netconnect.pm:427 standalone/drakconnect:116 standalone/drakups:247
+#: standalone/harddrake2:117
+#, c-format
+msgid "Driver"
+msgstr "Driver"
+
+#: network/netconnect.pm:439
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "Hvilken protokoll ønsker du å bruke?"
 
-#: 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"
@@ -10166,13 +10359,13 @@ msgstr ""
 "Velg din tilbyder.\n"
 " Hvis denne ikke er i listen, velg ikke i listen"
 
-#: 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 "Tilbyder:"
 
-#: network/netconnect.pm:450
+#: network/netconnect.pm:470
 #, c-format
 msgid ""
 "Your modem isn't supported by the system.\n"
@@ -10181,122 +10374,117 @@ msgstr ""
 "Ditt modem er ikke støttet av systemet.\n"
 "Se http://www.linmodems.org."
 
-#: network/netconnect.pm:462
+#: network/netconnect.pm:482
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "Velg modem som skal konfigureres:"
 
-#: network/netconnect.pm:469 standalone/drakgw:113 standalone/drakvpn:51
-#, c-format
-msgid "Sorry, we support only 2.4 and above kernels."
-msgstr "Beklager, vi støtter bare 2.4-kjerner og nyere."
-
-#: network/netconnect.pm:510
+#: network/netconnect.pm:530
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Vennligst velg hvilken serieport modemet ditt koblet til."
 
-#: network/netconnect.pm:539
+#: network/netconnect.pm:561
 #, c-format
 msgid "Select your provider:"
 msgstr "Velg din tilbyder:"
 
-#: network/netconnect.pm:568
+#: network/netconnect.pm:589
 #, c-format
 msgid "Dialup: account options"
 msgstr "Dialup: kontoopsjoner"
 
-#: network/netconnect.pm:571
+#: network/netconnect.pm:592
 #, c-format
 msgid "Connection name"
-msgstr "Navn tilknytning"
+msgstr "Tilkoblingsnavn"
 
-#: 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 "InnlogingsID"
 
-#: network/netconnect.pm:588 network/netconnect.pm:621
+#: network/netconnect.pm:609 network/netconnect.pm:642
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr "Dialup: IP-parametre"
 
-#: network/netconnect.pm:591
+#: network/netconnect.pm:612
 #, c-format
 msgid "IP parameters"
 msgstr "IP-parametre"
 
-#: 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 "Subnettmaske"
 
-#: network/netconnect.pm:605
+#: network/netconnect.pm:626
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr "Dialup: DNS-parametre"
 
-#: 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 "Domenenavn"
 
-#: 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-tjener (valgfri)"
 
-#: 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-tjener (valgfri)"
 
-#: network/netconnect.pm:612
+#: network/netconnect.pm:633
 #, c-format
 msgid "Set hostname from IP"
 msgstr "Sett vertsnavn etter IP"
 
-#: network/netconnect.pm:624 standalone/drakconnect:343
+#: network/netconnect.pm:645 standalone/drakconnect:334
 #, c-format
 msgid "Gateway"
 msgstr "Gateway"
 
-#: network/netconnect.pm:625
+#: network/netconnect.pm:646
 #, c-format
 msgid "Gateway IP address"
 msgstr "Gateway IP-adresse"
 
-#: network/netconnect.pm:649
+#: network/netconnect.pm:677
 #, c-format
 msgid "ADSL configuration"
 msgstr "ADSL-konfigurasjon"
 
-#: network/netconnect.pm:681
+#: network/netconnect.pm:717
 #, c-format
 msgid "Please choose your ADSL provider"
 msgstr "Vennligst velg din ADSL-tilbyder"
 
-#: network/netconnect.pm:699
+#: network/netconnect.pm:735
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10307,32 +10495,32 @@ msgstr ""
 "Du må gi tilby det via diskett eller din windows-partisjon,\n"
 "eller hoppe over og gjøre det senere."
 
-#: network/netconnect.pm:703 network/netconnect.pm:708
+#: network/netconnect.pm:739 network/netconnect.pm:744
 #, c-format
 msgid "Use a floppy"
 msgstr "Bruk en 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 min 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 "Gjør det senere"
 
-#: network/netconnect.pm:722
+#: network/netconnect.pm:758
 #, c-format
 msgid "Firmware copy failed, file %s not found"
 msgstr "Firmwarekopiering feilet, filen %s ble ikke funnet"
 
-#: network/netconnect.pm:729
+#: network/netconnect.pm:765
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr "Firmwarekopiering vellykket"
 
-#: network/netconnect.pm:744
+#: network/netconnect.pm:780
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10344,22 +10532,22 @@ msgstr ""
 "%s\n"
 ". Kopier mgmt.o til /usr/share/speedtouch/."
 
-#: network/netconnect.pm:797
+#: network/netconnect.pm:849
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr "Virtual Path ID (VPI):"
 
-#: network/netconnect.pm:798
+#: network/netconnect.pm:850
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr "Virtual Circuit ID (VCI):"
 
-#: network/netconnect.pm:800
+#: network/netconnect.pm:853
 #, c-format
-msgid "Encapsulation :"
+msgid "Encapsulation:"
 msgstr "Kapsulering :"
 
-#: network/netconnect.pm:817
+#: network/netconnect.pm:870
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -10372,25 +10560,25 @@ msgstr ""
 "\n"
 "Du kan finne en driver på http://eciadsl.flashtux.org/"
 
-#: network/netconnect.pm:829
+#: network/netconnect.pm:882
 #, c-format
 msgid "Manually load a driver"
-msgstr ""
+msgstr "Last en driver 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 ""
 "ADVARSEL: Denne enheten har tidligere blitt konfigurert til å koble opp mot "
 "Internett.\n"
-"Trykk OK for å beholde enhetens konfigurasjon.\n"
-"Modifisering av feltene nedenfor vil overskrive denne konfigurasjonen."
+"Modifisering av feltene nedenfor vil overskrive denne konfigurasjonen.\n"
+"Trykk OK for å beholde enhetens konfigurasjon."
 
-#: 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"
@@ -10399,17 +10587,17 @@ msgstr ""
 "Gratulerer, internett og nettverkskonfigurasjonen er fullført.\n"
 "\n"
 
-#: network/netconnect.pm:871
+#: network/netconnect.pm:929
 #, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "Zerconf vertsnavnoppløsning"
 
-#: 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 "Konfigurerer nettverksenhet %s (driver %s)"
 
-#: network/netconnect.pm:873
+#: network/netconnect.pm:931
 #, c-format
 msgid ""
 "The following protocols can be used to configure an ethernet connection. "
@@ -10418,7 +10606,7 @@ msgstr ""
 "De følgende protokollene kan bli brukt til å konfigurere en "
 "ethernetstilkobling. Vennligst velg den du vil bruke"
 
-#: network/netconnect.pm:907
+#: network/netconnect.pm:964
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -10429,89 +10617,95 @@ msgstr ""
 "Hvert element bør skrives som en IP-adresse i punkt-desimal\n"
 "notasjon (f.eks, 1.2.3.4)."
 
-#: network/netconnect.pm:914
+#: network/netconnect.pm:971
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr "Tilegn vertsnavn fra DHCP-adresse"
 
-#: network/netconnect.pm:915
+#: network/netconnect.pm:972
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP vertsnavn"
 
-#: 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 "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 "Spor id nettverkskort (nyttig for bærbare)"
 
-#: network/netconnect.pm:923 standalone/drakconnect:423
+#: network/netconnect.pm:980 standalone/drakconnect:414
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Nettverks Hotplugging"
 
-#: 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 "IP-adresse bør være i format 1.2.3.4"
 
-#: network/netconnect.pm:939
+#: network/netconnect.pm:999
 #, c-format
-msgid "Warning : IP address %s is usually reserved !"
+msgid "Warning: IP address %s is usually reserved!"
 msgstr "Advarsel : IP-adresse %s er vanligvis reservert !"
 
-#: network/netconnect.pm:969 network/netconnect.pm:998
+#: network/netconnect.pm:1004 standalone/drakTermServ:1690
+#: standalone/drakTermServ:1691 standalone/drakTermServ:1692
+#, c-format
+msgid "%s already in use\n"
+msgstr "%s er allerede i bruk\n"
+
+#: network/netconnect.pm:1030 network/netconnect.pm:1059
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
 msgstr "Vennligst skriv inn de trådløse parametrene for dette kortet:"
 
-#: network/netconnect.pm:972 standalone/drakconnect:389
+#: network/netconnect.pm:1033 standalone/drakconnect:380
 #, c-format
 msgid "Operating Mode"
 msgstr "Operasjonsmodus"
 
-#: network/netconnect.pm:974 standalone/drakconnect:390
+#: network/netconnect.pm:1035 standalone/drakconnect:381
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Nettverksnavn (ESSID)"
 
-#: network/netconnect.pm:975 standalone/drakconnect:391
+#: network/netconnect.pm:1036 standalone/drakconnect:382
 #, c-format
 msgid "Network ID"
 msgstr "NettverksID"
 
-#: network/netconnect.pm:976 standalone/drakconnect:392
+#: network/netconnect.pm:1037 standalone/drakconnect:383
 #, c-format
 msgid "Operating frequency"
 msgstr "Operasjonsfrekvens"
 
-#: network/netconnect.pm:977 standalone/drakconnect:393
+#: network/netconnect.pm:1038 standalone/drakconnect:384
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Følsomhetsgrense"
 
-#: 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 "
@@ -10521,7 +10715,7 @@ msgstr ""
 "frekvens),\n"
 "eller tilstrekkelig antall nuller (0). "
 
-#: 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 "
@@ -10530,12 +10724,12 @@ msgstr ""
 "Hastighet skal ha suffix k, M eller G (for eksempel \"11M\"), eller "
 "tilstrekkelig antall nuller"
 
-#: 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 "
@@ -10559,38 +10753,38 @@ msgstr ""
 "denne parameteren til auto, fixed\n"
 "eller off."
 
-#: 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 "Iwconfig-kommando ekstra argumenter"
 
-#: 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 ""
 "Her kan man konfigurere noen ekstra trådløse parametre som:\n"
 "ap, kanal, commit, enc, power, retry, sens, txpower (kallenavn er allerede "
 "satt til vertsnavn.\n"
 "\n"
-"Se iwpconfig(8) man-side for ytterligere informasjon."
+"Se iwconfig(8) man-side for ytterligere informasjon."
 
 #. -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 "Iwspy-kommando ekstra argumenter"
 
-#: 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"
@@ -10611,12 +10805,12 @@ msgstr ""
 "\n"
 "Se iwpspy(8) man-side for ytterligere informasjon."
 
-#: network/netconnect.pm:1027 standalone/drakconnect:409
+#: network/netconnect.pm:1088 standalone/drakconnect:400
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr "Iwpriv-kommando ekstra argumenter"
 
-#: network/netconnect.pm:1028
+#: network/netconnect.pm:1089
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10646,29 +10840,7 @@ msgstr ""
 "\n"
 "Se iwpriv(8) man-side for ytterligere informasjon."
 
-#: 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 ""
-"Ikke noe ethernet nettverksadapter har blitt oppdaget på ditt system.\n"
-"Jeg kan ikke sette opp denne tilkoblingstypen."
-
-#: network/netconnect.pm:1059 standalone/drakgw:261 standalone/drakpxe:142
-#, c-format
-msgid "Choose the network interface"
-msgstr "Velg nettverksgrensesnitt"
-
-#: network/netconnect.pm:1060
-#, c-format
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet."
-msgstr ""
-"Vennligst velg hvilket nettverksadapter du ønsker å bruke til å koble opp\n"
-"mot Internett"
-
-#: network/netconnect.pm:1081
+#: network/netconnect.pm:1163
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -10681,88 +10853,92 @@ msgstr ""
 "så som ``minboks.mittlab.mittfirma.no''.\n"
 "Du kan også taste inn IP-adressen til gateway'en hvis du har en"
 
-#: 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 "Sist, men ikke minst tast inn din DNS-tjeners IP-adresser."
 
-#: network/netconnect.pm:1087 standalone/drakconnect:946
+#: network/netconnect.pm:1169 standalone/drakconnect:997
 #, c-format
 msgid "Host name (optional)"
 msgstr "Vertsnavn (valgfritt)"
 
-#: network/netconnect.pm:1087
+#: network/netconnect.pm:1169
 #, c-format
 msgid "Host name"
 msgstr "Vertsnavn"
 
-#: network/netconnect.pm:1089
+#: network/netconnect.pm:1171
 #, c-format
 msgid "DNS server 1"
 msgstr "DNS-tjener 1"
 
-#: network/netconnect.pm:1090
+#: network/netconnect.pm:1172
 #, c-format
 msgid "DNS server 2"
 msgstr "DNS-tjener 2"
 
-#: network/netconnect.pm:1091
+#: network/netconnect.pm:1173
 #, c-format
 msgid "DNS server 3"
 msgstr "DNS-tjener 3"
 
-#: network/netconnect.pm:1092
+#: network/netconnect.pm:1174
 #, c-format
 msgid "Search domain"
 msgstr "Søk igjennom domene"
 
-#: 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 ""
 "Som standard vil domenet å søke gjennom bli satt til det fullkvalifiserte "
 "vertsnavnet"
 
-#: network/netconnect.pm:1094
+#: network/netconnect.pm:1176
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr "Gateway (f.eks. %s)"
 
-#: network/netconnect.pm:1096
+#: network/netconnect.pm:1178
 #, c-format
 msgid "Gateway device"
 msgstr "Gateway-enhet"
 
-#: network/netconnect.pm:1105
+#: network/netconnect.pm:1187
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS-tjener adresse bør være i format 1.2.3.4"
 
-#: 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 "Gatewayadresse bør være i format 1.2.3.4"
 
-#: 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 ""
-"Skriv inn et Zeroconfvertsnavn som vil bli det som din maskin vil "
-"kommunisere med andre maskiner på nettverket med:"
+"Hvis det ønskes, skriv inn et Zeroconf vertsnavn.\n"
+"Dette er navnet maskinen din vil bruke til å kunngjøre\n"
+"sine delte ressurser som ikke er behandlet av nettverket.\n"
+"Det trengs ikke på de fleste nettverk."
 
-#: network/netconnect.pm:1122
+#: network/netconnect.pm:1207
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Ukonfigurert vertsnavn"
 
-#: network/netconnect.pm:1125
+#: network/netconnect.pm:1210
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "Zeroconf vertsnavn må ikke innholde en ."
 
-#: network/netconnect.pm:1135
+#: network/netconnect.pm:1220
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -10773,35 +10949,55 @@ msgstr ""
 "Venligst velg den du ønsker å bruker.\n"
 "\n"
 
-#: network/netconnect.pm:1137
+#: network/netconnect.pm:1222
 #, c-format
 msgid "Internet connection"
 msgstr "Internett tilkobling"
 
-#: 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 "Konfigurasjonen er ferdig, vil du gjøre den gjeldende ?"
 
-#: network/netconnect.pm:1155
+#: network/netconnect.pm:1240
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "Ønsker du å starte tilkoblingen din ved oppstart?"
 
-#: network/netconnect.pm:1172
+#: network/netconnect.pm:1258
+#, c-format
+msgid "Automatically at boot"
+msgstr "Automatisk ved oppstart"
+
+#: network/netconnect.pm:1260
+#, c-format
+msgid "By using Net Applet in the system tray"
+msgstr "Ved å bruke Net miniprogrammet i systemkurven"
+
+#: network/netconnect.pm:1262
 #, c-format
-msgid "The network needs to be restarted. Do you want to restart it ?"
+msgid "Manually (the interface would still be activated at boot)"
+msgstr "Manuelt (grensesnittet vil fremdeles bli aktivert ved oppstart)"
+
+#: network/netconnect.pm:1271
+#, c-format
+msgid "How do you want to dial this connection?"
+msgstr "Hvordan vil du ringe opp denne tilkoblingen?"
+
+#: network/netconnect.pm:1284
+#, c-format
+msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr "Nettverket trengs å startes på nytt. Vil du starte det på nytt ?"
 
-#: network/netconnect.pm:1179 network/netconnect.pm:1244
+#: network/netconnect.pm:1291 network/netconnect.pm:1356
 #, c-format
 msgid "Network Configuration"
 msgstr "Nettverkskonfigurasjon"
 
-#: 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 ""
@@ -10809,27 +11005,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: network/netconnect.pm:1188
+#: network/netconnect.pm:1300
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "Vil du prøve å koble opp mot Internett nå?"
 
-#: network/netconnect.pm:1196 standalone/drakconnect:978
+#: network/netconnect.pm:1308 standalone/drakconnect:1029
 #, c-format
 msgid "Testing your connection..."
 msgstr "Tester tilkoblingen din..."
 
-#: network/netconnect.pm:1212
+#: network/netconnect.pm:1324
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "Systemet er nå koblet opp mot Internett."
 
-#: network/netconnect.pm:1213
+#: network/netconnect.pm:1325
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "Av sikkerhetsgrunner vil den bli frakoblet nå."
 
-#: network/netconnect.pm:1214
+#: network/netconnect.pm:1326
 #, c-format
 msgid ""
 "The system doesn't seem to be connected to the Internet.\n"
@@ -10838,7 +11034,7 @@ msgstr ""
 "Det ser ikke ut til at systemet er koblet til Internett.\n"
 "Prøv å rekonfigurere tilkoblingen din."
 
-#: network/netconnect.pm:1231
+#: network/netconnect.pm:1343
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
@@ -10847,10 +11043,10 @@ msgstr ""
 "Etter at det er ferding, anbefaler vi at du restarter X\n"
 "slik at du unngår problemer med at vertsnavnet forandres."
 
-#: 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 ""
@@ -10858,7 +11054,7 @@ msgstr ""
 "Test tilkoblingen din via net_monitor eller mcc. Hvis tilkoblingen din ikke "
 "virker, ønsker du kanskje å kjøre konfigureringen på nytt"
 
-#: network/netconnect.pm:1245
+#: network/netconnect.pm:1357
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -10871,7 +11067,7 @@ msgstr ""
 "Trykk OK for å beholde din eksisterende konfigurasjon, eller avbryt for å "
 "rekonfigurere din internett og nettverkskonfigurasjon.\n"
 
-#: network/netconnect.pm:1333
+#: network/netconnect.pm:1393
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
@@ -10880,27 +11076,27 @@ msgstr ""
 "En uventet feil oppstod:\n"
 "%s"
 
-#: network/network.pm:315
+#: network/network.pm:316
 #, c-format
 msgid "Proxies configuration"
 msgstr "Konfigurasjon proxy"
 
-#: network/network.pm:316
+#: network/network.pm:317
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP-proxy"
 
-#: network/network.pm:317
+#: network/network.pm:318
 #, c-format
 msgid "FTP proxy"
 msgstr "FTP-proxy"
 
-#: network/network.pm:320
+#: network/network.pm:321
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "Proxy burde være http://..."
 
-#: network/network.pm:321
+#: network/network.pm:322
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URLen bør begynne med 'ftp:' eller 'http:'"
@@ -10919,7 +11115,7 @@ msgstr ""
 "Advarsel! En eksisterende brannmurkonfigurasjon har blitt oppdaget. Du "
 "trenger muligens å konfigurere noe manuelt etter installasjon."
 
-#: 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"
@@ -10936,12 +11132,12 @@ msgstr ""
 "\t\teth0 eller eth1 for kabeltilkobling, \n"
 "\t\tippp+ for isdntilkobling.\n"
 
-#: network/tools.pm:165
+#: network/tools.pm:197
 #, c-format
 msgid "Insert floppy"
 msgstr "Sett 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 "
@@ -10950,22 +11146,22 @@ msgstr ""
 "Sett inn en FAT-formatert diskett i stasjon %s med %s i root-katalog og "
 "trykk på %s"
 
-#: network/tools.pm:167
+#: network/tools.pm:199
 #, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr "Diskettilgangsfeil, ikke i stand til å montere enheten %s"
 
-#: partition_table.pm:645
+#: partition_table.pm:393
 #, c-format
 msgid "mount failed: "
 msgstr "montering mislykket: "
 
-#: partition_table.pm:750
+#: partition_table.pm:498
 #, c-format
 msgid "Extended partition not supported on this platform"
 msgstr "Utvidet partisjon ikke støttet på denne plattformen"
 
-#: 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"
@@ -10976,22 +11172,22 @@ msgstr ""
 "Den eneste løsningen er å flytte primærpartisjonene dine for å ha hullet ved "
 "siden av de utvidede partisjonene"
 
-#: partition_table.pm:855
+#: partition_table.pm:602
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Gjenoppretting fra fil %s mislykket: %s"
 
-#: partition_table.pm:857
+#: partition_table.pm:604
 #, c-format
 msgid "Bad backup file"
 msgstr "Ugyldig sikkerhetskopi-fil"
 
-#: partition_table.pm:877
+#: partition_table.pm:624
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Feil ved skriving til fil %s"
 
-#: partition_table/raw.pm:187
+#: partition_table/raw.pm:238
 #, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -11004,27 +11200,27 @@ msgstr ""
 "Dette betyr at å skrive noe til disken vil ende opp med tilfeldig,\n"
 "ubrukelig data"
 
-#: 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 bra"
 
-#: pkgs.pm:27
+#: pkgs.pm:26
 #, c-format
 msgid "nice"
 msgstr "bra"
 
-#: pkgs.pm:28
+#: pkgs.pm:27
 #, c-format
 msgid "maybe"
 msgstr "kanskje"
@@ -11039,7 +11235,7 @@ msgstr "(på %s)"
 msgid "(on this machine)"
 msgstr "(på denne maskin)"
 
-#: printer/cups.pm:115 standalone/printerdrake:197
+#: printer/cups.pm:115 standalone/printerdrake:203
 #, c-format
 msgid "Configured on other machines"
 msgstr "Konfigurert på andre maskiner"
@@ -11049,296 +11245,306 @@ msgstr "Konfigurert på andre maskiner"
 msgid "On CUPS server \"%s\""
 msgstr "På CUPS-tjener \"%s\""
 
-#: 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 "PDQ - Print, Don't Queue"
 
-#: printer/data.pm:23
+#: printer/data.pm:41
 #, c-format
 msgid "PDQ"
 msgstr "PDQ"
 
-#: printer/data.pm:34
+#: printer/data.pm:53
 #, c-format
 msgid "LPD - Line Printer Daemon"
 msgstr "LPD - Line Printer Daemon"
 
-#: printer/data.pm:35
+#: printer/data.pm:54
 #, c-format
 msgid "LPD"
 msgstr "LPD"
 
-#: printer/data.pm:56
+#: printer/data.pm:76
 #, c-format
 msgid "LPRng - LPR New Generation"
 msgstr "LPRng - LPR New Generation"
 
-#: printer/data.pm:57
+#: printer/data.pm:77
 #, c-format
 msgid "LPRng"
 msgstr "LPRng"
 
-#: printer/data.pm:82
+#: printer/data.pm:103
 #, c-format
 msgid "CUPS - Common Unix Printing System"
 msgstr "CUPS - Common Unix Printing System"
 
+#: printer/data.pm:132
+#, c-format
+msgid "CUPS - Common Unix Printing System (remote server)"
+msgstr "CUPS - Common Unix Printing System (ekstern tjener)"
+
+#: printer/data.pm:133
+#, c-format
+msgid "Remote CUPS"
+msgstr "Fjern-CUPS"
+
 #: 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 "Ukjent modell"
 
-#: printer/main.pm:29
+#: printer/main.pm:27
 #, c-format
 msgid "Local printer"
 msgstr "Lokal skriver"
 
-#: printer/main.pm:30
+#: printer/main.pm:28
 #, c-format
 msgid "Remote printer"
 msgstr "Fjern-skriver"
 
-#: printer/main.pm:31
+#: printer/main.pm:29
 #, c-format
 msgid "Printer on remote CUPS server"
 msgstr "Skriver på fjern-CUPS tjener"
 
-#: 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 "Skriver på ekstern lpd-tjener"
 
-#: printer/main.pm:33
+#: printer/main.pm:31
 #, c-format
 msgid "Network printer (TCP/Socket)"
 msgstr "Nettverksskriver (TCP/Socket)"
 
-#: printer/main.pm:34
+#: printer/main.pm:32
 #, c-format
 msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "Skriver på SMB/Windows 95/98/NT server"
 
-#: printer/main.pm:35
+#: printer/main.pm:33
 #, c-format
 msgid "Printer on NetWare server"
 msgstr "Skriver på en NetWare tjener"
 
-#: 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 "Skriverenhetens URI"
 
-#: printer/main.pm:37
+#: printer/main.pm:35
 #, c-format
 msgid "Pipe job into a command"
 msgstr "Pipe inn i kommando"
 
-#: 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 "Ukjent modell"
 
-#: printer/main.pm:332 standalone/printerdrake:196
+#: printer/main.pm:346 standalone/printerdrake:202
 #, c-format
 msgid "Configured on this machine"
 msgstr "Konfigurert på denne maskin"
 
-#: printer/main.pm:338 printer/printerdrake.pm:963
+#: printer/main.pm:352 printer/printerdrake.pm:1069
 #, c-format
 msgid " on parallel port #%s"
 msgstr " på parallelport \\/#%s"
 
-#: printer/main.pm:341 printer/printerdrake.pm:965
+#: printer/main.pm:355 printer/printerdrake.pm:1072
 #, c-format
 msgid ", USB printer #%s"
 msgstr ", USB skriver \\/%s"
 
-#: printer/main.pm:343
+#: printer/main.pm:357
 #, c-format
 msgid ", USB printer"
 msgstr ", USB skriver"
 
-#: printer/main.pm:348
+#: printer/main.pm:362
 #, c-format
 msgid ", multi-function device on parallel port #%s"
 msgstr ", multifunksjonsenhet på parallelport #%s"
 
-#: printer/main.pm:351
+#: printer/main.pm:365
 #, c-format
 msgid ", multi-function device on a parallel port"
 msgstr " multifunksjonsenhet på en parallelport"
 
-#: printer/main.pm:353
+#: printer/main.pm:367
 #, c-format
 msgid ", multi-function device on USB"
 msgstr ", multifunksjonsenhet på USB"
 
-#: printer/main.pm:355
+#: printer/main.pm:369
 #, c-format
 msgid ", multi-function device on HP JetDirect"
 msgstr ", multifunksjonsenhet på HP JetDirect"
 
-#: printer/main.pm:357
+#: printer/main.pm:371
 #, c-format
 msgid ", multi-function device"
 msgstr ", multifunksjonsenhet"
 
-#: printer/main.pm:360
+#: printer/main.pm:375
 #, c-format
 msgid ", printing to %s"
 msgstr ", skriver til %s"
 
-#: printer/main.pm:362
+#: printer/main.pm:378
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
 msgstr "på LPD tjener \"%s\", skriver \"%s\""
 
-#: printer/main.pm:364
+#: printer/main.pm:381
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
 msgstr ", TCP/IP vert \"%s\", port %s"
 
-#: printer/main.pm:368
+#: printer/main.pm:386
 #, c-format
 msgid " on SMB/Windows server \"%s\", share \"%s\""
 msgstr "på SMB/Windows tjener \"%s\", del \"%s\""
 
-#: printer/main.pm:372
+#: printer/main.pm:391
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
 msgstr " på Novell-tjener \"%s\", skriver \"%s\""
 
-#: printer/main.pm:374
+#: printer/main.pm:394
 #, c-format
 msgid ", using command %s"
 msgstr ", bruker kommando %s"
 
-#: printer/main.pm:389
+#: printer/main.pm:409
 #, c-format
 msgid "Parallel port #%s"
 msgstr "Parallelport #%s"
 
-#: 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 skriver #%s"
 
-#: printer/main.pm:394
+#: printer/main.pm:414
 #, c-format
 msgid "USB printer"
 msgstr "USB-skriver"
 
-#: printer/main.pm:399
+#: printer/main.pm:419
 #, c-format
 msgid "Multi-function device on parallel port #%s"
 msgstr "Multifunksjonsenhet på parallelport #%s"
 
-#: printer/main.pm:402
+#: printer/main.pm:422
 #, c-format
 msgid "Multi-function device on a parallel port"
 msgstr "Multifunksjonsenhet på en parallelport"
 
-#: printer/main.pm:404
+#: printer/main.pm:424
 #, c-format
 msgid "Multi-function device on USB"
 msgstr "Multifunksjonsenhet på USB"
 
-#: printer/main.pm:406
+#: printer/main.pm:426
 #, c-format
 msgid "Multi-function device on HP JetDirect"
 msgstr "Multifunksjonsenhet på HP JetDirect"
 
-#: printer/main.pm:408
+#: printer/main.pm:428
 #, c-format
 msgid "Multi-function device"
 msgstr "Multifunksjonsenhet"
 
-#: printer/main.pm:411
+#: printer/main.pm:432
 #, c-format
 msgid "Prints into %s"
 msgstr "Skriver til %s"
 
-#: printer/main.pm:413
+#: printer/main.pm:435
 #, c-format
 msgid "LPD server \"%s\", printer \"%s\""
 msgstr "LPD-tjener \"%s\", skriver \"%s\""
 
-#: printer/main.pm:415
+#: printer/main.pm:438
 #, c-format
 msgid "TCP/IP host \"%s\", port %s"
 msgstr "TCP/IP-vert \"%s\", port %s"
 
-#: printer/main.pm:419
+#: printer/main.pm:443
 #, c-format
 msgid "SMB/Windows server \"%s\", share \"%s\""
 msgstr "SMB/Windows-tjener \"%s\", del \"%s\""
 
-#: printer/main.pm:423
+#: printer/main.pm:448
 #, c-format
 msgid "Novell server \"%s\", printer \"%s\""
 msgstr "Novell-tjener \"%s\", skriver \"%s\""
 
-#: printer/main.pm:425
+#: printer/main.pm:451
 #, c-format
 msgid "Uses command %s"
 msgstr "Bruker kommando %s"
 
-#: 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 "Rå skriver (ingen driver)"
 
-#: 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 "Lokale nettverk"
 
-#: printer/main.pm:1088 printer/printerdrake.pm:195
+#: printer/main.pm:1149 printer/printerdrake.pm:221
 #, c-format
 msgid "Interface \"%s\""
 msgstr "Grensesnitt \"%s\""
 
-#: printer/main.pm:1090
+#: printer/main.pm:1151
 #, c-format
 msgid "Network %s"
 msgstr "Nettverk %s"
 
-#: printer/main.pm:1092
+#: printer/main.pm:1153
 #, c-format
 msgid "Host %s"
 msgstr "Vertsnavn %s"
 
-#: printer/main.pm:1121
+#: printer/main.pm:1182
 #, c-format
 msgid "%s (Port %s)"
 msgstr "%s (Port %s)"
 
-#: 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"
@@ -11351,12 +11557,12 @@ msgstr ""
 "Der vil den bli funnet av det automatiske opplastningsskriptet og lastet opp "
 "når skriveren måtte bli koblet til og skrudd på.\n"
 
-#: printer/printerdrake.pm:62
+#: printer/printerdrake.pm:61
 #, c-format
 msgid "CUPS printer configuration"
 msgstr "CUPS-skriverkonfigurasjon"
 
-#: printer/printerdrake.pm:63
+#: printer/printerdrake.pm:62
 #, c-format
 msgid ""
 "Here you can choose whether the printers connected to this machine should be "
@@ -11366,7 +11572,7 @@ msgstr ""
 "tilgjengelige fra andre maskiner, og evt. hvilke maskiner som skal ha "
 "tilgang. "
 
-#: printer/printerdrake.pm:64
+#: printer/printerdrake.pm:63
 #, c-format
 msgid ""
 "You can also decide here whether printers on remote machines should be "
@@ -11375,43 +11581,38 @@ msgstr ""
 "Du kan her også velge om skriverene på andre maskiner skal gjøres "
 "tilgjengelige på denne maskinen."
 
-#: printer/printerdrake.pm:67
+#: printer/printerdrake.pm:66
 #, c-format
 msgid "The printers on this machine are available to other computers"
 msgstr "Skriverene på denne maskinen er tilgjengelig for andre maskiner"
 
-#: printer/printerdrake.pm:69
+#: printer/printerdrake.pm:71
 #, c-format
 msgid "Automatically find available printers on remote machines"
 msgstr "Finn tilgjengelige skrivere på andre maskiner automatisk"
 
-#: printer/printerdrake.pm:71
+#: printer/printerdrake.pm:76
 #, c-format
 msgid "Printer sharing on hosts/networks: "
 msgstr "Printerdeling på verter/nettverk"
 
-#: printer/printerdrake.pm:73
+#: printer/printerdrake.pm:78
 #, c-format
 msgid "Custom configuration"
 msgstr "Egendefinert konfigurasjon"
 
-#: 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 fjerne maskiner"
 
-#: printer/printerdrake.pm:88
+#: printer/printerdrake.pm:94
 #, c-format
 msgid "Additional CUPS servers: "
 msgstr "Andre CUPS tjenere i tilegg:"
 
-#: 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 "
@@ -11432,20 +11633,20 @@ msgstr ""
 "s IP-adresse(r) og evt. portnummeret for å få skriver-informasjon fra "
 "tjeneren(e)."
 
-#: printer/printerdrake.pm:100
+#: printer/printerdrake.pm:109
 #, c-format
 msgid "Japanese text printing mode"
 msgstr "Japansk tekstutskriftsmodus"
 
-#: 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 ""
 "Ved å aktivere dette så kan man skrive ut filer på japanesisk. Bare bruk "
@@ -11456,12 +11657,12 @@ msgstr ""
 "japanesisk tekst på en skriver på en ekstern maskin, så må du aktivere denne "
 "funksjonen på den eksterne maskinen."
 
-#: printer/printerdrake.pm:105
+#: printer/printerdrake.pm:117
 #, c-format
 msgid "Automatic correction of CUPS configuration"
 msgstr "Automatisk retting av CUPS-konfigurasjon"
 
-#: 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 "
@@ -11491,12 +11692,43 @@ msgstr ""
 "Dersom noen av disse tingene gir deg problemer, skru denne opsjonen av, men "
 "da må de selv sørge for at disse punktene blir overholdt."
 
-#: 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 "Ekstern CUPS tjener og ingen lokal CUPS daemon"
+
+#: 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 ""
+"I dette modueset vil den lokale CUPS daemonen bli stoppet og alle "
+"utskriftsforespørseler vil gå direkte til tjeneren spesifisert under. Merk "
+"at det ikke er mulig å definere lokale utskriftskøer da og hvis den "
+"spesifiserte tjeneren er nede vil det ikke være mulig å skrive ut fra denne "
+"maskinen."
+
+#: printer/printerdrake.pm:155 printer/printerdrake.pm:230
 #, c-format
 msgid "Sharing of local printers"
 msgstr "Delin av lokale skrivere"
 
-#: printer/printerdrake.pm:130
+#: printer/printerdrake.pm:156
 #, c-format
 msgid ""
 "These are the machines and networks on which the locally connected printer"
@@ -11505,29 +11737,29 @@ msgstr ""
 "Dette er maskinene og nettverkene som den lokalt tilkoblede skriveren skal "
 "gjøres tilgjengelig på:"
 
-#: printer/printerdrake.pm:141
+#: printer/printerdrake.pm:167
 #, c-format
 msgid "Add host/network"
 msgstr "Legg til tjener/nettverk"
 
-#: printer/printerdrake.pm:147
+#: printer/printerdrake.pm:173
 #, c-format
 msgid "Edit selected host/network"
 msgstr "Rediger valgt tjener/nettverk"
 
-#: printer/printerdrake.pm:156
+#: printer/printerdrake.pm:182
 #, c-format
 msgid "Remove selected host/network"
 msgstr "Fjern valgte vert/nettverk"
 
-#: 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 "IP adresse tli tjener/nettverk:"
 
-#: printer/printerdrake.pm:206
+#: printer/printerdrake.pm:231
 #, c-format
 msgid ""
 "Choose the network or host on which the local printers should be made "
@@ -11536,34 +11768,34 @@ msgstr ""
 "Velg nettverket eller tjeneren som de lokale skriverene skal gjøres "
 "tilgjengelige på:"
 
-#: printer/printerdrake.pm:213
+#: printer/printerdrake.pm:238
 #, c-format
 msgid "Host/network IP address missing."
 msgstr "Tjener/nettverks-IP mangler."
 
-#: printer/printerdrake.pm:221
+#: printer/printerdrake.pm:246
 #, c-format
 msgid "The entered host/network IP is not correct.\n"
 msgstr "Den angitte tjener/nettverks-IPen er ikke korrekt.\n"
 
-#: 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 "Eksempler på korrekte IPer:\n"
 
-#: 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 ""
 "Denne tjeneren/nettverket er allerede i lista, og kan ikke legges til "
 "igjen.\n"
 
-#: 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 "Går inn på skrivere på fjerne CUPS tjenere"
 
-#: 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 "
@@ -11574,103 +11806,119 @@ msgstr ""
 "bare gjøre dette dersom tjenerene ikke kringkaster skriverinformasjonen på "
 "det lokale nettverket. "
 
-#: printer/printerdrake.pm:328
+#: printer/printerdrake.pm:352
 #, c-format
 msgid "Add server"
 msgstr "Legg til tjener"
 
-#: printer/printerdrake.pm:334
+#: printer/printerdrake.pm:358
 #, c-format
 msgid "Edit selected server"
 msgstr "Rediger valgte tjener"
 
-#: printer/printerdrake.pm:343
+#: printer/printerdrake.pm:367
 #, c-format
 msgid "Remove selected server"
 msgstr "Fjern valgte tjener"
 
-#: 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 ""
 "Angi IP-adresse og port til tjeneren som har skriverene du vil benytte."
 
-#: printer/printerdrake.pm:389
+#: printer/printerdrake.pm:412
 #, c-format
 msgid "If no port is given, 631 will be taken as default."
 msgstr "Hvis ingen port blir gitt, så vil 631 bli valgt som standard"
 
-#: printer/printerdrake.pm:393
+#: printer/printerdrake.pm:416
 #, c-format
 msgid "Server IP missing!"
 msgstr "Tjener-IP mangler!"
 
-#: printer/printerdrake.pm:399
+#: printer/printerdrake.pm:422
 #, c-format
 msgid "The entered IP is not correct.\n"
 msgstr "Den spesifiserte IP-adressen er ikke riktig.\n"
 
-#: 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 "Portnummer burde være numerisk"
 
-#: 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 "Tjeneren er allerede i lista, den kan ikke legges til igjen.\n"
 
-#: 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 "På, Navn eller IP av ekstern tjener."
+
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:3942
+#: printer/printerdrake.pm:4007
+#, c-format
+msgid "CUPS server name or IP address missing."
+msgstr "CUPS-tjener navn eller IP adresse mangler."
+
+#: 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 "Printerdrake"
 
-#: printer/printerdrake.pm:479
+#: printer/printerdrake.pm:561 printer/printerdrake.pm:3550
+#: printer/printerdrake.pm:4077
+#, c-format
+msgid "Reading printer data..."
+msgstr "Leser skriverdata: ..."
+
+#: printer/printerdrake.pm:581
 #, c-format
 msgid "Restarting CUPS..."
 msgstr "Starter CUPS på nytt..."
 
-#: printer/printerdrake.pm:502
+#: printer/printerdrake.pm:606
 #, c-format
 msgid "Select Printer Connection"
 msgstr "Velg skrivertilkobling"
 
-#: printer/printerdrake.pm:503
+#: printer/printerdrake.pm:607
 #, c-format
 msgid "How is the printer connected?"
 msgstr "Hvordan er skriveren tilkoblet?"
 
-#: printer/printerdrake.pm:505
+#: printer/printerdrake.pm:609
 #, c-format
 msgid ""
 "\n"
@@ -11681,7 +11929,7 @@ msgstr ""
 "Skrivere på fjern CUPS-tjenere trenger du ikke å konfigurere her; disse "
 "skriverene vil bli oppdaget automatisk."
 
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:4012
+#: printer/printerdrake.pm:612 printer/printerdrake.pm:4315
 #, c-format
 msgid ""
 "\n"
@@ -11692,7 +11940,7 @@ msgstr ""
 "ADVARSEL: Ingen lokal nettverkstilkobling aktiv, fjerne skrivere kan dermed "
 "ikke bli oppdaget eller testet!"
 
-#: printer/printerdrake.pm:515
+#: printer/printerdrake.pm:619
 #, c-format
 msgid ""
 "Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
@@ -11700,22 +11948,22 @@ msgstr ""
 "Automatisk oppdagelse av skrivere (Lokale, TCP/Socketl, SMB skrivere og "
 "enhets URI)"
 
-#: printer/printerdrake.pm:545
+#: printer/printerdrake.pm:649
 #, c-format
 msgid "Checking your system..."
 msgstr "Sjekker systemet ditt..."
 
-#: printer/printerdrake.pm:561
+#: printer/printerdrake.pm:665
 #, c-format
 msgid "and one unknown printer"
 msgstr "og en ukjent skriver"
 
-#: printer/printerdrake.pm:563
+#: printer/printerdrake.pm:667
 #, c-format
 msgid "and %d unknown printers"
 msgstr "og %d ukjente skrivere"
 
-#: printer/printerdrake.pm:567
+#: printer/printerdrake.pm:671
 #, c-format
 msgid ""
 "The following printers\n"
@@ -11728,7 +11976,7 @@ msgstr ""
 "%s%s\n"
 "er koblet direkte til ditt system"
 
-#: printer/printerdrake.pm:569
+#: printer/printerdrake.pm:673
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11741,7 +11989,7 @@ msgstr ""
 "%s%s\n"
 "er koblet direkte til ditt system"
 
-#: printer/printerdrake.pm:570
+#: printer/printerdrake.pm:674
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11754,7 +12002,7 @@ msgstr ""
 "%s%s\n"
 "er koblet direkte til ditt system"
 
-#: printer/printerdrake.pm:574
+#: printer/printerdrake.pm:678
 #, c-format
 msgid ""
 "\n"
@@ -11763,7 +12011,7 @@ msgstr ""
 "\n"
 "Det er en ukjent skriver koblet direkte til ditt system"
 
-#: printer/printerdrake.pm:575
+#: printer/printerdrake.pm:679
 #, c-format
 msgid ""
 "\n"
@@ -11772,19 +12020,19 @@ msgstr ""
 "\n"
 "Det er %d ukjente skrivere koblet direkte til ditt system. "
 
-#: printer/printerdrake.pm:578
+#: printer/printerdrake.pm:682
 #, c-format
 msgid ""
 "There are no printers found which are directly connected to your machine"
 msgstr ""
 "Det er ikke funnet noen skrivere som er koblet direkte til denne maskinen"
 
-#: printer/printerdrake.pm:581
+#: printer/printerdrake.pm:685
 #, c-format
 msgid " (Make sure that all your printers are connected and turned on).\n"
 msgstr " (Vær sikker på at skriveren din er koblet til og skrudd på).\n"
 
-#: printer/printerdrake.pm:594
+#: printer/printerdrake.pm:698
 #, c-format
 msgid ""
 "Do you want to enable printing on the printers mentioned above or on "
@@ -11793,22 +12041,22 @@ msgstr ""
 "Vil du muliggjøre utskrift på skriverene over, eller på skrivere på det "
 "lokale nettverket?\n"
 
-#: 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 "Ønsker du å å aktivere skriving på denne printeren på lokalnettet?\n"
 
-#: printer/printerdrake.pm:597
+#: printer/printerdrake.pm:701
 #, c-format
 msgid "Do you want to enable printing on the printers mentioned above?\n"
 msgstr "Ønsker du å aktivere skriving på skriveren nevnt overnfor?\n"
 
-#: 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 "Er du sikker på at du vil sette opp skriver på denne maskinen?\n"
 
-#: 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 "
@@ -11817,48 +12065,42 @@ msgstr ""
 "MERK: Avhengig av skrivermodell og utskriftssystemet, kan inntil %d MB med "
 "tilleggsprogrammer bli installert."
 
-#: printer/printerdrake.pm:629
+#: printer/printerdrake.pm:742
 #, c-format
 msgid "Searching for new printers..."
 msgstr "Søker etter nye skrivere..."
 
-#: printer/printerdrake.pm:713
-#, c-format
-msgid "Configuring printer ..."
-msgstr "Konfigurerer skriver ..."
-
-#: printer/printerdrake.pm:714 printer/printerdrake.pm:769
-#: printer/printerdrake.pm:3790
+#: printer/printerdrake.pm:797
 #, c-format
-msgid "Configuring printer \"%s\"..."
-msgstr "Konfigurerer skriver \"%s\"..."
+msgid "Found printer on %s..."
+msgstr "Fant skriver 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 " på "
 
-#: 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 "Skrivervalg"
 
-#: 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 "Hva slags type skriver har du?"
 
-#: printer/printerdrake.pm:743
+#: printer/printerdrake.pm:831
 #, c-format
 msgid ""
 "\n"
@@ -11871,7 +12113,7 @@ msgstr ""
 "Printerdrake kunne ikke avgjøre hva slags modell skriveren \"%s\" er. "
 "Vennligst velg den korrekte modellen fra lista. "
 
-#: 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 "
@@ -11880,21 +12122,24 @@ msgstr ""
 "Hvis din skriver ikke finnes i listen velg en kompatibel (se i "
 "skrivermanualen) eller en lignende."
 
-#: 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 printer on %s..."
+msgstr "Konfigurerer skriver på %s..."
+
+#: printer/printerdrake.pm:849 printer/printerdrake.pm:4096
 #, c-format
-msgid "Configuring applications..."
-msgstr "Konfigurerer applikasjoner..."
+msgid "Configuring printer \"%s\"..."
+msgstr "Konfigurerer skriver \"%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 "Legg til en ny skriver"
 
-#: printer/printerdrake.pm:832
+#: printer/printerdrake.pm:933
 #, c-format
 msgid ""
 "\n"
@@ -11917,7 +12162,7 @@ msgstr ""
 "deg tilgang til alle tilgjengelige skriverdrivere, drivervalg og "
 "skrivertilkoblinger."
 
-#: printer/printerdrake.pm:845
+#: printer/printerdrake.pm:946
 #, c-format
 msgid ""
 "\n"
@@ -11957,7 +12202,7 @@ msgstr ""
 "Klikk \"Neste\" når du er ferdig, eller \"Avbryt\" dersom du ikke ønsker å "
 "sette opp skriver(e) nå. "
 
-#: printer/printerdrake.pm:854
+#: printer/printerdrake.pm:955
 #, c-format
 msgid ""
 "\n"
@@ -11984,7 +12229,7 @@ msgstr ""
 " Klikk på \"Neste\" når du er klar, eller på \"Avbryt\" dersom du ikke "
 "ønsker å sette opp skriver(e) nå."
 
-#: printer/printerdrake.pm:862
+#: printer/printerdrake.pm:963
 #, c-format
 msgid ""
 "\n"
@@ -12021,7 +12266,7 @@ msgstr ""
 "Klikk \"Neste\" når du er ferdig, eller \"Avbryt\" dersom du ikke ønsker å "
 "sette opp skrivere nå. "
 
-#: printer/printerdrake.pm:871
+#: printer/printerdrake.pm:972
 #, c-format
 msgid ""
 "\n"
@@ -12048,22 +12293,22 @@ msgstr ""
 "Klikk på \"Neste\" når du er klar, eller på \"Avbryt\" dersom du ikke ønsker "
 "å sette opp skrivere nå. "
 
-#: printer/printerdrake.pm:880
+#: printer/printerdrake.pm:981
 #, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr "Finn skrivere tilkoblet denne maskin automatisk"
 
-#: printer/printerdrake.pm:883
+#: printer/printerdrake.pm:984
 #, c-format
 msgid "Auto-detect printers connected directly to the local network"
 msgstr "Oppdag skrivere koblet direkte til det lokale nettverket automatisk"
 
-#: printer/printerdrake.pm:886
+#: printer/printerdrake.pm:987
 #, c-format
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr "Oppdag skrivere som er koblet til Windowsmaskiner automatisk"
 
-#: printer/printerdrake.pm:902
+#: printer/printerdrake.pm:1003
 #, c-format
 msgid ""
 "\n"
@@ -12087,70 +12332,70 @@ msgstr ""
 "utskriftkvalitet, .....), velg \"Skriver\" i \"Maskinvare\"-delen av %s "
 "Kontrollsenter."
 
-#: 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 "Kunne ikke installere %s-pakkene!"
 
-#: printer/printerdrake.pm:939
+#: printer/printerdrake.pm:1040
 #, c-format
 msgid "Skipping Windows/SMB server auto-detection"
 msgstr "Hopper over automatisk oppdagelse av Windows/SMB-tjener"
 
-#: 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 "Automatisk oppdagelse av skriver"
 
-#: printer/printerdrake.pm:945
+#: printer/printerdrake.pm:1046
 #, c-format
 msgid "Detecting devices..."
 msgstr "Finner enheter..."
 
-#: printer/printerdrake.pm:967
+#: printer/printerdrake.pm:1075
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ", nettverksskriver \"%s\", port %s"
 
-#: printer/printerdrake.pm:969
+#: printer/printerdrake.pm:1078
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ", skriver \"%s\" på SMB/Windows tjener \"%s\""
 
-#: printer/printerdrake.pm:973
+#: printer/printerdrake.pm:1082
 #, c-format
 msgid "Detected %s"
 msgstr "Oppdaget %s"
 
-#: 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 "Skriver på parallelport #%s"
 
-#: printer/printerdrake.pm:981
+#: printer/printerdrake.pm:1093
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "Nettverksskriver \"%s\", port %s"
 
-#: printer/printerdrake.pm:983
+#: printer/printerdrake.pm:1096
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "Skriver \"%s\" på SMB/Windows-tjener \"%s\""
 
-#: printer/printerdrake.pm:1062
+#: printer/printerdrake.pm:1177
 #, c-format
 msgid "Local Printer"
 msgstr "Lokal skriver"
 
-#: printer/printerdrake.pm:1063
+#: printer/printerdrake.pm:1178
 #, c-format
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
@@ -12163,32 +12408,32 @@ msgstr ""
 "lik LPT1:, LPT2:, ..., 1st USB skriver: /dev/usb/lp0, 2nd USB skriver: /dev/"
 "usb/lp1, ...)."
 
-#: printer/printerdrake.pm:1067
+#: printer/printerdrake.pm:1182
 #, c-format
 msgid "You must enter a device or file name!"
 msgstr "Du må legge til en enhet eller et filnavn!"
 
-#: printer/printerdrake.pm:1076
+#: printer/printerdrake.pm:1191
 #, c-format
 msgid "No printer found!"
 msgstr "Ingen skriver funnet!"
 
-#: printer/printerdrake.pm:1084
+#: printer/printerdrake.pm:1199
 #, c-format
 msgid "Local Printers"
 msgstr "Lokale skrivere"
 
-#: printer/printerdrake.pm:1085
+#: printer/printerdrake.pm:1200
 #, c-format
 msgid "Available printers"
 msgstr "Tilgjengelige skrivere"
 
-#: 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 "Følgende skriver ble automatisk oppdaget."
 
-#: 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 "
@@ -12197,18 +12442,18 @@ msgstr ""
 "Hvis det ikke er den vil konfigurere, skriv inn enhetsnavn/filnavn i input-"
 "linjen"
 
-#: 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 "Ellers kan du spesifisere enhetsnavn/filnavn i input-linjen."
 
-#: 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 "Her er en liste over alle skrivere som har blitt automatisk oppdaget."
 
-#: 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 "
@@ -12217,7 +12462,7 @@ msgstr ""
 "Vennligst velg en port hvor skriveren din er tilkoblet eller skriv inn "
 "enhetsnavn/filnavn  i input-linjen"
 
-#: 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 "
@@ -12226,7 +12471,7 @@ msgstr ""
 "Vennligst velg skriveren hvor jobbene skal gå eller skriv inn enhetsnavn/"
 "filnavni input-linjen"
 
-#: printer/printerdrake.pm:1100
+#: printer/printerdrake.pm:1215
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
@@ -12237,12 +12482,12 @@ msgstr ""
 "ble korrekt oppdaget, eller du foretrekker en tilpasset skriverinstallasjon, "
 "velg \"Manuell konfigurasjon\". "
 
-#: printer/printerdrake.pm:1101
+#: printer/printerdrake.pm:1216
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr "For øyeblikket så er ingen alternative muligheter tilgjengelig"
 
-#: printer/printerdrake.pm:1104
+#: printer/printerdrake.pm:1219
 #, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -12255,12 +12500,12 @@ msgstr ""
 "foretrekker en tilpasset skriverinstallsjon, sett på \"Manuell konfigurasjon"
 "\". "
 
-#: printer/printerdrake.pm:1105
+#: printer/printerdrake.pm:1220
 #, c-format
 msgid "Please choose the printer to which the print jobs should go."
 msgstr "Vennligst velg skriveren hvor skriverjobbene skal gå."
 
-#: 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 "
@@ -12269,12 +12514,12 @@ msgstr ""
 "Vennligst velg en port hvor skriveren din er tilkoblet eller tast inn en "
 "enhet navn/filnavn i input-linjen"
 
-#: printer/printerdrake.pm:1108
+#: printer/printerdrake.pm:1223
 #, c-format
 msgid "Please choose the port that your printer is connected to."
 msgstr "Vennligst velg porten hvor skriveren din er koblet til."
 
-#: printer/printerdrake.pm:1110
+#: printer/printerdrake.pm:1225
 #, c-format
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
@@ -12283,26 +12528,26 @@ msgstr ""
 " (Parallelporter: /dev/lp0, /dev/lp1, ..., lik LPT1:, LPT2:, ..., 1st USB "
 "skriver: /dev/usb/lp0, 2nd USB skriver: /dev/usb/lp1, ...)."
 
-#: printer/printerdrake.pm:1114
+#: printer/printerdrake.pm:1229
 #, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr "Du må velge/taste inn en skriver/enhet!"
 
-#: 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 "Opsjoner for fjern-lpd skriver"
 
-#: 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 "
@@ -12311,63 +12556,63 @@ msgstr ""
 "For å bruke en fjern-lpd skriverkø, må du oppgi vertsnavnet til skriver- "
 "tjeneren og skrivernavnet på denne tjeneren."
 
-#: printer/printerdrake.pm:1191
+#: printer/printerdrake.pm:1306
 #, c-format
 msgid "Remote host name"
 msgstr "Fjern-vertsnavn"
 
-#: printer/printerdrake.pm:1192
+#: printer/printerdrake.pm:1307
 #, c-format
 msgid "Remote printer name"
 msgstr "Fjern-skrivers navn"
 
-#: printer/printerdrake.pm:1195
+#: printer/printerdrake.pm:1310
 #, c-format
 msgid "Remote host name missing!"
 msgstr "Det eksterne vertsnavnet mangler!"
 
-#: printer/printerdrake.pm:1199
+#: printer/printerdrake.pm:1314
 #, c-format
 msgid "Remote printer name missing!"
 msgstr "Det eksterne vertsnavnet mangler!"
 
-#: 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 "Oppdaget modell %s %s"
 
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
 #, c-format
 msgid "Scanning network..."
 msgstr "Scanner nettverk ..."
 
-#: 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 ", skriver \"%s\", på tjener \"%s\""
 
-#: 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 "Skriver ut \"%s\" på skriver \"%s\""
 
-#: printer/printerdrake.pm:1366
+#: printer/printerdrake.pm:1481
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Opsjoner for SMB (Windows 9x/NT) skriver"
 
-#: 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 "
@@ -12380,7 +12625,7 @@ msgstr ""
 "skrivertjeneren, så vel som det delte navnet til skriveren du ønsker tilgang "
 "til og anvendelige brukernavn, passord og arbeidsgruppeinformasjon."
 
-#: printer/printerdrake.pm:1368
+#: printer/printerdrake.pm:1483
 #, c-format
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
@@ -12390,47 +12635,47 @@ msgstr ""
 "ganske enkelt velge den fra lista, og deretter legge til brukernavn, passord "
 "og/eller arbeidsgruppe om nødvendig. "
 
-#: printer/printerdrake.pm:1370
+#: printer/printerdrake.pm:1485
 #, c-format
 msgid "SMB server host"
 msgstr "SMB-tjener vert"
 
-#: printer/printerdrake.pm:1371
+#: printer/printerdrake.pm:1486
 #, c-format
 msgid "SMB server IP"
 msgstr "SMB-tjener IP"
 
-#: printer/printerdrake.pm:1372
+#: printer/printerdrake.pm:1487
 #, c-format
 msgid "Share name"
 msgstr "Navn deling"
 
-#: 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 "Automatisk oppdaget"
 
-#: printer/printerdrake.pm:1387
+#: printer/printerdrake.pm:1502
 #, c-format
 msgid "Either the server name or the server's IP must be given!"
 msgstr "Servernavnet eller serverens IP må oppgis!"
 
-#: printer/printerdrake.pm:1391
+#: printer/printerdrake.pm:1506
 #, c-format
 msgid "Samba share name missing!"
 msgstr "Samba delenavn mangler!"
 
-#: printer/printerdrake.pm:1397
+#: printer/printerdrake.pm:1512
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr "SIKKERHETS-ADVARSEL!"
 
-#: 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 "
@@ -12476,7 +12721,7 @@ msgstr ""
 "type i Printerdrake.\n"
 "\n"
 
-#: printer/printerdrake.pm:1408
+#: printer/printerdrake.pm:1523
 #, c-format
 msgid ""
 "Set up your Windows server to make the printer available under the IPP "
@@ -12489,7 +12734,7 @@ msgstr ""
 "forbindelsestype i printerdrake. \n"
 "\n"
 
-#: printer/printerdrake.pm:1411
+#: printer/printerdrake.pm:1526
 #, c-format
 msgid ""
 "Connect your printer to a Linux server and let your Windows machine(s) "
@@ -12502,12 +12747,12 @@ msgstr ""
 "\n"
 "Vil du virkelig fortsette å sette opp skriveren som dette?"
 
-#: printer/printerdrake.pm:1489
+#: printer/printerdrake.pm:1604
 #, c-format
 msgid "NetWare Printer Options"
 msgstr "NetWare skriveropsjoner"
 
-#: 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 "
@@ -12520,42 +12765,42 @@ msgstr ""
 "så vel som navnet på skriverkøen til skriveren du ønsker adgang til og "
 "anvendelige brukernavn og passord."
 
-#: printer/printerdrake.pm:1491
+#: printer/printerdrake.pm:1606
 #, c-format
 msgid "Printer Server"
 msgstr "Skrivertjener"
 
-#: printer/printerdrake.pm:1492
+#: printer/printerdrake.pm:1607
 #, c-format
 msgid "Print Queue Name"
 msgstr "Skriverkø-navn"
 
-#: printer/printerdrake.pm:1497
+#: printer/printerdrake.pm:1612
 #, c-format
 msgid "NCP server name missing!"
 msgstr "NCP servernavn mangler!"
 
-#: printer/printerdrake.pm:1501
+#: printer/printerdrake.pm:1616
 #, c-format
 msgid "NCP queue name missing!"
 msgstr "NCP kønavn mangler!"
 
-#: printer/printerdrake.pm:1574 printer/printerdrake.pm:1594
+#: printer/printerdrake.pm:1689 printer/printerdrake.pm:1709
 #, c-format
 msgid ", host \"%s\", port %s"
 msgstr ", vert \"%s\", port %s"
 
-#: printer/printerdrake.pm:1577 printer/printerdrake.pm:1597
+#: printer/printerdrake.pm:1692 printer/printerdrake.pm:1712
 #, c-format
 msgid "Host \"%s\", port %s"
 msgstr "Vert \"%s\", port %s"
 
-#: printer/printerdrake.pm:1618
+#: printer/printerdrake.pm:1733
 #, c-format
 msgid "TCP/Socket Printer Options"
 msgstr "TCP/Socket skrivervalg"
 
-#: 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 "
@@ -12565,7 +12810,7 @@ msgstr ""
 "eller IP adresse og eventuelt et portnummer (standard er 9100) i "
 "tekstfeltene. "
 
-#: 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 "
@@ -12578,27 +12823,27 @@ msgstr ""
 "tjenere er portnummeret vanligvis 9100, på andre tjenere kan dette variere. "
 "Sjekk manualen til maskinvaren din."
 
-#: printer/printerdrake.pm:1625
+#: printer/printerdrake.pm:1740
 #, c-format
 msgid "Printer host name or IP missing!"
 msgstr "Skriverens vertsnavn eller IP mangler!"
 
-#: printer/printerdrake.pm:1648
+#: printer/printerdrake.pm:1763
 #, c-format
 msgid "Printer host name or IP"
 msgstr "Skriverens vertsnavn eller IP"
 
-#: printer/printerdrake.pm:1704
+#: printer/printerdrake.pm:1819
 #, c-format
 msgid "Refreshing Device URI list..."
 msgstr "Oppdaterer Enhets URI-liste..."
 
-#: printer/printerdrake.pm:1707 printer/printerdrake.pm:1709
+#: printer/printerdrake.pm:1822 printer/printerdrake.pm:1824
 #, c-format
 msgid "Printer Device URI"
 msgstr "Skriverenhet URI"
 
-#: 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 "
@@ -12609,17 +12854,17 @@ msgstr ""
 "CUPS eller Foomatic standarden. Ikke alle typer URIer støttes av "
 "købehandlerene."
 
-#: printer/printerdrake.pm:1731
+#: printer/printerdrake.pm:1846
 #, c-format
 msgid "A valid URI must be entered!"
 msgstr "En korrekt URI må oppgis!"
 
-#: printer/printerdrake.pm:1834
+#: printer/printerdrake.pm:1949
 #, c-format
 msgid "Pipe into command"
 msgstr "Pipe inn i kommando"
 
-#: 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 "
@@ -12628,17 +12873,17 @@ msgstr ""
 "Her kan du spesifisere en vilkårlig kommandolinje som jobben skal pipes til "
 "istedet for å bli sendt direkte til en skriver. "
 
-#: printer/printerdrake.pm:1836
+#: printer/printerdrake.pm:1951
 #, c-format
 msgid "Command line"
 msgstr "Kommandolinje"
 
-#: printer/printerdrake.pm:1840
+#: printer/printerdrake.pm:1955
 #, c-format
 msgid "A command line must be entered!"
 msgstr "En kommandolinje må oppgis!"
 
-#: printer/printerdrake.pm:1873
+#: printer/printerdrake.pm:1988
 #, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
@@ -12649,73 +12894,73 @@ msgstr ""
 "(OfficeJet, PSC, Laserjet 1100/1200/1220/3200/3300 med scanner,\n"
 "DeskJet 450, Sony IJP-V100), en HP photosmart eller HP LaserJet 2200)?"
 
-#: printer/printerdrake.pm:1887
+#: printer/printerdrake.pm:2005
 #, c-format
 msgid "Installing HPOJ package..."
 msgstr "Installerer HPOJ-pakker..."
 
-#: printer/printerdrake.pm:1894
+#: printer/printerdrake.pm:2012
 #, c-format
 msgid "Only printing will be possible on the %s."
 msgstr "Bare utskrift vil være mulig på %s."
 
-#: 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 "Sjekker enhet og setter opp HPOJ"
 
-#: printer/printerdrake.pm:1946
+#: printer/printerdrake.pm:2065
 #, c-format
 msgid "Installing SANE packages..."
 msgstr "Installerer SANE pakker..."
 
-#: printer/printerdrake.pm:1956
+#: printer/printerdrake.pm:2078
 #, c-format
 msgid "Scanning on the %s will not be possible."
 msgstr "Scanning på %s vil ikke være mulig."
 
-#: printer/printerdrake.pm:1983
+#: printer/printerdrake.pm:2105
 #, c-format
 msgid "Installing mtools packages..."
 msgstr "Installerer mtools pakker..."
 
-#: printer/printerdrake.pm:1990
+#: printer/printerdrake.pm:2113
 #, c-format
 msgid "Photo memory card access on the %s will not be possible."
 msgstr "Fotominnekort tilgang på %s vil ikke være tilgjengelig."
 
-#: printer/printerdrake.pm:2005
+#: printer/printerdrake.pm:2128
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr "Scanner på din HP multifunksjonsenhet"
 
-#: printer/printerdrake.pm:2013
+#: printer/printerdrake.pm:2136
 #, c-format
 msgid "Photo memory card access on your HP multi-function device"
 msgstr "Fotominnekort tilgang på din HP multifunksjons enhet"
 
-#: printer/printerdrake.pm:2062
+#: printer/printerdrake.pm:2185
 #, c-format
 msgid "Making printer port available for CUPS..."
 msgstr "Gjør skriverport tilgjengelig for CUPS..."
 
-#: 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 "Leser skriverdatabase  ..."
 
-#: printer/printerdrake.pm:2281
+#: printer/printerdrake.pm:2404
 #, c-format
 msgid "Enter Printer Name and Comments"
 msgstr "Angi Skrivernavn og kommentar"
 
-#: 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 "Skrivernavn bør innholde kun bokstaver, tall og understrek"
 
-#: 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"
@@ -12724,7 +12969,7 @@ msgstr ""
 "Skriveren \"%s\" eksisterer allerede,\n"
 "ønsker du å overskrive dens konfigurasjon?"
 
-#: printer/printerdrake.pm:2300
+#: printer/printerdrake.pm:2423
 #, c-format
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
@@ -12733,35 +12978,35 @@ msgstr ""
 "Alle skrivere trenger ett navn (f.eks. \"skriver\"). Beskrivelsen og "
 "lokalisasjonsfeltene trenger ikke å fylles inn. De er brukerkommentarer."
 
-#: printer/printerdrake.pm:2301
+#: printer/printerdrake.pm:2424
 #, c-format
 msgid "Name of printer"
 msgstr "Navn på skriver"
 
-#: 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 "Beskrivelse"
 
-#: 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 "Lokasjon"
 
-#: printer/printerdrake.pm:2320
+#: printer/printerdrake.pm:2443
 #, c-format
 msgid "Preparing printer database..."
 msgstr "Forbereder skriverdatabase ..."
 
-#: printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2559
 #, c-format
 msgid "Your printer model"
 msgstr "Din skrivermodell"
 
-#: printer/printerdrake.pm:2439
+#: printer/printerdrake.pm:2560
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -12786,18 +13031,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: printer/printerdrake.pm:2444 printer/printerdrake.pm:2447
+#: printer/printerdrake.pm:2565 printer/printerdrake.pm:2568
 #, c-format
 msgid "The model is correct"
 msgstr "Modellen er riktig"
 
-#: 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 "Velg modell manuellt"
 
-#: printer/printerdrake.pm:2472
+#: printer/printerdrake.pm:2593
 #, c-format
 msgid ""
 "\n"
@@ -12812,12 +13057,12 @@ msgstr ""
 "Søk korrekt modell i listen når pekeren står over en feil modell eller på "
 "\"Rå skriver\"."
 
-#: printer/printerdrake.pm:2491
+#: printer/printerdrake.pm:2612
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
 msgstr "Installer en PPD-fil levert av produsent."
 
-#: printer/printerdrake.pm:2522
+#: printer/printerdrake.pm:2643
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
@@ -12826,7 +13071,7 @@ msgstr ""
 "Hver PostScript-skriver er levert med en PPD-fil som beskriver "
 "skriverensvalg og finesser."
 
-#: 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 "
@@ -12835,12 +13080,12 @@ msgstr ""
 "Denne filen er vanligvis et sted på CDen med Windows- og Mac-driverenesom "
 "fulgte med skriveren."
 
-#: 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 "Du kan finne PPD-filer også på produsentenes nettsteder."
 
-#: 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 "
@@ -12849,7 +13094,7 @@ msgstr ""
 "Hvis du har windows installert på din maskin så kan du finne PPD-fila på din "
 "windows-partisjon også."
 
-#: 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 "
@@ -12859,7 +13104,7 @@ msgstr ""
 "Installerer skriverens PPD-fil og bruker den mens den setter opp skriveren "
 "så alle valg til skriveren vil være tilgjengelig via skriverens hardware"
 
-#: 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 "
@@ -12868,58 +13113,51 @@ msgstr ""
 "Her kan du velge PPD-filen som skal installeres på din maskin, den vil "
 "sidenbli brukt til oppsett av din skriver."
 
-#: printer/printerdrake.pm:2529
+#: printer/printerdrake.pm:2650
 #, c-format
 msgid "Install PPD file from"
 msgstr "Installer PPD-fil fra"
 
-#: 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 "Diskett"
 
-#: 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 "Annet sted"
 
-#: printer/printerdrake.pm:2548
+#: printer/printerdrake.pm:2669
 #, c-format
 msgid "Select PPD file"
 msgstr "Velg PPD-fil"
 
-#: printer/printerdrake.pm:2552
+#: printer/printerdrake.pm:2673
 #, c-format
 msgid "The PPD file %s does not exist or is unreadable!"
 msgstr "PPD-fila %s eksisterer ikke eller er uleselig!"
 
-#: printer/printerdrake.pm:2558
+#: printer/printerdrake.pm:2679
 #, c-format
 msgid "The PPD file %s does not conform with the PPD specifications!"
 msgstr "PPD-fila %s følger ikke PPD-spesifikasjonene!"
 
-#: printer/printerdrake.pm:2569
+#: printer/printerdrake.pm:2690
 #, c-format
 msgid "Installing PPD file..."
 msgstr "Installerer PPD-fil..."
 
-#: printer/printerdrake.pm:2682
+#: printer/printerdrake.pm:2807
 #, c-format
 msgid "OKI winprinter configuration"
 msgstr "OKI winprinter konfigurasjon"
 
-#: printer/printerdrake.pm:2683
+#: printer/printerdrake.pm:2808
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -12936,12 +13174,12 @@ msgstr ""
 "før du skriver en testside. Ellers vil ikke skriveren virke. Innstillinger "
 "for oppkoblingstype vil bli ignorert av driveren."
 
-#: printer/printerdrake.pm:2707 printer/printerdrake.pm:2736
+#: printer/printerdrake.pm:2833 printer/printerdrake.pm:2863
 #, c-format
 msgid "Lexmark inkjet configuration"
 msgstr "Lexmark inkjet konfigurasjon"
 
-#: printer/printerdrake.pm:2708
+#: printer/printerdrake.pm:2834
 #, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -12953,7 +13191,7 @@ msgstr ""
 "skrivere på fjernmaskiner eller skrivertjenerbokser. Koble skriveren til en "
 "lokal port eller konfigurer den på maskinen hvor det er koblet til."
 
-#: printer/printerdrake.pm:2737
+#: printer/printerdrake.pm:2864
 #, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -12974,12 +13212,12 @@ msgstr ""
 "agreement. Skriv så skriverhode alignment sider med \"lexmarkmaintain\" og "
 "juster hode alignment innstillinger med dette programmet."
 
-#: printer/printerdrake.pm:2746
+#: printer/printerdrake.pm:2874
 #, c-format
 msgid "Lexmark X125 configuration"
 msgstr "Lexmark X125-konfigurasjon"
 
-#: printer/printerdrake.pm:2747
+#: printer/printerdrake.pm:2875
 #, c-format
 msgid ""
 "The driver for this printer only supports printers locally connected via "
@@ -12992,12 +13230,35 @@ msgstr ""
 "skriveren til en lokal USB-port eller konfigurer den på maskinen hvor den er "
 "koblet til."
 
-#: printer/printerdrake.pm:2765
+#: printer/printerdrake.pm:2897
+#, c-format
+msgid "Samsung ML/QL-85G configuration"
+msgstr "Samsung ML/QL-85G konfigurasjon"
+
+#: 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 ""
+"Driveren for denne skriveren støtter bare skrivere som er lokalt-tilkoblet "
+"på den første paralell-porten, ikke skrivere på eksterne maskiner eller "
+"andre paralell-porter.Vennligst koble til skriveren på den første paralell-"
+"porten eller konfigurer den på den maskinen den er koblet til."
+
+#: printer/printerdrake.pm:2924
+#, c-format
+msgid "Canon LBP-460/660 configuration"
+msgstr "Canon LBP-460/660 konfigurasjon"
+
+#: printer/printerdrake.pm:2943
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr "Firmwareopplasting for HP LaserJet 1000"
 
-#: printer/printerdrake.pm:2878
+#: printer/printerdrake.pm:3056
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -13015,27 +13276,27 @@ msgstr ""
 "ekstra papirholdere) er satt riktig. Merk deg at veldig god utskriftskvalite "
 "kan gjøre utskriften mye tregere."
 
-#: printer/printerdrake.pm:3003
+#: printer/printerdrake.pm:3181
 #, c-format
 msgid "Printer default settings"
 msgstr "Skriver standardoppsett"
 
-#: printer/printerdrake.pm:3010
+#: printer/printerdrake.pm:3188
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "Valg %s må være ett helt tall!"
 
-#: printer/printerdrake.pm:3014
+#: printer/printerdrake.pm:3192
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "Valg %s må være ett tall!"
 
-#: printer/printerdrake.pm:3018
+#: printer/printerdrake.pm:3196
 #, c-format
 msgid "Option %s out of range!"
 msgstr "Valg %s er utenfor rekkevidden!"
 
-#: printer/printerdrake.pm:3069
+#: printer/printerdrake.pm:3247
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
@@ -13044,12 +13305,12 @@ msgstr ""
 "Ønsker du å sette denne skriveren (\"%s\")\n"
 "som standard skriver?"
 
-#: printer/printerdrake.pm:3084
+#: printer/printerdrake.pm:3262
 #, c-format
 msgid "Test pages"
 msgstr "Testsider"
 
-#: printer/printerdrake.pm:3085
+#: printer/printerdrake.pm:3263
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -13062,57 +13323,57 @@ msgstr ""
 "for lite minne vil den ikke skrives ut i det hele tatt. Som regel vildet "
 "holde å skrive ut standard testside."
 
-#: printer/printerdrake.pm:3089
+#: printer/printerdrake.pm:3267
 #, c-format
 msgid "No test pages"
 msgstr "Ingen testsider"
 
-#: 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 "Standard testside"
 
-#: printer/printerdrake.pm:3118
+#: printer/printerdrake.pm:3296
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr "Alternativ testside (brev)"
 
-#: printer/printerdrake.pm:3121
+#: printer/printerdrake.pm:3299
 #, c-format
 msgid "Alternative test page (A4)"
 msgstr "Alternativ testside (A4)"
 
-#: printer/printerdrake.pm:3123
+#: printer/printerdrake.pm:3301
 #, c-format
 msgid "Photo test page"
 msgstr "Fototestside"
 
-#: printer/printerdrake.pm:3127
+#: printer/printerdrake.pm:3305
 #, c-format
 msgid "Do not print any test page"
 msgstr "Ikke skriv ut noen testside"
 
-#: printer/printerdrake.pm:3135 printer/printerdrake.pm:3300
+#: printer/printerdrake.pm:3313 printer/printerdrake.pm:3485
 #, c-format
 msgid "Printing test page(s)..."
 msgstr "Skriver ut testside(r)..."
 
-#: printer/printerdrake.pm:3150
+#: printer/printerdrake.pm:3331
 #, c-format
 msgid "Could not install the %s package!"
 msgstr "Kunne ikke installere %s-pakken!"
 
-#: printer/printerdrake.pm:3152
+#: printer/printerdrake.pm:3333
 #, c-format
 msgid "Skipping photo test page."
 msgstr "Hopper over fototestside."
 
-#: printer/printerdrake.pm:3169
+#: printer/printerdrake.pm:3350
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -13127,7 +13388,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: printer/printerdrake.pm:3173
+#: printer/printerdrake.pm:3354
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -13136,17 +13397,17 @@ msgstr ""
 "Testsiden(e) har blitt sendt til skriver-daemonen.\n"
 "Det kan ta litt tid før skriveren starter.\n"
 
-#: printer/printerdrake.pm:3180
+#: printer/printerdrake.pm:3364
 #, c-format
 msgid "Did it work properly?"
 msgstr "Virker det som det skal?"
 
-#: printer/printerdrake.pm:3201 printer/printerdrake.pm:4397
+#: printer/printerdrake.pm:3386 printer/printerdrake.pm:4689
 #, c-format
 msgid "Raw printer"
 msgstr "Rå skriver"
 
-#: 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 "
@@ -13159,7 +13420,7 @@ msgstr ""
 "eller \"kprinter <fil>\". De grafiske verktøyene lar deg velge skriver og "
 "forandre utskriftsvalg enkelt. \n"
 
-#: printer/printerdrake.pm:3233
+#: printer/printerdrake.pm:3418
 #, c-format
 msgid ""
 "These commands you can also use in the \"Printing command\" field of the "
@@ -13170,8 +13431,8 @@ msgstr ""
 "skriverdialogen til mange applikasjoner, men her skal du ikke angi filnavnet "
 "ettersom det er gitt av applikasjonen.\n"
 
-#: 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"
@@ -13184,7 +13445,7 @@ msgstr ""
 "skriverjobb. Du kan ganske enkelt angi de forskjellige opsjonene på "
 "kommandilinja, for eksempel \"%s <fil>\". "
 
-#: 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 "
@@ -13196,7 +13457,7 @@ msgstr ""
 "s\n"
 "\n"
 
-#: 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"
@@ -13205,7 +13466,7 @@ msgstr ""
 "Dette er en liste over tilgjengelige opsjoner for skriveren:\n"
 "\n"
 
-#: 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 "
@@ -13214,8 +13475,8 @@ msgstr ""
 "For å skrive ut en fil fra kommandolinja (terminalvindu), bruk kommandoen \"%"
 "s <fil>\". \n"
 
-#: 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 "
@@ -13227,7 +13488,7 @@ msgstr ""
 "filnanvn,\n"
 "ettersom det er gitt av applikasjonen.\n"
 
-#: 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 "
@@ -13236,7 +13497,7 @@ msgstr ""
 "Får å få en liste over tilgjengelige valg for nåværende skriver klikk på "
 "\"Skriveropsjonsliste\"-knappen."
 
-#: 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 "
@@ -13245,7 +13506,7 @@ msgstr ""
 "Får å skrive ut en fil fra kommandolinjen (terminalvindu) bruk kommandoen \"%"
 "s <file>\" eller \"%s <file>\".\n"
 
-#: printer/printerdrake.pm:3272
+#: printer/printerdrake.pm:3457
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -13263,7 +13524,7 @@ msgstr ""
 "annet\n"
 "ved papirstopp.\n"
 
-#: printer/printerdrake.pm:3276
+#: printer/printerdrake.pm:3461
 #, c-format
 msgid ""
 "\n"
@@ -13276,42 +13537,32 @@ msgstr ""
 "en spesifik skriverjobb. Bare legg til de ønskede valgene til "
 "kommandolinjen, feks. \"%s <fil>\".\n"
 
-#: printer/printerdrake.pm:3286
+#: printer/printerdrake.pm:3471
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr "Skriver ut/Skanner/Fotokort på \"%s\""
 
-#: printer/printerdrake.pm:3287
+#: printer/printerdrake.pm:3472
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "Skriver ut/Skanner på \"%s\""
 
-#: printer/printerdrake.pm:3289
+#: printer/printerdrake.pm:3474
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr "Skriver ut/Fotokort tilgang på \"%s\""
 
-#: printer/printerdrake.pm:3290
+#: printer/printerdrake.pm:3475
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "Skriver ut på skriver \"%s\""
 
-#: 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 "Skriveropsjonsliste"
 
-#: printer/printerdrake.pm:3317
+#: printer/printerdrake.pm:3502
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -13322,19 +13573,22 @@ 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 ""
-"Din multifunksjonsenhet ble automatisk satt opp til å kunne scanne.\n"
-"Du kan nå scanne med \"scanimage\" (\"scanimage -d hp:%s\" for å\n"
-"spesifisere scanneren om du har mer enn en) fra kommandolinja eller\n"
-"med de grafiske verktøyene \"xscanimage\" eller \"xsane\". Hvis du\n"
-"bruker GIMP, kan du også scanne ved å velge et passende verktøy\n"
-"i \"Fil\"/\"Hent\" i menyen. For mer informasjon kan du kjøre \"man\n"
-"scanimage\" på kommandolinja\" .\n"
+"Din multifunksjonsenhet ble automatisk satt opp til å kunne scanne. Du kan "
+"nå scanne med «scanimage» («scanimage -d hp:%s» for å spesifisere scanneren "
+"om du har mer enn en) fra kommandolinja eller med de grafiske verktøyene "
+"«xscanimage» eller «xsane». Hvis du bruker GIMP, kan du også scanne ved å "
+"velge et passende verktøy i «Fil»/«Hent» i menyen. For mer informasjon kan "
+"du kjøre «man scanimage» på kommandolinja.\n"
 "\n"
-"Ikke bruk \"scannerdrake\" for denne enheten!"
+"Du trenger Ikke bruk «scannerdrake» for å sette opp denne enheten, du "
+"trenger bare å bruke «scannerdrake» hvis du vil dele skanneren over "
+"nettverket."
 
-#: printer/printerdrake.pm:3343
+#: printer/printerdrake.pm:3528
 #, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -13356,18 +13610,13 @@ msgstr ""
 "\"MToolsFM\" kan du bytte mellom drevbokstaver med feltet i øvre høyre\n"
 "hjørne av fil-lista."
 
-#: printer/printerdrake.pm:3365 printer/printerdrake.pm:3767
-#, c-format
-msgid "Reading printer data..."
-msgstr "Leser skriverdata: ..."
-
-#: 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 "Overfør skriverkonfigurasjon"
 
-#: printer/printerdrake.pm:3386
+#: printer/printerdrake.pm:3571
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -13382,7 +13631,7 @@ msgstr ""
 "ikke jobber.\n"
 "Ikke alle køer kan overføres grunnet:\n"
 
-#: printer/printerdrake.pm:3389
+#: printer/printerdrake.pm:3574
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
@@ -13391,7 +13640,7 @@ msgstr ""
 "CUPS støtter ikke skrivere på Novelltjenere eller skrivere som sender "
 "dataene inn i en fritt formet kommando.\n"
 
-#: printer/printerdrake.pm:3391
+#: printer/printerdrake.pm:3576
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
@@ -13400,12 +13649,12 @@ msgstr ""
 "PDQ støtter bare lokale skrivere, fjern-LPD skrivere, og Socket/TCP "
 "skrivere.\n"
 
-#: printer/printerdrake.pm:3393
+#: printer/printerdrake.pm:3578
 #, c-format
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr "LPD og LPRng støtter ikke IPP skrivere.\n"
 
-#: printer/printerdrake.pm:3395
+#: printer/printerdrake.pm:3580
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
@@ -13414,7 +13663,7 @@ msgstr ""
 "I tillegg, køer laget med dette programmet eller \"foomatic -configure\" kan "
 "ikke overflyttes."
 
-#: printer/printerdrake.pm:3396
+#: printer/printerdrake.pm:3581
 #, c-format
 msgid ""
 "\n"
@@ -13425,7 +13674,7 @@ msgstr ""
 "Skrivere konfigurert med PPD filene som produsenten har laget eller med CUPS "
 "drivere ikke ikke overflyttes."
 
-#: printer/printerdrake.pm:3397
+#: printer/printerdrake.pm:3582
 #, c-format
 msgid ""
 "\n"
@@ -13436,17 +13685,17 @@ msgstr ""
 "Velg skriverene som du vil overflytte og klikk\n"
 "\"Overfør\"."
 
-#: printer/printerdrake.pm:3400
+#: printer/printerdrake.pm:3585
 #, c-format
 msgid "Do not transfer printers"
 msgstr "Ikke overfør skrivere"
 
-#: 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"
@@ -13457,17 +13706,17 @@ msgstr ""
 "Klikk \"Overfør\" for å overskrive.\n"
 "Du kan også gi ett nytt skrivernavn, eller hoppe over denne skriveren."
 
-#: printer/printerdrake.pm:3434
+#: printer/printerdrake.pm:3619
 #, c-format
 msgid "New printer name"
 msgstr "Nytt skrivernavn"
 
-#: 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 "
@@ -13477,28 +13726,28 @@ msgstr ""
 "opp\n"
 "som standardskriver også under det nye skriversystemet - %s?"
 
-#: printer/printerdrake.pm:3458
+#: printer/printerdrake.pm:3643
 #, c-format
 msgid "Refreshing printer data..."
 msgstr "Oppdaterer skriverdata ..."
 
-#: printer/printerdrake.pm:3467
+#: printer/printerdrake.pm:3652
 #, c-format
 msgid "Starting network..."
 msgstr "Starter 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 "Konfigurer nettverket nå"
 
-#: printer/printerdrake.pm:3509
+#: printer/printerdrake.pm:3696
 #, c-format
 msgid "Network functionality not configured"
 msgstr "Nettverksfunksjonalitet ikke konfigurert"
 
-#: printer/printerdrake.pm:3510
+#: printer/printerdrake.pm:3697
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -13512,12 +13761,12 @@ msgstr ""
 "nettverket, vil du ikke bli i stand til å bruke skriveren du setter opp. "
 "Hvordan vil du fortsette?"
 
-#: printer/printerdrake.pm:3513
+#: printer/printerdrake.pm:3700
 #, c-format
 msgid "Go on without configuring the network"
 msgstr "Fortsett uten å konfigurere nettverket"
 
-#: printer/printerdrake.pm:3547
+#: printer/printerdrake.pm:3735
 #, c-format
 msgid ""
 "The network configuration done during the installation cannot be started "
@@ -13532,7 +13781,7 @@ msgstr ""
 "\"Nettverk og internett\"/ \"Forbindelse\", og sett opp skriveren etterpå, "
 "også i %s Kontrollsenter, under /\"Maskinvare\"/\"Skriver\""
 
-#: printer/printerdrake.pm:3548
+#: printer/printerdrake.pm:3736
 #, c-format
 msgid ""
 "The network access was not running and could not be started. Please check "
@@ -13543,27 +13792,27 @@ msgstr ""
 "nettverkskonfigurasjonen og prøv deretter å sette opp nettverks-\n"
 "skriveren igjen."
 
-#: printer/printerdrake.pm:3558
+#: printer/printerdrake.pm:3746
 #, c-format
 msgid "Restarting printing system..."
 msgstr "Starter skriversystemet på nytt ..."
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, c-format
 msgid "high"
 msgstr "høy"
 
-#: 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 "Installerer et utskriftsystem på %s sikkerhetsnivået"
 
-#: 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 %"
@@ -13587,12 +13836,12 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil sette opp skriver på dette systemet?"
 
-#: printer/printerdrake.pm:3633
+#: printer/printerdrake.pm:3814
 #, c-format
 msgid "Starting the printing system at boot time"
 msgstr "Starter utskriftsystemet ved oppstart"
 
-#: printer/printerdrake.pm:3634
+#: printer/printerdrake.pm:3815
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -13612,67 +13861,170 @@ msgstr ""
 "\n"
 "Ønsker du å skru på automatisk start av skriversystemet igjen?"
 
-#: printer/printerdrake.pm:3655 printer/printerdrake.pm:3889
+#: printer/printerdrake.pm:3837
 #, c-format
 msgid "Checking installed software..."
 msgstr "Sjekker installert programvare..."
 
-#: printer/printerdrake.pm:3661
+#: printer/printerdrake.pm:3843
 #, c-format
-msgid "Removing %s ..."
+msgid "Removing %s..."
 msgstr "Fjerner %s ..."
 
-#: printer/printerdrake.pm:3665
+#: printer/printerdrake.pm:3847
 #, c-format
 msgid "Could not remove the %s printing system!"
 msgstr "Kunne ikke fjerne %s-utskriftssysteme!"
 
-#: 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 "Kunne ikke installere %s-utskriftssystemet!"
 
-#: 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 ""
+"Hvis det ikke er noe lokalt utskriftssystem vil alle utskriftsforespørseler "
+"gå direkte til tjeneren spesifisert under. Merk at det ikke er mulig å "
+"definere lokale utskriftskøer da og hvis den spesifiserte tjeneren er nede "
+"vil det ikke være mulig å skrive ut fra denne maskinen."
+
+#: 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 ""
+"Skriv inn vertsnavnet eller IP adressen av din CUPS tjener og klikk OK hvis "
+"du vil bruke dette moduset, hvis ikke, klikk \"Avslutt\"."
+
+#: printer/printerdrake.pm:3950
+#, c-format
+msgid "Name or IP of remote server:"
+msgstr "Navn eller IP av ekstern tjener."
+
+#: printer/printerdrake.pm:3970
 #, c-format
 msgid "Setting Default Printer..."
 msgstr "Setter standardskriver..."
 
-#: printer/printerdrake.pm:3747
+#: printer/printerdrake.pm:3989
+#, c-format
+msgid "Local CUPS printing system or remote CUPS server?"
+msgstr "Lokalt CUPS utskriftssystem eller ekstern CUPS tjener?"
+
+#: printer/printerdrake.pm:3990
+#, c-format
+msgid "The CUPS printing system can be used in two ways: "
+msgstr "CUPS utskiftssystemet kan brukes på to måter:"
+
+#: printer/printerdrake.pm:3992
+#, c-format
+msgid "1. The CUPS printing system can run locally. "
+msgstr "1. CUPS utskriftssystemet kan bli kjørt lokalt."
+
+#: 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 ""
+"Da vil skrivere som er koblet til lokalt kunne brukes og eksterne skrivere "
+"på andre CUPS tjenere i samme nettverket blir oppdaget automatisk."
+
+#: 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 ""
+"Ulempen med denne metoden er, at det trenger mer ressurser på den lokale "
+"maskinen: Flere programpakker må installeres, CUPS daemonen må kjøre i "
+"bakgrunnen og trenger litt minne, og IPP porten (port 631) blir åpnet."
+
+#: printer/printerdrake.pm:3996
+#, c-format
+msgid "2. All printing requests are immediately sent to a remote CUPS server. "
+msgstr ""
+"2. Alle utskriftsforespørseler blir umiddelbart sent til en ekstern CUPS "
+"tjener."
+
+#: 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 ""
+"Her blir de lokale ressursene som trenges redusert til et minimum. Ingen "
+"CUPS daemon må bli startet og ingen port åpnet, ingen program infrastruktur "
+"for å sette opp lokale utskriftsforespørseler blir installert, så mindre "
+"minne og harddiskplass blir brukt."
+
+#: 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 ""
+"Ulemen er at det ikke er mulig å definere lokale skrivere og at hvis den "
+"spesifiserte tjeneren er nede er det ikke mulig å skrive ut fra denne "
+"maskinen."
+
+#: printer/printerdrake.pm:4000
+#, c-format
+msgid "How should CUPS be set up on your machine?"
+msgstr "Hvordan skal CUPS bli satt opp på din maskin?"
+
+#: 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 "Ekstern tjener, spesifiser Navn eller IP her:"
+
+#: 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 "Velg skrivertkøbehandler"
 
-#: printer/printerdrake.pm:3748
+#: printer/printerdrake.pm:4057
 #, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "Hvilket utskriftsystem (spooler) ønsker du å bruke?"
 
-#: printer/printerdrake.pm:3799
+#: printer/printerdrake.pm:4105
 #, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr "Klarte ikke å konfigurere skriver \"%s\"!"
 
-#: 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 "Kunne ikke installere %s pakkene. %s kan ikke startes!"
 
-#: printer/printerdrake.pm:3910
-#, c-format
-msgid "Could not install necessary packages, %s cannot be started!"
-msgstr "Kunne ikke installere de nødvendige pakkene, %s kan ikke startes!"
-
-#: printer/printerdrake.pm:4011
+#: printer/printerdrake.pm:4314
 #, c-format
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
@@ -13683,189 +14035,160 @@ msgstr ""
 "endre oppsettet; for å gjøre den til standard printer; eller for å vise "
 "informasjon om den."
 
-#: printer/printerdrake.pm:4039
+#: printer/printerdrake.pm:4344
 #, c-format
 msgid "Display all available remote CUPS printers"
 msgstr "Vis alle tilgjengelige fjerne CUPS-skrivere"
 
-#: printer/printerdrake.pm:4040
+#: printer/printerdrake.pm:4345
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr "Oppdater skriverliste (for å vise alle tilgjengelige CUPS-skrivere)"
 
-#: printer/printerdrake.pm:4050
+#: printer/printerdrake.pm:4356
 #, c-format
 msgid "CUPS configuration"
 msgstr "CUPS konfigurasjon"
 
-#: printer/printerdrake.pm:4062
+#: printer/printerdrake.pm:4368
 #, c-format
 msgid "Change the printing system"
 msgstr "Endrer utskriftssystemet"
 
-#: printer/printerdrake.pm:4071
+#: printer/printerdrake.pm:4377
 #, c-format
 msgid "Normal Mode"
 msgstr "Normalt modus"
 
-#: 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 "Opsjoner for skriver"
 
-#: printer/printerdrake.pm:4379
+#: printer/printerdrake.pm:4668
 #, c-format
 msgid "Modify printer configuration"
 msgstr "Modifiser skriverkonfigurasjon"
 
-#: 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 ""
-"Skriver %s\n"
+"Skriver %s%s\n"
 "Hva ønsker du å forandre på denne skriveren?"
 
-#: printer/printerdrake.pm:4385
+#: printer/printerdrake.pm:4675
+#, c-format
+msgid "This printer is disabled"
+msgstr "Denne skriveren er deaktivert"
+
+#: printer/printerdrake.pm:4677
 #, c-format
 msgid "Do it!"
 msgstr "Gjør det!"
 
-#: printer/printerdrake.pm:4390 printer/printerdrake.pm:4448
+#: printer/printerdrake.pm:4682 printer/printerdrake.pm:4737
 #, c-format
 msgid "Printer connection type"
 msgstr "Skrivertilkoblingstype"
 
-#: printer/printerdrake.pm:4391 printer/printerdrake.pm:4452
+#: printer/printerdrake.pm:4683 printer/printerdrake.pm:4743
 #, c-format
 msgid "Printer name, description, location"
 msgstr "Skrivernavn, beskrivelse, sted"
 
-#: printer/printerdrake.pm:4393 printer/printerdrake.pm:4471
+#: printer/printerdrake.pm:4685 printer/printerdrake.pm:4761
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr "Skriverprodusent, modell, driver"
 
-#: printer/printerdrake.pm:4394 printer/printerdrake.pm:4472
+#: printer/printerdrake.pm:4686 printer/printerdrake.pm:4762
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr "Skriverprodusent, modell"
 
-#: 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 "Sett denne skriveren som standard"
 
-#: 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 "Legg denne skriveren til Star Office/OpenOffice.org/GIMP"
+msgid "Enable Printer"
+msgstr "Aktiver skriver"
 
-#: 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 "Fjern denne skriveren fra Star Office/OpenOffice.org/GIMP"
+msgid "Disable Printer"
+msgstr "Deaktiver skriver"
 
-#: printer/printerdrake.pm:4404 printer/printerdrake.pm:4500
+#: printer/printerdrake.pm:4701 printer/printerdrake.pm:4788
 #, c-format
 msgid "Print test pages"
 msgstr "Skriver 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 hvordan man skal bruke denne skriveren"
 
-#: printer/printerdrake.pm:4406 printer/printerdrake.pm:4504
+#: printer/printerdrake.pm:4703 printer/printerdrake.pm:4792
 #, c-format
 msgid "Remove printer"
 msgstr "Fjern skriver"
 
-#: printer/printerdrake.pm:4460
+#: printer/printerdrake.pm:4750
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "Fjerner gammel skriver \"%s\" ..."
 
-#: printer/printerdrake.pm:4491
-#, c-format
-msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
-msgstr "Legger skriver til Star Office/OpenOffice.org/GIMP"
-
-#: printer/printerdrake.pm:4493
-#, c-format
-msgid ""
-"The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"Skriveren \"%s\" ble vellykket lagt til Star Office/OpenOffice.org/GIMP."
-
-#: printer/printerdrake.pm:4494
+#: printer/printerdrake.pm:4781
 #, c-format
-msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"Kunne ikke legge til skriveren \"%s\" til Star Office/OpenOffice.org/GIMP."
+msgid "Printer \"%s\" is now enabled."
+msgstr "Skriver «%s» er nå aktivert."
 
-#: printer/printerdrake.pm:4496
+#: printer/printerdrake.pm:4786
 #, c-format
-msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
-msgstr "Fjerner skriver fra Star Office/OpenOffice.org/GIMP"
+msgid "Printer \"%s\" is now disabled."
+msgstr "Skriver «%s» er nå deaktivert."
 
-#: printer/printerdrake.pm:4498
-#, c-format
-msgid ""
-"The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
-"GIMP."
-msgstr "Skriveren \"%s\" har blitt fjernet fra StarOffice/OpenOffice.org/GIMP."
-
-#: printer/printerdrake.pm:4499
-#, c-format
-msgid ""
-"Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"Klarte ikke å fjerne skriver \"%s\" fra Star Office/OpenOffice.org/GIMP."
-
-#: printer/printerdrake.pm:4543
+#: printer/printerdrake.pm:4823
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "Ønsker du virkelig å fjerne skriveren \"%s\"?"
 
-#: printer/printerdrake.pm:4547
+#: printer/printerdrake.pm:4827
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "Fjerner skriver \"%s\"..."
 
-#: printer/printerdrake.pm:4571
+#: printer/printerdrake.pm:4851
 #, c-format
 msgid "Default printer"
 msgstr "Standardskriver"
 
-#: printer/printerdrake.pm:4572
+#: printer/printerdrake.pm:4852
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr "Skriveren \"%s\" er nå satt til standard skriver."
 
-#: raid.pm:37
-#, c-format
-msgid "Can't add a partition to _formatted_ RAID md%d"
-msgstr "Kan ikke legge til en partisjon til _formattert_ RAID md%d"
-
-#: raid.pm:139
+# #fikset
+#: raid.pm:36
 #, c-format
-msgid "mkraid failed (maybe raidtools are missing?)"
-msgstr "mkraid mislykket (kanskje raidtool mangler?)"
+msgid "Can't add a partition to _formatted_ RAID %s"
+msgstr "Kan ikke legge til en partisjon til _formattert_ RAID %s"
 
-#: raid.pm:139
-#, c-format
-msgid "mkraid failed"
-msgstr "mkraid mislykket"
-
-#: raid.pm:155
+#: raid.pm:132
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Ikke nok partisjoner for RAID nivå %d\n"
@@ -13890,16 +14213,16 @@ msgstr "Kunne ikke kopiere firmware-fil %s til /usr/share/sane/firmware!"
 msgid "Could not set permissions of firmware file %s!"
 msgstr "Kunne ikke sette rettigheter på firmware-fil %s!"
 
-#: 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 "Scannerdrake"
 
-#: 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 "Kunne ikke installere pakkene som trengs for å dele din(e) skanner(e)."
@@ -13930,7 +14253,8 @@ msgstr " Aksepter/Nekt icmp echo."
 msgid "Allow/Forbid autologin."
 msgstr "Tillat/Forby automatisk innlogging."
 
-#: 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"
@@ -13945,22 +14269,22 @@ msgstr ""
 "\n"
 "Ellers er bare /etc/issue tillatt."
 
-#: security/help.pm:25
+#: security/help.pm:27
 #, c-format
 msgid "Allow/Forbid reboot by the console user."
 msgstr "Tillat/Forby omstart av konsolbrukeren."
 
-#: security/help.pm:27
+#: security/help.pm:29
 #, c-format
 msgid "Allow/Forbid remote root login."
 msgstr "Tillat/Forby fjern root-innlogging."
 
-#: security/help.pm:29
+#: security/help.pm:31
 #, c-format
 msgid "Allow/Forbid direct root login."
 msgstr "Tillat/Forby direkte root-innlogging."
 
-#: 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 "
@@ -13969,7 +14293,20 @@ msgstr ""
 "Tillat/Forby liste over brukere på systemet i innloggingshåndterer (kdm og "
 "gdm)"
 
-#: 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 ""
+"Tillat/nekte å eksportere display når\n"
+"det sendes fra root kontoen til andre brukere.\n"
+"\n"
+"Se pam_xauth(8) for flere detaljer.'"
+
+#: security/help.pm:40
 #, c-format
 msgid ""
 "Allow/Forbid X connections:\n"
@@ -13988,7 +14325,7 @@ msgstr ""
 "\n"
 "- NONE (ingen tilkoblinger)."
 
-#: security/help.pm:41
+#: security/help.pm:48
 #, c-format
 msgid ""
 "The argument specifies if clients are authorized to connect\n"
@@ -13997,7 +14334,8 @@ msgstr ""
 "Dette argumentet spesifiserer om klienter er autoriserte til å koble\n"
 "til X-tjeneren fra nettverket på tcp port 6000 eller ei."
 
-#: 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"
@@ -14024,7 +14362,7 @@ msgstr ""
 "For å autorisere tjenestene du trenger, bruk /etc/hosts.allow\n"
 "(se hosts.allow(5))."
 
-#: security/help.pm:54
+#: security/help.pm:63
 #, c-format
 msgid ""
 "If SERVER_LEVEL (or SECURE_LEVEL if absent)\n"
@@ -14045,7 +14383,7 @@ msgstr ""
 "installasjonenen\n"
 "av pakker."
 
-#: security/help.pm:63
+#: security/help.pm:72
 #, c-format
 msgid ""
 "Enable/Disable crontab and at for users.\n"
@@ -14058,41 +14396,46 @@ msgstr ""
 "Plasser tillatte brukere i /etc/cron.allow og /etc/at.allow\n"
 "(se man at(1) og crontab(1))."
 
-#: security/help.pm:68
+#: security/help.pm:77
 #, c-format
 msgid "Enable/Disable syslog reports to console 12"
 msgstr "Aktiver/deaktiver systemloggrapporter til konsol 12"
 
-#: 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 ""
 "Aktiver/Deaktiver navneoppslagsforfalskningsbeskyttelse.  Hvis\n"
-"\"alert\" er sann, rapporter også til syslog."
+"\"%s\" er sann, rapporter også til syslog."
+
+#: security/help.pm:80 standalone/draksec:213
+#, c-format
+msgid "Security Alerts:"
+msgstr "Sikkerhetvarsler:"
 
-#: security/help.pm:73
+#: security/help.pm:82
 #, c-format
 msgid "Enable/Disable IP spoofing protection."
 msgstr "Aktiver/Deaktiver IP-forfalskningsbeskyttelse."
 
-#: security/help.pm:75
+#: security/help.pm:84
 #, c-format
 msgid "Enable/Disable libsafe if libsafe is found on the system."
 msgstr "Aktiver/Deaktiver libsafe hvis libsafe er funnet på systemet."
 
-#: security/help.pm:77
+#: security/help.pm:86
 #, c-format
 msgid "Enable/Disable the logging of IPv4 strange packets."
 msgstr "Aktiver/Deaktiver loggingen av rare IPv4 pakker."
 
-#: security/help.pm:79
+#: security/help.pm:88
 #, c-format
 msgid "Enable/Disable msec hourly security check."
 msgstr "Aktiver/Deaktiver msec sikkerhetssjekk hver time."
 
-#: 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."
@@ -14100,45 +14443,45 @@ msgstr ""
 " Aktiverer su bare for medlemmer av wheel gruppen eller tillat hvilken som "
 "helst bruker."
 
-#: security/help.pm:83
+#: security/help.pm:92
 #, c-format
 msgid "Use password to authenticate users."
 msgstr "Bruk passord for å autentisere brukere."
 
-#: security/help.pm:85
+#: security/help.pm:94
 #, c-format
 msgid "Activate/Disable ethernet cards promiscuity check."
 msgstr "Aktiver/Deaktiver ethernettkorts promiskiøssjekk."
 
-#: security/help.pm:87
+#: security/help.pm:96
 #, c-format
 msgid " Activate/Disable daily security check."
 msgstr "Aktiver/Deaktiver daglig sikkerhetssjekk."
 
-#: security/help.pm:89
+#: security/help.pm:98
 #, c-format
 msgid " Enable/Disable sulogin(8) in single user level."
 msgstr " Aktiver/Deaktiver sulogin(8) i enbruker-nivå."
 
-#: 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 ""
 "Legg til navnet som et unntak for håndteringen av passordforeldelse av msec."
 
-#: security/help.pm:93
+#: security/help.pm:102
 #, c-format
 msgid "Set password aging to \"max\" days and delay to change to \"inactive\"."
 msgstr ""
 "Sett passordaldring til \"Imax\" dager og forsinkelsen for endring til "
 "\"inactive\"."
 
-#: security/help.pm:95
+#: security/help.pm:104
 #, c-format
 msgid "Set the password history length to prevent password reuse."
 msgstr "Setter passordhistorielengden for å hindre gjenbruk av passord. "
 
-#: security/help.pm:97
+#: security/help.pm:106
 #, c-format
 msgid ""
 "Set the password minimum length and minimum number of digit and minimum "
@@ -14147,20 +14490,20 @@ msgstr ""
 "Sett minimum passordlengde, minimum antall tall, og minimum antall store "
 "bokstaver."
 
-#: security/help.pm:99
+#: security/help.pm:108
 #, c-format
 msgid "Set the root umask."
 msgstr "Setter root sin umask."
 
-#: security/help.pm:100
+#: security/help.pm:109
 #, c-format
 msgid "if set to yes, check open ports."
 msgstr "Sjekker åpne porter når satt til ja."
 
-#: 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"
@@ -14176,105 +14519,105 @@ msgstr ""
 "\n"
 "- for brukere med 0-iden utenom root."
 
-#: security/help.pm:108
+#: security/help.pm:117
 #, c-format
 msgid "if set to yes, check permissions of files in the users' home."
 msgstr ""
 "Sjekker rettigheter på filer i brukerens hjemmekatalog dersom satt til ja. "
 
-#: 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 "Sjekker om nettverksenhetene er i promiskuøs modus dersom satt til ja."
 
-#: security/help.pm:110
+#: security/help.pm:119
 #, c-format
 msgid "if set to yes, run the daily security checks."
 msgstr "Kjører de daglige sikkerhetskontrollene dersom satt til ja."
 
-#: security/help.pm:111
+#: security/help.pm:120
 #, c-format
 msgid "if set to yes, check additions/removals of sgid files."
 msgstr "Sjekker tillegg/fjerning av sgid filer når satt til ja."
 
-#: security/help.pm:112
+#: security/help.pm:121
 #, c-format
 msgid "if set to yes, check empty password in /etc/shadow."
 msgstr "Sjekker tomme passord i /etc/shadow dersom satt til ja."
 
-#: security/help.pm:113
+#: security/help.pm:122
 #, c-format
 msgid "if set to yes, verify checksum of the suid/sgid files."
 msgstr "Sjekker kontrollsum på suid/guid filer dersom satt til ja."
 
-#: security/help.pm:114
+#: security/help.pm:123
 #, c-format
 msgid "if set to yes, check additions/removals of suid root files."
 msgstr "Sjekker tillegg/fjerning av suid root filer dersom satt til ja."
 
-#: security/help.pm:115
+#: security/help.pm:124
 #, c-format
 msgid "if set to yes, report unowned files."
 msgstr "Sjekker for filer uten eier dersom satt til ja."
 
-#: security/help.pm:116
+#: security/help.pm:125
 #, c-format
 msgid "if set to yes, check files/directories writable by everybody."
 msgstr ""
 "Sjekker filer eller kataloger som er skrivbare av alle når satt til ja."
 
-#: security/help.pm:117
+#: security/help.pm:126
 #, c-format
 msgid "if set to yes, run chkrootkit checks."
 msgstr "Kjører chkrootkit kontroller dersom satt til ja."
 
-#: 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 "Sender epostrapport til denne adressen dersom satt, ellers til root."
 
-#: security/help.pm:119
+#: security/help.pm:128
 #, c-format
 msgid "if set to yes, report check result by mail."
 msgstr "rapporterer kontrollresultat på epost når satt til ja."
 
-#: security/help.pm:120
+#: security/help.pm:129
 #, c-format
 msgid "Do not send mails if there's nothing to warn about"
 msgstr "Ikke send epost med mindre det er noe å varsle om"
 
-#: security/help.pm:121
+#: security/help.pm:130
 #, c-format
 msgid "if set to yes, run some checks against the rpm database."
 msgstr "Kjører noen kontroller mot rpm-databasen dersom satt til ja."
 
-#: security/help.pm:122
+#: security/help.pm:131
 #, c-format
 msgid "if set to yes, report check result to syslog."
 msgstr "Rapporterer kontrollresultat til systemloggen dersom satt til ja."
 
-#: security/help.pm:123
+#: security/help.pm:132
 #, c-format
 msgid "if set to yes, reports check result to tty."
 msgstr "Rapporterer kontrollresultat til tty dersom satt til ja."
 
-#: security/help.pm:125
+#: security/help.pm:134
 #, c-format
 msgid "Set shell commands history size. A value of -1 means unlimited."
 msgstr "Setter skallets kommandohistoriestørrelse. -1 betyr ubegrenset."
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Set the shell timeout. A value of zero means no timeout."
 msgstr "Sett skallets tidsavbrudd. Null betyr inget tidsavbrudd."
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Timeout unit is second"
 msgstr "Tidsavbruddenhet er sekund"
 
-#: security/help.pm:129
+#: security/help.pm:138
 #, c-format
 msgid "Set the user umask."
 msgstr "Setter brukerens umask."
@@ -14321,213 +14664,218 @@ msgstr "List brukere innloggingshåndterer (kdm og gdm)"
 
 #: security/l10n.pm:20
 #, c-format
+msgid "Export display when passing from root to the other users"
+msgstr "Eksporter display når det sendes fra root kontoen til andre brukere."
+
+#: security/l10n.pm:21
+#, c-format
 msgid "Allow X Window connections"
 msgstr "Tillat X Window-tilkoblinger"
 
-#: security/l10n.pm:21
+#: security/l10n.pm:22
 #, c-format
 msgid "Authorize TCP connections to X Window"
 msgstr "Autoriser TCP-tilkoblinger til X Windows"
 
-#: security/l10n.pm:22
+#: security/l10n.pm:23
 #, c-format
 msgid "Authorize all services controlled by tcp_wrappers"
 msgstr "Autoriser alle tjenester kontrollert av tcp_wrappers"
 
-#: security/l10n.pm:23
+#: security/l10n.pm:24
 #, c-format
 msgid "Chkconfig obey msec rules"
 msgstr "Chkconfig adlyd msec-regler"
 
-#: security/l10n.pm:24
+#: security/l10n.pm:25
 #, c-format
 msgid "Enable \"crontab\" and \"at\" for users"
 msgstr "Aktiver \"crontab\" og \"at\" for brukere"
 
-#: security/l10n.pm:25
+#: security/l10n.pm:26
 #, c-format
 msgid "Syslog reports to console 12"
 msgstr "Syslog rapporterer til konsol 12"
 
-#: security/l10n.pm:26
+#: security/l10n.pm:27
 #, c-format
 msgid "Name resolution spoofing protection"
 msgstr "Navneoppslagsforfalskningsbeskyttelse."
 
-#: security/l10n.pm:27
+#: security/l10n.pm:28
 #, c-format
 msgid "Enable IP spoofing protection"
 msgstr "Aktiver IP-forfalskningsbeskyttelse."
 
-#: security/l10n.pm:28
+#: security/l10n.pm:29
 #, c-format
 msgid "Enable libsafe if libsafe is found on the system"
 msgstr "Aktiver libsafe hvis libsafe er funnet på systemet."
 
-#: security/l10n.pm:29
+#: security/l10n.pm:30
 #, c-format
 msgid "Enable the logging of IPv4 strange packets"
 msgstr "Aktiver loggingen av rare IPv4 pakker."
 
-#: security/l10n.pm:30
+#: security/l10n.pm:31
 #, c-format
 msgid "Enable msec hourly security check"
 msgstr "Aktiver msec sikkerhetssjekk hver time"
 
-#: security/l10n.pm:31
+#: security/l10n.pm:32
 #, c-format
 msgid "Enable su only from the wheel group members or for any user"
 msgstr ""
 "Aktiver su bare for medlemmer av wheel gruppen eller fra hvilken som helst "
 "bruker"
 
-#: security/l10n.pm:32
+#: security/l10n.pm:33
 #, c-format
 msgid "Use password to authenticate users"
 msgstr "Bruk passord for å autentisere brukere."
 
-#: security/l10n.pm:33
+#: security/l10n.pm:34
 #, c-format
 msgid "Ethernet cards promiscuity check"
 msgstr "Ethernettkorts promiskiøssjekk."
 
-#: security/l10n.pm:34
+#: security/l10n.pm:35
 #, c-format
 msgid "Daily security check"
 msgstr "Daglig sikkerhetssjekk"
 
-#: security/l10n.pm:35
+#: security/l10n.pm:36
 #, c-format
 msgid "Sulogin(8) in single user level"
 msgstr "Sulogin(8) i enbruker-nivå."
 
-#: security/l10n.pm:36
+#: security/l10n.pm:37
 #, c-format
 msgid "No password aging for"
 msgstr "Ingen passordaldring for"
 
-#: security/l10n.pm:37
+#: security/l10n.pm:38
 #, c-format
 msgid "Set password expiration and account inactivation delays"
 msgstr "Sett passordforelding og konto-inaktiveringsforsinkelser"
 
-#: security/l10n.pm:38
+#: security/l10n.pm:39
 #, c-format
 msgid "Password history length"
 msgstr "Passordhistorielengde"
 
-#: security/l10n.pm:39
+#: security/l10n.pm:40
 #, c-format
 msgid "Password minimum length and number of digits and upcase letters"
 msgstr "Passords minimumlengde og nummer av tall og store bokstaver"
 
-#: security/l10n.pm:40
+#: security/l10n.pm:41
 #, c-format
 msgid "Root umask"
 msgstr "Root-umask"
 
-#: security/l10n.pm:41
+#: security/l10n.pm:42
 #, c-format
 msgid "Shell history size"
 msgstr "Skallhistorestørrelse"
 
-#: security/l10n.pm:42
+#: security/l10n.pm:43
 #, c-format
 msgid "Shell timeout"
 msgstr "Skall-tidsavbrudd"
 
-#: security/l10n.pm:43
+#: security/l10n.pm:44
 #, c-format
 msgid "User umask"
 msgstr "Bruker-umask"
 
-#: security/l10n.pm:44
+#: security/l10n.pm:45
 #, c-format
 msgid "Check open ports"
 msgstr "Sjekk åpne porter"
 
-#: security/l10n.pm:45
+#: security/l10n.pm:46
 #, c-format
 msgid "Check for unsecured accounts"
 msgstr "Sjekk for usikrede kontoer"
 
-#: security/l10n.pm:46
+#: security/l10n.pm:47
 #, c-format
 msgid "Check permissions of files in the users' home"
 msgstr "Sjekk rettigheter på filer i brukerens hjemmekatalog"
 
-#: security/l10n.pm:47
+#: security/l10n.pm:48
 #, c-format
 msgid "Check if the network devices are in promiscuous mode"
 msgstr "Sjekk om nettverksenhetene er i promiskuøs modus."
 
-#: security/l10n.pm:48
+#: security/l10n.pm:49
 #, c-format
 msgid "Run the daily security checks"
 msgstr "Kjør de daglige sikkerhetskontrollene"
 
-#: security/l10n.pm:49
+#: security/l10n.pm:50
 #, c-format
 msgid "Check additions/removals of sgid files"
 msgstr "Sjekker tillegg/fjerning av sgid filer "
 
-#: security/l10n.pm:50
+#: security/l10n.pm:51
 #, c-format
 msgid "Check empty password in /etc/shadow"
 msgstr "Sjekk tomme passord i /etc/shadow"
 
-#: security/l10n.pm:51
+#: security/l10n.pm:52
 #, c-format
 msgid "Verify checksum of the suid/sgid files"
 msgstr "Kontroller kontrollsum på suid/guid filer"
 
-#: security/l10n.pm:52
+#: security/l10n.pm:53
 #, c-format
 msgid "Check additions/removals of suid root files"
 msgstr "Sjekker tillegg/fjerning av suid root filer dersom"
 
-#: security/l10n.pm:53
+#: security/l10n.pm:54
 #, c-format
 msgid "Report unowned files"
 msgstr "Rapporter ueide filer"
 
-#: security/l10n.pm:54
+#: security/l10n.pm:55
 #, c-format
 msgid "Check files/directories writable by everybody"
 msgstr "Sjekk filer eller kataloger som er skrivbare av alle"
 
-#: security/l10n.pm:55
+#: security/l10n.pm:56
 #, c-format
 msgid "Run chkrootkit checks"
 msgstr "Kjører chkrootkit-kontroller"
 
-#: security/l10n.pm:56
+#: security/l10n.pm:57
 #, c-format
 msgid "Do not send mails when unneeded"
 msgstr "Ikke send epost når det ikke trengs"
 
-#: 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 ""
 "Hvis satt, send epostrapport til denne epost-adressen, ellers send til root."
 
-#: security/l10n.pm:58
+#: security/l10n.pm:59
 #, c-format
 msgid "Report check result by mail"
 msgstr "Rapporterer kontrollresultat per epost"
 
-#: security/l10n.pm:59
+#: security/l10n.pm:60
 #, c-format
 msgid "Run some checks against the rpm database"
 msgstr "Kjør noen kontroller mot rpm-databasen"
 
-#: security/l10n.pm:60
+#: security/l10n.pm:61
 #, c-format
 msgid "Report check result to syslog"
 msgstr "Rapporterer sjekkresultat til systemloggen"
 
-#: security/l10n.pm:61
+#: security/l10n.pm:62
 #, c-format
 msgid "Reports check result to tty"
 msgstr "Rapporterer kontrollresultat til tty"
@@ -14864,9 +15212,9 @@ msgstr ""
 #, c-format
 msgid ""
 "Automatically switch on numlock key locker under console\n"
-"and XFree at boot."
+"and Xorg at boot."
 msgstr ""
-"Slår automatisk på numlock-tast i konsoll og XFree ved\n"
+"Slår automatisk på numlock-tast i konsoll og Xorg ved\n"
 "oppstart."
 
 #: services.pm:66
@@ -14895,7 +15243,7 @@ msgid ""
 "machines\n"
 "which act as servers for protocols which make use of the RPC mechanism."
 msgstr ""
-"Portmapper håndterer RPC-tilknytninger, som brukes av protokoller\n"
+"Portmapper håndterer RPC-tilkoblinger, som brukes av protokoller\n"
 "som NFS og NIS. Portmap-tjeneren må kjøres på maskiner som brukes som\n"
 "tjenere for protokoller som bruker RPC-mekanismen."
 
@@ -14960,7 +15308,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 ""
 "rwho-protokollen lar fjernbrukere motta en liste over alle brukerne\n"
 "som er logget på en maskin som kjører rwho-daemonen (lik finger)."
@@ -14986,9 +15334,9 @@ msgstr "Last driverene for dine usb enheter."
 
 #: 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 ""
-"Starter X-font-tjeneren (dette er obligatorisk for at XFree skal kjøre)."
+"Starter X-font-tjeneren (dette er obligatorisk for at Xorg skal kjøre)."
 
 #: services.pm:117 services.pm:159
 #, c-format
@@ -15032,7 +15380,7 @@ msgstr "stoppet"
 
 #: services.pm:215
 #, c-format
-msgid "Services and deamons"
+msgid "Services and daemons"
 msgstr "Tjenester og daemoner"
 
 #: services.pm:221
@@ -15044,7 +15392,7 @@ msgstr ""
 "Ingen tilleggsinformasjon\n"
 "om denne tjenesten, begklager."
 
-#: services.pm:226 ugtk2.pm:1176
+#: services.pm:226 ugtk2.pm:1214
 #, c-format
 msgid "Info"
 msgstr "Info"
@@ -15059,830 +15407,1342 @@ msgstr "Start når det forespørres"
 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>Congratulations for choosing Mandrakelinux!</b>"
-msgstr "<b>Gratulerer med ditt valg av Mandrakelinux!</b>"
+msgid "<b>What is Mandrakelinux?</b>"
+msgstr "<b>Hva er Mandrakelinux?</b>"
 
-#: 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/01.pl:15
 #, c-format
-msgid "Welcome to the Open Source world!"
-msgstr "Velkommen til Open Source-verdenen!"
+msgid "Welcome to <b>Mandrakelinux</b>!"
+msgstr "Velkommen til <b>Mandrakelinux!</b>!"
 
-#: share/advertising/dis-01.pl:17
+#: share/advertising/01.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 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 ""
-"Ditt nye Mandrakelinux-operativsystem og dets mange applikasjoner er "
-"resultatet av samarbeid mellom MandrakeSoft-utviklere og Mandrakelinux-"
-"bidragsytere rundt om i verden."
+"Mandrakelinux er en <b>Linux distribusjon</b> som inneholder kjernen i "
+"systemet, kalt <b>operativsystemet</b> (basert på Linux kjernen) sammen med "
+"<b>mange programmer</b> som møter alle behov du kan tenke på."
 
-#: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19
-#: share/advertising/ppp-01.pl:19
+#: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of this "
-"latest release."
+"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 ""
-"Vi vil takke alle som har deltatt i utviklingen av denne siste utgaven."
+"Mandrakelinux er den mest <b>brukervennlige</b> Linux distribusjonen i dag. "
+"Det er også en av de <b>mest brukte</b> Linux distribusjonene i verden!"
 
-#: share/advertising/dis-02.pl:13
+#: share/advertising/02.pl:13
 #, c-format
-msgid "<b>Discovery</b>"
-msgstr "<b>Discovery</b>"
+msgid "<b>Open Source</b>"
+msgstr "<b>Open Source</b>"
 
-#: share/advertising/dis-02.pl:15
+#: share/advertising/02.pl:15
+#, c-format
+msgid "Welcome to the <b>world of open source</b>!"
+msgstr "Velkommen til <b>Open Source-verdenen</b>!"
+
+#: share/advertising/02.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."
+"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 ""
-"Discovery er den enkleste og mest brukervennlige Linux-distribusjonen. Den "
-"innholder et håndplukket utvalg er topp programvare for Kontor, Multimediaog "
-"Internettaktiviteter."
+"Mandrakelinux er og skal fortsette å være basert på åpen kildekode-modellen. "
+"Dette betyr at hver nye utgivelse er resultatet av <b>samarbeid</b> mellom "
+"<b>Mandrakesoft's utviklergruppe</b> og det <b>verdensomspennende samfunnet</"
+"b> av Mandrakelinux bidragsytere."
 
-#: share/advertising/dis-02.pl:17
+#: share/advertising/02.pl:19
 #, c-format
-msgid "The menu is task-oriented, with a single selected application per task."
+msgid ""
+"We would like to <b>thank</b> everyone who participated in the development "
+"of this latest release."
 msgstr ""
-"Menyen er oppgaveorientert, med et enkelt program valg for hver oppgave."
+"Vi vil <b>takke</b> alle som har deltatt i utviklingen av denne siste "
+"utgaven."
 
-#: share/advertising/dis-03.pl:13
+#: share/advertising/03.pl:13
 #, c-format
-msgid "<b>The KDE Choice</b>"
-msgstr "<b>KDE-valget</b>"
+msgid "<b>The GPL</b>"
+msgstr "<b>GPL-lisensen</b>"
 
-#: share/advertising/dis-03.pl:15
+#: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"The powerful Open Source graphical desktop environment KDE is the desktop of "
-"choice for the Discovery Pack."
+"Most of the software included in the distribution and all of the "
+"Mandrakelinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
-"Det kraftig Open Source skrivebordsmiljøet KDE er det valgte skrivebordet "
-"for Discovery-pakka."
-
-#: share/advertising/dis-04.pl:13
-#, c-format
-msgid "<b>OpenOffice.org</b>: The complete Linux office suite."
-msgstr "<b>OpenOffice.org</b>: Den komplette Linux kontorsuiten."
+"De fleste programmene inkludert i distribusjonen og alle Mandrakelinux "
+"verktøyene er lisensert under <b>General Public License</b>."
 
-#: share/advertising/dis-04.pl:15
+#: share/advertising/03.pl:17
 #, 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."
+"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 ""
-"<b>WRITER</b> er et kraftig skriveprogram for å lage alle slags "
-"tekstdokumenter. Dokumenter kan innholde bilder, diagram og tabeller."
+"GPL er hjertet i åpen-kildekode modellen, det gir alle <b>friheten</b> til å "
+"bruke, studere, distribuere og forbedre programmet i hvilken som helst måte "
+"de vil, så lenge de lar resultatet være tilgjengelig."
 
-#: share/advertising/dis-04.pl:16
+#: share/advertising/03.pl:19
 #, c-format
 msgid ""
-"<b>CALC</b> is a feature-packed spreadsheet which enables you to compute, "
-"analyze and manage all of your data."
+"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 ""
-"<b>CALC</b> er et finessefylt regneark som lar deg beregne, analysere og "
-"håndtere alle dine data."
+"Hovedfordelen med dette er at antallet utviklere er så å si <b>uendelig</b>, "
+"noe som resulterer i <b>veldig høy kvalitets</b> programvare."
+
+# # Ingenting gjort, syntes "Bli med i samfunnet" ikke hørtes helt bra ut
+#: share/advertising/04.pl:13
+#, c-format
+msgid "<b>Join the Community</b>"
+msgstr "<b>Bli med i Mandrakelinux-samfunnet!</b>"
 
-#: share/advertising/dis-04.pl:17
+#: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"<b>IMPRESS</b> is the fastest, most powerful way to create effective "
-"multimedia presentations."
+"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 ""
-"<b>IMPRESS</b> er den raskeste, mest kraftige veien til å lage effektive "
-"multimediapresentasjoner."
+"Mandrakelinux har et av de <b>største samfunnene</b> med brukere og "
+"utviklere. Rollen til et slikt samfunn er veldig bred, alt fra "
+"feilrapportering til utvikling av nye programmer. Samfunnet har en "
+"<b>avgjørende rolle</b> i Mandrakelinux verdenen."
 
-#: share/advertising/dis-04.pl:18
+#: share/advertising/04.pl:17
 #, c-format
 msgid ""
-"<b>DRAW</b> will produce everything from simple diagrams to dynamic 3D "
-"illustrations."
+"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 ""
-"<b>DRAW</b> vil produsere alt fra enkle diagram til dynamiske 3D-"
-"illustrasjoner"
+"For <b>å lære mer</b> om vårt dynamiske samfunn, vennligst besøk <b>www."
+"mandrakelinux.com</b> eller direkte <b>www.mandrakelinux.com/en/cookerdevel."
+"php3</b> hvis du vil bli <b>involvert</b> i utviklingen."
 
-#: share/advertising/dis-05.pl:13 share/advertising/dis-06.pl:13
+#: share/advertising/05.pl:13
 #, c-format
-msgid "<b>Surf The Internet</b>"
-msgstr "<b>Surf Internett</b>"
+msgid "<b>Download Version</b>"
+msgstr "<b>Nedlastingsversjon</b>"
 
-#: share/advertising/dis-05.pl:15
+#: share/advertising/05.pl:15
 #, c-format
-msgid "Discover the new integrated personal information suite KDE Kontact."
-msgstr "Oppdag den nye integrerte personaliainformasjonssuiten KDE Kontact."
+msgid ""
+"You are now installing <b>Mandrakelinux Download</b>. This is the free "
+"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+msgstr ""
+"Du installerer nå <b>Mandrakelinux Download</b>. Dette er gratisversjonen "
+"som Mandrakesoft vil ha <b>tilgjengelig for alle</b>."
 
-#: share/advertising/dis-05.pl:17
+#: share/advertising/05.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!"
+"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 ""
-"Mer enn bare en epostklient full av finesser; <b>Kontact</b> inkluderer også "
-"en adressebok, kalender og planlegger, plus et verktøy for å ta notater!"
+"Nedlastings-versjonen <b>kan ikke inkludere</b> alle programmene som ikke er "
+"åpen kildekode. Derfor vil du i nedlastings-versjonen ikke finne:"
 
-#: share/advertising/dis-06.pl:15
+#: share/advertising/05.pl:18
 #, c-format
-msgid "You can also:"
-msgstr "Du kan også:"
+msgid ""
+"\t* <b>Proprietary drivers</b> (such as drivers for NVIDIA®, ATI™, etc.)."
+msgstr ""
+"\t* <b>Proprietære drivere</b> (som drivere for NVIDIA®, ATI(tm), osv.)."
 
-#: share/advertising/dis-06.pl:16
+#: share/advertising/05.pl:19
 #, c-format
-msgid "\t- browse the Web"
-msgstr "\t- utforsk nettet"
+msgid ""
+"\t* <b>Proprietary software</b> (such as Acrobat® Reader®, RealPlayer®, "
+"Flash™, etc.)."
+msgstr ""
+"\t* <b>Proprietær programvare</b> (som Acrobat® Reader®, RealPlayer®, Flash"
+"(tm), etc.)."
 
-#: share/advertising/dis-06.pl:17
+#: share/advertising/05.pl:21
 #, c-format
-msgid "\t- chat"
-msgstr "\t- snakk"
+msgid ""
+"You won't have access to the <b>services included</b> in the other "
+"Mandrakesoft products either."
+msgstr ""
+"Du vil ikke ha tilgang til <b>tjenestene inkludert</b> i andre Mandrakesoft "
+"produkter heller."
 
-#: share/advertising/dis-06.pl:18
+#: share/advertising/06.pl:13
 #, c-format
-msgid "\t- organize a video-conference"
-msgstr "\t- organiser en videokonferanse"
+msgid "<b>Discovery, Your First Linux Desktop</b>"
+msgstr "<b>Discovery, ditt første Linux system</b>"
 
-#: share/advertising/dis-06.pl:19
+#: share/advertising/06.pl:15
 #, c-format
-msgid "\t- create your own Web site"
-msgstr "\t- lag ditt eget nettsted"
+msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgstr "Du installerer nå <b>Mandrakelinux Discovery</b>."
 
-#: share/advertising/dis-06.pl:20
+#: share/advertising/06.pl:17
 #, c-format
-msgid "\t- ..."
-msgstr "\t- ..."
+msgid ""
+"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 ""
+"Discovery er den <b>enkleste</b> og mest <b>brukervennlige</b> Linux "
+"distribusjonen. Den inkluderer et håndplukket utvalg av <b>førsteklasses "
+"progamvare» for kontor-, multimedia- og Internett-aktiviteter. Menyen er "
+"oppgave-orientert, med et enkelt program for hver oppgave."
 
-#: share/advertising/dis-07.pl:13
+#: share/advertising/07.pl:13
 #, c-format
-msgid "<b>Multimedia</b>: Software for every need!"
-msgstr "<b>Multimedia</b>: Programvare for ethvert behov!"
+msgid "<b>PowerPack, The Ultimate Linux Desktop</b>"
+msgstr "<b>PowerPack, det ultimate Linux systemet</b>"
 
-#: share/advertising/dis-07.pl:15
+#: share/advertising/07.pl:15
 #, c-format
-msgid "Listen to audio CDs with <b>KsCD</b>."
-msgstr "Hør på audioCDer med <b>KsCD</b>."
+msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgstr "Du installerer nå <b>Mandrakelinux PowerPack</b>."
 
-#: share/advertising/dis-07.pl:17
+#: share/advertising/07.pl:17
 #, c-format
-msgid "Listen to music files and watch videos with <b>Totem</b>."
-msgstr "Hør på musikkfiler og se på videoer med <b>Totem</b>."
+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 ""
+"PowerPack er Mandrakesoft's <b>førsteklasses skrivebordspakke</b>. PowerPack "
+"inkluderer <b>flere tusen programmer</b> - alt fra de mest populære til de "
+"mest avanserte."
 
-#: share/advertising/dis-07.pl:19
+#: share/advertising/08.pl:13
 #, c-format
-msgid "View and edit images and photos with <b>GQview</b> and <b>The Gimp!</b>"
-msgstr "Vis og rediger bilder og fotografier med <b>GQview</b> og <b>Gimp</b>!"
+msgid "<b>PowerPack+, The Linux Solution for Desktops and Servers</b>"
+msgstr "<b>PowerPack+, Linux løsningen for hjemme PC-er og tjenere</b>"
 
-#: share/advertising/dis-08.pl:13 share/advertising/ppp-08.pl:13
-#: share/advertising/pwp-07.pl:13
+#: share/advertising/08.pl:15
 #, c-format
-msgid "<b>Mandrake Control Center</b>"
-msgstr "<b>Mandrake Kontrollsenter</b>"
+msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgstr "Du installerer nå <b>Mandrakelinux PowerPack+</b>"
 
-#: share/advertising/dis-08.pl:15 share/advertising/ppp-08.pl:15
-#: share/advertising/pwp-07.pl:15
+#: share/advertising/08.pl:17
 #, c-format
 msgid ""
-"The Mandrake Control Center is an essential collection of Mandrake-specific "
-"utilities for simplifying the configuration of your computer."
+"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 ""
-"Mandrake Kontrollsenter er en essensensiell samling av Mandrake-spesifikke "
-"verktøy for å forenkle konfigurasjonen av din maskin,"
+"PowerPack+ er en finessefylt Linux-løsning for små til mellomstore nettverk. "
+"Powerpack+ øker verdien til den vanlige PowerPack ved å legge til et stort "
+"utvalg av tjenerapplikasjoner i verdensklassen."
 
-#: share/advertising/dis-08.pl:17 share/advertising/ppp-08.pl:17
-#: share/advertising/pwp-07.pl:17
+#: share/advertising/09.pl:13
+#, c-format
+msgid "<b>Mandrakesoft Products</b>"
+msgstr "<b>Mandrakesoft-produkter</b>"
+
+#: share/advertising/09.pl:15
 #, 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."
+"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"products."
 msgstr ""
-"Du vil umidelbart sette pris på denne samlingen av hendige verktøy for å "
-"enkelt konfigurere maskinvareenheter, definere monteringspunkter, sette opp "
-"nettverk og internett, justere sikkerhetsnivå på din maskin og så og si alt "
-"som er relatert til systemet."
+"<b>Mandrakesoft</b> har utviklet en lang rekke med <b>Mandrakelinux</b> "
+"produkter."
+
+#: share/advertising/09.pl:17
+#, c-format
+msgid "The Mandrakelinux 10.1 products are:"
+msgstr "Mandrakelinux 10.1-produktene er:"
+
+#: share/advertising/09.pl:18
+#, c-format
+msgid "\t* <b>Discovery</b>, Your First Linux Desktop."
+msgstr "\t* <b>Discovery</b>, Ditt første Linux-skrivebord."
 
-#: 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/09.pl:19
 #, c-format
-msgid "<b>MandrakeStore</b>"
-msgstr "<b>MandrakeStore</b>"
+msgid "\t* <b>PowerPack</b>, The Ultimate Linux Desktop."
+msgstr "\t* <b>PowerPack</b>, Det Ultimate Linux-skrivebordet."
 
-#: share/advertising/dis-09.pl:15 share/advertising/ppp-09.pl:15
-#: share/advertising/pwp-08.pl:15
+#: share/advertising/09.pl:20
+#, c-format
+msgid "\t* <b>PowerPack+</b>, The Linux Solution for Desktops and Servers."
+msgstr "\t* <b>PowerPack+</b>, Linux løsningen for hjemme PC-er og tjenere"
+
+#: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"Find all MandrakeSoft products and services at <b>MandrakeStore</b> -- our "
-"full service e-commerce platform."
+"\t* <b>Mandrakelinux 10.1 for x86-64</b>, The Mandrakelinux solution for "
+"making the most of your 64-bit processor."
 msgstr ""
-"Finn alle MandrakeSoft-produkter og tjenester på <b>MandrakeStore</b> -- vår "
-"fulle tjeneste e-handelplattform."
+"\t* <b>Mandrakelinux 10.1 for x86-64</b>, Mandrakelinux løsningen for å få "
+"mest mulig ut av din 64-bits prosessor."
 
-#: 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:13
 #, c-format
-msgid "Stop by today at <b>www.mandrakestore.com</b>"
-msgstr "Stopp innom i dag på <b>www.mandrakestore.com</b>"
+msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgstr "<b>Mandrakesoft Produketer (Nomade Produkter)</b>"
 
-#: share/advertising/dis-10.pl:13 share/advertising/ppp-10.pl:13
-#: share/advertising/pwp-09.pl:13
+#: share/advertising/10.pl:15
 #, c-format
-msgid "Become a <b>MandrakeClub</b> member!"
-msgstr "Bli et <b>MandrakeClub</b>-medlem"
+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 ""
+"Mandrakesoft har utviklet to produkter som lar deg bruke Mandrakelinux <b>på "
+"hvilken som helst PC</b> uten å trenge å installere det."
 
-#: 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/10.pl:16
 #, c-format
 msgid ""
-"Take advantage of valuable benefits, products and services by joining "
-"MandrakeClub, such as:"
+"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"bootable CD-Rom."
 msgstr ""
-"Ta nytte av verdifulle fordeler, produkter og tjenester ved å bli med i "
-"Mandrake Club som:"
+"\t* <b>Move</b>, en Mandrakelinux distribusjon som kjører helt fra en "
+"oppstartbar CD-Rom."
 
-#: 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/10.pl:17
 #, c-format
-msgid "\t- Full access to commercial applications"
-msgstr "\t- Full tilgang til kommersielle applikasjoner"
+msgid ""
+"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"ultra-compact “LaCie Mobile Hard Drive”."
+msgstr ""
+"\t* <b>GlobeTrotter</b>, en Mandrakelinux distribusjon ferdig installert på "
+"den ultra-kompakte «LaCie Mobile Hard Drive»."
 
-#: 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:13
 #, c-format
-msgid "\t- Special download mirror list exclusively for MandrakeClub Members"
-msgstr ""
-"\t- Spesiell liste over nedlastningsspeill eksklusivt for MandrakeClub-"
-"medlemmer"
+msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgstr "<n>Mandrakesoft produkter (profesjonelle løsninger)</b>"
 
-#: 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:15
 #, c-format
-msgid "\t- Voting for software to put in Mandrakelinux"
-msgstr "\t- Stem på programvare som skal være med i Mandrakelinux"
+msgid ""
+"Below are the Mandrakesoft products designed to meet the <b>professional "
+"needs</b>:"
+msgstr ""
+"Under er Mandrakesoft produktene utformet for å møte <b>profesjonelle behov</"
+"b>:#"
 
-#: 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/11.pl:16
 #, c-format
-msgid "\t- Special discounts for products and services at MandrakeStore"
-msgstr "\t- Spesielle rabatter for produkter og tjenester hos MandrakeStore"
+msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b>, Mandrakelinux systemet for bedrifter."
 
-#: 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/11.pl:17
 #, c-format
-msgid "\t- Plus much more"
-msgstr "\t- Pluss mye mer"
+msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, Mandrakelinux tjener-løsningen."
 
-#: 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/11.pl:18
 #, c-format
-msgid "For more information, please visit <b>www.mandrakeclub.com</b>"
-msgstr "For mer informasjon, vennligst besøk <b>www.mandrakeclub.com</b>"
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgstr "\t* <b>Multi-Network Firewall</b>, Mandrakelinux sikkerhets-løsningen."
 
-#: share/advertising/dis-11.pl:13
+#: share/advertising/12.pl:13
 #, c-format
-msgid "Do you require assistance?"
-msgstr "Trenger du assistanse?"
+msgid "<b>The KDE Choice</b>"
+msgstr "<b>KDE-valget</b>"
 
-#: 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/12.pl:15
 #, c-format
-msgid "<b>MandrakeExpert</b> is the primary source for technical support."
-msgstr "<b>MandrakeExpert</b> er den primære kilden for teknisk kundestøtte."
+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 ""
+"Du vil bli introdusert til <b>KDE</b>, det mest avanserte og brukervennelige "
+"<b>grafiske skrivebordsmiljøet</b> tilgjengelig."
 
-#: 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/12.pl:17
 #, c-format
 msgid ""
-"If you have Linux questions, subscribe to MandrakeExpert at <b>www."
-"mandrakeexpert.com</b>"
+"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 ""
-"Hvis du har Linux-spørsmål, abonner på MandrakeExpert hos <b>www."
-"mandrakeexpert.com</b>"
+"KDE vil også gjøre dine <b>første skritt</b> med Linux så <b>enkle</b> at du "
+"aldri vil tenke på å kjøre et annet operativsystem!"
 
-#: share/advertising/dwd-01.pl:17
+#: share/advertising/12.pl:19
 #, 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."
+"KDE also includes a lot of <b>well integrated applications</b> such as "
+"Konqueror, the web browser and Kontact, the personal information manager."
 msgstr ""
-"Mandrakelinux er bundet til Open Source-modellen og har full respekt for "
-"General Public License. Denne nye utgaven er resultatet av samarbeid mellom "
-"MandrakeSoft's team av utviklere og det verdensomspennende samfunnet av "
-"Mandrakelinux-bidragsytere."
+"KDE inkluderer også mange <b>godt integrerte programmer</b> som for eksempel "
+"Konqueror, nettleseren og Kontact, personlig informasjonsbehandleren."
 
-#: share/advertising/dwd-02.pl:13
+#: share/advertising/13-a.pl:13 share/advertising/13-b.pl:13
 #, c-format
-msgid "<b>Join the Mandrakelinux community!</b>"
-msgstr "<b>Bli med i Mandrakelinux-samfunnet!</b>"
+msgid "<b>Choose your Favorite Desktop Environment</b>"
+msgstr "<b>Velg ditt foretrukne grafiske skrivebordsmiljø</b>"
 
-#: share/advertising/dwd-02.pl:15
+#: share/advertising/13-a.pl:15
 #, 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>"
+"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 ""
-"Hvis du vil bli involvert, abonnér da vennligst på \"Cooker\"- mailinglisten "
-"ved å besøke <b>mandrake-linux.com/cooker</b>"
+"Med PowerPack vil du ha valget mellom flere <b>grafiske skrivebordsmiljøer</"
+"b>. Mandrakesoft har valgt <b>KDE</b> som standard."
 
-#: share/advertising/dwd-02.pl:17
+#: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
 msgid ""
-"To learn more about our dynamic community, please visit <b>www.mandrake-"
-"linux.com</b>!"
+"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 ""
-"For å lære mer om vårt dynamiske samfunn, besøk <b>www.mandrake-linux.com</"
-"b>!"
+"KDE er en av de <b>mest avanserte</b> og <b>brukervennlige</b> grafiske "
+"skrivebordsmiljøene tilgjengelig. Det inkluderer mange integrerte programmer."
 
-#: share/advertising/dwd-03.pl:13
+#: share/advertising/13-a.pl:19 share/advertising/13-b.pl:19
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Hva er Mandrakelinux?</b>"
+msgid ""
+"But we advise you to try all available ones (including <b>GNOME</b>, "
+"<b>IceWM</b>, etc.) and pick your favorite."
+msgstr ""
+"Men vi råder deg til å prøve alle de tilgjengelige (inkludert <b>GNOME</b>, "
+"<b>IceWM</b>, etc.) og velge din favoritt."
 
-#: share/advertising/dwd-03.pl:15
+#: share/advertising/13-b.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!"
+"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 ""
-"Mandrakelinux er en Open Source-distribusjon laget med tusenvis av "
-"programmer fra den Frie Programvare-verdenen. Mandrakelinux er en av de mest "
-"brukte Linux-distribusjonene i hele verden!"
+"Med PowerPack+ vil du ha valget mellom flere <b>grafiske skrivebordsmiljøer</"
+"b>. Mandrakesoft har valgt <b>KDE</b> som standard."
+
+#: share/advertising/14.pl:13
+#, c-format
+msgid "<b>OpenOffice.org</b>"
+msgstr "<b>OpenOffice.org</b>"
 
-#: share/advertising/dwd-03.pl:17
+#: share/advertising/14.pl:15
+#, c-format
+msgid "With Discovery, you will discover <b>OpenOffice.org</b>."
+msgstr "Med Discovery vil du utforske <b>OpenOffice.org</b>."
+
+#: share/advertising/14.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."
+"It is a <b>full-featured office suite</b> that includes word processor, "
+"spreadsheet, presentation and drawing applications."
 msgstr ""
-"Mandrakelinux inkluderer de berømte grafiske skrivebordene KDE og GNOME, "
-"pluss den siste versjonen av de mest populære Open Source-applikasjonene."
+"Det er en <b>komplett kontorpakke</b> som inkluderer en tekstbehandler, "
+"regneark og tegne-programmer."
 
-#: share/advertising/dwd-04.pl:13
+#: share/advertising/14.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."
+"OpenOffice.org can read and write most types of <b>Microsoft® Office</b> "
+"documents such as Word, Excel and PowerPoint® files."
 msgstr ""
-"Mandrakelinux er vidt kjent for å være den mest brukervennlige, enkleste å "
-"installere og letteste å bruke Linux-distribusjonen som er."
+"OpenOffice.org kan lese og skrive de fleste typer av <b>Microsoft® Office</"
+"b> dokumenter som Word, Excel og PowerPoint® filer."
 
-#: share/advertising/dwd-04.pl:15
+#: share/advertising/15.pl:13
 #, c-format
-msgid "Find out about our <b>Personal Solutions</b>:"
-msgstr "Find ut mer om våre <b>Personlige løsninger</b>:"
+msgid "<b>Kontact</b>"
+msgstr "<b>Kontact</b>"
 
-#: share/advertising/dwd-04.pl:16
+#: share/advertising/15.pl:15
 #, c-format
-msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
+msgid ""
+"Discovery includes <b>Kontact</b>, the new KDE <b>groupware solution</b>."
 msgstr ""
-"\t- Finn ut mer om vår Mandrakelinux på en oppstartsbar CD med MandrakeMove"
+"Discovery inkluderer <b>Kontact</b>, den nye KDE <b>gruppevare-løsningen</b>."
 
-#: share/advertising/dwd-04.pl:17
+#: share/advertising/15.pl:17
 #, c-format
 msgid ""
-"\t- If you use Linux mostly for Office, Internet and Multimedia tasks, "
-"<b>Discovery</b> perfectly meets your needs"
+"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 ""
-"\t- Hvis du bruker Linux mest for Kontoret, Internett og Multimediaoppgaver, "
-"så passer <b>Discovery</b> dine behov perfekt"
+"Mer enn bare en <b>epostklient</b> full av finesser; Kontact inkluderer også "
+"en <b>adressebok</b>, <b>kalender og planlegger</b>, pluss et verktøy for å "
+"ta <b>notater</b>!"
 
-#: share/advertising/dwd-04.pl:18
+#: share/advertising/15.pl:19
 #, c-format
 msgid ""
-"\t- If you appreciate the largest selection of software including powerful "
-"development tools, <b>PowerPack</b> is for you"
+"It is the easiest way to communicate with your contacts and to organize your "
+"time."
 msgstr ""
-"\t- Hvis du setter pris på det største utvalget av progamvare inklusive "
-"kraftige utviklingsverktøy så er <b>PowerPack</b> for deg"
+"Det er den enkleste måten å kommunisere med dine kontakter og organisere din "
+"tid."
 
-#: share/advertising/dwd-04.pl:19
+#: share/advertising/16.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>Surf the Internet</b>"
+msgstr "<b>Surf internett</b>"
+
+#: share/advertising/16.pl:15
+#, c-format
+msgid "Discovery will give you access to <b>every Internet resource</b>:"
 msgstr ""
-"\t- Hvis du trenger en Linux-løsning full av finesser skreddersydd for små "
-"til mediumstore nettverk, velg <b>PowerPack+</b>"
+"Discovery vil gi deg tilgang til <b>alle mulige Internett-ressurser</b>:"
+
+#: share/advertising/16.pl:16
+#, c-format
+msgid "\t* Browse the <b>Web</b> with Konqueror."
+msgstr "\t* Surf på <b>nettet</b> med Konqueror"
+
+#: share/advertising/16.pl:17
+#, c-format
+msgid "\t* <b>Chat</b> online with your friends using Kopete."
+msgstr "\t* <b>Snakk</b> på Internett med dine venner ved bruk av Kopete."
+
+#: share/advertising/16.pl:18
+#, c-format
+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 "\t* ..."
 
-#: share/advertising/dwd-05.pl:13
+#: share/advertising/17.pl:13
 #, c-format
-msgid "Find out also our <b>Business Solutions</b>!"
-msgstr "Finn også ut om våre <b>Bedriftsløsninger</b>!"
+msgid "<b>Enjoy our Multimedia Features</b>"
+msgstr "<b>Nyt våre multimedia-funksjoner</b>"
 
-#: share/advertising/dwd-05.pl:15
+#: share/advertising/17.pl:15
+#, c-format
+msgid "Discovery will also make <b>multimedia</b> very easy for you:"
+msgstr "Discovery vil også gjøre <b>multimedia</b> veldig enkelt for deg."
+
+#: share/advertising/17.pl:16
+#, c-format
+msgid "\t* Watch your favorite <b>videos</b> with Kaffeine."
+msgstr "\t* Se dine <b>favorittvideoer</b> med Kaffeine."
+
+#: share/advertising/17.pl:17
+#, c-format
+msgid "\t* Listen to your <b>music files</b> with amaroK."
+msgstr "\t* Hør på dine <b>musikkfiler</b> med amaroK."
+
+#: share/advertising/17.pl:18
+#, c-format
+msgid "\t* Edit and create <b>images</b> with the GIMP."
+msgstr "\t* Rediger og lag bilder <b>GIMP</b>"
+
+#: share/advertising/18.pl:13
+#, c-format
+msgid "<b>Enjoy the Wide Range of Applications</b>"
+msgstr "<b>Nyt den lange rekken med programmer</b>"
+
+#: 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 ""
-"<b>Corporate Server</b>: den idéelle løsningen for større bedrifter. Det er "
-"en komplett \"alt-i-en\"-løsning som inkluderer alt som trengs for å kjapt "
-"rulle ut Linux-tjenerapplikasjoner i verdensklassen."
+"I Mandrakelinux-menyen vil du finne programmer som er <b>enkle å bruke</b> "
+"for <b>alle dine oppgaver</b>:"
+
+#: share/advertising/18.pl:16
+#, c-format
+msgid "\t* Create, edit and share office documents with <b>OpenOffice.org</b>."
+msgstr "\t* Opprett, rediger og del dokumenter med <b>OpenOffice.org</b>"
 
-#: 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 ""
-"<b>Multi Network Firewall</b>: basert på Linux 2.4 \"kernel secure\" for å "
-"gi multi-VPN- så vel som multi-DMZ-funksjonaliteter. Det er den perfekte "
-"høyytelses sikkerhetsløsning."
+"\t* Ta kontroll over dine personlige data med de integrerte, personlige "
+"informasjonssuitene <b>Kontact</b> og <b>Evolution</b>"
 
-#: 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 "\t* Surf nettet med <b>Mozilla</b> og <b>Konqueror</b>"
+
+#: share/advertising/18.pl:19
+#, c-format
+msgid "\t* Participate in online chat with <b>Kopete</b>."
+msgstr "\t* Delta i onlinesamtaler med Kopete"
+
+#: 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."
-msgstr ""
-"<b>MandrakeClustering</b>: kraften og hastigheten av en Linux-klynge "
-"kombinert med stabiliteten og brukervennligheten av den verdenskjente "
-"Mandrakelinux-distribusjonen. En unik blanding for enestående HPC-ytelse."
+"\t* Listen to your <b>audio CDs</b> and <b>music files</b>, watch your "
+"<b>videos</b>."
+msgstr "\t* Hør på <b>CD-er</b> og <b>musikkfiler</b>, se dine <b>filmer</b>."
+
+#: share/advertising/18.pl:21
+#, c-format
+msgid "\t* Edit and create images with the <b>GIMP</b>."
+msgstr "\t* Rediger bilder og fotografier med <b>Gimp</b>"
+
+#: share/advertising/19.pl:13
+#, c-format
+msgid "<b>Development Environments</b>"
+msgstr "<b>Utviklingsmiljøer</b>"
 
-#: share/advertising/dwd-06.pl:15
+#: 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 ""
-"Finn alle MandrakeSoft-produkter hos <b>MandrakeStore</b> - vår fullbetjente "
-"e-handelplattform."
+"PowerPack gir deg noen av de beste verktøyene til å <b>utvikle</b> dine egne "
+"programmer."
 
-#: 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 ""
-"Find også ut om kundestøttetilfeller hvis du har noen problemer, fra "
-"standard til profesjonell kundestøtte, fra 1 til 50 tilfeller, velg den som "
-"møter dine behov best!"
+"Du vil nyte det kraftige, integrerte utviklingsmiljøet fra KDE; <b>KDevelop</"
+"b>, som vil la deg programmere i mange programmerings-spårk</b>"
 
-#: share/advertising/dwd-07.pl:13
+#: share/advertising/19.pl:19
 #, c-format
-msgid "<b>Become a MandrakeClub member!</b>"
-msgstr "<b>Bli et MandrakeClub-medlem!</b>"
+msgid ""
+"PowerPack also ships with <b>GCC</b>, the leading Linux compiler and <b>GDB</"
+"b>, the associated debugger."
+msgstr ""
+"PowerPack kommer også med <b>GCC</b>, den ledende Linux kompilatoren og "
+"<b>GDB</b>, det tilhørende feilsøkingsprogrammet."
 
-#: 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>Trenger du assistanse?</b>"
+msgid "<b>Development Editors</b>"
+msgstr "<b>Utviklings-redigerere</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 ""
+"PowerPack vil la deg velge mellom de <b>populære skriveprogrammene</b>:"
 
-#: share/advertising/dwd-09.pl:18
+#: share/advertising/20.pl:16
 #, c-format
-msgid "This is the Mandrakelinux <b>Download version</b>."
-msgstr "Dette er Mandrakelinux <b>Download Edition</b>."
+msgid "\t* <b>Emacs</b>: a customizable and real time display editor."
+msgstr "\t* <b>Emacs</b>: et sanntids tekstprogram som lar seg tilpasses mye"
 
-#: 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 ""
-"Den gratis nedlastningsversjonen inkluderer ikke kommersiell programvare, og "
-"vil dermed muligens ikke fungere med enkelte modemer (slik som noen ADSL og "
-"RTC) og skjermkort (slik som ATI® og NVIDIA®)."
+"\t - <b>XEmacs</b>: enda et open source tekstprogram og  "
+"applikasjonsutviklingssystem"
 
-#: 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 ""
-"Din nye Mandrakelinux-distribusjon og dets mange applikasjoner er resultatet "
-"av samarbeid mellom MandrakeSoft-utviklere og Mandrakelinux-bidragsytere "
-"rundtom i verden."
+"\t <b>Vim</b>: avansert tekstprogram med flere finesser enn standard Vi"
 
-#: 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>Utviklingssprå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 ""
-"PowerPack+ er en finessefylt Linux-løsning for små til mellomstore nettverk. "
-"Powerpack+ øker verdien til den vanlige PowerPack ved å legge til et stort "
-"utvalg av tjenerapplikasjoner i verdensklassen."
+"Med alle disse <b>kraftige verktøyene</b>, vil du kunne skrive programmer i "
+"<b>dusiner av programmerings-språk</b>:"
+
+#: share/advertising/21.pl:16
+#, c-format
+msgid "\t* The famous <b>C language</b>."
+msgstr "\t* Det kjente <b>C-språket</b>."
+
+#: share/advertising/21.pl:17
+#, c-format
+msgid "\t* Object oriented languages:"
+msgstr "\t* Objekt-orienterte språk:"
+
+#: 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* Skripte-språ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 "\t* Og mange andre."
+
+#: share/advertising/22.pl:13
+#, c-format
+msgid "<b>Development Tools</b>"
+msgstr "<b>Utviklingsverktøy</b>"
 
-#: share/advertising/ppp-02.pl:17
+#: share/advertising/22.pl:17
 #, c-format
 msgid ""
-"It is the only Mandrakelinux product that includes the groupware solution."
+"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 ""
-"Det er den eneste Mandrakelinux-produktet som inkluderer gruppevareløsningen."
+"Med det kraftige integrerte utviklings-miljøet <b>KDevelop</b> og den "
+"ledende Linux kompilatoren <b>GCC</b>, vil du kunne lage programmer i "
+"<b>mange forskjellige språk</b> (C, C++, Jave(tm), Perl, Python, osv.)."
 
-#: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13
+#: share/advertising/23.pl:13
 #, c-format
-msgid "<b>Choose your graphical Desktop environment!</b>"
-msgstr "<b>Velg ditt grafiske skrivebordsmiljø!</b>"
+msgid "<b>Groupware Server</b>"
+msgstr "<b>Gruppevare tjener</b>"
 
-#: share/advertising/ppp-03.pl:15 share/advertising/pwp-03.pl:15
+#: share/advertising/23.pl:15
 #, 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."
+"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 ""
-"Når du logger inn på ditt Mandrakelinux-system for første gang så kan du "
-"velge mellom en rekke populære grafiske skrivebordsmiljøer, inkludert KDE, "
-"GNOME, WindowMaker, IceWM og andre."
+"PowerPack+ vil gi deg tilgang til <b>Kolab</b>, en fullstendig "
+"<b>gruppevaretjener</b> som vill, takket være klienten <b>Kontact</b>, la "
+"deg:"
 
-#: share/advertising/ppp-04.pl:13
+#: share/advertising/23.pl:16
+#, c-format
+msgid "\t* Send and receive your <b>e-mails</b>."
+msgstr "\t* Send og motta din <b>epost</b>"
+
+#: share/advertising/23.pl:17
+#, c-format
+msgid "\t* Share your <b>agendas</b> and your <b>address books</b>."
+msgstr "\t* Del din <b>tidsplan</b> og din <b>addressebok</b>."
+
+#: share/advertising/23.pl:18
+#, c-format
+msgid "\t* Manage your <b>memos</b> and <b>task lists</b>."
+msgstr "\t* Håndter dine <b>huskelapper</b> og <b>oppgavelister</b>."
+
+#: share/advertising/24.pl:13
+#, c-format
+msgid "<b>Servers</b>"
+msgstr "<b>Tjenere</b>"
+
+#: share/advertising/24.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all "
-"tasks:"
+"Empower your business network with <b>premier server solutions</b> including:"
 msgstr ""
-"I Mandrakelinux-menyen så vil du finne applikasjoner som er enkle for s alle "
-"oppgaver:"
+"Styrk ditt bedriftsnettverk med <b>utmerkede tjenerløsninger</b> som "
+"inkluderer:"
+
+#: share/advertising/24.pl:16
+#, c-format
+msgid ""
+"\t* <b>Samba</b>: File and print services for Microsoft® Windows® clients."
+msgstr "\t* <b>Samba</b>: Fil- og skriver-tjenester for MS Windows-klienter"
 
-#: share/advertising/ppp-04.pl:15 share/advertising/pwp-04.pl:15
+#: share/advertising/24.pl:17
 #, c-format
-msgid "\t- Create, edit and share office documents with <b>OpenOffice.org</b>"
-msgstr "\t- Opprett, rediger og del dokumenter med <b>OpenOffice.org</b>"
+msgid "\t* <b>Apache</b>: The most widely used web server."
+msgstr "\t* <b>Apache</b>: Den mest brukte Web-tjeneren"
 
-#: share/advertising/ppp-04.pl:16
+#: share/advertising/24.pl:18
 #, c-format
 msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites: <b>Kontact</b> and <b>Evolution</b>"
+"\t* <b>MySQL</b> and <b>PostgreSQL</b>: The world's most popular open source "
+"databases."
 msgstr ""
-"\t- Ta kontroll over dine personlige data med de integrertre, personlige "
-"informasjonssuitene: <b>Kontact</b> og <b>Evolution</b>"
+"\t* <b>MySQL</b> og <b>PostgreSQL</b>: Verdens mest populære databaser som "
+"er åen kildekode."
 
-#: share/advertising/ppp-04.pl:17
+#: share/advertising/24.pl:19
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla and Konqueror</b>"
-msgstr "\t- Surf nettet med <b>Mozilla og Konqueror</b>"
+msgid ""
+"\t* <b>CVS</b>: Concurrent Versions System, the dominant open source network-"
+"transparent version control system."
+msgstr ""
+"\t* <b>CVS</b>: Concurrent Versions System, det dominerende open-source "
+"transparente versjonskontrollsystemet"
 
-#: share/advertising/ppp-04.pl:18 share/advertising/pwp-04.pl:18
+#: share/advertising/24.pl:20
 #, c-format
-msgid "\t- Participate in online chat with <b>Kopete</b>"
-msgstr "\t- Delta i onlinesamtaler med Kopete"
+msgid ""
+"\t* <b>ProFTPD</b>: The highly configurable GPL-licensed FTP server software."
+msgstr ""
+"\t* <b>ProFTPD</b>: den høyt konfigurerbare, GPL-lisensierte FTP-"
+"tjenerprogramvaren"
 
-#: share/advertising/ppp-04.pl:19
+#: share/advertising/24.pl:21
 #, c-format
 msgid ""
-"\t- Listen to audio CDs and music files with <b>KsCD</b> and <b>Totem</b>"
-msgstr "\t- Hør på audioCDer og musikk med <b>KsCD</b> og <b>Totem</b>"
+"\t* <b>Postfix</b> and <b>Sendmail</b>: The popular and powerful mail "
+"servers."
+msgstr ""
+"\t* <b>Postfix</b> og <b>Sendmail</b>. De populære og kraftige mailtjenerene."
 
-#: share/advertising/ppp-04.pl:20 share/advertising/pwp-04.pl:20
+#: share/advertising/25.pl:13
 #, c-format
-msgid "\t- Edit images and photos with <b>The Gimp</b>"
-msgstr "\t- Rediger bilder og fotografier med <b>Gimp</b>"
+msgid "<b>Mandrakelinux Control Center</b>"
+msgstr "<b>Mandrakelinux Kontrollsenter</b>"
 
-#: share/advertising/ppp-05.pl:13
+#: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"PowerPack+ includes everything needed for developing and creating your own "
-"software, including:"
+"The <b>Mandrakelinux Control Center</b> is an essential collection of "
+"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"your computer."
 msgstr ""
-"PowerPack+ inkluderer alt som trengs for utvikiling og for å lage din "
-"egenprogramvare, inkludert:"
+"<b>Mandrakelinux Kontrollsenter</b> er en uunværlig samling av Mandrakelinux-"
+"spesifikke verktøy for å forenkle konfigurasjonen av din maskin."
 
-#: share/advertising/ppp-05.pl:15 share/advertising/pwp-05.pl:16
+#: share/advertising/25.pl:17
 #, c-format
 msgid ""
-"\t- <b>Kdevelop</b>: a full featured, easy to use Integrated Development "
-"Environment for C++ programming"
+"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 ""
-"\t- <b>Kdevelop</b>: et finessefylt, brukervennlig tntegrert utviklingsmiljø "
-"for C++-programmering"
+"Du vil umidelbart sette pris på denne samlingen av <b>mer enn 60</b> hendige "
+"verktøy for å <b>enkelt konfigurere ditt system</b>: maskinvareenheter, "
+"monteringspunkter, nettverk og Internet, sikkerhetsnivået til din maskin, "
+"osv."
 
-#: share/advertising/ppp-05.pl:16 share/advertising/pwp-05.pl:17
+#: share/advertising/26.pl:13
 #, c-format
-msgid "\t- <b>GCC</b>: the GNU Compiler Collection"
-msgstr "\t- <b>GCC</b>: GCC kompilatorsamlingen"
+msgid "<b>The Open Source Model</b>"
+msgstr "<b>Åpen kildekode-modellen</b>"
 
-#: share/advertising/ppp-05.pl:17 share/advertising/pwp-05.pl:18
+#: share/advertising/26.pl:15
 #, c-format
-msgid "\t- <b>GDB</b>: the GNU Project debugger"
-msgstr "\t- <b>GDB</b>: GNU Prosjektavluseren"
+msgid ""
+"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 ""
+"Som all dataprogrammering, åpen kildekode-programmer <b>trenger tid og folk</"
+"b> for utvikling. For å respektere åpen kildekode-filosofien selger "
+"Mandrakesoft ekstra produkter og tjenester for å <b>fortsette å forbedre "
+"Mandrakelinux</b>. Hvis du vil <b>støtte åpen kildekode-filosofien</b> og "
+"utviklingen av Mandrakelinux, <b>vennligst</b> vurder å kjøpe en av våre "
+"produkter eller tjenester!"
 
-#: share/advertising/ppp-05.pl:18 share/advertising/pwp-06.pl:16
+#: share/advertising/27.pl:13
 #, c-format
-msgid "\t- <b>Emacs</b>: a customizable and real time display editor"
-msgstr "\t- <b>Emacs</b>: et sanntids tekstprogram som lar seg tilpasses mye"
+msgid "<b>Online Store</b>"
+msgstr "<b>Nettbutikk</b>"
 
-#: share/advertising/ppp-05.pl:19
+#: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"\t- <b>Xemacs</b>: open source text editor and application development system"
+"To learn more about Mandrakesoft products and services, you can visit our "
+"<b>e-commerce platform</b>."
 msgstr ""
-"\t - <b>Xemacs</b>: open source tekstprogram og applikasjonsutviklingssystem"
+"For å lære mer om Mandrakesoft produkter og tjenester kan du besøke får <b>e-"
+"handelplattform</b>."
 
-#: share/advertising/ppp-05.pl:20
+#: share/advertising/27.pl:17
 #, c-format
-msgid ""
-"\t- <b>Vim</b>: advanced text editor with more features than standard Vi"
+msgid "There you can find all our products, services and third-party products."
 msgstr ""
-"\t- <b>Vim</b>: avansert tekstprogram med flere finesser enn standard Vi"
+"Det kan du finne alle våre produkter, tjeneste og tredjeparts-produkter."
 
-#: share/advertising/ppp-06.pl:13
+#: share/advertising/27.pl:19
 #, c-format
-msgid "<b>Discover the full-featured groupware solution!</b>"
-msgstr "<b>Oppdag den finessefylte gruppevareløsningen!</b>"
+msgid ""
+"This platform has just been <b>redesigned</b> to improve its efficiency and "
+"usability."
+msgstr ""
+"Plattformen har akkuratt blitt <b>redesignet</b> for å forbedre "
+"effektiviteten og brukervenneligheten."
 
-#: share/advertising/ppp-06.pl:15
+#: share/advertising/27.pl:21
 #, c-format
-msgid "It includes both server and client features for:"
-msgstr "Det inkluderer både tjener- og klientfinesser for:"
+msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
+msgstr "Stopp innom i dag på <b>store.mandrakesoft.com</b>"
 
-#: share/advertising/ppp-06.pl:16
+#: share/advertising/28.pl:13
 #, c-format
-msgid "\t- Sending and receiving emails"
-msgstr "\t- Send og motta epost"
+msgid "<b>Mandrakeclub</b>"
+msgstr "<b>Mandrakeclub</b>"
 
-#: share/advertising/ppp-06.pl:17
+#: 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 ""
-"\t- Kalender, Oppgaveliste, Påminnelser, Kontakter, Møteforespørsler "
-"(sending og mottagelse), Oppgaveforespørsler (sending og mottagelse)"
+"<b>Mandrakeclub</b> er den <p>perfekte partner</b> til ditt Mandrakelinux "
+"produkt."
 
-#: share/advertising/ppp-06.pl:18
+#: share/advertising/28.pl:17
 #, c-format
-msgid "\t- Address Book (server and client)"
-msgstr "\t- Addressebok (tjener og klient)"
+msgid ""
+"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+msgstr "Utnytt våre <b>verdifulle fordeler</b> ved å i Mandrake Club, som:"
 
-#: 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 ""
-"Styrk ditt bedriftsnettverk med <b>utmerkede tjenerløsninger</b> som "
-"inkluderer:"
+"\t* <b>Spesielle rabatter</b> for produkter og tjenester hos vår nettbutikk "
+"<b>store.mandrakesoft.com</b>."
 
-#: 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"
-msgstr "\t- <b>Samba</b>: Fil- og skriver-tjenester for MS Windows-klienter"
+msgid ""
+"\t* Access to <b>commercial applications</b> (for example to NVIDIA® or ATI™ "
+"drivers)."
+msgstr ""
+"\t* Tilgang til <b>kommersielle applikasjoner</b> (for eksempel NVIDIA®- "
+"eller ATI™-drivere)."
+
+#: share/advertising/28.pl:20
+#, c-format
+msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgstr "\t* Delta i Mandrakelinux--<b>brukerforum</b>."
 
-#: share/advertising/ppp-07.pl:16
+#: share/advertising/28.pl:21
 #, c-format
-msgid "\t- <b>Apache</b>: The most widely used Web server"
-msgstr "\t- <b>Apache</b>: Den mest brukte Web-tjeneren"
+msgid ""
+"\t* <b>Early and privileged access</b>, before public release, to "
+"Mandrakelinux <b>ISO images</b>."
+msgstr ""
+"\t*<b>Tidlig og priviligert tilgang</b>, før offentlige utgivelser til "
+"Mandrakelinux-<b>ISO-imagefiler</b>."
 
-#: share/advertising/ppp-07.pl:17
+#: share/advertising/29.pl:13
 #, c-format
-msgid "\t- <b>MySQL</b>: The world's most popular Open Source database"
-msgstr "\t- <b>MySQL</b>: Verdens mest populære Open Source-database"
+msgid "<b>Mandrakeonline</b>"
+msgstr "<b>Mandrakeonline</b>"
 
-#: share/advertising/ppp-07.pl:18
+#: 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 ""
-"\t- <b>CVS</b>: Concurrent Versions System, det dominerende open-source "
-"transparente versjonskontrollsystemet"
+"<b>Mandrakeonline</b> er enflott tjeneste som Mandrakesoft er stolt over å "
+"kunne tilby sine kunder!"
 
-#: 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 ""
-"\t- <b>ProFTPD</b>: den høyt konfigurerbare, GPL-lisensierte FTP-"
-"tjenerprogramvaren"
+"Mandrakeonline tilbyr en lang rekke med verdifulle tjenester for <b>enkel "
+"oppdatering</b> av dine Mandrakelinux systemer:"
 
-#: share/advertising/ppp-07.pl:20
+#: share/advertising/29.pl:18
 #, c-format
-msgid "\t- And others"
-msgstr "\t- Og andre"
+msgid "\t* <b>Perfect</b> system security (automated software updates)."
+msgstr ""
+"\t* <b>Perfekt</b> systemsikkerhet (automatiske programvare-oppdateringer)."
 
-#: 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 ""
-"Din nye Mandrakelinux-distribusjon er et resultat av samarbeid mellom "
-"MandrakeSoft-uviklgere og Mandrakelinux-bidragsytere rundt om i verden."
+"\t* <b>Varsling</b> av oppdateringer (via e-post eller av et miniprogram på "
+"skrivebordet)."
 
-#: share/advertising/pwp-01.pl:19
+#: share/advertising/29.pl:20
+#, c-format
+msgid "\t* Flexible <b>scheduled</b> updates."
+msgstr "\t* Fleksible <b>planlagte</b> oppdateringer."
+
+#: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of our "
-"latest release."
-msgstr "Vi vil takke alle som deltok i utviklingen av vår seneste utgave."
+"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+msgstr "\t*Håndtering av <b>alle dine Mandrakelinux-systemer</b> med en konto."
 
-#: share/advertising/pwp-02.pl:13
+#: share/advertising/30.pl:13
 #, c-format
-msgid "<b>PowerPack</b>"
-msgstr "<b>PowerPack</b>"
+msgid "<b>Mandrakeexpert</b>"
+msgstr "<b>Mandrakeexpert</b>"
 
-#: share/advertising/pwp-02.pl:15
+#: share/advertising/30.pl:15
 #, 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."
-msgstr "u"
+"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"<b>our technical support platform</b> www.mandrakeexpert.com."
+msgstr ""
+"Har du behov for <b>assistanse?</b> Mæt Mandrakesoft's tekniske eksperter på "
+"<b>vår tekniske kundestøtteplattform</b> www.mandrakeexpert.com."
 
-#: share/advertising/pwp-04.pl:13
+#: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all of "
-"your tasks:"
+"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"a lot of time."
 msgstr ""
-"I Mandrakelinux-menyen vil du finne applikasjoner som er enklere å bruke for "
-"alle formål:"
+"Takket være hjelpa fra <b>kvalifiserte Mandrakelinux-eksperter</b>, så vil "
+"du få spart masse tid."
 
-#: share/advertising/pwp-04.pl:16
+#: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites <b>Kontact</b> and <b>Evolution</b>"
+"For any question related to Mandrakelinux, you have the possibility to "
+"purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"\t- Ta kontroll over dine personlige data med den integrerte, personlige "
-"informasjonssuiten <b>Kontact</b> og <b>Evolution</b>"
+"For alle spørsmål relatert til Mandrakelinux så har du muligheten til å "
+"kjøpe kundestøttetilfeller på <b>store.mandrakesoft.com</b>."
 
-#: share/advertising/pwp-04.pl:17
+#: share/compssUsers.pl:25
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla</b> and <b>Konqueror</b>"
-msgstr "\t- Surf nettet med <b>Mozilla</b> og <b>Konqueror</b>"
+msgid "Office Workstation"
+msgstr "Kontor og arbeidsmaskin"
 
-#: share/advertising/pwp-04.pl:19
+#: share/compssUsers.pl:27
 #, c-format
-msgid "\t- Listen to audio CDs and music files with KsCD and <b>Totem</b>"
-msgstr "\t- Hør på audioCDer og musikk med KsCD og <b>Totem</b>"
+msgid ""
+"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
+"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+msgstr ""
+"Kontorprogrammer: tekstbehandlere (OpenOffice.org Writer, Kword), regneark "
+"(OpenOffice.org Calc, Kspread), PDF fremvisere etc"
 
-#: share/advertising/pwp-05.pl:13 share/advertising/pwp-06.pl:13
+#: share/compssUsers.pl:28
 #, c-format
-msgid "<b>Development tools</b>"
-msgstr "<b>Utviklingsverktøy</b>"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Kontorstøtteprogrammer: tekstbehandlere (kword, abiword), regneark (kspread, "
+"gnumeric), pdf fremvisere etc"
+
+#: share/compssUsers.pl:33
+#, c-format
+msgid "Game station"
+msgstr "Spillstasjon"
+
+#: share/compssUsers.pl:34
+#, c-format
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Underholdningsprogrammer: arkade, bordspill, strategi etc"
+
+#: share/compssUsers.pl:37
+#, c-format
+msgid "Multimedia station"
+msgstr "Multimediastasjon"
+
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Sound and video playing/editing programs"
+msgstr "Lyd og bilde avspilling/redigeringsprogrammer"
+
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Internet station"
+msgstr "Internettstasjon"
 
-#: share/advertising/pwp-05.pl:15
+#: 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 ""
-"PowerPack inkluderer alt som trengs for utvikiling og for å lage din "
-"egenprogramvare, inkludert:"
+"Sett med verktøy for å lese og sende e-post og nyheter (mutt, tin..) og for "
+"se på webben"
+
+#: 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 "Klienter for forskjellige protokoller inkludert ssh"
+
+#: share/compssUsers.pl:54
+#, c-format
+msgid "Configuration"
+msgstr "Konfigurasjon"
+
+#: share/compssUsers.pl:55
+#, c-format
+msgid "Tools to ease the configuration of your computer"
+msgstr "Verktøy for å forenkle konfigurasjonen av maskinen din"
+
+#: 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 "Tekstprogrammer, skall, filverktøy, terminaler"
+
+#: share/compssUsers.pl:65 share/compssUsers.pl:165
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C og C++ utviklingsbibliotek, programmer og include-filer"
+
+#: share/compssUsers.pl:69 share/compssUsers.pl:169
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentasjon"
+
+#: share/compssUsers.pl:70 share/compssUsers.pl:170
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Bøker og howto's om Linux og fri programvare"
+
+#: 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 "Linux Standard Base. Tredjeparts programvarestøtte"
 
-#: share/advertising/pwp-06.pl:15
+#: share/compssUsers.pl:85
 #, c-format
-msgid "And of course the editors!"
-msgstr "Og selvfølgelig tekstprogrammene!"
+msgid "Apache"
+msgstr "Apache"
 
-#: share/advertising/pwp-06.pl:17
+#: share/compssUsers.pl:88
+#, c-format
+msgid "Groupware"
+msgstr "Gruppevare"
+
+#: share/compssUsers.pl:89
+#, c-format
+msgid "Kolab Server"
+msgstr "Kolab-tjener"
+
+#: share/compssUsers.pl:92 share/compssUsers.pl:133
+#, c-format
+msgid "Firewall/Router"
+msgstr "Tjener, Brannmur/ruter"
+
+#: share/compssUsers.pl:93 share/compssUsers.pl:134
+#, c-format
+msgid "Internet gateway"
+msgstr "Internett-gateway"
+
+#: share/compssUsers.pl:96
+#, c-format
+msgid "Mail/News"
+msgstr "E-post/Njus"
+
+#: share/compssUsers.pl:97
+#, c-format
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix eposttjener, Inn njusttjener"
+
+#: share/compssUsers.pl:100
+#, c-format
+msgid "Directory Server"
+msgstr "Katalogtjener"
+
+#: share/compssUsers.pl:104
+#, c-format
+msgid "FTP Server"
+msgstr "FTP-tjener"
+
+#: share/compssUsers.pl:105
+#, c-format
+msgid "ProFTPd"
+msgstr "ProFTPd"
+
+#: share/compssUsers.pl:108
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: share/compssUsers.pl:109
+#, c-format
+msgid "Domain Name and Network Information Server"
+msgstr "Domenenavn- og nettverksinformasjons-tjener"
+
+#: share/compssUsers.pl:112
+#, c-format
+msgid "File and Printer Sharing Server"
+msgstr "Fil og Skriverdelingstjener"
+
+#: share/compssUsers.pl:113
+#, c-format
+msgid "NFS Server, Samba server"
+msgstr "NFS Tjener, Samba tjener"
+
+#: share/compssUsers.pl:116 share/compssUsers.pl:129
+#, c-format
+msgid "Database"
+msgstr "Database"
+
+#: share/compssUsers.pl:117
+#, c-format
+msgid "PostgreSQL and MySQL Database Server"
+msgstr "PostgreSQL og MySQL database tjener"
+
+#: share/compssUsers.pl:121
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+#: share/compssUsers.pl:122
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+#: share/compssUsers.pl:125
+#, c-format
+msgid "Mail"
+msgstr "Epost"
+
+#: share/compssUsers.pl:126
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix eposttjener"
+
+#: share/compssUsers.pl:130
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL eller MySQL database tjener"
+
+#: share/compssUsers.pl:137
+#, c-format
+msgid "Network Computer server"
+msgstr "Nettverk datamaskintjener"
+
+#: share/compssUsers.pl:138
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS-tjener, SMB-tjener, Proxy-tjener, SSH-tjener"
+
+#: 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 ""
-"\t - <b>Xemacs</b>: enda et open source tekstprogram og  "
-"applikasjonsutviklingssystem"
+"K Desktop Environment, basis grafikkmiljø med en samling av passende verktøy"
+
+#: share/compssUsers.pl:151
+#, c-format
+msgid "GNOME Workstation"
+msgstr "GNOME-arbeidsstasjon"
 
-#: share/advertising/pwp-06.pl:18
+#: 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 ""
-"\t <b>Vim</b>: avansert tekstprogram med flere finesser enn standard Vi"
+"Et grafisk miljø med et brukervennlig sett med applikasjoner og skrivebords-"
+"verktøy"
+
+#: 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 "Icewm, Window Maker, Enlightenment, Fvwm etc"
+
+#: share/compssUsers.pl:179
+#, c-format
+msgid "Utilities"
+msgstr "Verktøy"
+
+#: share/compssUsers.pl:181 share/compssUsers.pl:182 standalone/logdrake:381
+#, c-format
+msgid "SSH Server"
+msgstr "SSH-tjener"
+
+#: share/compssUsers.pl:186
+#, c-format
+msgid "Webmin"
+msgstr "Webmin"
+
+#: share/compssUsers.pl:187
+#, c-format
+msgid "Webmin Remote Configuration Server"
+msgstr "Webmin fjernkonfigureringstjener"
+
+#: share/compssUsers.pl:191
+#, c-format
+msgid "Network Utilities/Monitoring"
+msgstr "Nettverks-verktøy/overvåking"
+
+#: share/compssUsers.pl:192
+#, c-format
+msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
+msgstr "Overvårkningsverktøy, prosessbokføring, tcpdump, nmap, ..."
+
+#: share/compssUsers.pl:196
+#, c-format
+msgid "MandrakeSoft Wizards"
+msgstr "MandrakeSoft veivisere"
+
+#: share/compssUsers.pl:197
+#, c-format
+msgid "Wizards to configure server"
+msgstr "Veivisere til å sette opp tjener"
 
 #: standalone.pm:21
 #, c-format
@@ -15969,15 +16829,15 @@ 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 ""
 "[OPSJONER] [PROGRAMNAVN]\n"
 "\n"
-"OPTIONS:\n"
+"OPSJONER:\n"
 "  --help            - skriv denne hjelp-meldingen.\n"
-"  --report          - program skal være et av Mandrakeverktøyene\n"
-"  --incident        - program skal være et av Mandrakeverktøyene"
+"  --report          - program skal være et av mandrakelinux-verktøyene\n"
+"  --incident        - program skal være et av mandrakelinux-verktøyene"
 
 #: standalone.pm:63
 #, c-format
@@ -16005,7 +16865,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"
@@ -16031,7 +16891,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"
@@ -16044,8 +16904,8 @@ msgid ""
 "--delclient      : delete a client machine from MTS (requires MAC address, "
 "IP, nbi image name)"
 msgstr ""
-"[OPSJONER]...\n"
-"Mandrake Terminaltjener konfigurasjon\n"
+"[VALG]...\n"
+"Mandrakelinux Terminaltjener-konfigurasjon\n"
 "--enable         : aktiver MTS\n"
 "--disable        : deaktiver MTS\n"
 "--start          : start MTS\n"
@@ -16054,9 +16914,9 @@ msgstr ""
 "brukernavn)\n"
 "--deluser        : fjern en systembruker fra MTS (krever brukernavn)\n"
 "--addclient      : legg til en klientmaskin til MTS (krever MAC addresse, "
-"IP, nbi bildenavn)\n"
-"--delclient      : slett en klientmaskin fra MTS (krever MAC addresse, IP, "
-"nbi bildenavn)"
+"IP, nbi-imagefilnavn)\n"
+"--delclient      : slett en klientmaskin fra MTS (krever MAC-addresse, IP, "
+"nbi-imagefilnavn)"
 
 #: standalone.pm:96
 #, c-format
@@ -16135,7 +16995,7 @@ msgstr ""
 "       XFdrake [--noauto] monitor\n"
 "       XFdrake oppløsning"
 
-#: standalone.pm:128
+#: standalone.pm:133
 #, c-format
 msgid ""
 "\n"
@@ -16146,28 +17006,28 @@ msgstr ""
 "Bruk: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
 "testing] [-v|--version] "
 
-#: standalone/XFdrake:87
+#: standalone/XFdrake:85
 #, c-format
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Vennligst logg ut og bruk så Ctrl-Alt-BackSpace"
 
-#: standalone/XFdrake:91
+#: standalone/XFdrake:89
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
 msgstr ""
 "Du trenger å logge ut og inn igjen for at forandringene skal tre i effekt"
 
-#: standalone/drakTermServ:79
+#: standalone/drakTermServ:76
 #, c-format
 msgid "Useless without Terminal Server"
 msgstr "Nytteløs uten Terminaltjener"
 
-#: standalone/drakTermServ:116 standalone/drakTermServ:123
+#: standalone/drakTermServ:108 standalone/drakTermServ:114
 #, c-format
 msgid "%s: %s requires a username...\n"
 msgstr "%s: %s krever et brukernavn...\n"
 
-#: standalone/drakTermServ:136
+#: standalone/drakTermServ:125
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
@@ -16176,81 +17036,75 @@ msgstr ""
 "%s: %s krever vertsnavn, MAC-adresse, IP, nbi-image, 0/1 for THIN_CLIENT, "
 "0/1 for Lokal konfigurasjon...\n"
 
-#: standalone/drakTermServ:143
+#: standalone/drakTermServ:131
 #, c-format
 msgid "%s: %s requires hostname...\n"
 msgstr "%s: %s trenger vertsnavn...\n"
 
-#: 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 "Terminaltjenerkonfigurasjon"
 
-#: standalone/drakTermServ:255
+#: standalone/drakTermServ:231
 #, c-format
 msgid "Enable Server"
 msgstr "Aktiver tjener"
 
-#: standalone/drakTermServ:261
+#: standalone/drakTermServ:237
 #, c-format
 msgid "Disable Server"
 msgstr "Deaktiver tjener"
 
-#: standalone/drakTermServ:269
+#: standalone/drakTermServ:245
 #, c-format
 msgid "Start Server"
 msgstr "Start tjener"
 
-#: standalone/drakTermServ:275
+#: standalone/drakTermServ:251
 #, c-format
 msgid "Stop Server"
 msgstr "Stopp tjener"
 
-#: standalone/drakTermServ:283
+#: standalone/drakTermServ:259
 #, c-format
 msgid "Etherboot Floppy/ISO"
 msgstr "Etherboot-diskett/ISO"
 
-#: standalone/drakTermServ:287
+#: standalone/drakTermServ:263
 #, c-format
 msgid "Net Boot Images"
 msgstr "Nettverksoppstart-imagefiler"
 
-#: standalone/drakTermServ:293
+#: standalone/drakTermServ:269
 #, c-format
 msgid "Add/Del Users"
 msgstr "Legg til/slett brukere"
 
-#: standalone/drakTermServ:297
+#: standalone/drakTermServ:273
 #, c-format
 msgid "Add/Del Clients"
 msgstr "Legg til/slett klienter"
 
-#: standalone/drakTermServ:308 standalone/drakbug:54
+#: standalone/drakTermServ:284 standalone/drakbug:47
 #, c-format
 msgid "First Time Wizard"
 msgstr "Veiviseren for første kjøring"
 
-#: 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 ""
 "%s er definert som innloggingshåndterer, legger til gdm-bruker i /etc/passwd$"
 "$CLIENT$$"
 
-#: 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"
@@ -16269,7 +17123,7 @@ msgstr ""
 "\n"
 " Denne veiviserrutinen vil:\n"
 " \t1) Spørre deg om å velge enten 'tynne' eller 'tykke' klienter.\n"
-"\t2)Sette opp dhcp.\n"
+"\t2)Sette opp DHCP.\n"
 "\t\n"
 "Etter å ha gjort følgende steg så vil veiviseren:\n"
 "\t\n"
@@ -16284,22 +17138,22 @@ msgstr ""
 "    e) Spørre deg om å opprette en oppstartsdiskett.\n"
 "    f) Hvis det er tynne klienter, spørre om du vil starte KDM på nytt.\n"
 
-#: standalone/drakTermServ:392
+#: standalone/drakTermServ:367
 #, c-format
 msgid "Cancel Wizard"
 msgstr "Avbryt Veiviser"
 
-#: standalone/drakTermServ:404
+#: standalone/drakTermServ:379
 #, c-format
 msgid "Please save dhcpd config!"
 msgstr "Vennligst lagre dhcpd-konfigurasjon!"
 
-#: standalone/drakTermServ:432
+#: standalone/drakTermServ:407
 #, c-format
 msgid "Use thin clients."
 msgstr "Bruk tynne klienter."
 
-#: standalone/drakTermServ:434
+#: standalone/drakTermServ:409
 #, c-format
 msgid ""
 "Please select default client type.\n"
@@ -16312,33 +17166,33 @@ msgstr ""
 "skjerm.\n"
 "    'Tykke' klienter bruker deres egen CPU/RAM, men tjeneres filsystem."
 
-#: standalone/drakTermServ:446 standalone/drakTermServ:1061
+#: standalone/drakTermServ:421 standalone/drakTermServ:1034
 #, c-format
 msgid "Sync client X keyboard settings with server."
 msgstr "Synkroniserer klients X-tastaturoppsett med tjener."
 
-#: standalone/drakTermServ:453
+#: standalone/drakTermServ:428
 #, c-format
 msgid "Creating net boot images for all kernels"
 msgstr "Oppretter nettoppstartsimagefiler for alel kjerner"
 
-#: 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 "Dette vil ta en stund."
 
-#: 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 "Synkroniserer serverbrukerliste med klientliste, inkludert root."
 
-#: standalone/drakTermServ:484
+#: standalone/drakTermServ:458
 #, c-format
 msgid ""
 "In order to enable changes made for thin clients, the display manager must "
@@ -16347,12 +17201,12 @@ msgstr ""
 "For å kunne aktivere endringe gjort for tynne klienter, så må "
 "sesjonsbehandleren startes på nytt. Start på nytt nå?"
 
-#: standalone/drakTermServ:519
+#: standalone/drakTermServ:493
 #, c-format
 msgid "Terminal Server Overview"
 msgstr "Terminaltjener oversikt"
 
-#: standalone/drakTermServ:520
+#: standalone/drakTermServ:494
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -16380,7 +17234,7 @@ msgstr ""
 "        \tdhcpd.conf, så burde du opprette etherboot-imagefilene for i det "
 "minste en full kjerne."
 
-#: standalone/drakTermServ:526
+#: standalone/drakTermServ:500
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -16414,7 +17268,7 @@ msgstr ""
 "        \t\tEn typisk dhcpd.conf strofe for å støtte diskløse klienter "
 "serslik ut:"
 
-#: standalone/drakTermServ:544
+#: standalone/drakTermServ:518
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -16425,14 +17279,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"
@@ -16461,19 +17315,19 @@ msgstr ""
 "\t\t\tMerk: \"#type\" entréen er bare brukt av drakTermServ.  Klienter "
 "kanenten være \"tynne\"\n"
 "\t\t\teller 'fete'.  Tynne klienter kjører mesteparten av programvaren via "
-"xdmcp, mens tykke klienter kjører mesteparten\n"
+"XDMCP, mens tykke klienter kjører mesteparten\n"
 "av programvaren på klientmaskinen. En spesiell inttab, %s blir\n"
 "\t\t\tskrevet for tynne klienter. Systemkonfigurasjonsfilene xdm-config, "
 "kdmrc, og gdm.conf blir modifiserte\n"
-"\t\t\thvis tynne klienter blir brukt, for å aktivere xdmcp. Siden det er "
-"sikkerhetsproblematikkrundt bruken av xdmcp,\n"
+"\t\t\thvis tynne klienter blir brukt, for å aktivere XDMCP. Siden det er "
+"sikkerhetsproblematikkrundt bruken av XDMCP,\n"
 "\t\t\tså blir hosts.deny og hosts.allow endret for å begrense tilgangen til "
 "det lokale subnettet.\n"
 "\t\t\t\n"
 "\t\t\tMerk: Du må stoppe/starte tjeneren etter å ha lagt til eller "
 "endretklienter."
 
-#: standalone/drakTermServ:564
+#: standalone/drakTermServ:538
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -16504,7 +17358,7 @@ msgstr ""
 "\t\t\t\n"
 "\t\t\tHvor SUBNETT/MASKE blir defintert for ditt nettverk."
 
-#: standalone/drakTermServ:576
+#: standalone/drakTermServ:550
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -16520,7 +17374,7 @@ msgstr ""
 "        \t\t/etc/shadow kopieres inn i %s. drakTermServ hjelper til\n"
 "        \t\tved å legge til og slette brukere fra denne filen."
 
-#: standalone/drakTermServ:580
+#: standalone/drakTermServ:554
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -16537,7 +17391,7 @@ msgstr ""
 "kunne hjelpe til med å lage disse\n"
 "        \t\tfilene."
 
-#: standalone/drakTermServ:585
+#: standalone/drakTermServ:559
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -16572,7 +17426,7 @@ msgstr ""
 "        av igjen, og beholde konfigurasjonsfilene så fort klientmaskinen er "
 "konfigurert."
 
-#: standalone/drakTermServ:594
+#: standalone/drakTermServ:568
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -16582,7 +17436,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"
@@ -16608,7 +17462,7 @@ msgstr ""
 "utnettverks oppstartsimagefilene til hver \n"
 "        \t\tdiskløse klient.\n"
 "\n"
-"        \t\tEn typisk tftp konfigurasjonsfil ser slik ut:\n"
+"        \t\tEn typisk TFTP konfigurasjonsfil ser slik ut:\n"
 "        \t\t\n"
 "        \tservice tftp\n"
 "\t\t\t{\n"
@@ -16627,13 +17481,13 @@ msgstr ""
 "net\n"
 "        \t\tplassere sine imagefiler."
 
-#: 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"
@@ -16658,62 +17512,62 @@ msgstr ""
 "        \t\t/usr/share/etherboot/start16.bin \\\t\t\t\n"
 "        \t\t/usr/lib/etherboot/lzrom/3c509.zimg > /dev/fd0"
 
-#: standalone/drakTermServ:650
+#: standalone/drakTermServ:624
 #, c-format
 msgid "Boot Floppy"
 msgstr "Oppstarts-diskett"
 
-#: standalone/drakTermServ:652
+#: standalone/drakTermServ:626
 #, c-format
 msgid "Boot ISO"
 msgstr "Oppstarts-ISO"
 
-#: standalone/drakTermServ:654
+#: standalone/drakTermServ:628
 #, c-format
 msgid "PXE Image"
 msgstr "PXE-imagefil"
 
-#: 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 "Bygg hele kjernen -->"
 
-#: standalone/drakTermServ:758
+#: standalone/drakTermServ:731
 #, c-format
 msgid "No kernel selected!"
 msgstr "Ingen kjerne valgt!"
 
-#: standalone/drakTermServ:761
+#: standalone/drakTermServ:734
 #, c-format
 msgid "Build Single NIC -->"
 msgstr "Bygg for et enkelt nettverkskort -->"
 
-#: standalone/drakTermServ:765
+#: standalone/drakTermServ:738
 #, c-format
 msgid "No NIC selected!"
 msgstr "Inget nettverkskort valgt!"
 
-#: standalone/drakTermServ:768
+#: standalone/drakTermServ:741
 #, c-format
 msgid "Build All Kernels -->"
 msgstr "Bygge alle kjerner -->"
 
-#: standalone/drakTermServ:776
+#: standalone/drakTermServ:749
 #, c-format
 msgid "<-- Delete"
 msgstr "<-- Slett"
 
-#: standalone/drakTermServ:783
+#: standalone/drakTermServ:756
 #, c-format
 msgid "Delete All NBIs"
 msgstr "Slett alle NBI'er"
 
-#: standalone/drakTermServ:870
+#: standalone/drakTermServ:843
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -16724,94 +17578,94 @@ msgstr ""
 " det i terminalserver-databasen.\n"
 "Slett/legg til bruker på nytt i terminalserveren for å aktivere innlogging."
 
-#: standalone/drakTermServ:875
+#: standalone/drakTermServ:848
 #, c-format
 msgid "Add User -->"
 msgstr "Legg til bruker -->"
 
-#: standalone/drakTermServ:881
+#: standalone/drakTermServ:854
 #, c-format
 msgid "<-- Del User"
 msgstr "<-- Slett bruker"
 
-#: 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 "lokal konfigurasjon: %s"
 
-#: standalone/drakTermServ:951
+#: standalone/drakTermServ:924
 #, c-format
 msgid ""
 "Allow local hardware\n"
 "configuration."
 msgstr "Tillatt lokal maskinvarekonfigurasjon."
 
-#: standalone/drakTermServ:960
+#: standalone/drakTermServ:933
 #, c-format
 msgid "No net boot images created!"
 msgstr "Ingen nettverksoppstart imagefiler ble laget!"
 
-#: standalone/drakTermServ:978
+#: standalone/drakTermServ:951
 #, c-format
 msgid "Thin Client"
 msgstr "Tynn klient"
 
-#: standalone/drakTermServ:982
+#: standalone/drakTermServ:955
 #, c-format
 msgid "Allow Thin Clients"
 msgstr "Tillat tynne klienter"
 
-#: standalone/drakTermServ:983
+#: standalone/drakTermServ:956
 #, c-format
 msgid "Add Client -->"
 msgstr "Legg til klient -->"
 
-#: standalone/drakTermServ:997
+#: standalone/drakTermServ:970
 #, c-format
 msgid "type: fat"
 msgstr "type: fat"
 
-#: 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 "lokal konfigurasjon: falsk"
 
-#: standalone/drakTermServ:1006
+#: standalone/drakTermServ:979
 #, c-format
 msgid "local config: true"
 msgstr "lokal konfigurasjon: sann"
 
-#: standalone/drakTermServ:1014
+#: standalone/drakTermServ:987
 #, c-format
 msgid "<-- Edit Client"
 msgstr "<-- Rediger klient"
 
-#: standalone/drakTermServ:1040
+#: standalone/drakTermServ:1013
 #, c-format
 msgid "Disable Local Config"
 msgstr "Deaktiver lokal konfigurasjon"
 
-#: 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 Konfigurasjon..."
 
-#: standalone/drakTermServ:1072
+#: standalone/drakTermServ:1045
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
@@ -16821,79 +17675,79 @@ msgstr ""
 "i effekt. \n"
 "(service dm restart - i konsolet)"
 
-#: standalone/drakTermServ:1112
+#: standalone/drakTermServ:1085
 #, c-format
 msgid "Thin clients won't work with autologin. Disable autologin?"
 msgstr ""
 "Tynne klienter vil ikke fungerer med automatisk innlogging. Deaktiver "
 "automatisk innlogging?"
 
-#: standalone/drakTermServ:1128
+#: standalone/drakTermServ:1101
 #, c-format
 msgid "All clients will use %s"
 msgstr "Alle klienter vil bruke %s"
 
-#: standalone/drakTermServ:1160
+#: standalone/drakTermServ:1133
 #, c-format
 msgid "Subnet:"
 msgstr "Subnett:"
 
-#: standalone/drakTermServ:1167
+#: standalone/drakTermServ:1140
 #, c-format
 msgid "Netmask:"
 msgstr "Nettmaske:"
 
-#: standalone/drakTermServ:1174
+#: standalone/drakTermServ:1147
 #, c-format
 msgid "Routers:"
 msgstr "Routere:"
 
-#: standalone/drakTermServ:1181
+#: standalone/drakTermServ:1154
 #, c-format
 msgid "Subnet Mask:"
 msgstr "Subnettmaske:"
 
-#: standalone/drakTermServ:1188
+#: standalone/drakTermServ:1161
 #, c-format
 msgid "Broadcast Address:"
 msgstr "Broadcastadresse:"
 
-#: standalone/drakTermServ:1195
+#: standalone/drakTermServ:1168
 #, c-format
 msgid "Domain Name:"
 msgstr "Domenenavn:"
 
-#: standalone/drakTermServ:1203
+#: standalone/drakTermServ:1176
 #, c-format
 msgid "Name Servers:"
 msgstr "Navntjenere:"
 
-#: standalone/drakTermServ:1214
+#: standalone/drakTermServ:1187
 #, c-format
 msgid "IP Range Start:"
 msgstr "IP-rekke start:"
 
-#: standalone/drakTermServ:1215
+#: standalone/drakTermServ:1188
 #, c-format
 msgid "IP Range End:"
 msgstr "IP-rekke slutt:"
 
-#: standalone/drakTermServ:1257
+#: standalone/drakTermServ:1230
 #, c-format
 msgid "Append TS Includes To Existing Config"
 msgstr "Legg til TS-includes i eksisterende konfigurasjon"
 
-#: standalone/drakTermServ:1259
+#: standalone/drakTermServ:1232
 #, c-format
 msgid "Write Config"
 msgstr "Skriv konfigurasjon"
 
-#: standalone/drakTermServ:1275
+#: standalone/drakTermServ:1248
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr "dhcpd-tjener-konfigurasjon"
 
-#: standalone/drakTermServ:1276
+#: standalone/drakTermServ:1249
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -16904,104 +17758,98 @@ msgstr ""
 "ut fra ditt system.\n"
 "Du kan endre dem etter behov."
 
-#: standalone/drakTermServ:1279
+#: standalone/drakTermServ:1252
 #, c-format
 msgid "Dynamic IP Address Pool:"
 msgstr "Dynamisk IP-adresse brønn:"
 
-#: standalone/drakTermServ:1426
+#: standalone/drakTermServ:1399
 #, c-format
 msgid "Please insert floppy disk:"
 msgstr "Sett inn en diskett:"
 
-#: standalone/drakTermServ:1430
+#: standalone/drakTermServ:1403
 #, c-format
 msgid "Couldn't access the floppy!"
 msgstr "Kunne ikke få tilgang til diskettstasjonen!"
 
-#: standalone/drakTermServ:1432
+#: standalone/drakTermServ:1405
 #, c-format
 msgid "Floppy can be removed now"
 msgstr "Disketten kan fjernes nå"
 
-#: standalone/drakTermServ:1435
+#: standalone/drakTermServ:1408
 #, c-format
 msgid "No floppy drive available!"
 msgstr "Ingen diskettstasjon tilgjengelig!"
 
-#: standalone/drakTermServ:1440
+#: standalone/drakTermServ:1413
 #, c-format
 msgid "PXE image is %s/%s"
 msgstr "PXE-imagefil er %s/%s"
 
-#: standalone/drakTermServ:1442
+#: standalone/drakTermServ:1415
 #, c-format
 msgid "Error writing %s/%s"
 msgstr "Feil ved skriving %s/%s"
 
-#: standalone/drakTermServ:1451
+#: standalone/drakTermServ:1424
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr "Etheroppstart ISO imagefil er %s"
 
-#: standalone/drakTermServ:1453
+#: standalone/drakTermServ:1426
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr "Noe gikk feil! - Er mkisofs installert?"
 
-#: standalone/drakTermServ:1475
+#: standalone/drakTermServ:1447
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr "Trenger å opprette /etc/dhcpd.conf først!"
 
-#: standalone/drakTermServ:1634
+#: standalone/drakTermServ:1602
 #, c-format
 msgid "%s passwd bad in Terminal Server - rewriting...\n"
 msgstr "%s passord feil i Terminaltjener - skriver om...\n"
 
-#: standalone/drakTermServ:1647
+#: standalone/drakTermServ:1615
 #, c-format
 msgid "%s is not a user..\n"
 msgstr "%s er ikke en bruker..\n"
 
-#: standalone/drakTermServ:1648
+#: standalone/drakTermServ:1616
 #, c-format
 msgid "%s is already a Terminal Server user\n"
 msgstr "%s er allerede en Terminaltjenerbruker\n"
 
-#: standalone/drakTermServ:1650
+#: standalone/drakTermServ:1618
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
 msgstr "Klarte ikke å legge %s til i Terminaltjener!\n"
 
-#: standalone/drakTermServ:1652
+#: standalone/drakTermServ:1620
 #, c-format
 msgid "%s added to Terminal Server\n"
 msgstr "%s lagt til Terminaltjener\n"
 
-#: standalone/drakTermServ:1698
+#: standalone/drakTermServ:1666
 #, c-format
 msgid "Deleted %s...\n"
 msgstr "Slettet %s...\n"
 
-#: standalone/drakTermServ:1700 standalone/drakTermServ:1773
+#: standalone/drakTermServ:1668 standalone/drakTermServ:1741
 #, c-format
 msgid "%s not found...\n"
 msgstr "%s ikke funnet...\n"
 
-#: standalone/drakTermServ:1722 standalone/drakTermServ:1723
-#: standalone/drakTermServ:1724
-#, c-format
-msgid "%s already in use\n"
-msgstr "%s er allerede i bruk\n"
-
-#: standalone/drakTermServ:1801
+#: standalone/drakTermServ:1769
 #, c-format
 msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
 msgstr ""
 "/etc/hosts.allow og /etc/hosts.deny er allerede konfigurerert - ikke endret"
 
-#: standalone/drakTermServ:1953
+#: standalone/drakTermServ:1921
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr "Konfigurasjon endret - restarte clusternfs/dhcpd?"
@@ -17101,8 +17949,8 @@ msgstr ""
 "\n"
 "Parametrene av auto-install er tilgjengelige i seksjonen 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!"
@@ -17141,26 +17989,21 @@ msgstr "hd"
 msgid "tape"
 msgstr "bånd"
 
-#: standalone/drakbackup:112
-#, c-format
-msgid "No devices found"
-msgstr "Inget enheter funnet"
-
-#: 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 en utvidelse til Tcl-scripting-språket som tillater interaktive "
 "sesjoner uten brukerinnblanding."
 
-#: standalone/drakbackup:153
+#: standalone/drakbackup:154
 #, c-format
 msgid "Store the password for this system in drakbackup configuration."
 msgstr "Lagre passordet for dette systemet i drakbackup's konfigurasjon."
 
-#: standalone/drakbackup:154
+#: standalone/drakbackup:155
 #, c-format
 msgid ""
 "For a multisession CD, only the first session will erase the cdrw. Otherwise "
@@ -17169,7 +18012,7 @@ msgstr ""
 "For en multisesjons-CD vil bare den første sesjonen overskrive CDRW'en. "
 "Ellers vil CDRW'en bli overskrevet før hver sikkerhetskopi."
 
-#: standalone/drakbackup:155
+#: standalone/drakbackup:156
 #, c-format
 msgid ""
 "This option will save files that have changed.  Exact behavior depends on "
@@ -17178,7 +18021,7 @@ msgstr ""
 "Dette valget vil lagre filer som har blitt forandret.  Eksakt oppførsel er "
 "avhengig av om inkrementielt eller differensielt modues er brukt."
 
-#: standalone/drakbackup:156
+#: standalone/drakbackup:157
 #, c-format
 msgid ""
 "Incremental backups only save files that have changed or are new since the "
@@ -17187,7 +18030,7 @@ msgstr ""
 "Inkrementelle sikkerhetskopier lagrer bare filer som har endret seg eller er "
 "nye siden siste sikkerhetskopi."
 
-#: standalone/drakbackup:157
+#: standalone/drakbackup:158
 #, c-format
 msgid ""
 "Differential backups only save files that have changed or are new since the "
@@ -17196,17 +18039,17 @@ msgstr ""
 "Differensiele sikkerhetskopier lagrer bare filer som har blitt forandret "
 "eller er nye siden den opprinnelige 'base'-sikkerhetskopien."
 
-#: 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 være en lokal bruker eller epostadresse som du vil ha "
 "sikkerhetskopieringsresultatene sendt til. Du trenger en fungerende "
 "posttjener satt opp på ditt system."
 
-#: standalone/drakbackup:159
+#: standalone/drakbackup:160
 #, c-format
 msgid ""
 "Files or wildcards listed in a .backupignore file at the top of a directory "
@@ -17215,7 +18058,7 @@ msgstr ""
 "Filer eller asterisk listet i en .backupignore-fil på toppen av et "
 "katalogtre vil det ikke bli tatt sikkerhetskopi av."
 
-#: standalone/drakbackup:160
+#: standalone/drakbackup:161
 #, c-format
 msgid ""
 "For backups to other media, files are still created on the hard drive, then "
@@ -17227,7 +18070,7 @@ msgstr ""
 "denne opsjonen så vil tar-filene bli slettet fra din harddisk etter "
 "sikkerhetskopiering."
 
-#: standalone/drakbackup:161
+#: standalone/drakbackup:162
 #, c-format
 msgid ""
 "Some protocols, like rsync, may be configured at the server end.  Rather "
@@ -17237,7 +18080,7 @@ msgstr ""
 "Noen protokoller, som rsync kan bli konfigurerert på tjenersiden.  Heller "
 "enn å bruke en katalogsti så vil du bruke 'modul'-navn for tjenestestien."
 
-#: standalone/drakbackup:162
+#: standalone/drakbackup:163
 #, c-format
 msgid ""
 "Custom allows you to specify your own day and time.  The other options use "
@@ -17246,28 +18089,28 @@ msgstr ""
 "Egendefinert lar deg spesifisere din egen dag og tid.  De andre valgene "
 "bruker kjøre-deler i /etc/crontab"
 
-#: standalone/drakbackup:326
+#: standalone/drakbackup:327
 #, c-format
 msgid "No media selected for cron operation."
 msgstr "Inget media valgt for cron-operasjon."
 
-#: standalone/drakbackup:330
+#: standalone/drakbackup:331
 #, c-format
 msgid "No interval selected for cron operation."
 msgstr "Inget interval valgt for cron-operasjon"
 
-#: standalone/drakbackup:377
+#: standalone/drakbackup:378
 #, c-format
 msgid "Interval cron not available as non-root"
 msgstr "cron er ikke tilgjengelig som ikke-root"
 
-#: 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 en gyldig epostadresse eller en eksisterende lokal bruker!"
 
-#: 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 "
@@ -17276,22 +18119,22 @@ msgstr ""
 "\"%s\" er en lokal bruker, men du valgte ikke en lokal smtp, så du må bruke "
 "en fullstendig epostadresse!"
 
-#: standalone/drakbackup:475
+#: standalone/drakbackup:476
 #, c-format
 msgid "Valid user list changed, rewriting config file."
 msgstr "Gyldig brukerliste endret, skriver konfigurasjonsfil på nytt."
 
-#: standalone/drakbackup:477
+#: standalone/drakbackup:478
 #, c-format
 msgid "Old user list:\n"
 msgstr "Gammel brukerliste\n"
 
-#: standalone/drakbackup:479
+#: standalone/drakbackup:480
 #, c-format
 msgid "New user list:\n"
 msgstr "Ny brukerfilerliste:\n"
 
-#: standalone/drakbackup:524
+#: standalone/drakbackup:525
 #, c-format
 msgid ""
 "\n"
@@ -17300,7 +18143,7 @@ msgstr ""
 "\n"
 "                      DrakBackup Rapport \n"
 
-#: standalone/drakbackup:525
+#: standalone/drakbackup:526
 #, c-format
 msgid ""
 "\n"
@@ -17309,7 +18152,7 @@ msgstr ""
 "\n"
 "                      DrakBackup Daemon Rapport\n"
 
-#: standalone/drakbackup:531
+#: standalone/drakbackup:532
 #, c-format
 msgid ""
 "\n"
@@ -17322,13 +18165,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 fremgang"
 
-#: standalone/drakbackup:609
+#: standalone/drakbackup:610
 #, c-format
 msgid ""
 "%s exists, delete?\n"
@@ -17341,42 +18184,42 @@ msgstr ""
 "Hvis du allerede har gjort denne prosessen må du kanskje\n"
 " slette oppføringen fra authorized_keys på denne serveren."
 
-#: standalone/drakbackup:618
+#: standalone/drakbackup:619
 #, c-format
 msgid "This may take a moment to generate the keys."
 msgstr "Det kan ta en tid å generere disse nøklene."
 
-#: standalone/drakbackup:625
+#: standalone/drakbackup:626
 #, c-format
 msgid "Cannot spawn %s."
 msgstr "Kan ikke skape %s."
 
-#: standalone/drakbackup:642
+#: standalone/drakbackup:643
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr "Inget 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 "Overføring %s til %s nektet"
 
-#: standalone/drakbackup:645
+#: standalone/drakbackup:646
 #, c-format
 msgid "Can't find %s on %s"
 msgstr "Klarer ikke å finne %s på %s"
 
-#: standalone/drakbackup:649
+#: standalone/drakbackup:650
 #, c-format
 msgid "%s not responding"
 msgstr "%s svarer ikke"
 
-#: standalone/drakbackup:653
+#: standalone/drakbackup:654
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -17393,47 +18236,47 @@ msgstr ""
 "\n"
 "uten å bli spurt etter passord."
 
-#: standalone/drakbackup:697
+#: standalone/drakbackup:698
 #, c-format
 msgid "WebDAV remote site already in sync!"
 msgstr "WebDAV fjernplass allerede synkronisert!"
 
-#: standalone/drakbackup:701
+#: standalone/drakbackup:702
 #, c-format
 msgid "WebDAV transfer failed!"
 msgstr "WebDAV overføring gikk feil!"
 
-#: standalone/drakbackup:722
+#: standalone/drakbackup:723
 #, c-format
 msgid "No CD-R/DVD-R in drive!"
 msgstr "Ingen CDR/DVDR i stasjonen!"
 
-#: standalone/drakbackup:726
+#: standalone/drakbackup:727
 #, c-format
 msgid "Does not appear to be recordable media!"
 msgstr "Ser ikke ut til å være ett medimu som kan skrives til!"
 
-#: standalone/drakbackup:730
+#: standalone/drakbackup:732
 #, c-format
 msgid "Not erasable media!"
 msgstr "Ikke slettbart medium!"
 
-#: standalone/drakbackup:771
+#: standalone/drakbackup:774
 #, c-format
 msgid "This may take a moment to erase the media."
 msgstr "Det kan ta en stund å slette dette mediumet."
 
-#: standalone/drakbackup:829
+#: standalone/drakbackup:832
 #, c-format
 msgid "Permission problem accessing CD."
 msgstr "Rettighetsproblemer ved tilgang til CD."
 
-#: standalone/drakbackup:856
+#: standalone/drakbackup:859
 #, c-format
 msgid "No tape in %s!"
 msgstr "Ingen bånd i %s!"
 
-#: standalone/drakbackup:956
+#: standalone/drakbackup:966
 #, c-format
 msgid ""
 "Backup quota exceeded!\n"
@@ -17442,37 +18285,37 @@ msgstr ""
 "Sikkerhetskopikvota overskredet!\n"
 "%d MB brukt mot %d MB forbeholdt."
 
-#: standalone/drakbackup:975 standalone/drakbackup:1008
+#: standalone/drakbackup:985 standalone/drakbackup:1018
 #, c-format
 msgid "Backup system files..."
 msgstr "Sikkerhetskopier systemfiler..."
 
-#: standalone/drakbackup:1009 standalone/drakbackup:1050
+#: standalone/drakbackup:1019 standalone/drakbackup:1060
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr "Harddisk sikkerhetskopifiler..."
 
-#: standalone/drakbackup:1049
+#: standalone/drakbackup:1059
 #, c-format
 msgid "Backup User files..."
 msgstr "Sikkerhetskopier brukerfiler..."
 
-#: standalone/drakbackup:1084
+#: standalone/drakbackup:1094
 #, c-format
 msgid "Backup Other files..."
 msgstr "Sikkerhetskopier andre filer..."
 
-#: standalone/drakbackup:1085
+#: standalone/drakbackup:1095
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr "Harddisk sikkerhetskopieringprogress..."
 
-#: standalone/drakbackup:1090
+#: standalone/drakbackup:1100
 #, c-format
 msgid "No changes to backup!"
 msgstr "Ingen forandringer til sikkerhetskopi!"
 
-#: standalone/drakbackup:1108 standalone/drakbackup:1132
+#: standalone/drakbackup:1118 standalone/drakbackup:1142
 #, c-format
 msgid ""
 "\n"
@@ -17483,7 +18326,7 @@ msgstr ""
 "Drakbackup-aktiviteter via %s:\n"
 "\n"
 
-#: standalone/drakbackup:1117
+#: standalone/drakbackup:1127
 #, c-format
 msgid ""
 "\n"
@@ -17494,19 +18337,19 @@ msgstr ""
 " FTP tilkoblingsproblemer: Det var ikke mulig å sende dine sikkerhetskopier "
 "via FTP.\n"
 
-#: standalone/drakbackup:1118
+#: standalone/drakbackup:1128
 #, c-format
 msgid ""
 "Error during sending file via FTP. Please correct your FTP configuration."
 msgstr ""
 "Feil under sending av fil via FTP. Vennligst korriger din FTP-konfigurasjon."
 
-#: 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"
@@ -17517,7 +18360,7 @@ msgstr ""
 "Drakbackup-aktiviteter via CD:\n"
 "\n"
 
-#: standalone/drakbackup:1142
+#: standalone/drakbackup:1152
 #, c-format
 msgid ""
 "\n"
@@ -17528,22 +18371,22 @@ msgstr ""
 "Drakbackup-aktiviteter via bånd:\n"
 "\n"
 
-#: standalone/drakbackup:1151
+#: standalone/drakbackup:1161
 #, c-format
 msgid "Error sending mail. Your report mail was not sent."
 msgstr "Feil ved sending av epost. Din rapportbeskjed ble ikke sent."
 
-#: standalone/drakbackup:1152
+#: standalone/drakbackup:1162
 #, c-format
 msgid " Error while sending mail. \n"
 msgstr "Feil under sending av post. \n"
 
-#: standalone/drakbackup:1180
+#: standalone/drakbackup:1192
 #, c-format
 msgid "Can't create catalog!"
 msgstr "Kan ikke lage katalog!"
 
-#: standalone/drakbackup:1393
+#: standalone/drakbackup:1414
 #, c-format
 msgid ""
 "\n"
@@ -17552,7 +18395,7 @@ msgstr ""
 "\n"
 "Vennligst sjekk alle opsjonene du trenger.\n"
 
-#: standalone/drakbackup:1394
+#: standalone/drakbackup:1415
 #, c-format
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
@@ -17560,36 +18403,36 @@ msgstr ""
 "Disse valgene kan ta sikkerhetskopi og gjenopprette alle filene i din /etc "
 "katalog.\n"
 
-#: standalone/drakbackup:1395
+#: standalone/drakbackup:1416
 #, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr "SIkkerhetskopier dine systemfiler. (/etc katalog)"
 
-#: 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 ""
 "Bruk inkrementelle sikkerhetskopier  (ikke bytt ut gamle sikkerhetskopier)"
 
-#: 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 inkrementelle sikkerhetskopier"
 
-#: 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 differensielle sikkerhetskopier"
 
-#: standalone/drakbackup:1400
+#: standalone/drakbackup:1421
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr "Ikke inkluder kritiske filer (passwd, group, fstab)"
 
-#: standalone/drakbackup:1401
+#: standalone/drakbackup:1422
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
@@ -17598,177 +18441,177 @@ msgstr ""
 "Med dette valget kan du gjenopprette hvilken som helst versjon\n"
 " av din /etc katalog"
 
-#: standalone/drakbackup:1432
+#: standalone/drakbackup:1453
 #, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr "Vennligst sjekk alle brukere du vil inkludere i din sikkerhetskopi."
 
-#: standalone/drakbackup:1459
+#: standalone/drakbackup:1480
 #, c-format
 msgid "Do not include the browser cache"
 msgstr "Ikke inkluder utforsker-hurtigminne"
 
-#: standalone/drakbackup:1513
+#: standalone/drakbackup:1534
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr "Velg filene eller katalogene og klikk 'Ok'"
 
-#: standalone/drakbackup:1514 standalone/drakfont:656
+#: standalone/drakbackup:1535 standalone/drakfont:660
 #, c-format
 msgid "Remove Selected"
 msgstr "Fjern valgte"
 
-#: standalone/drakbackup:1577
+#: standalone/drakbackup:1598
 #, c-format
 msgid "Users"
 msgstr "Brukere"
 
-#: standalone/drakbackup:1597
+#: standalone/drakbackup:1618
 #, c-format
 msgid "Use network connection to backup"
 msgstr "Bruk nettverkstilkobling til sikkerhetskopiering"
 
-#: 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 ssikkerhetskopinøkler for SSH"
 
-#: standalone/drakbackup:1606
+#: standalone/drakbackup:1627
 #, c-format
 msgid "Transfer Now"
 msgstr "Overfør  nå"
 
-#: standalone/drakbackup:1608
+#: standalone/drakbackup:1629
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr "Andre (ikke drakbackup) nøkler på plass allerede"
 
-#: standalone/drakbackup:1611
+#: standalone/drakbackup:1632
 #, c-format
 msgid "Host name or IP."
 msgstr "Vertsnavn eller IP."
 
-#: standalone/drakbackup:1616
+#: standalone/drakbackup:1637
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
 msgstr "Katalog (eller modul) for å legge sikkerhetskopien på denne verten."
 
-#: standalone/drakbackup:1621
-#, c-format
-msgid "Login name"
-msgstr "Innloggingsnavn"
-
-#: standalone/drakbackup:1628
+#: standalone/drakbackup:1649
 #, c-format
 msgid "Remember this password"
 msgstr "Husk dette passordet"
 
-#: standalone/drakbackup:1644
+#: standalone/drakbackup:1665
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr "Trenger vertsnavn, brukernavn og passord!"
 
-#: standalone/drakbackup:1742
+#: standalone/drakbackup:1756
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr "Bruk CD/DVDROM for sikkerhetskopiering"
 
-#: standalone/drakbackup:1745
+#: standalone/drakbackup:1759
 #, c-format
 msgid "Choose your CD/DVD device"
 msgstr "Velg din CD/DVD-enhet"
 
-#: standalone/drakbackup:1750
+#: standalone/drakbackup:1764
 #, c-format
 msgid "Choose your CD/DVD media size"
 msgstr "Velg ditt CD/DVD-mediastørrelse"
 
-#: standalone/drakbackup:1757
+#: standalone/drakbackup:1771
 #, c-format
 msgid "Multisession CD"
 msgstr "Flersesjons CD"
 
-#: standalone/drakbackup:1759
+#: standalone/drakbackup:1773
 #, c-format
 msgid "CDRW media"
 msgstr "CDRW-media"
 
-#: standalone/drakbackup:1765
+#: standalone/drakbackup:1779
 #, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr "Slett ditt RW-media (første sesjon)"
 
-#: standalone/drakbackup:1766
+#: standalone/drakbackup:1780
 #, c-format
 msgid " Erase Now "
 msgstr " Slett nå "
 
-#: standalone/drakbackup:1772
+#: standalone/drakbackup:1786
 #, c-format
 msgid "DVD+RW media"
 msgstr "DVD+RW-media"
 
-#: standalone/drakbackup:1774
+#: standalone/drakbackup:1788
 #, c-format
 msgid "DVD-R media"
 msgstr "DVD-R-media"
 
-#: standalone/drakbackup:1776
+#: standalone/drakbackup:1790
 #, c-format
 msgid "DVDRAM device"
 msgstr "DVDRAM-enhet"
 
-#: standalone/drakbackup:1807
+#: standalone/drakbackup:1821
 #, c-format
 msgid "No CD device defined!"
 msgstr "Ingen CD-enhet definert!"
 
-#: standalone/drakbackup:1854
+#: standalone/drakbackup:1863
 #, c-format
 msgid "Use tape to backup"
 msgstr "Bruk bånd til sikkerhetskopiering"
 
-#: standalone/drakbackup:1857
+#: standalone/drakbackup:1866
 #, c-format
 msgid "Device name to use for backup"
 msgstr "Enhetsnavn som skal brukes for sikkerhetskopiering"
 
-#: standalone/drakbackup:1863
+#: standalone/drakbackup:1872
+#, c-format
+msgid "Backup directly to tape"
+msgstr "Ta sikkerhetskopi direkte til bånd"
+
+#: standalone/drakbackup:1878
 #, c-format
 msgid "Don't rewind tape after backup"
 msgstr "Ikke spol bånd tilbake etter sikkerhetskopiering"
 
-#: standalone/drakbackup:1869
+#: standalone/drakbackup:1884
 #, c-format
 msgid "Erase tape before backup"
 msgstr "Slett bånd før sikkerhetskopiering"
 
-#: standalone/drakbackup:1875
+#: standalone/drakbackup:1890
 #, c-format
 msgid "Eject tape after the backup"
 msgstr "Løs ut bånd etter sikkerhetskopiering"
 
-#: standalone/drakbackup:1942
+#: standalone/drakbackup:1962
 #, c-format
 msgid "Enter the directory to save to:"
 msgstr "Skriv inn katalogen for lagring:"
 
-#: standalone/drakbackup:1946
+#: standalone/drakbackup:1966
 #, c-format
 msgid "Directory to save to"
 msgstr "Katalog som skal lagres til"
 
-#: standalone/drakbackup:1951
+#: standalone/drakbackup:1971
 #, c-format
 msgid ""
 "Maximum size\n"
@@ -17777,307 +18620,307 @@ msgstr ""
 "Maksimum størrelse\n"
 " tillatt for Drakbackup (Mb)"
 
-#: standalone/drakbackup:2015
+#: standalone/drakbackup:2035
 #, c-format
 msgid "CD-R / DVD-R"
 msgstr "CDROM / DVDROM"
 
-#: 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 "hver time"
 
-#: standalone/drakbackup:2037 standalone/drakbackup:2042
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2057
+#: standalone/drakbackup:2062
 #, c-format
 msgid "daily"
 msgstr "daglig"
 
-#: standalone/drakbackup:2038 standalone/drakbackup:2043
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2058
+#: standalone/drakbackup:2063
 #, c-format
 msgid "weekly"
 msgstr "ukentlig"
 
-#: standalone/drakbackup:2039 standalone/drakbackup:2044
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2059
+#: standalone/drakbackup:2064
 #, c-format
 msgid "monthly"
 msgstr "månedlig"
 
-#: standalone/drakbackup:2040 standalone/drakbackup:2045
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2060
+#: standalone/drakbackup:2065
 #, c-format
 msgid "custom"
 msgstr "egendefinert"
 
-#: 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 "Mandag"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: 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 "Lørdag"
 
-#: standalone/drakbackup:2094
+#: standalone/drakbackup:2107
 #, c-format
 msgid "Use daemon"
 msgstr "Bruk daemon"
 
-#: standalone/drakbackup:2099
+#: standalone/drakbackup:2112
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr "Vennligst velg tidsinterval mellom hver sikkerhetskopiering"
 
-#: standalone/drakbackup:2105
+#: standalone/drakbackup:2118
 #, c-format
 msgid "Custom setup/crontab entry:"
 msgstr "Egendefinert 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åned"
 
-#: standalone/drakbackup:2126
+#: standalone/drakbackup:2139
 #, c-format
 msgid "Weekday"
 msgstr "Ukedag"
 
-#: standalone/drakbackup:2132
+#: standalone/drakbackup:2145
 #, c-format
 msgid "Please choose the media for backup."
 msgstr "Vennligst velg media for sikkerhetskopiering."
 
-#: standalone/drakbackup:2139
+#: standalone/drakbackup:2152
 #, c-format
 msgid "Please be sure that the cron daemon is included in your services."
 msgstr "Vær sikker på at cron daemonen er inkluder i dine tjenester."
 
-#: standalone/drakbackup:2140
+#: standalone/drakbackup:2153
 #, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
 msgstr "Merk at alle nåværende 'nett'-media også bruker harddisken."
 
-#: standalone/drakbackup:2190
+#: standalone/drakbackup:2201
 #, c-format
 msgid "Please choose the compression type"
 msgstr "Vennnligst velg 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 epostrapport etter hver sikkerhetskopiering til:"
 
-#: standalone/drakbackup:2202
+#: standalone/drakbackup:2213
 #, c-format
 msgid "SMTP server for mail:"
 msgstr "SMTP-tjener for epost:"
 
-#: standalone/drakbackup:2207
+#: standalone/drakbackup:2218
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr "Slett harddisk tarfiler etter sikkerhetskopiering til andre medium"
 
-#: standalone/drakbackup:2247
+#: standalone/drakbackup:2258
 #, c-format
 msgid "What"
 msgstr "Hva"
 
-#: standalone/drakbackup:2252
+#: standalone/drakbackup:2263
 #, c-format
 msgid "Where"
 msgstr "Hvor"
 
-#: 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 "Flere valg"
 
-#: standalone/drakbackup:2275
+#: standalone/drakbackup:2286
 #, c-format
 msgid "Backup destination not configured..."
 msgstr "Sikkerhetskopisted ikke konfigurert..."
 
-#: standalone/drakbackup:2293 standalone/drakbackup:4208
+#: standalone/drakbackup:2306 standalone/drakbackup:4229
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr "Drakbackup konfigurasjon"
 
-#: standalone/drakbackup:2309
+#: standalone/drakbackup:2322
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr "Vennligst velg hvor du vil ta sikkerhetskopi"
 
-#: standalone/drakbackup:2311
+#: standalone/drakbackup:2325
 #, c-format
 msgid "Hard Drive used to prepare backups for all media"
 msgstr "Harddisk brukt til å forberede sikkerhetskopiering til alle medier"
 
-#: 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å CDROM"
 
-#: standalone/drakbackup:2335
+#: standalone/drakbackup:2325
 #, c-format
 msgid "On Tape Device"
 msgstr "på Båndenhet"
 
-#: standalone/drakbackup:2374
+#: standalone/drakbackup:2371
 #, c-format
 msgid "Backup Users"
 msgstr "Sikkerhetskopier brukere"
 
-#: standalone/drakbackup:2375
+#: standalone/drakbackup:2372
 #, c-format
 msgid " (Default is all users)"
 msgstr " (Standard er alle brukere)"
 
-#: standalone/drakbackup:2387
+#: standalone/drakbackup:2384
 #, c-format
 msgid "Please choose what you want to backup"
 msgstr "Vennligst velg hva du ønsker å sikkerhetskopiere"
 
-#: standalone/drakbackup:2388
+#: standalone/drakbackup:2385
 #, c-format
 msgid "Backup System"
 msgstr "Sikkerhetskopi system"
 
-#: standalone/drakbackup:2390
+#: standalone/drakbackup:2387
 #, c-format
 msgid "Select user manually"
 msgstr "Velg bruker manuelt"
 
-#: standalone/drakbackup:2419
+#: standalone/drakbackup:2416
 #, c-format
 msgid "Please select data to backup..."
 msgstr "Vennligst velg data til å ta sikkerhetskopi av..."
 
-#: standalone/drakbackup:2491
+#: standalone/drakbackup:2488
 #, c-format
 msgid ""
 "\n"
@@ -18086,7 +18929,7 @@ msgstr ""
 "\n"
 "Sikkerhetskopikilder: \n"
 
-#: standalone/drakbackup:2492
+#: standalone/drakbackup:2489
 #, c-format
 msgid ""
 "\n"
@@ -18095,7 +18938,7 @@ msgstr ""
 "\n"
 "- Systemfiler:\n"
 
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2491
 #, c-format
 msgid ""
 "\n"
@@ -18104,7 +18947,7 @@ msgstr ""
 "\n"
 "- Brukerfiler:\n"
 
-#: standalone/drakbackup:2496
+#: standalone/drakbackup:2493
 #, c-format
 msgid ""
 "\n"
@@ -18113,7 +18956,7 @@ msgstr ""
 "\n"
 "- Andre filer:\n"
 
-#: standalone/drakbackup:2498
+#: standalone/drakbackup:2495
 #, c-format
 msgid ""
 "\n"
@@ -18122,12 +18965,12 @@ msgstr ""
 "\n"
 "- Lagre til harddisk i filbane: %s\n"
 
-#: standalone/drakbackup:2499
+#: standalone/drakbackup:2496
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr "\tBegrens diskforbruk til %s Mb\n"
 
-#: standalone/drakbackup:2502
+#: standalone/drakbackup:2499
 #, c-format
 msgid ""
 "\n"
@@ -18136,17 +18979,7 @@ msgstr ""
 "\n"
 "- Slett harddisk tarfiler etter sikkerhetskopiering.\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"
@@ -18155,22 +18988,22 @@ msgstr ""
 "\n"
 "- Brenn til 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å enhet: %s"
 
-#: standalone/drakbackup:2511
+#: standalone/drakbackup:2507
 #, c-format
 msgid " (multi-session)"
 msgstr " (multisesjon)"
 
-#: standalone/drakbackup:2512
+#: standalone/drakbackup:2508
 #, c-format
 msgid ""
 "\n"
@@ -18179,12 +19012,17 @@ msgstr ""
 "\n"
 "- Lagre til Bånd på enhet: %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 "\tTa sikkerhetskopi direkte til bånd\n"
+
+#: standalone/drakbackup:2513
 #, c-format
 msgid ""
 "\n"
@@ -18193,7 +19031,7 @@ msgstr ""
 "\n"
 "- Lagre via %s på vert: %s\n"
 
-#: standalone/drakbackup:2517
+#: standalone/drakbackup:2514
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -18202,7 +19040,7 @@ msgstr ""
 "\t\t brukernavn: %s\n"
 "\t\t på filbane: %s \n"
 
-#: standalone/drakbackup:2518
+#: standalone/drakbackup:2515
 #, c-format
 msgid ""
 "\n"
@@ -18211,42 +19049,42 @@ msgstr ""
 "\n"
 "- Valg:\n"
 
-#: standalone/drakbackup:2519
+#: standalone/drakbackup:2516
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr "\tIkke inkluder systemfiler\n"
 
-#: standalone/drakbackup:2521
+#: standalone/drakbackup:2518
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
 msgstr "\tSikkerhetskopier bruker tar og bzip2\n"
 
-#: standalone/drakbackup:2522
+#: standalone/drakbackup:2519
 #, c-format
 msgid "\tBackups use tar and gzip\n"
 msgstr "\tSikkerhetskopier bruker tar og gzip\n"
 
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2520
 #, c-format
 msgid "\tBackups use tar only\n"
 msgstr "\tSikkerhetskopier bruker bare 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 epost til %s\n"
 
-#: standalone/drakbackup:2527
+#: standalone/drakbackup:2524
 #, c-format
 msgid "\tUsing SMTP server %s\n"
 msgstr "Bruker SMTP-tjener %s\n"
 
-#: standalone/drakbackup:2529
+#: standalone/drakbackup:2526
 #, c-format
 msgid ""
 "\n"
@@ -18255,47 +19093,47 @@ msgstr ""
 "\n"
 "- Daemon (%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-ROM.\n"
 
-#: standalone/drakbackup:2532
+#: standalone/drakbackup:2529
 #, c-format
 msgid "\t-Tape \n"
 msgstr "\t-Bånd \n"
 
-#: standalone/drakbackup:2533
+#: standalone/drakbackup:2530
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr "\t-Nettverk med FTP.\n"
 
-#: standalone/drakbackup:2534
+#: standalone/drakbackup:2531
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr "\t-Nettverk med SSH.\n"
 
-#: standalone/drakbackup:2535
+#: standalone/drakbackup:2532
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr "\t-Nettverk med rsync.\n"
 
-#: standalone/drakbackup:2536
+#: standalone/drakbackup:2533
 #, c-format
 msgid "\t-Network by webdav.\n"
 msgstr "\t-Nettverk med webdav.\n"
 
-#: standalone/drakbackup:2538
+#: standalone/drakbackup:2535
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
 msgstr "Ingen konfigurasjon, vennligst klikk Veiviser og Avansert.\n"
 
-#: standalone/drakbackup:2543
+#: standalone/drakbackup:2540
 #, c-format
 msgid ""
 "List of data to restore:\n"
@@ -18304,27 +19142,27 @@ msgstr ""
 "Liste over data for gjenoppretting:\n"
 "\n"
 
-#: standalone/drakbackup:2545
+#: standalone/drakbackup:2542
 #, c-format
 msgid "- Restore System Files.\n"
 msgstr "- Gjenopprett systemfiler:\n"
 
-#: standalone/drakbackup:2547 standalone/drakbackup:2557
+#: standalone/drakbackup:2544 standalone/drakbackup:2554
 #, c-format
 msgid "   - from date: %s %s\n"
 msgstr "   - fra dato: %s %s\n"
 
-#: standalone/drakbackup:2550
+#: standalone/drakbackup:2547
 #, c-format
 msgid "- Restore User Files: \n"
 msgstr "- Gjenopprett brukerfiler: \n"
 
-#: standalone/drakbackup:2555
+#: standalone/drakbackup:2552
 #, c-format
 msgid "- Restore Other Files: \n"
 msgstr "- Gjenopprett andre filer: \n"
 
-#: standalone/drakbackup:2736
+#: standalone/drakbackup:2731
 #, c-format
 msgid ""
 "List of data corrupted:\n"
@@ -18333,130 +19171,130 @@ msgstr ""
 "Liste over korruptert data:\n"
 "\n"
 
-#: standalone/drakbackup:2738
+#: standalone/drakbackup:2733
 #, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr "Vennligst velg bort eller fjern den for neste gang."
 
-#: standalone/drakbackup:2748
+#: standalone/drakbackup:2743
 #, c-format
 msgid "Backup files are corrupted"
 msgstr "Sikkerhetskopier er korrupte"
 
-#: standalone/drakbackup:2769
+#: standalone/drakbackup:2764
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr "          Alle dine valgte data har blitt          "
 
-#: standalone/drakbackup:2770
+#: standalone/drakbackup:2765
 #, c-format
-msgid "          Successfuly Restored on %s       "
+msgid "          Successfully Restored on %s       "
 msgstr "          Gjenopprettet vellykket fra %s       "
 
-#: standalone/drakbackup:2889
+#: standalone/drakbackup:2885
 #, c-format
 msgid "         Restore Configuration       "
 msgstr "         Gjenopprett konfigurasjon       "
 
-#: standalone/drakbackup:2917
+#: standalone/drakbackup:2913
 #, c-format
 msgid "OK to restore the other files."
 msgstr "OK til å gjenopprette andre filer."
 
-#: standalone/drakbackup:2933
+#: standalone/drakbackup:2929
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr ""
 "Brukerliste til å gjenopprette (bare den siste datoen per bruker er viktig)"
 
-#: standalone/drakbackup:3000
+#: standalone/drakbackup:2994
 #, c-format
 msgid "Please choose the date to restore:"
 msgstr "vennligst velg datoen til å gjenopprette fra:"
 
-#: standalone/drakbackup:3037
+#: standalone/drakbackup:3031
 #, c-format
 msgid "Restore from Hard Disk."
 msgstr "Gjenopprett fra harddisk"
 
-#: standalone/drakbackup:3039
+#: standalone/drakbackup:3033
 #, c-format
 msgid "Enter the directory where backups are stored"
 msgstr "Vennligst skriv inn katalogen hvor sikkerhetskopier blir lagret"
 
-#: standalone/drakbackup:3043
+#: standalone/drakbackup:3037
 #, c-format
 msgid "Directory with backups"
 msgstr "Katalog med sikkerhetskopier"
 
-#: standalone/drakbackup:3097
+#: standalone/drakbackup:3091
 #, c-format
 msgid "Select another media to restore from"
 msgstr "Velg et annet media til å gjenopprette fra"
 
-#: standalone/drakbackup:3099
+#: standalone/drakbackup:3093
 #, c-format
 msgid "Other Media"
 msgstr "Andre media"
 
-#: standalone/drakbackup:3104
+#: standalone/drakbackup:3098
 #, c-format
 msgid "Restore system"
 msgstr "Gjenopprett systemet"
 
-#: standalone/drakbackup:3105
+#: standalone/drakbackup:3099
 #, c-format
 msgid "Restore Users"
 msgstr "Gjenopprett brukere"
 
-#: standalone/drakbackup:3106
+#: standalone/drakbackup:3100
 #, c-format
 msgid "Restore Other"
 msgstr "Gjenopprett andre"
 
-#: standalone/drakbackup:3108
+#: standalone/drakbackup:3102
 #, c-format
 msgid "Select path to restore (instead of /)"
 msgstr "velg filbane til gjenoppretting (i stedet for /)"
 
-#: standalone/drakbackup:3112 standalone/drakbackup:3394
+#: standalone/drakbackup:3106 standalone/drakbackup:3388
 #, c-format
 msgid "Path To Restore To"
 msgstr "Sti til å gjenopprette til"
 
-#: standalone/drakbackup:3115
+#: standalone/drakbackup:3109
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr ""
 "Ta ny sikkerhetskopi før gjenoppretting (bare for inkrementelle "
 "sikkerhetskopier.)"
 
-#: standalone/drakbackup:3117
+#: standalone/drakbackup:3111
 #, c-format
 msgid "Remove user directories before restore."
 msgstr "Fjern brukerkataloger før gjenoppretting."
 
-#: standalone/drakbackup:3201
+#: standalone/drakbackup:3196
 #, c-format
 msgid "Filename text substring to search for (empty string matches all):"
 msgstr "Filnavntekst å søke etter (tom streng matcher alt):"
 
-#: standalone/drakbackup:3204
+#: standalone/drakbackup:3199
 #, c-format
 msgid "Search Backups"
 msgstr "Søk igjennom sikkerhetskopier"
 
-#: standalone/drakbackup:3223
+#: standalone/drakbackup:3217
 #, c-format
 msgid "No matches found..."
 msgstr "Ingen treff funnet..."
 
-#: standalone/drakbackup:3227
+#: standalone/drakbackup:3221
 #, c-format
 msgid "Restore Selected"
 msgstr "Gjenoppretting valgt"
 
-#: standalone/drakbackup:3362
+#: standalone/drakbackup:3356
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
@@ -18465,7 +19303,7 @@ msgstr ""
 "Klikk på dato/tid for å se sikkerhetskopifiler.\n"
 "Klikk på filer med CTRL-tasten inne for å velge flere filer."
 
-#: standalone/drakbackup:3368
+#: standalone/drakbackup:3362
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -18474,7 +19312,7 @@ msgstr ""
 "Gjenopprett valgte\n"
 "katalogentré"
 
-#: standalone/drakbackup:3377
+#: standalone/drakbackup:3371
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -18483,17 +19321,17 @@ msgstr ""
 "Gjenopprett valge\n"
 "filer"
 
-#: standalone/drakbackup:3454
+#: standalone/drakbackup:3448
 #, c-format
 msgid "Backup files not found at %s."
 msgstr "Sikkerhetskopifiler ikke funnet på %s."
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid "Restore From CD"
 msgstr "Gjenopprett fra CD"
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
@@ -18502,17 +19340,17 @@ msgstr ""
 "Sett inn CD-en med navnet %s\n"
 " i CD-stasjonen under monteringspunktet /mnt/cdrom"
 
-#: standalone/drakbackup:3469
+#: standalone/drakbackup:3463
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr "Ikke det riktige CD-navnet. CD'en er merket med %s."
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid "Restore From Tape"
 msgstr "Gjenopprett fra bånd"
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
@@ -18521,219 +19359,219 @@ msgstr ""
 "Sett inn båndet med volumnavn %s\n"
 " i båndenhet %s"
 
-#: standalone/drakbackup:3481
+#: standalone/drakbackup:3475
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr "Ikke det riktige båndnavnet. Båndet er merket med %s."
 
-#: 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 "Gjenopprett via nettverksprotokoll: %s"
 
-#: standalone/drakbackup:3493
+#: standalone/drakbackup:3487
 #, c-format
 msgid "Host Name"
 msgstr "Vertsnavn"
 
-#: standalone/drakbackup:3494
+#: standalone/drakbackup:3488
 #, c-format
 msgid "Host Path or Module"
 msgstr "Vert Filbane eller modul"
 
-#: standalone/drakbackup:3501
+#: standalone/drakbackup:3495
 #, c-format
 msgid "Password required"
 msgstr "Passord trengs"
 
-#: standalone/drakbackup:3507
+#: standalone/drakbackup:3501
 #, c-format
 msgid "Username required"
 msgstr "Brukernavn kreves"
 
-#: standalone/drakbackup:3510
+#: standalone/drakbackup:3504
 #, c-format
 msgid "Hostname required"
 msgstr "Vertsnavn kreves"
 
-#: standalone/drakbackup:3515
+#: standalone/drakbackup:3509
 #, c-format
 msgid "Path or Module required"
 msgstr "Filbane eller modul kreves"
 
-#: standalone/drakbackup:3528
+#: standalone/drakbackup:3522
 #, c-format
 msgid "Files Restored..."
 msgstr "Filer gjenopprettet..."
 
-#: standalone/drakbackup:3531
+#: standalone/drakbackup:3525
 #, c-format
 msgid "Restore Failed..."
 msgstr "Feil ved gjenoppreting..."
 
-#: standalone/drakbackup:3549
+#: standalone/drakbackup:3543
 #, c-format
 msgid "%s not retrieved..."
 msgstr "%s ikke mottatt"
 
-#: standalone/drakbackup:3748 standalone/drakbackup:3817
+#: standalone/drakbackup:3765 standalone/drakbackup:3834
 #, c-format
 msgid "Search for files to restore"
 msgstr "Søk etter filer som skal gjenopprettes"
 
-#: standalone/drakbackup:3752
+#: standalone/drakbackup:3769
 #, c-format
 msgid "Restore all backups"
 msgstr "Gjenopprett alle sikkerhetskopier"
 
-#: standalone/drakbackup:3760
+#: standalone/drakbackup:3777
 #, c-format
 msgid "Custom Restore"
 msgstr "Egendefinert gjenoppretting"
 
-#: standalone/drakbackup:3764 standalone/drakbackup:3813
+#: standalone/drakbackup:3781 standalone/drakbackup:3830
 #, c-format
 msgid "Restore From Catalog"
 msgstr "Gjenopprett fra katalog"
 
-#: standalone/drakbackup:3785
+#: standalone/drakbackup:3802
 #, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr "Klarer ikke å finne igjen sikkerhetskopier for gjenoppretting...\n"
 
-#: standalone/drakbackup:3786
+#: standalone/drakbackup:3803
 #, c-format
 msgid "Verify that %s is the correct path"
 msgstr "Kontroller at %s er riktig sti"
 
-#: standalone/drakbackup:3787
+#: standalone/drakbackup:3804
 #, c-format
 msgid " and the CD is in the drive"
 msgstr " og CD'en er i stasjonen"
 
-#: standalone/drakbackup:3789
+#: standalone/drakbackup:3806
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr ""
 "Sikkerhetskopier på umonterbart media - bruk Catalog for å gjenopprette"
 
-#: standalone/drakbackup:3805
+#: standalone/drakbackup:3822
 #, c-format
 msgid "CD in place - continue."
 msgstr "CD på plasse - fortsett."
 
-#: standalone/drakbackup:3810
+#: standalone/drakbackup:3827
 #, c-format
 msgid "Browse to new restore repository."
 msgstr "Bla deg fram til nytt gjenoppretelsesrepositorie."
 
-#: standalone/drakbackup:3811
+#: standalone/drakbackup:3828
 #, c-format
 msgid "Directory To Restore From"
 msgstr "Katalog å gjenopprette fra"
 
-#: standalone/drakbackup:3847
+#: standalone/drakbackup:3864
 #, c-format
 msgid "Restore Progress"
 msgstr "Gjenopprettelseprogress"
 
-#: standalone/drakbackup:3898 standalone/drakbackup:3971
-#: standalone/logdrake:174
+#: standalone/drakbackup:3919 standalone/drakbackup:3992
+#: standalone/logdrake:173
 #, c-format
 msgid "Save"
 msgstr "Lagre"
 
-#: standalone/drakbackup:3954
+#: standalone/drakbackup:3975
 #, c-format
 msgid "Build Backup"
 msgstr "Lag sikkerhetskopi"
 
-#: 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 "De følgende pakker trenger å bli installert:\n"
 
-#: standalone/drakbackup:4102
+#: standalone/drakbackup:4123
 #, c-format
 msgid "Please select data to restore..."
 msgstr "Vennligst velg data for å gjenopprette..."
 
-#: standalone/drakbackup:4142
+#: standalone/drakbackup:4163
 #, c-format
 msgid "Backup system files"
 msgstr "Ta sikkerhetskopi av systemfiler"
 
-#: standalone/drakbackup:4145
+#: standalone/drakbackup:4166
 #, c-format
 msgid "Backup user files"
 msgstr "Ta sikkerhetskopi av brukerfiler"
 
-#: standalone/drakbackup:4148
+#: standalone/drakbackup:4169
 #, c-format
 msgid "Backup other files"
 msgstr "Ta sikkerhetskopi av 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 vie 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 sikkerhetskopi nå fra konfigurasjonsfil"
 
-#: standalone/drakbackup:4255
+#: standalone/drakbackup:4276
 #, c-format
 msgid "View Backup Configuration."
 msgstr "Vis sikkerhetskopiert konfigurasjon"
 
-#: standalone/drakbackup:4281
+#: standalone/drakbackup:4302
 #, c-format
 msgid "Wizard Configuration"
 msgstr "Veiviser-konfigurasjon"
 
-#: standalone/drakbackup:4286
+#: standalone/drakbackup:4307
 #, c-format
 msgid "Advanced Configuration"
 msgstr "Avansert konfigurasjon"
 
-#: standalone/drakbackup:4291
+#: standalone/drakbackup:4312
 #, c-format
 msgid "View Configuration"
 msgstr "Vis konfigurasjon"
 
-#: 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 sikkerhetskopi nå"
 
-#: standalone/drakbackup:4304
+#: standalone/drakbackup:4325
 #, c-format
 msgid ""
 "No configuration file found \n"
@@ -18742,56 +19580,56 @@ msgstr ""
 "Ingen konfigurasjonsfil funnet \n"
 "vennligst klikk Veiviser eller Avansert."
 
-#: standalone/drakbackup:4324 standalone/drakbackup:4327
+#: standalone/drakbackup:4345 standalone/drakbackup:4348
 #, c-format
 msgid "Drakbackup"
 msgstr "Drakbackup"
 
-#: standalone/drakboot:58
+#: standalone/drakboot:64
 #, c-format
 msgid "Graphical boot theme selection"
 msgstr "Grafisk oppstartstemavalg"
 
-#: 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 temaer"
 
-#: standalone/drakboot:140
+#: standalone/drakboot:149
 #, c-format
 msgid "Create new theme"
 msgstr "Opprett 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 "
@@ -18801,12 +19639,17 @@ msgstr ""
 "grafisk oppstart, velg et grafisk videomodus fra "
 "oppstartlasterkonfigurasjonsverktøyet."
 
-#: standalone/drakboot:164
+#: standalone/drakboot:167
+#, c-format
+msgid "Do you want to configure it now?"
+msgstr "Ønsker du å konfigurere det nå?"
+
+#: standalone/drakboot:177
 #, c-format
 msgid "Theme"
 msgstr "Tema"
 
-#: standalone/drakboot:167
+#: standalone/drakboot:180
 #, c-format
 msgid ""
 "Display theme\n"
@@ -18815,156 +19658,134 @@ 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 miljet ved oppstart"
 
-#: standalone/drakboot:184
+#: standalone/drakboot:197
 #, c-format
 msgid "No, I don't want autologin"
 msgstr "Nei, jeg vil ikke ha automatisk innlogging"
 
-#: standalone/drakboot:185
+#: standalone/drakboot:198
 #, c-format
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "Ja, jeg vil ha automatisk innlogging med denne (bruker; skrivebord)"
 
-#: standalone/drakboot:191
+#: standalone/drakboot:201
 #, c-format
 msgid "Default user"
 msgstr "Standardbruker"
 
-#: standalone/drakboot:192
+#: standalone/drakboot:202
 #, c-format
 msgid "Default desktop"
 msgstr "Standard skrivebord"
 
-#: standalone/drakboot:256
-#, c-format
-msgid "Installation of %s failed. The following error occured:"
-msgstr "Installasjon av %s mislykket. Følgende feil oppsto:"
-
-#: 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 ""
-"For å sende en bugrapport, klikk på knappen rapport.\n"
-"Dette vil åpne  et nettleservindu på %s\n"
-" hvor du vil finne ett skjema for utfylling. Informasjonen ovenfor vil bli "
-"bli \n"
-"overført til den serveren."
+"Vennligst velg et videomodus, det vil bli lagt til hver oppstartsoppføring "
+"valg nedenfor.\n"
+"Vær sikker på at ditt kort støtter moduset du velger."
 
-#: standalone/drakbug:48
+#: standalone/drakbug:41
 #, c-format
-msgid "Mandrake Bug Report Tool"
-msgstr "Mandrake bugrapporterings verktøy"
+msgid "Mandrakelinux Bug Report Tool"
+msgstr "Mandrakelinux programvarefeilrapporterings verktøy"
 
-#: standalone/drakbug:53
+#: standalone/drakbug:46
 #, c-format
-msgid "Mandrake Control Center"
-msgstr "Mandrake Kontrollsenter"
+msgid "Mandrakelinux Control Center"
+msgstr "Mandrakelinux 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 "Verktøy som fungerer alene"
 
-#: standalone/drakbug:57
+#: standalone/drakbug:50
 #, c-format
 msgid "HardDrake"
 msgstr "HardDrake"
 
-#: 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 "Menudrake"
 
-#: standalone/drakbug:60
+#: standalone/drakbug:53
 #, c-format
 msgid "Msec"
 msgstr "Msec"
 
-#: 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 "Programvarehåndterer"
 
-#: 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 "Userdrake"
 
-#: standalone/drakbug:66
+#: standalone/drakbug:59
 #, c-format
 msgid "Configuration Wizards"
 msgstr "Konfigurasjonsveivisere"
 
-#: 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 ""
-"For å sende en feilrapport, klikk på rapport-knappen. som vil åpne din "
-"standard nettleser\n"
-"til Anthill hvor du vil få muligheten til å laste opp informasjonen ovenfor "
-"som en feilmelding."
-
-#: standalone/drakbug:102
+#: standalone/drakbug:83
 #, c-format
 msgid "Application:"
 msgstr "Applikasjon:"
 
-#: 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 "Utgivelse: "
 
-#: standalone/drakbug:110
+#: standalone/drakbug:91
 #, c-format
 msgid ""
 "Application Name\n"
@@ -18973,117 +19794,132 @@ msgstr ""
 "Applikasjonnavn\n"
 "eller full sti:"
 
-#: 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 "Oppsummering: "
 
-#: standalone/drakbug:129
-#, c-format
-msgid "YOUR TEXT HERE"
-msgstr "DIN TEKST HER"
-
-#: standalone/drakbug:132
+#: standalone/drakbug:104
 #, c-format
 msgid "Bug Description/System Information"
 msgstr "Feilbeskrivelse/Systeminformasjon"
 
-#: standalone/drakbug:136
+#: standalone/drakbug:105
+#, c-format
+msgid "YOUR TEXT HERE"
+msgstr "DIN TEKST 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 cpuinfo"
 
-#: standalone/drakbug:138
+#: standalone/drakbug:110
 #, c-format
 msgid "Submit lspci"
 msgstr "Send lspci"
 
-#: 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 ""
+"For å sende en bugrapport, klikk på knappen rapport.\n"
+"Dette vil åpne  et nettleservindu på %s\n"
+" hvor du vil finne ett skjema for utfylling. Informasjonen ovenfor vil bli "
+"bli \n"
+"overført til den serveren."
+
+#: standalone/drakbug:130
 #, c-format
 msgid "Report"
 msgstr "Rapporter"
 
-#: standalone/drakbug:219
+#: standalone/drakbug:191
 #, c-format
 msgid "Not installed"
 msgstr "Ikke installert"
 
-#: standalone/drakbug:231
+#: standalone/drakbug:203
 #, c-format
 msgid "Package not installed"
 msgstr "Pakke ikke installert"
 
-#: standalone/drakbug:248
+#: standalone/drakbug:220
 #, c-format
 msgid "NOT FOUND"
 msgstr "IKKE FUNNET"
 
-#: standalone/drakbug:259
+#: standalone/drakbug:227
 #, c-format
-msgid "connecting to %s ..."
+msgid "connecting to %s..."
 msgstr "kobler til %s ..."
 
-#: standalone/drakbug:267
+#: standalone/drakbug:235
 #, c-format
 msgid "No browser available! Please install one"
 msgstr "Ingen utforsker tilgjengelig! Vennligst installer en"
 
-#: standalone/drakbug:286
+#: standalone/drakbug:254
 #, c-format
 msgid "Please enter a package name."
 msgstr "Vennligst oppgi et pakkenavn"
 
-#: standalone/drakbug:292
+#: standalone/drakbug:260
 #, c-format
 msgid "Please enter summary text."
 msgstr "Vennligst skriv inn tekstsammendrag."
 
-#: standalone/drakclock:29
+#: standalone/drakclock:30
 #, c-format
 msgid "DrakClock"
 msgstr "DrakClock"
 
-#: standalone/drakclock:39
+#: standalone/drakclock:40
 #, c-format
 msgid "not defined"
 msgstr "ikke definert"
 
-#: standalone/drakclock:41
+#: standalone/drakclock:42
 #, c-format
 msgid "Change Time Zone"
 msgstr "Skift tidssone"
 
-#: standalone/drakclock:45
+#: standalone/drakclock:46
 #, c-format
 msgid "Timezone - DrakClock"
 msgstr "Tidssone - DrakClock"
 
-#: standalone/drakclock:47
+#: standalone/drakclock:48
 #, c-format
 msgid "GMT - DrakClock"
 msgstr "GMT - DrakClock"
 
-#: standalone/drakclock:47
+#: standalone/drakclock:48
 #, c-format
 msgid "Is your hardware clock set to GMT?"
 msgstr "Er din maskinvareklokk satt til GMT?"
 
-#: standalone/drakclock:79
+#: standalone/drakclock:76
 #, c-format
 msgid "Network Time Protocol"
 msgstr "Nettverkstidsprotokoll"
 
-#: standalone/drakclock:81
+#: standalone/drakclock:78
 #, c-format
 msgid ""
 "Your computer can synchronize its clock\n"
@@ -19092,50 +19928,55 @@ msgstr ""
 "Din maskin kan synkronisere sin egen klokke\n"
 " mot en ekstern tidstjener ved hjelp av NTP"
 
-#: standalone/drakclock:82
+#: standalone/drakclock:79
 #, c-format
 msgid "Enable Network Time Protocol"
 msgstr "Aktiver Nettverkstidsprotokoll"
 
-#: standalone/drakclock:90
+#: standalone/drakclock:87
 #, c-format
 msgid "Server:"
 msgstr "Tjener:"
 
-#: standalone/drakclock:137 standalone/drakclock:149
+#: standalone/drakclock:125
+#, c-format
+msgid "Could not synchronize with %s."
+msgstr "Kunne ikke synkronisere med %s."
+
+#: standalone/drakclock:147 standalone/drakclock:157
 #, c-format
 msgid "Reset"
 msgstr "Omstart"
 
-#: 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 ""
 "Vi trenger å installere ntp-pakka\n"
 " for å aktivere Nettverkstidsprotokoll\n"
 "\n"
 "Vil du installere ntp ?"
 
-#: standalone/drakconnect:81
+#: standalone/drakconnect:85
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Nettverkskonfigurasjon (%d adaptere"
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Gateway:"
 msgstr "Gateway:"
 
-#: 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 "Vennligst vent"
@@ -19145,12 +19986,8 @@ msgstr "Vennligst vent"
 msgid "Interface"
 msgstr "rensesnitt"
 
-#: standalone/drakconnect:116 standalone/drakups:233
-#, c-format
-msgid "Driver"
-msgstr "Driver"
-
-#: standalone/drakconnect:116
+#: standalone/drakconnect:116 standalone/printerdrake:218
+#: standalone/printerdrake:225
 #, c-format
 msgid "State"
 msgstr "Status"
@@ -19165,7 +20002,7 @@ msgstr "Vertsnavn: "
 msgid "Configure hostname..."
 msgstr "Konfigurerer vertsnavn..."
 
-#: standalone/drakconnect:149 standalone/drakconnect:792
+#: standalone/drakconnect:149 standalone/drakconnect:843
 #, c-format
 msgid "LAN configuration"
 msgstr "LAN-konfigurasjon"
@@ -19175,8 +20012,8 @@ msgstr "LAN-konfigurasjon"
 msgid "Configure Local Area Network..."
 msgstr "Konfigurer lokalt nettverk"
 
-#: standalone/drakconnect:162 standalone/drakconnect:240
-#: standalone/drakconnect:244
+#: standalone/drakconnect:162 standalone/drakconnect:246
+#: standalone/drakconnect:250
 #, c-format
 msgid "Apply"
 msgstr "Bruk"
@@ -19186,107 +20023,113 @@ msgstr "Bruk"
 msgid "Manage connections"
 msgstr "Håndter tilkoblinger"
 
-#: standalone/drakconnect:218
+#: standalone/drakconnect:224
 #, c-format
 msgid "Device selected"
 msgstr "Enhet valgt"
 
-#: standalone/drakconnect:314
+#: standalone/drakconnect:305
 #, c-format
 msgid "IP configuration"
 msgstr "IP-konfigurasjon"
 
-#: standalone/drakconnect:351
+#: standalone/drakconnect:342
 #, c-format
 msgid "DNS servers"
 msgstr "DNS-tjenere"
 
-#: standalone/drakconnect:359
+#: standalone/drakconnect:350
 #, c-format
 msgid "Search Domain"
 msgstr "Søk igjennom 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 "Metrisk"
+
+#: standalone/drakconnect:491
 #, c-format
 msgid "Flow control"
 msgstr "Flytkontroll"
 
-#: standalone/drakconnect:494
+#: standalone/drakconnect:492
 #, c-format
 msgid "Line termination"
 msgstr "Linjeterminering"
 
-#: standalone/drakconnect:505
+#: standalone/drakconnect:503
 #, c-format
 msgid "Modem timeout"
 msgstr "Modem-tidsavbrudd"
 
-#: standalone/drakconnect:509
+#: standalone/drakconnect:507
 #, c-format
 msgid "Use lock file"
 msgstr "Bruk lock-fil"
 
-#: standalone/drakconnect:511
+#: standalone/drakconnect:509
 #, c-format
 msgid "Wait for dialup tone before dialing"
 msgstr "Vent på summetone før oppringning"
 
-#: standalone/drakconnect:514
+#: standalone/drakconnect:512
 #, c-format
 msgid "Busy wait"
 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 "Aktiver"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
 #, c-format
 msgid "Disable"
 msgstr "Deaktiver"
 
-#: standalone/drakconnect:571 standalone/harddrake2:62
+#: standalone/drakconnect:569 standalone/harddrake2:45
 #, c-format
 msgid "Media class"
 msgstr "Mediaklasse"
 
-#: standalone/drakconnect:572 standalone/drakfloppy:141
+#: standalone/drakconnect:570 standalone/drakfloppy:136
 #, c-format
 msgid "Module name"
 msgstr "Modulnavn"
 
-#: standalone/drakconnect:573
+#: standalone/drakconnect:571
 #, c-format
 msgid "Mac Address"
 msgstr "Macadresse"
 
-#: 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 "Lokasjon 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 "
@@ -19295,20 +20138,20 @@ msgstr ""
 "Ikke noe ethernet nettverksadapter har blitt oppdaget på ditt system. "
 "Vennligst kjør verktøyet for maskinvarekonfigurasjon."
 
-#: standalone/drakconnect:651
+#: standalone/drakconnect:678
 #, c-format
 msgid "Remove a network interface"
 msgstr "Fjern et nettverksgrensesnitt"
 
-#: standalone/drakconnect:655
+#: standalone/drakconnect:682
 #, c-format
 msgid "Select the network interface to remove:"
 msgstr "Velg nettverksgrensesnittet som skal fjernes:"
 
-#: 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 ""
@@ -19316,53 +20159,53 @@ msgstr ""
 "\n"
 "%s"
 
-#: standalone/drakconnect:681
+#: standalone/drakconnect:715
 #, c-format
 msgid ""
-"Congratulations, the \"%s\" network interface has been succesfully deleted"
+"Congratulations, the \"%s\" network interface has been successfully deleted"
 msgstr "Gratulerer, \"%s\"-nettverksgrensesnittet har blitt vellykket slettet"
 
-#: standalone/drakconnect:698
+#: standalone/drakconnect:732
 #, c-format
-msgid "No Ip"
-msgstr "Ingen Ip"
+msgid "No IP"
+msgstr "Ingen IP"
 
-#: standalone/drakconnect:699
+#: standalone/drakconnect:733
 #, c-format
 msgid "No Mask"
 msgstr "Ingen 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 "Tilkoblet"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Not connected"
 msgstr "Ikke tilkoblet"
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Disconnect..."
 msgstr "Koble fra..."
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Connect..."
 msgstr "Koble til..."
 
-#: standalone/drakconnect:772
+#: standalone/drakconnect:808
 #, c-format
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
@@ -19371,17 +20214,17 @@ msgstr ""
 "Advarsel, en annen internettoppkobling har blitt oppdaget, bruker kanskje "
 "ditt nettverk"
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, c-format
 msgid "Deactivate now"
 msgstr "Deaktiver nå"
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, c-format
 msgid "Activate now"
 msgstr "Aktiver nå"
 
-#: standalone/drakconnect:796
+#: standalone/drakconnect:847
 #, c-format
 msgid ""
 "You don't have any configured interface.\n"
@@ -19390,81 +20233,101 @@ msgstr ""
 "Du har ingen konfigurerte grensesnitt.\n"
 "Konfigurer disse først ved å klikke på 'Konfigurer'"
 
-#: standalone/drakconnect:810
+#: standalone/drakconnect:861
 #, c-format
 msgid "LAN Configuration"
 msgstr "LAN-konfigurasjon"
 
-#: standalone/drakconnect:822
+#: standalone/drakconnect:873
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Adapter %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 "Startet 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 ""
 "Dette grensesnittet har ikke blitt konfigurert ennå.\n"
-"Kjør \"Legg til et grensesnitt\"-assistenten fra Mandrake Kontrollsenter"
+"Kjør \"Legg til et grensesnitt\"-assistenten fra Mandrakelinux Kontrollsenter"
 
-#. -PO: here "Internet access" should be translated the same was as in control-center
-#: standalone/drakconnect:923
+#. -PO: here "Add Connection" should be translated the same was as in control-center
+#: standalone/drakconnect:974 standalone/net_applet:46
 #, 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 ""
-"Du har ikke konfigurert noen internettilkobling.\n"
-"Vennligst kjørt \"Internettilgang\" i kontrolsenteret."
+"Du har ikke satt opp en internett tilkobling enda.\n"
+"Kjør «Ny tilkobling»-assistenten fra Mandrakelinux Kontrollsenter."
 
-#: standalone/drakconnect:931
+#: standalone/drakconnect:982
 #, c-format
 msgid "Internet connection configuration"
 msgstr "Internett tilkobling konfigurasjon"
 
-#: standalone/drakconnect:949
+#: standalone/drakconnect:1000
 #, c-format
 msgid "Third DNS server (optional)"
 msgstr "Tredje DNS-tjener (valgfri)"
 
-#: standalone/drakconnect:971
+#: standalone/drakconnect:1022
 #, c-format
 msgid "Internet Connection Configuration"
 msgstr "Internettilkoblingkonfigurasjon"
 
-#: 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 "Oppkoblingstype:"
 
-#: 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 "GDM (GNOME Innloggingshåndterer)"
+
+#: standalone/drakedm:35
+#, c-format
+msgid "KDM (KDE Display Manager)"
+msgstr "KDM (KDE Innloggingshåndterer)"
+
+#: standalone/drakedm:36
+#, c-format
+msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgstr "MdkKDM (Mandrakelinux Innloggingshåndterer)"
+
+#: standalone/drakedm:37
+#, c-format
+msgid "XDM (X Display Manager)"
+msgstr "XDM (X innloggingshåndterer)"
+
+#: standalone/drakedm:55
 #, c-format
 msgid "Choosing a display manager"
 msgstr "Velg en innloggingshåndterer(DM)"
 
-#: standalone/drakedm:54
+#: standalone/drakedm:56
 #, c-format
 msgid ""
 "X11 Display Manager allows you to graphically log\n"
@@ -19475,92 +20338,101 @@ msgstr ""
 "inn på ditt system med X Window-systemet kjørende og støtter kjøring\n"
 "av forskjellige X-sesjoner på din lokale maskin på en gang."
 
-#: 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 "Forandringen er gjort, vil du restarte dm-tjenesten ?"
 
-#: 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 ""
+"Du skal lukke alle kjørende programmer og miste din gjeldende sesjon. Er du "
+"helt sikker på at du vil restarte dm tjenesten?"
+
+#: standalone/drakfloppy:41
 #, c-format
 msgid "drakfloppy"
 msgstr "drakoppstartsdiskett"
 
-#: standalone/drakfloppy:83
+#: standalone/drakfloppy:78
 #, c-format
 msgid "Boot disk creation"
 msgstr "Oppstartsdiskett-laging"
 
-#: 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 "Enhet"
 
-#: standalone/drakfloppy:93
+#: standalone/drakfloppy:88
 #, c-format
 msgid "Kernel version"
 msgstr "Kjerneversjon"
 
-#: standalone/drakfloppy:108
+#: standalone/drakfloppy:103
 #, c-format
 msgid "Preferences"
 msgstr "Egenskaper"
 
-#: standalone/drakfloppy:122
+#: standalone/drakfloppy:117
 #, c-format
 msgid "Advanced preferences"
 msgstr "Avanserte egenskaper"
 
-#: standalone/drakfloppy:141
+#: standalone/drakfloppy:136
 #, c-format
 msgid "Size"
 msgstr "Størrelse"
 
-#: standalone/drakfloppy:144
+#: standalone/drakfloppy:139
 #, c-format
 msgid "Mkinitrd optional arguments"
 msgstr "Mkinitrd valgfrie argumenter"
 
-#: 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 "utelat raid-moduler"
 
-#: standalone/drakfloppy:148
+#: standalone/drakfloppy:143
 #, c-format
 msgid "if needed"
 msgstr "hvis det behøves"
 
-#: standalone/drakfloppy:149
+#: standalone/drakfloppy:144
 #, c-format
 msgid "omit scsi modules"
 msgstr "utelat scsi moduler"
 
-#: standalone/drakfloppy:152
+#: standalone/drakfloppy:147
 #, c-format
 msgid "Add a module"
 msgstr "Legg til en modul"
 
-#: standalone/drakfloppy:161
+#: standalone/drakfloppy:156
 #, c-format
 msgid "Remove a module"
 msgstr "Fjern en modul"
 
-#: standalone/drakfloppy:296
+#: standalone/drakfloppy:291
 #, c-format
 msgid "Be sure a media is present for the device %s"
 msgstr "Vær sikker på at det er media i %s"
 
-#: standalone/drakfloppy:302
+#: standalone/drakfloppy:297
 #, c-format
 msgid ""
 "There is no medium or it is write-protected for device %s.\n"
@@ -19569,22 +20441,23 @@ msgstr ""
 "Det er ikke noe media i %s eller så er det skrivebeskyttet.\n"
 "Vennligst sett inn ett."
 
-#: standalone/drakfloppy:306
+#: standalone/drakfloppy:301
 #, c-format
 msgid "Unable to fork: %s"
 msgstr "Kan ikke dele %s"
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, c-format
 msgid "Floppy creation completed"
 msgstr "Diskettopprettelse fullført"
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, c-format
 msgid "The creation of the boot floppy has been successfully completed \n"
 msgstr "Opprettelsen av oppstartsdiskett har blitt vellykket gjennomført \n"
 
-#: standalone/drakfloppy:312
+#. -PO: Do not alter the <span ..> and </span> tags
+#: standalone/drakfloppy:309
 #, c-format
 msgid ""
 "Unable to properly close mkbootdisk:\n"
@@ -19727,7 +20600,7 @@ msgstr "Skrifttype liste"
 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"
@@ -19737,10 +20610,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"
@@ -19749,7 +20623,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright (C) 2001-2002 ved MandrakeSoft \n"
+"Copyright (C) 2001-2002 ved Mandrakesoft \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (opprinnelig versjon)\n"
@@ -19758,7 +20632,7 @@ msgstr ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 
-#: standalone/drakfont:521
+#: standalone/drakfont:523
 #, c-format
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
@@ -19792,7 +20666,7 @@ msgstr ""
 " dette programmet. Hvis ikke, skriv til Free Software\n"
 " Foundation Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: standalone/drakfont:537
+#: standalone/drakfont:539
 #, c-format
 msgid ""
 "Thanks:\n"
@@ -19823,12 +20697,12 @@ msgstr ""
 "\t  av Andrew Weeks, Frank Siegert, Thomas Henlich, Sergey Babkin  \n"
 "             Konverter ttf-fontfiles til afm og pfb fonter\n"
 
-#: standalone/drakfont:556
+#: standalone/drakfont:558
 #, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr "Velg applikasjonene som vil søtte skrifttypene:"
 
-#: standalone/drakfont:557
+#: standalone/drakfont:559
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -19843,122 +20717,127 @@ msgstr ""
 "Du kan installere skrifttypene på den vanlige måten. I noen sjeldne "
 "tilfeller kan herpede skrifttyper få din X-tjener til å henge."
 
-#: 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 skrivere"
 
-#: standalone/drakfont:586
+#: standalone/drakfont:588
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
 msgstr "Velg skrifttypefil eller katalog og klikk 'Legg til'"
 
-#: standalone/drakfont:587
+#: standalone/drakfont:589
 #, c-format
 msgid "File Selection"
 msgstr "Filvalg"
 
-#: standalone/drakfont:600
+#: standalone/drakfont:604
 #, c-format
 msgid "You've not selected any font"
 msgstr "Du har ikke valgt noen skrifttype"
 
-#: standalone/drakfont:652
+#: standalone/drakfont:656
 #, c-format
 msgid "Import fonts"
 msgstr "Importer skrifttyper"
 
-#: standalone/drakfont:657
+#: standalone/drakfont:661
 #, c-format
 msgid "Install fonts"
 msgstr "Installer skrifttyper"
 
-#: standalone/drakfont:692
+#: standalone/drakfont:696
 #, c-format
 msgid "click here if you are sure."
 msgstr "klikk her hvis du er sikker."
 
-#: standalone/drakfont:694
+#: standalone/drakfont:698
 #, c-format
 msgid "here if no."
 msgstr "her hvis nei."
 
-#: standalone/drakfont:733
+#: standalone/drakfont:737
 #, c-format
 msgid "Unselected All"
 msgstr "Valgte vekk alle"
 
-#: standalone/drakfont:736
+#: standalone/drakfont:740
 #, c-format
 msgid "Selected All"
 msgstr "Valgte alle"
 
-#: 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 skrifttyper"
 
-#: standalone/drakfont:754 standalone/drakfont:774
+#: standalone/drakfont:758 standalone/drakfont:778
 #, c-format
 msgid "Initial tests"
 msgstr "Initielle tester"
 
-#: standalone/drakfont:755
+#: standalone/drakfont:759
 #, c-format
 msgid "Copy fonts on your system"
 msgstr "Kopier skrifttyper på ditt system"
 
-#: standalone/drakfont:756
+#: standalone/drakfont:760
 #, c-format
 msgid "Install & convert Fonts"
 msgstr "Installer og konverter skrifttyper"
 
-#: standalone/drakfont:757
+#: standalone/drakfont:761
 #, c-format
 msgid "Post Install"
 msgstr "Etter installasjon"
 
-#: standalone/drakfont:775
+#: standalone/drakfont:779
 #, c-format
 msgid "Remove fonts on your system"
 msgstr "Fjern skrifttyper på systemet ditt"
 
-#: standalone/drakfont:776
+#: standalone/drakfont:780
 #, c-format
 msgid "Post Uninstall"
 msgstr "Etter installering"
 
-#: standalone/drakgw:58 standalone/drakgw:193
+#: standalone/drakgw:58 standalone/drakgw:194
 #, c-format
 msgid "Internet Connection Sharing"
 msgstr "Deling av Internettilkobling"
 
-#: standalone/drakgw:124
+#: standalone/drakgw:114 standalone/drakvpn:51
+#, c-format
+msgid "Sorry, we support only 2.4 and above kernels."
+msgstr "Beklager, vi støtter bare 2.4-kjerner og nyere."
+
+#: standalone/drakgw:125
 #, c-format
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Deling av Internett tilkobling er deaktivert"
 
-#: standalone/drakgw:125
+#: standalone/drakgw:126
 #, c-format
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
@@ -19971,39 +20850,39 @@ msgstr ""
 "\n"
 "Hva vil du gjøre?"
 
-#: standalone/drakgw:129 standalone/drakvpn:127
+#: standalone/drakgw:130 standalone/drakvpn:127
 #, c-format
 msgid "enable"
 msgstr "aktiver"
 
-#: 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 "Konfigurer 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 "avvis"
 
-#: standalone/drakgw:136
+#: standalone/drakgw:137
 #, c-format
 msgid "Enabling servers..."
 msgstr "Slår på tjenere..."
 
-#: standalone/drakgw:148
+#: standalone/drakgw:149
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr "Deling av Internettilkobling er nå aktivert."
 
-#: standalone/drakgw:151
+#: standalone/drakgw:152
 #, c-format
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Deling av Internett tilkobling er aktivert"
 
-#: standalone/drakgw:152
+#: standalone/drakgw:153
 #, c-format
 msgid ""
 "The setup of Internet Connection Sharing has already been done.\n"
@@ -20016,22 +20895,22 @@ msgstr ""
 "\n"
 "Hva vil du gjøre?"
 
-#: standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:157 standalone/drakvpn:101
 #, c-format
 msgid "disable"
 msgstr "deaktivert"
 
-#: standalone/drakgw:159
+#: standalone/drakgw:160
 #, c-format
 msgid "Disabling servers..."
 msgstr "Slår av tjenere..."
 
-#: standalone/drakgw:174
+#: standalone/drakgw:175
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr "Deling av Internett tilkobling er deaktivert"
 
-#: standalone/drakgw:194
+#: standalone/drakgw:195
 #, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -20055,27 +20934,27 @@ msgstr ""
 "Merk: du trenger en dedikert nettverksadapter for å sette opp et lokalt "
 "nettverk (LAN)."
 
-#: standalone/drakgw:237
+#: standalone/drakgw:239
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Grensesnitt %s (bruker modul %s)"
 
-#: standalone/drakgw:238
+#: standalone/drakgw:240
 #, c-format
 msgid "Interface %s"
 msgstr "Grensesnitt %s"
 
-#: standalone/drakgw:247 standalone/drakpxe:137
+#: standalone/drakgw:249 standalone/drakpxe:137
 #, c-format
 msgid "No network adapter on your system!"
 msgstr "Ikke noe nettverksadapter på ditt system!"
 
-#: 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"
@@ -20090,7 +20969,12 @@ msgstr ""
 "\n"
 "Jeg er i ferd med å sette opp ditt lokale nettverk (LAN) med dette adapteret."
 
-#: standalone/drakgw:262
+#: standalone/drakgw:263 standalone/drakpxe:142
+#, c-format
+msgid "Choose the network interface"
+msgstr "Velg nettverksgrensesnitt"
+
+#: standalone/drakgw:264
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
@@ -20099,12 +20983,12 @@ msgstr ""
 "Vennligst velg hvilket nettverksadapter som skal kobles til ditt lokale "
 "nettverk (LAN)."
 
-#: standalone/drakgw:291
+#: standalone/drakgw:293
 #, c-format
 msgid "Network interface already configured"
 msgstr "Nettverksgrensesnitt allerede konfigurert"
 
-#: standalone/drakgw:292
+#: standalone/drakgw:294
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -20119,27 +21003,27 @@ msgstr ""
 "\n"
 "Du kan gjøre manuelt, men da må du vite hva du driver med."
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "Automatic reconfiguration"
 msgstr "Automatisk omkonfigurasjon"
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "No (experts only)"
 msgstr "Nei (bare eksperter)"
 
-#: standalone/drakgw:298
+#: standalone/drakgw:300
 #, c-format
 msgid "Show current interface configuration"
 msgstr "Vis gjeldende grensesnittkonfigurasjon"
 
-#: standalone/drakgw:299
+#: standalone/drakgw:301
 #, c-format
 msgid "Current interface configuration"
 msgstr "Gjeldende grensesnittkonfigurasjon"
 
-#: standalone/drakgw:300
+#: standalone/drakgw:302
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -20156,7 +21040,7 @@ msgstr ""
 "IP-attributer: %s\n"
 "Driver: %s"
 
-#: standalone/drakgw:313
+#: standalone/drakgw:315
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
@@ -20185,12 +21069,12 @@ msgstr ""
 "tjenerfor deg.\n"
 "\n"
 
-#: standalone/drakgw:320
+#: standalone/drakgw:322
 #, c-format
 msgid "Local Network adress"
 msgstr "Lokal nettverksadresse"
 
-#: standalone/drakgw:324
+#: standalone/drakgw:326
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -20203,72 +21087,72 @@ msgstr ""
 "Her kan du velge forskjellige valg for DHCP-tjenerkonfigurasjonen.\n"
 "Hvis du ikke vet hva et valg gjør, bare la den være som den er."
 
-#: standalone/drakgw:328
+#: standalone/drakgw:330
 #, c-format
 msgid "(This) DHCP Server IP"
 msgstr "(Denne) DHCP-tjeners IP"
 
-#: standalone/drakgw:329
+#: standalone/drakgw:331
 #, c-format
 msgid "The DNS Server IP"
 msgstr "Navntjeners IP"
 
-#: standalone/drakgw:330
+#: standalone/drakgw:332
 #, c-format
 msgid "The internal domain name"
 msgstr "Det internasjonale domenenavnet"
 
-#: standalone/drakgw:331
+#: standalone/drakgw:333
 #, c-format
 msgid "The DHCP start range"
 msgstr "DHCP start rekken"
 
-#: standalone/drakgw:332
+#: standalone/drakgw:334
 #, c-format
 msgid "The DHCP end range"
 msgstr "DHCP sluttrekken"
 
-#: standalone/drakgw:333
+#: standalone/drakgw:335
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr "Standard leieavtal (i sekunder)"
 
-#: standalone/drakgw:334
+#: standalone/drakgw:336
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr "Maksimum leieavtale (i sekunder)"
 
-#: standalone/drakgw:335
+#: standalone/drakgw:337
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr "Omkonfigurer grensesnitt og DHCP-tjener"
 
-#: standalone/drakgw:342
+#: standalone/drakgw:344
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr "Det lokale nettverket sluttet ikke med `.0', hopper ut."
 
-#: standalone/drakgw:352
+#: standalone/drakgw:354
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr "Mulig LAN-adresse konflikt funnet i konfigurasjonen til %s!\n"
 
-#: standalone/drakgw:362
+#: standalone/drakgw:364
 #, c-format
 msgid "Configuring..."
 msgstr "Konfigurerer..."
 
-#: standalone/drakgw:363
+#: standalone/drakgw:365
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "Konfigurerer script, installerer programvare, starter tjenere..."
 
-#: 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 "Problemer ved installering av pakke %s"
 
-#: standalone/drakgw:599
+#: standalone/drakgw:601
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -20285,14 +21169,14 @@ 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"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 MandrakeSoft.\n"
+"Copyright (C) 2003-2004 Mandrakesoft.\n"
 "Dette er fri  programvare og kan bli redistribuert under vilkårene til GNU "
 "GPL.\n"
 "\n"
@@ -20319,7 +21203,12 @@ msgstr ""
 " --doc <link>          - lenk til en annen nettside ( for WM-"
 "velkomsgrensesnitt)\n"
 
-#: standalone/drakhelp:35
+#: standalone/drakhelp:36
+#, c-format
+msgid "Mandrakelinux Help Center"
+msgstr "Mandrakelinux hjelp-senter"
+
+#: standalone/drakhelp:36
 #, c-format
 msgid ""
 "%s cannot be displayed \n"
@@ -20328,7 +21217,7 @@ msgstr ""
 "%s kan ikke vises.\n"
 "Ingen hjelpeoppføring for denne typen\n"
 
-#: standalone/drakhelp:41
+#: standalone/drakhelp:42
 #, c-format
 msgid ""
 "No browser is installed on your system, Please install one if you want to "
@@ -20337,42 +21226,42 @@ msgstr ""
 "Ingen nettlser er installert på ditt system, du må installere en om du vil "
 "bruke hjelpesystemet"
 
-#: standalone/drakperm:21
+#: standalone/drakperm:22
 #, c-format
 msgid "System settings"
 msgstr "Systemoppsett"
 
-#: standalone/drakperm:22
+#: standalone/drakperm:23
 #, c-format
 msgid "Custom settings"
 msgstr "Egendefinert oppsett"
 
-#: standalone/drakperm:23
+#: standalone/drakperm:24
 #, c-format
 msgid "Custom & system settings"
 msgstr "Egendefinerte- og systemoppsett"
 
-#: 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 "Filbane"
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, c-format
 msgid "User"
 msgstr "Bruker"
 
-#: 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 "Rettigheter"
@@ -20432,9 +21321,9 @@ msgid "Delete selected rule"
 msgstr "Fjern vagte regel"
 
 #. -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"
@@ -20444,47 +21333,65 @@ msgstr "Rediger"
 msgid "Edit current rule"
 msgstr "Rediger gjeldende regel"
 
-#: standalone/drakperm:246
+#: standalone/drakperm:242
 #, c-format
 msgid "browse"
 msgstr "utforsk"
 
-#: standalone/drakperm:256
+#: standalone/drakperm:247
+#, c-format
+msgid "user"
+msgstr "bruker"
+
+#: 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 "Aktiver \"%s\" for å lese filen"
 
-#: 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 "Aktiver \"%s\" for å skrive til filen"
 
-#: standalone/drakperm:264
+#: standalone/drakperm:266
 #, c-format
 msgid "Execute"
 msgstr "Utfør"
 
-#: 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 "Aktiver \"%s\" for å kjøre filen"
 
-#: standalone/drakperm:267
+#: standalone/drakperm:272
 #, c-format
 msgid "Sticky-bit"
 msgstr "Sticky-bit"
 
-#: standalone/drakperm:267
+#: standalone/drakperm:272
 #, c-format
 msgid ""
 "Used for directory:\n"
@@ -20493,52 +21400,52 @@ msgstr ""
 "Brukt for katalog:\n"
 " bare eiere av katalogen eller filen i denne katalogen kan slette den"
 
-#: standalone/drakperm:268
+#: standalone/drakperm:273
 #, c-format
 msgid "Set-UID"
 msgstr "Set-UID"
 
-#: standalone/drakperm:268
+#: standalone/drakperm:273
 #, c-format
 msgid "Use owner id for execution"
 msgstr "Bruk eierid for utføring"
 
-#: standalone/drakperm:269
+#: standalone/drakperm:274
 #, c-format
 msgid "Set-GID"
 msgstr "Set-GID"
 
-#: standalone/drakperm:269
+#: standalone/drakperm:274
 #, c-format
 msgid "Use group id for execution"
 msgstr "Bruke gruppeid for utføring"
 
-#: standalone/drakperm:287 standalone/drakxtv:87
+#: standalone/drakperm:290 standalone/drakxtv:89
 #, c-format
-msgid "User :"
+msgid "User:"
 msgstr "Bruker :"
 
-#: 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 "Gjeldende bruker"
 
-#: standalone/drakperm:294
+#: standalone/drakperm:297
 #, c-format
 msgid "When checked, owner and group won't be changed"
 msgstr "Når sjekket, så vil ikke eier og gruppe bli forandret"
 
-#: standalone/drakperm:304
+#: standalone/drakperm:307
 #, c-format
 msgid "Path selection"
 msgstr "Filbane valg"
 
-#: standalone/drakperm:324
+#: standalone/drakperm:327
 #, c-format
 msgid "Property"
 msgstr "Eiendom"
@@ -20668,54 +21575,42 @@ msgstr ""
 msgid "Location of auto_install.cfg file"
 msgstr "Lokalisjon for auto_install.cfg fil"
 
-#: standalone/draksec:44
+#: standalone/draksec:49
 #, c-format
 msgid "ALL"
 msgstr "ALL"
 
-#: standalone/draksec:44
+#: standalone/draksec:50
 #, c-format
 msgid "LOCAL"
 msgstr "LOCAL"
 
-#: standalone/draksec:44 standalone/drakvpn:1146
-#, c-format
-msgid "default"
-msgstr "standard"
-
-#: standalone/draksec:44
-#, c-format
-msgid "ignore"
-msgstr "ignorer"
-
-#: standalone/draksec:44
+#: standalone/draksec:53
 #, c-format
-msgid "no"
-msgstr "nei"
+msgid "Ignore"
+msgstr "Ignorer"
 
-#: standalone/draksec:44
-#, c-format
-msgid "yes"
-msgstr "ja"
-
-#. -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 "
@@ -20749,19 +21644,21 @@ msgid ""
 "level, but the system is entirely closed and security features are at their\n"
 "maximum"
 msgstr ""
-"Her kan du sette opp sikkerhetsnivået og administrere din maskin.\n"
+"Her kan du sette opp sikkerhetsnivået og administrator av din maskin.\n"
 "\n"
 "\n"
-"Sikkerhetsadministratoren er den som vil motta sikkerhetsadvarsler hvis\n"
-"'Sikkerhetsadvarlser'-valget er satt. Det kan være et brukernavn eller en "
-"epost.\n"
+"<span weight=\"bold\">Sikkerhetsadministratoren</span>' er den som vil motta "
+"sikkerhetsadvarsler hvis\n"
+"'<span weight=\"bold\">Sikkerhetsadvarlser</span>'-valget er satt. Det kan "
+"være et brukernavn eller en epost.\n"
 "\n"
 "\n"
-"Sikkerhetsnivå-menyen tillater deg å velge en av seks forhåndskonfigurerte "
-"sikkerhetsnivå\n"
-"gitt av msec. Disse nivåene rangerer fra dårlig sikkerhet og "
-"brukervennlighet, til\n"
-"paranoid oppsett, passendes for veldig sensitive tjenapolikasjoner:\n"
+"<span weight=\"bold\">Sikkerhetsnivå</span>-menyen tillater deg å velge en "
+"av seks forhåndskonfigurerte sikkerhetsnivå\n"
+"gitt av msec. Disse nivåene rangerer fra <span weight=\"bold\">dårlig "
+"sikkerhet</span> og brukervennlighet, til\n"
+"<span weight=\"bold\">paranoid</span> oppsett, passendes for veldig "
+"sensitive tjenapolikasjoner:\n"
 "\n"
 "\n"
 "<span foreground=\"royalblue3\">Dårlig</span>: Dette er et totalt usikkert, "
@@ -20791,61 +21688,56 @@ msgstr ""
 "sikkerhetsnivået,\n"
 "men systemet er helt stengt av og sikkerhetsfinessene er på maksimum."
 
-#: standalone/draksec:129
+#: standalone/draksec:154 standalone/harddrake2:184
+#, c-format
+msgid ""
+"Description of the fields:\n"
+"\n"
+msgstr ""
+"Beskrivelse av feltene:\n"
+"\n"
+
+#: standalone/draksec:168
 #, c-format
 msgid "(default value: %s)"
 msgstr "(standard verdi: %s)"
 
-#: standalone/draksec:170
+#: standalone/draksec:210
 #, c-format
 msgid "Security Level:"
 msgstr "Sikkerhetsnivå:"
 
-#: standalone/draksec:173
-#, c-format
-msgid "Security Alerts:"
-msgstr "Sikkerhetvarsler:"
-
-#: standalone/draksec:177
+#: standalone/draksec:217
 #, c-format
 msgid "Security Administrator:"
 msgstr "Sikkerhetsadministrator"
 
-#: standalone/draksec:179
+#: standalone/draksec:219
 #, c-format
 msgid "Basic options"
 msgstr "Basisopsjoner"
 
-#: 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 ""
-"De følgende opsjonene kan bli satt for å skreddersy din egen\n"
-"systemsikkerhet. Hvis du trenger en forklaring, se på hjelpetipset.\n"
-
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "Network Options"
 msgstr "Nettverksopsjoner"
 
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "System Options"
 msgstr "Systemopsjoner"
 
-#: standalone/draksec:240
+#: standalone/draksec:268
 #, c-format
 msgid "Periodic Checks"
 msgstr "Periodiske sjekker"
 
-#: standalone/draksec:258
+#: standalone/draksec:299
 #, c-format
 msgid "Please wait, setting security level..."
 msgstr "Vennligst vent, setter sikkerhetsnivå..."
 
-#: standalone/draksec:264
+#: standalone/draksec:305
 #, c-format
 msgid "Please wait, setting security options..."
 msgstr "Vennligst vent, setter sikkerhetsopsjoner..."
@@ -20855,7 +21747,8 @@ msgstr "Vennligst vent, setter sikkerhetsopsjoner..."
 msgid "No Sound Card detected!"
 msgstr "Inget lydkort oppdaget!"
 
-#: 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-"
@@ -20876,7 +21769,7 @@ msgstr ""
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 
-#: standalone/draksound:55
+#: standalone/draksound:57
 #, c-format
 msgid ""
 "\n"
@@ -21018,15 +21911,15 @@ msgstr "Vis logo på konsolet"
 msgid "Make kernel message quiet by default"
 msgstr "Gjør kjerne-meldinger stille som standard"
 
-#: standalone/draksplash:161 standalone/draksplash:319
-#: standalone/draksplash:464
+#: standalone/draksplash:161 standalone/draksplash:309
+#: standalone/draksplash:454
 #, c-format
 msgid "Notice"
 msgstr "Notis"
 
-#: 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 "Dette temaet har ikke fått noen bootsplash i %s ennå !"
 
 #: standalone/draksplash:167
@@ -21039,102 +21932,115 @@ msgstr "velg bildefil"
 msgid "saving Bootsplash theme..."
 msgstr "lagrer bootsplash-tema..."
 
-#: standalone/draksplash:445
+#: standalone/draksplash:435
 #, c-format
 msgid "ProgressBar color selection"
 msgstr "Framgangsviser fargevalg"
 
-#: standalone/draksplash:464
+#: standalone/draksplash:454
 #, c-format
 msgid "You must choose an image file first!"
 msgstr "Du må velge en imagefil først!"
 
-#: standalone/draksplash:469
+#: standalone/draksplash:459
 #, c-format
-msgid "Generating preview ..."
+msgid "Generating preview..."
 msgstr "Genererer forhåndsvisning ..."
 
 #. -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 "%s BootSplash (%s) forhåndsvisning"
 
-#: 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 ""
+"Imagefila \"%s\" kan ikke bli lastet pga. det følgende problemet:\n"
+"\n"
+"<span foreground=\"Red\">%s</span>"
+
+#: standalone/drakups:74
 #, c-format
 msgid "Connected through a serial port or an usb cable"
 msgstr "Koblet  til via en serieport eller usb-kabel"
 
-#: standalone/drakups:69
+#: standalone/drakups:80
 #, c-format
 msgid "Add an UPS device"
 msgstr "Legg til en UPS-enhet"
 
-#: 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 ""
 "Velkommen til UPS-konfigurasjonsverktøyet.\n"
 "\n"
 "Her kan du legge til en ny UPS til ditt system.\n"
 
-#: 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 ""
 "Vi skal legge til en UPS-enhet.\n"
 "\n"
-"Foretrekker du å automatisk oppdage UPS-enheter som er tilkoblet denne "
-"maskinen eller  ?"
+"Vil du automatisk oppdage UPS-enheter som er tilkoblet denne maskinen eller "
+"velge dem manuelt?"
 
-#: standalone/drakups:82
+#: standalone/drakups:93
 #, c-format
 msgid "Autodetection"
 msgstr "Automatisk oppdagelse"
 
-#: standalone/drakups:90 standalone/harddrake2:140
+#: standalone/drakups:101 standalone/harddrake2:211
 #, c-format
 msgid "Detection in progress"
 msgstr "oppdagelse pågår"
 
-#: 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 "Veiviseren konfigurerte de følgende UPS-enhetene vellykket:"
 
-#: standalone/drakups:111
+#: standalone/drakups:123
 #, c-format
 msgid "No new UPS devices was found"
 msgstr "\tInget enheter funnet"
 
-#: standalone/drakups:116 standalone/drakups:128
+#: standalone/drakups:128 standalone/drakups:140
 #, c-format
 msgid "UPS driver configuration"
 msgstr "UPS-driverkonfigurasjon"
 
-#: standalone/drakups:116
+#: standalone/drakups:128
 #, c-format
 msgid "Please select your UPS model."
 msgstr "Vennligst velg din UPS-modell."
 
-#: standalone/drakups:117
+#: standalone/drakups:129
 #, c-format
 msgid "Manufacturer / Model:"
 msgstr "Produsent / Modell:"
 
-#: standalone/drakups:128
+#: standalone/drakups:140
 #, c-format
 msgid ""
 "We are configuring the \"%s\" UPS from \"%s\".\n"
@@ -21143,88 +22049,88 @@ msgstr ""
 "Vi konfigurerer \"%s\" UPS fra \"%s\".\n"
 "Vennligst fyll inn dets navn, driver og port."
 
-#: standalone/drakups:133
+#: standalone/drakups:145
 #, c-format
 msgid "Name:"
 msgstr "Navn:"
 
-#: standalone/drakups:133
+#: standalone/drakups:145
 #, c-format
 msgid "The name of your ups"
 msgstr "Navnet på din ups"
 
-#: standalone/drakups:134
+#: standalone/drakups:146
 #, c-format
-msgid "The driver that manage your ups"
+msgid "The driver that manages your ups"
 msgstr "Driveren som håndterer din ups"
 
-#: 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 "Porten upsen din er koblet til"
 
-#: standalone/drakups:144
+#: standalone/drakups:156
 #, c-format
 msgid "The wizard successfully configured the new \"%s\" UPS device."
 msgstr "Veiviseren konfigurerte den nye \"%s\" UPS-enheten."
 
-#: standalone/drakups:232
+#: standalone/drakups:246
 #, c-format
 msgid "UPS devices"
 msgstr "UPS-enhet"
 
-#: 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 "Navn"
 
-#: standalone/drakups:250
+#: standalone/drakups:265
 #, c-format
 msgid "UPS users"
 msgstr "UPS-brukere"
 
-#: standalone/drakups:265
+#: standalone/drakups:281
 #, c-format
 msgid "Access Control Lists"
 msgstr "TilgangsKontrollLister"
 
-#: 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 "Regler"
 
-#: 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-navn"
 
-#: 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-konfigurasjonsverktøyene"
@@ -21246,7 +22152,7 @@ msgid ""
 "\n"
 "It's currently enabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 "Oppsett av en VPN-tilkobling har allerede blitt gjort.\n"
 "\n"
@@ -21276,7 +22182,7 @@ msgid ""
 "\n"
 "It's currently disabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 "Oppsettet for en VPN-tilkobling har allerede blitt gjort.\n"
 "\n"
@@ -21364,7 +22270,7 @@ msgstr "Kjernemodul."
 #: 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"
@@ -21394,13 +22300,13 @@ msgstr "Konfigurasjonsfil"
 #: 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 ""
 "Konfigurasjonssteg !\n"
 "\n"
@@ -21434,12 +22340,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 ""
 "%s-filas innhold\n"
 "er delt opp i flere avsnitt.\n"
@@ -21496,7 +22402,7 @@ msgstr "ipsec.conf-oppføringer"
 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"
@@ -21533,7 +22439,7 @@ msgstr "normal conn"
 
 #: standalone/drakvpn:382 standalone/drakvpn:423 standalone/drakvpn:510
 #, c-format
-msgid "Exists !"
+msgid "Exists!"
 msgstr "Eksisterer!"
 
 #: standalone/drakvpn:383 standalone/drakvpn:424
@@ -21775,7 +22681,7 @@ msgstr "Avsnittsnavne"
 
 #: standalone/drakvpn:590
 #, c-format
-msgid "Can't edit !"
+msgid "Can't edit!"
 msgstr "Kan ikke redigere!"
 
 #: standalone/drakvpn:591
@@ -21783,10 +22689,10 @@ msgstr "Kan ikke redigere!"
 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 ""
 "Du kan ikke endre på dette avsnittet.\n"
 "\n"
@@ -21841,7 +22747,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 ""
@@ -21875,7 +22781,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"
@@ -21917,7 +22823,7 @@ msgstr "racoon.conf-oppføringer"
 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"
@@ -21971,23 +22877,23 @@ msgstr "sti-type"
 #: 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 ""
@@ -22153,7 +23059,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"
@@ -22199,7 +23105,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"
@@ -22239,7 +23145,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"
@@ -22285,7 +23191,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"
@@ -22320,7 +23226,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 ""
 "definer gruppen av Diffie-Hellman eksponentieringer.\n"
@@ -22339,11 +23245,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"
@@ -22381,18 +23287,18 @@ msgstr "Levetidsenhet"
 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"
@@ -22448,7 +23354,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]"
@@ -22607,7 +23513,7 @@ msgstr "Min identifiserer"
 #, 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"
@@ -22616,7 +23522,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"
@@ -22625,12 +23531,12 @@ 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 ""
 "spesifiserer idenfisereren sent til fjern vert og\n"
-"typen som skal bli brukt i phase 1-forhandling. address, fqdn,\n"
+"typen som skal bli brukt i phase 1-forhandling. address, FQDN,\n"
 "user_fqdn, keyid og  asn1dn kan bli brukt som en idtype.\n"
 "de er brukt som::\n"
 "\tmy_identifier address [adresse];\n"
@@ -22639,7 +23545,7 @@ msgstr ""
 "\tmy_identifier user_fqdn streng;\n"
 "\t\ttypen er en USER_FQDN (bruker fullkvalifisert\n"
 "\t\tdomenenavn).\n"
-"\tmy_identifier fqdn streng;\n"
+"\tmy_identifier FQDN streng;\n"
 "\t\ttypen er et FQDN (fullkvalifisert domenenavn).\n"
 "\tmy_identifier keyid fil;\n"
 "\t\ttypen er en KEY_ID.\n"
@@ -22667,9 +23573,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 ""
@@ -22677,7 +23583,7 @@ msgstr ""
 "phase 1-forhandlingen. Dette direktivet må bli definert. \n"
 "algoritme er en av følgende: \n"
 "\n"
-"des, 3des, blowfish, cast128 for oakley.\n"
+"DES, 3DES, blowfish, cast128 for oakley.\n"
 "\n"
 "For andre omforminger, bør ikke dette bli brukt."
 
@@ -22773,6 +23679,11 @@ msgstr "trenger"
 
 #: standalone/drakvpn:1146
 #, c-format
+msgid "default"
+msgstr "standard"
+
+#: standalone/drakvpn:1146
+#, c-format
 msgid "use"
 msgstr "bruk"
 
@@ -22781,67 +23692,67 @@ msgstr "bruk"
 msgid "unique"
 msgstr "unik"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (broadcast)"
 msgstr "USA (kringkastning)"
 
-#: 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 "USA (kabel-hrc)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "Canada (cable)"
 msgstr "Kanada (Quebec)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (broadcast)"
 msgstr "Japan (kringkastning)"
 
-#: 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 (kringkastning)"
 
-#: 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 "Øst 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 "Newzealand"
 
-#: standalone/drakxtv:49
+#: standalone/drakxtv:51
 #, c-format
 msgid "Australian Optus cable TV"
 msgstr "Australsk Optus kabeltv"
 
-#: standalone/drakxtv:83
+#: standalone/drakxtv:85
 #, c-format
 msgid ""
 "Please,\n"
@@ -22850,47 +23761,48 @@ msgstr ""
 "Vennligst,\n"
 "skriv inn din tv standard og land"
 
-#: 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øk etter tv-kanaler underveis ..."
 
-#: standalone/drakxtv:101
+#: standalone/drakxtv:103
 #, c-format
 msgid "Scanning for TV channels"
 msgstr "Søker etter tv-kanaler"
 
-#: standalone/drakxtv:105
+#: standalone/drakxtv:107
 #, c-format
 msgid "There was an error while scanning for TV channels"
 msgstr "Det var en feil under søking etter TV-kanaler"
 
-#: standalone/drakxtv:108
+#: standalone/drakxtv:110
 #, c-format
 msgid "Have a nice day!"
 msgstr "Ha en fin dag!"
 
-#: standalone/drakxtv:109
+#: standalone/drakxtv:111
 #, c-format
 msgid "Now, you can run xawtv (under X Window!) !\n"
 msgstr "Nå kan du kjøre xawtv (under X Windows!) !\n"
 
-#: standalone/drakxtv:132
+#: standalone/drakxtv:134
 #, c-format
 msgid "No TV Card detected!"
 msgstr "Inget TV-kort oppdaget!"
 
-#: 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-"
@@ -22911,50 +23823,24 @@ msgstr ""
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 
-#: standalone/harddrake2:18
+#: standalone/harddrake2:20
 #, c-format
 msgid "Alternative drivers"
 msgstr "Alternative drivere"
 
-#: standalone/harddrake2:19
+#: standalone/harddrake2:21
 #, c-format
 msgid "the list of alternative drivers for this sound card"
 msgstr "listen over alternative drivere for dette lydkortet"
 
-#: standalone/harddrake2:22
+#: standalone/harddrake2:24
 #, c-format
 msgid ""
 "this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
 msgstr ""
 "dette er den fysiske bussen som enheten er plugget til (f.eks. PCI, USB, ...)"
 
-#: 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 "Bogomips"
-
-#: 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."
-msgstr ""
-"GNU/Linux kjernen trenger å kjøre kalkulasjonsberegning under oppstart for å "
-"initialisere en tidtaker. Dens resultat er lagret som \"bogomips\" som en "
-"måte for å \"måle\" prosessorens ytelse."
-
-#: standalone/harddrake2:26
+#: standalone/harddrake2:26 standalone/harddrake2:130
 #, c-format
 msgid "Bus identification"
 msgstr "Buss identifikasjon"
@@ -22981,132 +23867,284 @@ msgstr ""
 
 #: standalone/harddrake2:33
 #, c-format
-msgid "Cache size"
-msgstr "Hurtigminnestørrelse"
+msgid "Drive capacity"
+msgstr "Diskkapasitet"
 
 #: standalone/harddrake2:33
 #, c-format
-msgid "size of the (second level) cpu cache"
-msgstr "størrelse på (andrenivå) prosessor-hurtigminne"
+msgid "special capacities of the driver (burning ability and or DVD support)"
+msgstr "spesielle egenskaper for enheten (brenne mulighet og/eller DVD-støtte)"
 
 #: standalone/harddrake2:34
 #, c-format
-msgid "Drive capacity"
-msgstr "Diskkapasitet"
+msgid "this field describes the device"
+msgstr "dette feltet beskriver enheten"
 
-#: standalone/harddrake2:34
+#: standalone/harddrake2:35
 #, c-format
-msgid "special capacities of the driver (burning ability and or DVD support)"
-msgstr "spesielle egenskaper for enheten (brenne mulighet og/eller DVD-støtte)"
+msgid "Old device file"
+msgstr "Gammel enhetfil"
 
-#. -PO: here "comas" is the medical coma, not the lexical coma!!
-#: standalone/harddrake2:37
+#: standalone/harddrake2:36
 #, c-format
-msgid "Coma bug"
-msgstr "Kommafeil"
+msgid "old static device name used in dev package"
+msgstr "gammelt statisk enhetsnavn brukt i dev pakke"
 
 #: standalone/harddrake2:37
 #, c-format
-msgid "whether this cpu has the Cyrix 6x86 Coma bug"
-msgstr "om denne prosessoren har Cyrix 6x86 kommafeil"
-
-#: standalone/harddrake2:38
-#, c-format
-msgid "Cpuid family"
-msgstr "Prosessorid-familie"
+msgid "New devfs device"
+msgstr "Ny devfs enhet"
 
 #: standalone/harddrake2:38
 #, c-format
-msgid "family of the cpu (eg: 6 for i686 class)"
-msgstr "prosessorfamilie (feks. 6 for i686-klasse)"
+msgid "new dynamic device name generated by core kernel devfs"
+msgstr "nytt dynamisk enhetsnavn generert av incore kjerne devfs"
 
-#: standalone/harddrake2:39
+#. -PO: here "module" is the "jargon term" for a kernel driver
+#: standalone/harddrake2:41
 #, c-format
-msgid "Cpuid level"
-msgstr "Prosessorid-nivå"
+msgid "Module"
+msgstr "Modul"
 
-#: standalone/harddrake2:39
+#: standalone/harddrake2:41
 #, c-format
-msgid "information level that can be obtained through the cpuid instruction"
-msgstr "Informasjonsnivå som kan bli anskaffet via prosessorid-instruksjonen"
+msgid "the module of the GNU/Linux kernel that handles the device"
+msgstr "modulen til GNU/Linux kjernen som håndterer den enheten"
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:42
 #, c-format
-msgid "Frequency (MHz)"
-msgstr "Frekvens (MHz)"
+msgid "Extended partitions"
+msgstr "Utvidede partisjoner"
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:42
 #, 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 ""
-"Prosessorklokkefrekvens i MHz (MegaHertz som kan grovt måles i antall "
-"instruksjoner prosessoren klarer å utføre per sekund)"
+msgid "the number of extended partitions"
+msgstr "nummer på utvidede partisjoner"
 
-#: standalone/harddrake2:41
+#: standalone/harddrake2:43
 #, c-format
-msgid "this field describes the device"
-msgstr "dette feltet beskriver enheten"
+msgid "Geometry"
+msgstr "Geometri"
 
-#: standalone/harddrake2:42
+#: standalone/harddrake2:43
 #, c-format
-msgid "Old device file"
-msgstr "Gammel enhetfil"
+msgid "Cylinder/head/sectors geometry of the disk"
+msgstr "Sylinder/hode/sektorer-geometri av disken"
 
-#: standalone/harddrake2:43
+#: standalone/harddrake2:44
 #, c-format
-msgid "old static device name used in dev package"
-msgstr "gammelt statisk enhetsnavn brukt i dev pakke"
+msgid "Disk controller"
+msgstr "Diskkontroller"
 
 #: standalone/harddrake2:44
 #, c-format
-msgid "New devfs device"
-msgstr "Ny devfs enhet"
+msgid "the disk controller on the host side"
+msgstr "diskkontrolleren på vertens side"
 
 #: standalone/harddrake2:45
 #, c-format
-msgid "new dynamic device name generated by core kernel devfs"
-msgstr "nytt dynamisk enhetsnavn generert av incore kjerne devfs"
+msgid "class of hardware device"
+msgstr "klasse av maskinvareenhet"
+
+#: standalone/harddrake2:46 standalone/harddrake2:78
+#: standalone/printerdrake:218
+#, c-format
+msgid "Model"
+msgstr "Modell"
+
+#: standalone/harddrake2:46
+#, c-format
+msgid "hard disk model"
+msgstr "harddisk modell"
+
+#: standalone/harddrake2:47
+#, c-format
+msgid "network printer port"
+msgstr "nettverksskriverport"
 
-#. -PO: here "module" is the "jargon term" for a kernel driver
 #: standalone/harddrake2:48
 #, c-format
-msgid "Module"
-msgstr "Modul"
+msgid "Primary partitions"
+msgstr "Primære partisjoner"
 
 #: standalone/harddrake2:48
 #, c-format
-msgid "the module of the GNU/Linux kernel that handles the device"
-msgstr "modulen til GNU/Linux kjernen som håndterer den enheten"
+msgid "the number of the primary partitions"
+msgstr "antall primære partisjoner"
 
 #: standalone/harddrake2:49
-#, fuzzy, c-format
-msgid "Extended partitions"
-msgstr "Opprette en ny partisjon"
+#, c-format
+msgid "the vendor name of the device"
+msgstr "leverandørnavnet til enheten"
 
-#: standalone/harddrake2:49
-#, fuzzy, c-format
-msgid "the number of extended partitions"
-msgstr "leverandørnavnet til prosessoren"
+#: standalone/harddrake2:50
+#, c-format
+msgid "Bus PCI #"
+msgstr "Bus PCI #"
 
 #: standalone/harddrake2:50
 #, c-format
+msgid "the PCI bus on which the device is plugged"
+msgstr "PCI bussen som enheten er plugget til"
+
+#: standalone/harddrake2:51
+#, c-format
+msgid "PCI device #"
+msgstr "PCI-enhets #"
+
+#: standalone/harddrake2:51
+#, c-format
+msgid "PCI device number"
+msgstr "PCI-enhetsnummer"
+
+#: standalone/harddrake2:52
+#, c-format
+msgid "PCI function #"
+msgstr "PCI-funksjon #"
+
+#: standalone/harddrake2:52
+#, c-format
+msgid "PCI function number"
+msgstr "PCI-funksjonsnummer"
+
+#: standalone/harddrake2:53
+#, c-format
+msgid "Vendor ID"
+msgstr "SelgerID"
+
+#: standalone/harddrake2:53
+#, c-format
+msgid "this is the standard numerical identifier of the vendor"
+msgstr "dette er det standard numeriske identifikasjonsnavnet til levrandøren"
+
+#: standalone/harddrake2:54
+#, c-format
+msgid "Device ID"
+msgstr "Enhets-ID"
+
+#: standalone/harddrake2:54
+#, c-format
+msgid "this is the numerical identifier of the device"
+msgstr "dette er identifikasjons-nummeret til enheten"
+
+#: standalone/harddrake2:55
+#, c-format
+msgid "Sub vendor ID"
+msgstr "Sub levrandør ID"
+
+#: standalone/harddrake2:55
+#, c-format
+msgid "this is the minor numerical identifier of the vendor"
+msgstr "dette er under-identifikasjonsnavnet til levrandøren"
+
+#: standalone/harddrake2:56
+#, c-format
+msgid "Sub device ID"
+msgstr "Underenhets-ID"
+
+#: standalone/harddrake2:56
+#, c-format
+msgid "this is the minor numerical identifier of the device"
+msgstr "dette er undernummeret til enheten"
+
+#: standalone/harddrake2:57
+#, c-format
+msgid "Device USB ID"
+msgstr "Enhets USB-ID"
+
+#: standalone/harddrake2:57
+#, c-format
+msgid ".."
+msgstr ".."
+
+#: standalone/harddrake2:61
+#, c-format
+msgid "Bogomips"
+msgstr "Bogomips"
+
+#: standalone/harddrake2:61
+#, 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."
+msgstr ""
+"GNU/Linux kjernen trenger å kjøre kalkulasjonsberegning under oppstart for å "
+"initialisere en tidtaker. Dens resultat er lagret som \"bogomips\" som en "
+"måte for å \"måle\" prosessorens ytelse."
+
+#: standalone/harddrake2:62
+#, c-format
+msgid "Cache size"
+msgstr "Hurtigminnestørrelse"
+
+#: standalone/harddrake2:62
+#, c-format
+msgid "size of the (second level) cpu cache"
+msgstr "størrelse på (andrenivå) prosessor-hurtigminne"
+
+#. -PO: here "comas" is the medical coma, not the lexical coma!!
+#: standalone/harddrake2:65
+#, c-format
+msgid "Coma bug"
+msgstr "Kommafeil"
+
+#: standalone/harddrake2:65
+#, c-format
+msgid "whether this cpu has the Cyrix 6x86 Coma bug"
+msgstr "om denne prosessoren har Cyrix 6x86 kommafeil"
+
+#: standalone/harddrake2:66
+#, c-format
+msgid "Cpuid family"
+msgstr "Prosessorid-familie"
+
+#: standalone/harddrake2:66
+#, c-format
+msgid "family of the cpu (eg: 6 for i686 class)"
+msgstr "prosessorfamilie (feks. 6 for i686-klasse)"
+
+#: standalone/harddrake2:67
+#, c-format
+msgid "Cpuid level"
+msgstr "Prosessorid-nivå"
+
+#: standalone/harddrake2:67
+#, c-format
+msgid "information level that can be obtained through the cpuid instruction"
+msgstr "Informasjonsnivå som kan bli anskaffet via prosessorid-instruksjonen"
+
+#: standalone/harddrake2:68
+#, c-format
+msgid "Frequency (MHz)"
+msgstr "Frekvens (MHz)"
+
+#: standalone/harddrake2:68
+#, 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 ""
+"Prosessorklokkefrekvens i MHz (MegaHertz som kan grovt måles i antall "
+"instruksjoner prosessoren klarer å utføre per sekund)"
+
+#: standalone/harddrake2:69
+#, c-format
 msgid "Flags"
 msgstr "Flagg"
 
-#: standalone/harddrake2:50
+#: standalone/harddrake2:69
 #, c-format
 msgid "CPU flags reported by the kernel"
 msgstr "Prosessorflagg rapportert av kjernen"
 
-#: standalone/harddrake2:51
+#: standalone/harddrake2:70
 #, c-format
 msgid "Fdiv bug"
 msgstr "Fdiv feil"
 
-#: standalone/harddrake2:52
+#: standalone/harddrake2:71
 #, c-format
 msgid ""
 "Early Intel Pentium chips manufactured have a bug in their floating point "
@@ -23117,55 +24155,45 @@ msgstr ""
 "at man ikke oppnådde den nødvendige presisjonen når man gjorde \"Floating "
 "point DIVision\" (FDIV)"
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
 #, c-format
 msgid "Is FPU present"
 msgstr "Er matteprosessor tilgjengelig"
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
 #, c-format
 msgid "yes means the processor has an arithmetic coprocessor"
 msgstr "ja betyr at prosessoren har en matematisk tilleggprosessor"
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
 #, c-format
 msgid "Whether the FPU has an irq vector"
 msgstr "Om matteprosessoren har en avbruddsvektor"
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
 #, c-format
 msgid "yes means the arithmetic coprocessor has an exception vector attached"
 msgstr ""
 "ja betyr at den matematiske tilleggsprosessoren har en unntaksvektor "
 "tilkoblet"
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
 #, c-format
 msgid "F00f bug"
 msgstr "F00f-feil"
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
 #, c-format
 msgid "early pentiums were buggy and freezed when decoding the F00F bytecode"
 msgstr ""
 "tidlige pentiumer var fulle av feil og fryste når man dekodet F00F-bytekode"
 
-#: standalone/harddrake2:56
-#, fuzzy, c-format
-msgid "Geometry"
-msgstr "Prøv på nytt"
-
-#: standalone/harddrake2:56
-#, c-format
-msgid "Cylinder/head/sectors geometry of the disk"
-msgstr ""
-
-#: standalone/harddrake2:57
+#: standalone/harddrake2:75
 #, c-format
 msgid "Halt bug"
 msgstr "Halt feil"
 
-#: standalone/harddrake2:58
+#: standalone/harddrake2:76
 #, c-format
 msgid ""
 "Some of the early i486DX-100 chips cannot reliably return to operating mode "
@@ -23174,126 +24202,65 @@ msgstr ""
 "Noen av de tidligere i486DX-100-brikkene kan ikke returnere ordentlig "
 "tilbake til operativt modues etter at \"halt\"-instruksjonen har blitt brukt."
 
-#: standalone/harddrake2:60
-#, c-format
-msgid "Floppy format"
-msgstr "Diskettformat"
-
-#: standalone/harddrake2:60
-#, c-format
-msgid "format of floppies supported by the drive"
-msgstr "diskettformater diskettstasjonen støtter"
-
-#: standalone/harddrake2:61
+#: standalone/harddrake2:77
 #, c-format
 msgid "sub generation of the cpu"
 msgstr "undergenerasjon av prosessoren"
 
-#: standalone/harddrake2:62
-#, c-format
-msgid "class of hardware device"
-msgstr "klasse av maskinvareenhet"
-
-#: standalone/harddrake2:63 standalone/harddrake2:64
-#: standalone/printerdrake:212
+#: standalone/harddrake2:78
 #, c-format
-msgid "Model"
-msgstr "Modell"
-
-#: standalone/harddrake2:63
-#, c-format
-msgid "hard disk model"
-msgstr "harddisk modell"
+msgid "generation of the cpu (eg: 8 for Pentium III, ...)"
+msgstr "generasjon av prosessoren (feks. 8 for Pentium III, ...)"
 
-#: standalone/harddrake2:64
-#, c-format
-msgid "generation of the cpu (eg: 8 for PentiumIII, ...)"
-msgstr "generasjon av prosessoren (feks. 8 for PentiumIII, ...)"
-
-#: standalone/harddrake2:65
+#: standalone/harddrake2:79
 #, c-format
 msgid "Model name"
 msgstr "Modellnavn"
 
-#: standalone/harddrake2:65
+#: standalone/harddrake2:79
 #, c-format
 msgid "official vendor name of the cpu"
 msgstr "Offisielt leverandørnavn på prosessoren"
 
-#: standalone/harddrake2:66
-#, c-format
-msgid "Number of buttons"
-msgstr "Antall knapper"
-
-#: standalone/harddrake2:66
-#, c-format
-msgid "the number of buttons the mouse has"
-msgstr "antall knapper som musen har"
-
-#: standalone/harddrake2:67
+#: standalone/harddrake2:80
 #, c-format
 msgid "the name of the CPU"
 msgstr "navnet på prosessoren"
 
-#: standalone/harddrake2:68
-#, c-format
-msgid "network printer port"
-msgstr "nettverksskriverport"
-
-#: standalone/harddrake2:69
+#: standalone/harddrake2:81
 #, c-format
 msgid "Processor ID"
 msgstr "Prosessorid"
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:81
 #, c-format
 msgid "the number of the processor"
 msgstr "leverandørnavnet til prosessoren"
 
-#: standalone/harddrake2:70
-#, fuzzy, c-format
-msgid "Primary partitions"
-msgstr "Formater partisjoner"
-
-#: standalone/harddrake2:70
-#, fuzzy, c-format
-msgid "the number of the primary partitions"
-msgstr "leverandørnavnet til prosessoren"
-
-#: standalone/harddrake2:71
+#: standalone/harddrake2:82
 #, c-format
 msgid "Model stepping"
 msgstr "Modellserie"
 
-#: standalone/harddrake2:71
+#: standalone/harddrake2:82
 #, c-format
 msgid "stepping of the cpu (sub model (generation) number)"
 msgstr "serie av prosessoren (undermodell (generasjon) nummer)"
 
-#: standalone/harddrake2:72
-#, c-format
-msgid "the type of bus on which the mouse is connected"
-msgstr "busstypen musen din er tilkoblet"
-
-#: standalone/harddrake2:73
-#, c-format
-msgid "the vendor name of the device"
-msgstr "leverandørnavnet til enheten"
-
-#: standalone/harddrake2:74
+#: standalone/harddrake2:83
 #, c-format
 msgid "the vendor name of the processor"
 msgstr "prosessorens leverandørnavn"
 
-#: standalone/harddrake2:75
+#: standalone/harddrake2:84
 #, c-format
 msgid "Write protection"
 msgstr "Skrivebeskyttelse"
 
-#: 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 ""
@@ -23301,60 +24268,190 @@ msgstr ""
 "minnesidenivå, dermed aktiveres prosessoren til å hindre usjekket "
 "kjernetilgang til brukerminne (dvs. at dette er en feilvakt)"
 
-#. -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 "diskettformater diskettstasjonen støtter"
+
+#: 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 "Diskidentifiserer"
+
+#: standalone/harddrake2:93
+#, c-format
+msgid "usually the disk serial number"
+msgstr "vanligvis diskens serienummer"
+
+#: standalone/harddrake2:94
+#, c-format
+msgid "Logical unit number"
+msgstr "Logisk enhetsnummer"
+
+#: 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 ""
+"SCSI mål nummeret (LUN). SCSI enheter koblet til en tjener blir unikt "
+"identifisert av et\n"
+"kanal-nummer, en mål-id og et logisk enhetsnummer"
+
+#: standalone/harddrake2:99
+#, c-format
+msgid "Device file"
+msgstr "Enhetsfil"
+
+#: standalone/harddrake2:99
+#, c-format
+msgid ""
+"the device file used to communicate with the kernel driver for the mouse"
+msgstr "enhetsfilen bruket for å kommunisere med kjernedrivere for musa"
+
+#: standalone/harddrake2:100
+#, c-format
+msgid "Emulated wheel"
+msgstr "Emulert hjul"
+
+#: standalone/harddrake2:100
+#, c-format
+msgid "whether the wheel is emulated or not"
+msgstr "om hjulet er emulert eller ei"
+
+#: standalone/harddrake2:101
+#, c-format
+msgid "the type of the mouse"
+msgstr "type mus"
+
+#: standalone/harddrake2:102
+#, c-format
+msgid "the name of the mouse"
+msgstr "navnet på musa"
+
+#: standalone/harddrake2:103
+#, c-format
+msgid "Number of buttons"
+msgstr "Antall knapper"
+
+#: standalone/harddrake2:103
+#, c-format
+msgid "the number of buttons the mouse has"
+msgstr "antall knapper som musen har"
+
+#: standalone/harddrake2:104
+#, c-format
+msgid "the type of bus on which the mouse is connected"
+msgstr "busstypen musen din er tilkoblet"
+
+#: standalone/harddrake2:105
+#, c-format
+msgid "Mouse protocol used by X11"
+msgstr "Museprotokoll brukt av X11"
+
+#: standalone/harddrake2:105
+#, c-format
+msgid "the protocol that the graphical desktop use with the mouse"
+msgstr "protokollen som det grafiske skrivebordet bruker med musa"
+
+#: standalone/harddrake2:112 standalone/harddrake2:121
+#: standalone/harddrake2:128 standalone/harddrake2:136
+#: standalone/harddrake2:309
+#, c-format
+msgid "Identification"
+msgstr "Identifikasjon"
+
+#: standalone/harddrake2:113 standalone/harddrake2:129
+#, c-format
+msgid "Connection"
+msgstr "Tilkobling"
+
+#: standalone/harddrake2:122
+#, c-format
+msgid "Performances"
+msgstr "Ytelser"
+
+#: standalone/harddrake2:123
+#, c-format
+msgid "Bugs"
+msgstr "Programfeil"
+
+#: standalone/harddrake2:124
+#, c-format
+msgid "FPU"
+msgstr "FPU"
+
+#: standalone/harddrake2:132
+#, c-format
+msgid "Partitions"
+msgstr "Partisjoner"
+
+#: standalone/harddrake2:137
+#, c-format
+msgid "Features"
+msgstr "Finesser"
+
+#. -PO: please keep all "/" characters !!!
+#: standalone/harddrake2:158 standalone/logdrake:77
+#: standalone/printerdrake:152 standalone/printerdrake:165
 #, c-format
 msgid "/_Options"
 msgstr "/_Valg"
 
-#: 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 "/Oppdag automatisk _skrivere"
 
-#: standalone/harddrake2:96
+#: standalone/harddrake2:164
 #, c-format
 msgid "/Autodetect _modems"
 msgstr "/Oppdag automatisk _modemer"
 
-#: standalone/harddrake2:97
+#: standalone/harddrake2:165
 #, c-format
 msgid "/Autodetect _jaz drives"
 msgstr "/Oppdag automatisk _jaz enheter"
 
-#: 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 "/_Felt beskrivelser"
 
-#: standalone/harddrake2:115
+#: standalone/harddrake2:183
 #, c-format
 msgid "Harddrake help"
 msgstr "Harddrake hjelp"
 
-#: standalone/harddrake2:116
-#, c-format
-msgid ""
-"Description of the fields:\n"
-"\n"
-msgstr ""
-"Beskrivelse av feltene:\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 "
@@ -23363,174 +24460,188 @@ msgstr ""
 "Når du har valg en enhet, så kan du se informasjon om den i feltet i den "
 "høyre rammen (\"Informasjon\")"
 
-#: 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 "Om Harddrake"
 
 #. -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 ""
-"Dette er HardDrake, et Mandrake maskinvarekonfigureringsverktøy.\n"
+"Dette er HardDrake, et Mandrakelinux maskinvarekonfigureringsverktøy.\n"
 "<span foreground=\"royalblue3\">Versjon:</span> %s\n"
 "<span foreground=\"royalblue3\">Forfatter:</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 
-#: standalone/harddrake2:147
+#: standalone/harddrake2:218
 #, c-format
-msgid "Harddrake2 version %s"
-msgstr "Harddrake2 versjon %s"
+msgid "Harddrake2"
+msgstr "Harddrake2"
 
-#: standalone/harddrake2:163
+#: standalone/harddrake2:234
 #, c-format
 msgid "Detected hardware"
 msgstr "Oppdaget maskinvare"
 
-#: standalone/harddrake2:168
+#: standalone/harddrake2:239
 #, c-format
 msgid "Configure module"
 msgstr "Konfigurer modul"
 
-#: standalone/harddrake2:175
+#: standalone/harddrake2:246
 #, c-format
 msgid "Run config tool"
 msgstr "Kjør konfig verktøy"
 
-#: standalone/harddrake2:222
+#: standalone/harddrake2:296 standalone/net_monitor:108
+#: standalone/net_monitor:109 standalone/net_monitor:114
 #, c-format
 msgid "unknown"
 msgstr "ukjent"
 
-#: standalone/harddrake2:223
+#: standalone/harddrake2:297 standalone/printerdrake:308
+#: standalone/printerdrake:346
 #, c-format
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: standalone/harddrake2:241
+#: standalone/harddrake2:317
+#, c-format
+msgid "Misc"
+msgstr "Diverse"
+
+#: standalone/harddrake2:332
 #, c-format
 msgid ""
 "Click on a device in the left tree in order to display its information here."
 msgstr "Klikk på en enhet i det venstre treet for å vise dens informasjon her."
 
-#: 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 "brenner"
 
-#: 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 "Vennligst velg tastatur-oppsettet ditt."
 
-#: standalone/keyboarddrake:33
+#: standalone/keyboarddrake:34
 #, c-format
 msgid "Do you want the BackSpace to return Delete in console?"
 msgstr "Ønsker du at BackSpace skal returnere Delete i konsoll?"
 
-#: 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 "Endringen er gjort, men for å være effektivisert så må du logge ut"
 
-#: standalone/logdrake:51
+#: standalone/logdrake:50
 #, c-format
-msgid "Mandrake Tools Logs"
+msgid "Mandrakelinux Tools Logs"
 msgstr "Mandrakeverktøy-logger"
 
-#: standalone/logdrake:52
+#: standalone/logdrake:51
 #, c-format
 msgid "Logdrake"
 msgstr "Logdrake"
 
-#: standalone/logdrake:65
+#: standalone/logdrake:64
 #, c-format
 msgid "Show only for the selected day"
 msgstr "Vis kun for den valgte 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/_Åpne"
 
-#: standalone/logdrake:73
+# definition of shortcupt must use keysym names
+# "Ctrl-Å" is "<control>Aring"
+#: standalone/logdrake:72
 #, c-format
 msgid "<control>O"
-msgstr "<control>Å"
+msgstr "<control>Aring"
 
-#: standalone/logdrake:74
+#: standalone/logdrake:73
 #, c-format
 msgid "/File/_Save"
 msgstr "/Fil/_Lagre"
 
-#: standalone/logdrake:74
+#: standalone/logdrake:73
 #, c-format
 msgid "<control>S"
 msgstr "<control>L"
 
-#: standalone/logdrake:75
+#: standalone/logdrake:74
 #, c-format
 msgid "/File/Save _As"
 msgstr "/Fil/Lagre _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 "/Valg/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"
@@ -23539,7 +24650,7 @@ msgstr ""
 "_:dette er auth.log-loggfila\n"
 "Autentifisering"
 
-#: standalone/logdrake:111
+#: standalone/logdrake:110
 #, c-format
 msgid ""
 "_:this is the user.log log file\n"
@@ -23548,7 +24659,7 @@ msgstr ""
 "_:dette er user.log-loggfila\n"
 "Bruker"
 
-#: standalone/logdrake:112
+#: standalone/logdrake:111
 #, c-format
 msgid ""
 "_:this is the /var/log/messages log file\n"
@@ -23557,7 +24668,7 @@ msgstr ""
 "_:dette er /var/log/messages-loggfila\n"
 "Meldinger"
 
-#: standalone/logdrake:113
+#: standalone/logdrake:112
 #, c-format
 msgid ""
 "_:this is the /var/log/syslog log file\n"
@@ -23566,117 +24677,112 @@ msgstr ""
 "_:dette er /var/log/syslog-loggfila\n"
 "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 "Ett verktøy for å sjekke loggene dine"
 
-#: standalone/logdrake:130 standalone/net_monitor:86
+#: standalone/logdrake:129 standalone/net_monitor:99
 #, c-format
 msgid "Settings"
 msgstr "Instillinger"
 
-#: standalone/logdrake:135
+#: standalone/logdrake:134
 #, c-format
 msgid "Matching"
 msgstr "Matchende"
 
-#: standalone/logdrake:136
+#: standalone/logdrake:135
 #, c-format
 msgid "but not matching"
 msgstr "men ikke lik"
 
-#: standalone/logdrake:140
+#: standalone/logdrake:139
 #, c-format
 msgid "Choose file"
 msgstr "Velg 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 "Innholdet i filen"
 
-#: standalone/logdrake:163 standalone/logdrake:429
+#: standalone/logdrake:162 standalone/logdrake:399
 #, c-format
 msgid "Mail alert"
 msgstr "E-post varsel"
 
-#: standalone/logdrake:170
+#: standalone/logdrake:169
 #, c-format
-msgid "The alert wizard had unexpectly failled:"
-msgstr "Advarselsveiviseren feilet uventet:"
+msgid "The alert wizard has failed unexpectedly:"
+msgstr "Varslingsveiviseren feilet uten forvarsel:"
 
 #: standalone/logdrake:221
 #, c-format
 msgid "please wait, parsing file: %s"
 msgstr "vennligst vent, gjennomgår %s"
 
-#: standalone/logdrake:406
+#: standalone/logdrake:376
 #, c-format
 msgid "Apache World Wide Web Server"
 msgstr "Apache World Wide Web Tjener"
 
-#: standalone/logdrake:407
+#: standalone/logdrake:377
 #, c-format
 msgid "Domain Name Resolver"
 msgstr "Domenenavnoppslagstjeneste"
 
-#: standalone/logdrake:408
+#: standalone/logdrake:378
 #, c-format
 msgid "Ftp Server"
 msgstr "Ftp-server"
 
-#: standalone/logdrake:409
+#: standalone/logdrake:379
 #, c-format
 msgid "Postfix Mail Server"
 msgstr "Postfix posttjener"
 
-#: standalone/logdrake:410
+#: standalone/logdrake:380
 #, c-format
 msgid "Samba Server"
 msgstr "Samba-tjener"
 
-#: standalone/logdrake:411
-#, c-format
-msgid "SSH Server"
-msgstr "SSH-tjener"
-
-#: standalone/logdrake:412
+#: standalone/logdrake:382
 #, c-format
 msgid "Webmin Service"
 msgstr "Webmin-tjeneste"
 
-#: standalone/logdrake:413
+#: standalone/logdrake:383
 #, c-format
 msgid "Xinetd Service"
 msgstr "Xinetd-tjener"
 
-#: standalone/logdrake:424
+#: standalone/logdrake:394
 #, c-format
 msgid "Configure the mail alert system"
 msgstr "Konfigurer epostvarslingssystemet"
 
-#: standalone/logdrake:425
+#: standalone/logdrake:395
 #, c-format
 msgid "Stop the mail alert system"
 msgstr "Stop epostvarslingssystemet"
 
-#: standalone/logdrake:432
+#: standalone/logdrake:402
 #, c-format
 msgid "Mail alert configuration"
 msgstr "E-post varslingskonfigurasjon"
 
-#: standalone/logdrake:433
+#: standalone/logdrake:403
 #, c-format
 msgid ""
 "Welcome to the mail configuration utility.\n"
@@ -23687,17 +24793,17 @@ msgstr ""
 "\n"
 "Her kan du sette opp varslingsystemet.\n"
 
-#: standalone/logdrake:436
+#: standalone/logdrake:406
 #, c-format
 msgid "What do you want to do?"
 msgstr "Hva ønsker du å gjøre?"
 
-#: standalone/logdrake:443
+#: standalone/logdrake:413
 #, c-format
 msgid "Services settings"
 msgstr "Tjenesteoppsett"
 
-#: standalone/logdrake:444
+#: standalone/logdrake:414
 #, c-format
 msgid ""
 "You will receive an alert if one of the selected services is no longer "
@@ -23705,50 +24811,50 @@ msgid ""
 msgstr ""
 "Du vil motta en advarsel hvis en av de valgte tjenestene ikke lenger kjører"
 
-#: standalone/logdrake:451
+#: standalone/logdrake:421
 #, c-format
 msgid "Load setting"
 msgstr "Last inn oppsett"
 
-#: standalone/logdrake:452
+#: standalone/logdrake:422
 #, c-format
 msgid "You will receive an alert if the load is higher than this value"
 msgstr "Du vil motta en advarsel hvis lasten er høyere enn denne advarselen"
 
-#: standalone/logdrake:453
+#: standalone/logdrake:423
 #, c-format
 msgid ""
 "_: load here is a noun, the load of the system\n"
 "Load"
 msgstr "Last"
 
-#: standalone/logdrake:458
+#: standalone/logdrake:428
 #, c-format
 msgid "Alert configuration"
 msgstr "Varsel-konfigurasjon"
 
-#: standalone/logdrake:459
+#: standalone/logdrake:429
 #, c-format
 msgid "Please enter your email address below "
 msgstr "Vennligst skriv inn epostadressen din nedenfor"
 
-#: 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 ""
 "og skriver inn navnet (eller IP-adresse) til smtp-tjeneren du ønsker å bruke"
 
-#: standalone/logdrake:479
+#: standalone/logdrake:449
 #, c-format
 msgid "The wizard successfully configured the mail alert."
 msgstr "Veiviseren konfigurerte epostvarsleren vellykket."
 
-#: standalone/logdrake:485
+#: standalone/logdrake:455
 #, c-format
 msgid "The wizard successfully disabled the mail alert."
 msgstr "Veiviseren deaktiverte epostvarsleren vellykket."
 
-#: standalone/logdrake:544
+#: standalone/logdrake:514
 #, c-format
 msgid "Save as.."
 msgstr "Lagre Som..."
@@ -23773,27 +24879,74 @@ msgstr "Musetest"
 msgid "Please test your mouse:"
 msgstr "Vennligst test musen din:"
 
-#: standalone/net_monitor:52 standalone/net_monitor:57
+#: standalone/net_applet:30
+#, c-format
+msgid "Network is up on interface %s"
+msgstr "Nettverk er oppe på grensesnitt %s"
+
+#. -PO: keep the "Configure Network" substring synced with the "Configure Network" message below
+#: standalone/net_applet:38
+#, c-format
+msgid "Network is down on interface %s. Click on \"Configure Network\""
+msgstr "Nettverk er nede på grensesnitt %s. Klikk på \"Konfigurer nettverk\""
+
+#: standalone/net_applet:53 standalone/net_monitor:471
+#, c-format
+msgid "Connect %s"
+msgstr "Koble til %s"
+
+#: standalone/net_applet:54 standalone/net_monitor:471
+#, c-format
+msgid "Disconnect %s"
+msgstr "Koble fra %s"
+
+#: standalone/net_applet:55
+#, c-format
+msgid "Monitor Network"
+msgstr "Overvåk nettverk"
+
+#: standalone/net_applet:56
+#, c-format
+msgid "Configure Network"
+msgstr "Konfigurer 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 "Få hjelp på nett"
+
+#: standalone/net_applet:158
+#, c-format
+msgid "Always launch on startup"
+msgstr "Kjør alltid under oppstart"
+
+#: standalone/net_monitor:61 standalone/net_monitor:66
 #, c-format
 msgid "Network Monitoring"
 msgstr "Nettverksovervåkning"
 
-#: standalone/net_monitor:92
+#: standalone/net_monitor:104
 #, c-format
 msgid "Global statistics"
 msgstr "Globale statistikker"
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Instantaneous"
 msgstr "Øyeblikkelig"
 
-#: 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"
@@ -23802,7 +24955,7 @@ msgstr ""
 "Sende-\n"
 "hastighet:"
 
-#: standalone/net_monitor:97
+#: standalone/net_monitor:109
 #, c-format
 msgid ""
 "Receiving\n"
@@ -23811,7 +24964,7 @@ msgstr ""
 "Nedlastnings\n"
 "hastighet:"
 
-#: standalone/net_monitor:100
+#: standalone/net_monitor:113
 #, c-format
 msgid ""
 "Connection\n"
@@ -23820,81 +24973,76 @@ msgstr ""
 "Oppkoblings-\n"
 "tid: "
 
-#: standalone/net_monitor:122
+#: standalone/net_monitor:120
+#, c-format
+msgid "Use same scale for received and transmitted"
+msgstr "Bruk samme skala for mottatt og sendt"
+
+#: standalone/net_monitor:139
 #, c-format
 msgid "Wait please, testing your connection..."
 msgstr "Vennligst vent, tester tilkoblingen din..."
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, c-format
 msgid "Disconnecting from Internet "
 msgstr "Kobler fra Internett "
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, c-format
 msgid "Connecting to Internet "
 msgstr "Kobler til internett"
 
-#: standalone/net_monitor:194
+#: standalone/net_monitor:232
 #, c-format
 msgid "Disconnection from Internet failed."
 msgstr "Frakobling fra internett feilet."
 
-#: standalone/net_monitor:195
+#: standalone/net_monitor:233
 #, c-format
 msgid "Disconnection from Internet complete."
 msgstr "Frakobling fra internett fullført."
 
-#: standalone/net_monitor:197
+#: standalone/net_monitor:235
 #, c-format
 msgid "Connection complete."
 msgstr "Oppkobling ferdig."
 
-#: 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 ""
 "Oppkobling feilet.\n"
-"Sjekk konfigurasjonen din i Mandrake Kontrollsenter."
+"Sjekk konfigurasjonen din i Mandrakelinux Kontrollsenter."
 
-#: standalone/net_monitor:299
+#: standalone/net_monitor:341
 #, c-format
 msgid "Color configuration"
 msgstr "Farge-konfigurasjon"
 
-#: standalone/net_monitor:347 standalone/net_monitor:367
+#: standalone/net_monitor:389 standalone/net_monitor:409
 #, c-format
 msgid "sent: "
 msgstr "sendt: "
 
-#: standalone/net_monitor:354 standalone/net_monitor:371
+#: standalone/net_monitor:396 standalone/net_monitor:413
 #, c-format
 msgid "received: "
 msgstr "mottatt: "
 
-#: 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 "Lokal måling"
 
-#: standalone/net_monitor:396
-#, c-format
-msgid "transmitted"
-msgstr "overført"
-
-#: standalone/net_monitor:397
-#, c-format
-msgid "received"
-msgstr "mottatt"
-
-#: standalone/net_monitor:415
+#: standalone/net_monitor:464
 #, c-format
 msgid ""
 "Warning, another internet connection has been detected, maybe using your "
@@ -23903,173 +25051,168 @@ msgstr ""
 "Advarsel, en annen internettoppkobling har blitt oppdaget, kanskje bruker "
 "ditt nettverk"
 
-#: standalone/net_monitor:421
-#, c-format
-msgid "Disconnect %s"
-msgstr "Koble fra %s"
-
-#: standalone/net_monitor:421
-#, c-format
-msgid "Connect %s"
-msgstr "Koble til %s"
-
-#: standalone/net_monitor:426
+#: standalone/net_monitor:475
 #, c-format
 msgid "No internet connection configured"
 msgstr "Ingen Internettilkobling er konfigurert"
 
-#: standalone/printerdrake:70
+#: standalone/printerdrake:69
 #, c-format
 msgid "Loading printer configuration... Please wait"
 msgstr "Laster skriverkonfigurasjon... Vennligst vent"
 
-#: standalone/printerdrake:86
+#: standalone/printerdrake:85
 #, c-format
 msgid "Reading data of installed printers..."
 msgstr "Leser data fra installerte skrivere..."
 
-#: standalone/printerdrake:129
+#: standalone/printerdrake:134
 #, c-format
 msgid "%s Printer Management Tool"
 msgstr "%s Skriverhåndteringsverktøy"
 
-#: 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 "/_Handlinger"
 
-#: standalone/printerdrake:143
+#: standalone/printerdrake:148 standalone/printerdrake:160
+#, c-format
+msgid "/_Add Printer"
+msgstr "/_Legg til skriver"
+
+#: standalone/printerdrake:149
 #, c-format
 msgid "/Set as _Default"
 msgstr "/_Sett 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 skriver"
-
-#: standalone/printerdrake:158
+#: standalone/printerdrake:164
 #, c-format
 msgid "/_Configure CUPS"
 msgstr "/_Konfigurer 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 "Legg til 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 "Skrivernavn"
 
-#: standalone/printerdrake:212
+#: standalone/printerdrake:218
 #, c-format
 msgid "Connection Type"
 msgstr "Tilkoblingstype"
 
-#: standalone/printerdrake:219
+#: standalone/printerdrake:225
 #, c-format
 msgid "Server Name"
 msgstr "Tjenernavn"
 
 #. -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 skriver"
 
-#: standalone/printerdrake:227
+#: standalone/printerdrake:233
 #, c-format
 msgid "Add a new printer to the system"
 msgstr "/_Legg en ny skriver til systmet"
 
 #. -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 "Sett som standard"
 
-#: standalone/printerdrake:230
+#: standalone/printerdrake:236
 #, c-format
 msgid "Set selected printer as the default printer"
 msgstr "Sett valgteskriver som standard skriver"
 
-#: standalone/printerdrake:233
+#: standalone/printerdrake:239
 #, c-format
 msgid "Edit selected printer"
 msgstr "Endre valgte skriver"
 
-#: standalone/printerdrake:236
+#: standalone/printerdrake:242
 #, c-format
 msgid "Delete selected printer"
 msgstr "/_Fjern vagte skriver"
 
-#. -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 listen"
 
 #. -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 "Konfigurer CUPS"
 
-#: standalone/printerdrake:242
+#: standalone/printerdrake:248
 #, c-format
 msgid "Configure CUPS printing system"
 msgstr "Konfigurer CUPS-utskriftssystem"
 
-#: standalone/printerdrake:528
+#: standalone/printerdrake:309 standalone/printerdrake:347
+#, c-format
+msgid "Enabled"
+msgstr "Aktivert"
+
+#: standalone/printerdrake:310 standalone/printerdrake:348
+#, c-format
+msgid "Disabled"
+msgstr "Deaktivert"
+
+#: standalone/printerdrake:572
 #, c-format
 msgid "Authors: "
 msgstr "Forfatter: "
 
-#: standalone/printerdrake:534
+#: standalone/printerdrake:578
 #, c-format
 msgid "Printer Management \n"
 msgstr "Skriveradministrering\n"
 
-#: standalone/scannerdrake:50
+#: standalone/scannerdrake:51
 #, c-format
 msgid ""
 "SANE packages need to be installed to use scanners.\n"
@@ -24080,12 +25223,12 @@ msgstr ""
 "\n"
 "Ønsker du å installere SANE-pakkene?"
 
-#: standalone/scannerdrake:54
+#: standalone/scannerdrake:55
 #, c-format
 msgid "Aborting Scannerdrake."
 msgstr "Avbryter Scannerdrake"
 
-#: standalone/scannerdrake:59
+#: standalone/scannerdrake:60
 #, c-format
 msgid ""
 "Could not install the packages needed to set up a scanner with Scannerdrake."
@@ -24093,78 +25236,67 @@ msgstr ""
 "Kunne ikke installere pakkene som trengs for å sette opp en scanner med "
 "Scannerdrake."
 
-#: standalone/scannerdrake:60
+#: standalone/scannerdrake:61
 #, c-format
 msgid "Scannerdrake will not be started now."
 msgstr "Scannerdrake vil ikke bli startet nå."
 
-#: 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 "Søker etter konfigurerte scannere ..."
 
-#: 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 "Søker etter nye scannerer ..."
 
-#: 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 "Re-genererer liste over konfigurerte scannere ..."
 
-#: 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 "%s er ikke støttet i denne versjonen av %s."
 
-#: standalone/scannerdrake:103
+#: standalone/scannerdrake:104
 #, c-format
 msgid "%s found on %s, configure it automatically?"
 msgstr "%s ble funnet på %s, vil du konfigurere den automatisk?"
 
-#: standalone/scannerdrake:115
+#: standalone/scannerdrake:116
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
 msgstr "%s er ikke i skannerdatabasen, konfigurere den manuelt?"
 
-#: standalone/scannerdrake:130
+#: standalone/scannerdrake:131
 #, c-format
 msgid "Select a scanner model"
 msgstr "Velg en scannermodell"
 
-#: standalone/scannerdrake:131
+#: standalone/scannerdrake:132
 #, c-format
 msgid " ("
 msgstr " ("
 
-#: standalone/scannerdrake:132
+#: standalone/scannerdrake:133
 #, c-format
 msgid "Detected model: %s"
 msgstr "Oppdaget modell %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 "%s er ikke kjent av denne versjonen av Scannerdrake."
-
-#: standalone/scannerdrake:169 standalone/scannerdrake:183
+#: standalone/scannerdrake:165 standalone/scannerdrake:179
 #, c-format
 msgid "Do not install firmware file"
 msgstr "Ikke installer firmware-fil"
 
-#: 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 "
@@ -24173,13 +25305,13 @@ msgstr ""
 "Det er mulig at din %s trenger dets firmware opplastet hver gang den skrus "
 "på."
 
-#: 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 ""
 "hvis dette er tilfellet så kan du gjøre så at dette blir automatisk gjort."
 
-#: 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 "
@@ -24188,7 +25320,7 @@ msgstr ""
 "For å gjøre slik så trenger du å oppgi firmware-fil for skanneren din så den "
 "kan bli installert."
 
-#: 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 "
@@ -24197,22 +25329,22 @@ msgstr ""
 "Du finner fila på CDen eller disketten som kom med skanneren, på "
 "produsentens hjemmeside eller på din Windows-partisjon."
 
-#: standalone/scannerdrake:178 standalone/scannerdrake:237
+#: standalone/scannerdrake:174 standalone/scannerdrake:233
 #, c-format
 msgid "Install firmware file from"
 msgstr "Installer firmware-fil fra"
 
-#: standalone/scannerdrake:198
+#: standalone/scannerdrake:194
 #, c-format
 msgid "Select firmware file"
 msgstr "Velg firmware-fil"
 
-#: 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 "Firmware-fila %s eksisterer ikke eller er uleselig"
 
-#: standalone/scannerdrake:224
+#: standalone/scannerdrake:220
 #, c-format
 msgid ""
 "It is possible that your scanners need their firmware to be uploaded "
@@ -24221,7 +25353,7 @@ msgstr ""
 "Det er mulig at dine scannere trenger deres firmware opplastet hver gang de "
 "skrus på."
 
-#: 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 "
@@ -24230,7 +25362,7 @@ msgstr ""
 "For å gjøre slik så trenger du å oppgi firmware-filer for dine skannere så "
 "de kan bli installert."
 
-#: standalone/scannerdrake:231
+#: standalone/scannerdrake:227
 #, c-format
 msgid ""
 "If you have already installed your scanner's firmware you can update the "
@@ -24239,32 +25371,32 @@ msgstr ""
 "Hvis du allerede har installert din scanners firmware så kan du oppdatere "
 "den her ved å gi det nye firmwaren-filnavnet."
 
-#: standalone/scannerdrake:233
+#: standalone/scannerdrake:229
 #, c-format
 msgid "Install firmware for the"
 msgstr "Installer firmware for"
 
-#: standalone/scannerdrake:256
+#: standalone/scannerdrake:252
 #, c-format
 msgid "Select firmware file for the %s"
 msgstr "Velg firmware-fil for %s"
 
-#: standalone/scannerdrake:274
+#: standalone/scannerdrake:270
 #, c-format
 msgid "Could not install the firmware file for the %s!"
 msgstr "Kunne ikke installere firmware-fil for %s'en!"
 
-#: standalone/scannerdrake:287
+#: standalone/scannerdrake:283
 #, c-format
 msgid "The firmware file for your %s was successfully installed."
 msgstr "Firmware-fila for din %s ble vellykket installert."
 
-#: standalone/scannerdrake:297
+#: standalone/scannerdrake:293
 #, c-format
 msgid "The %s is unsupported"
 msgstr "%s er ikke støttet"
 
-#: standalone/scannerdrake:302
+#: standalone/scannerdrake:298
 #, c-format
 msgid ""
 "The %s must be configured by printerdrake.\n"
@@ -24273,33 +25405,33 @@ msgstr ""
 "%s må være konfigurert av printerdrake.\n"
 "Du kan kjøre %s Kontrollsenter fra maskinvareseksjonen."
 
-#: 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 "Oppdag automisk tilgjengelige porter"
 
-#: 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 "Vennligst velg enheten hvor din %s er tilkoblet"
 
-#: standalone/scannerdrake:309
+#: standalone/scannerdrake:305
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
 msgstr "(Merk: Parallellporter kan ikke bli automatisk oppdaget)"
 
-#: standalone/scannerdrake:311 standalone/scannerdrake:356
+#: standalone/scannerdrake:307 standalone/scannerdrake:352
 #, c-format
 msgid "choose device"
 msgstr "velg enhet"
 
-#: standalone/scannerdrake:345
+#: standalone/scannerdrake:341
 #, c-format
-msgid "Searching for scanners ..."
+msgid "Searching for scanners..."
 msgstr "Søker etter scannere ..."
 
-#: standalone/scannerdrake:380
+#: standalone/scannerdrake:376
 #, c-format
 msgid ""
 "Your %s has been configured.\n"
@@ -24310,7 +25442,7 @@ msgstr ""
 "Du vil nå kunne skanne dokumentene dine ved hjelp av \"XSane\" eller \"Kooka"
 "\" fra  Multimedia/Grafikk i applikasjonsmenyen."
 
-#: standalone/scannerdrake:404
+#: standalone/scannerdrake:400
 #, c-format
 msgid ""
 "The following scanners\n"
@@ -24323,7 +25455,7 @@ msgstr ""
 "%s\n"
 "er tilgjengelige på ditt system.\n"
 
-#: standalone/scannerdrake:405
+#: standalone/scannerdrake:401
 #, c-format
 msgid ""
 "The following scanner\n"
@@ -24336,43 +25468,43 @@ msgstr ""
 "%s\n"
 "er tilgjengelig på ditt system.\n"
 
-#: 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 ""
 "Det ble ikke funnet noen scannere som er tilgjengelig på ditt system.\n"
 
-#: standalone/scannerdrake:425
+#: standalone/scannerdrake:421
 #, c-format
 msgid "Search for new scanners"
 msgstr "Søk for nye scannere"
 
-#: standalone/scannerdrake:431
+#: standalone/scannerdrake:427
 #, c-format
 msgid "Add a scanner manually"
 msgstr "Legg til scanner manuelt"
 
-#: standalone/scannerdrake:438
+#: standalone/scannerdrake:434
 #, c-format
 msgid "Install/Update firmware files"
 msgstr "Installer/Oppdater firmware-filer"
 
-#: standalone/scannerdrake:444
+#: standalone/scannerdrake:440
 #, c-format
 msgid "Scanner sharing"
 msgstr "Scannerdeling"
 
-#: 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 maskinen"
 
-#: standalone/scannerdrake:555
+#: standalone/scannerdrake:551
 #, c-format
 msgid ""
 "Here you can choose whether the scanners connected to this machine should be "
@@ -24381,7 +25513,7 @@ msgstr ""
 "Her kan du velge om scannerne tilkoblet denne maskinen skal være "
 "tilgjengelige for andre maskiner og for hvilke."
 
-#: standalone/scannerdrake:556
+#: standalone/scannerdrake:552
 #, c-format
 msgid ""
 "You can also decide here whether scanners on remote machines should be made "
@@ -24390,33 +25522,33 @@ msgstr ""
 "Du kan også velge om fjernskannere kan bli gjort tilgjengelige på denne "
 "maskinen."
 
-#: standalone/scannerdrake:559
+#: standalone/scannerdrake:555
 #, c-format
 msgid "The scanners on this machine are available to other computers"
 msgstr "Scannerne på denne maskinen er tilgjengelig for andre maskiner"
 
-#: standalone/scannerdrake:561
+#: standalone/scannerdrake:557
 #, c-format
 msgid "Scanner sharing to hosts: "
 msgstr "Scannerdeling til verter: "
 
-#: standalone/scannerdrake:575
+#: standalone/scannerdrake:571
 #, c-format
 msgid "Use scanners on remote computers"
 msgstr "Bruk scannere på fjerne maskiner"
 
-#: standalone/scannerdrake:578
+#: standalone/scannerdrake:574
 #, c-format
 msgid "Use the scanners on hosts: "
 msgstr "Bruk scannere på verter: "
 
-#: 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 "Deling av lokale scannere"
 
-#: standalone/scannerdrake:606
+#: standalone/scannerdrake:602
 #, c-format
 msgid ""
 "These are the machines on which the locally connected scanner(s) should be "
@@ -24425,56 +25557,56 @@ msgstr ""
 "Dette er maskiner som de(n) lokalt tilkoblede scanneren(e) skal være "
 "tilgjengelig for:"
 
-#: standalone/scannerdrake:617 standalone/scannerdrake:767
+#: standalone/scannerdrake:613 standalone/scannerdrake:763
 #, c-format
 msgid "Add host"
 msgstr "Legg til vert"
 
-#: standalone/scannerdrake:623 standalone/scannerdrake:773
+#: standalone/scannerdrake:619 standalone/scannerdrake:769
 #, c-format
 msgid "Edit selected host"
 msgstr "Rediger valgte vert"
 
-#: standalone/scannerdrake:632 standalone/scannerdrake:782
+#: standalone/scannerdrake:628 standalone/scannerdrake:778
 #, c-format
 msgid "Remove selected host"
 msgstr "Fjern valgte 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 "Navn/IP-adresse på 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 ""
 "Velg verten som de(n) lokale scanneren(e) skal bli gjort tilgjengelig for:"
 
-#: 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 "Du må spesifisere vertsnavn eller en IP.\n"
 
-#: 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 "Denne verten er allerede i listen, den kan ikke bli lagt til igjen.\n"
 
-#: standalone/scannerdrake:755
+#: standalone/scannerdrake:751
 #, c-format
 msgid "Usage of remote scanners"
 msgstr "Bruk av fjerne scannere"
 
-#: standalone/scannerdrake:756
+#: standalone/scannerdrake:752
 #, c-format
 msgid "These are the machines from which the scanners should be used:"
 msgstr "Dette er maskinene som scanneren skal kunne bli brukt fra:"
 
-#: standalone/scannerdrake:913
+#: standalone/scannerdrake:909
 #, c-format
 msgid ""
 "saned needs to be installed to share the local scanner(s).\n"
@@ -24485,32 +25617,32 @@ msgstr ""
 "\n"
 "Vil du installere saned-pakka?"
 
-#: 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 "Din(e) skanner(e) vil ikke være tilgjengelig(e) på nettverket."
 
-#: standalone/service_harddrake:62
+#: standalone/service_harddrake:104
 #, c-format
 msgid "Some devices in the \"%s\" hardware class were removed:\n"
 msgstr "Noen enheter i \"%s\" maskinvareklassen ble fjernet:\n"
 
-#: standalone/service_harddrake:63
+#: standalone/service_harddrake:105
 #, c-format
 msgid "- %s was removed\n"
 msgstr "- %s ble fjernet\n"
 
-#: standalone/service_harddrake:66
+#: standalone/service_harddrake:108
 #, c-format
 msgid "Some devices were added: %s\n"
 msgstr "Noen enheter ble lagt til: %s\n"
 
-#: standalone/service_harddrake:67
+#: standalone/service_harddrake:109
 #, c-format
 msgid "- %s was added\n"
 msgstr "- %s ble lagt til\n"
 
-#: standalone/service_harddrake:126
+#: standalone/service_harddrake:199
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "Maskinvareoppdagelse pågår"
@@ -24522,7 +25654,7 @@ msgstr "Maskinvareendringer i \"%s\"-klasse (%s sekunder på å svare)"
 
 #: 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 "Ønskjer du å kjøre det passende konfigurasjonsverktøyet?"
 
 #: steps.pm:14
@@ -24615,22 +25747,22 @@ msgstr "Installer oppdateringer"
 msgid "Exit install"
 msgstr "Avslutt installasjon"
 
-#: ugtk2.pm:1084
+#: ugtk2.pm:1122
 #, c-format
 msgid "Is this correct?"
 msgstr "Er dette riktig?"
 
-#: ugtk2.pm:1212
+#: ugtk2.pm:1250
 #, c-format
 msgid "Expand Tree"
 msgstr "Utvid tre"
 
-#: ugtk2.pm:1213
+#: ugtk2.pm:1251
 #, c-format
 msgid "Collapse Tree"
 msgstr "Trekk sammen tre"
 
-#: ugtk2.pm:1214
+#: ugtk2.pm:1252
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr "Skift mellom flat og gruppesortert"
@@ -24648,534 +25780,3 @@ msgstr ""
 #, c-format
 msgid "Installation failed"
 msgstr "Installasjon feilet"
-
-#: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Kontor og arbeidsmaskin"
-
-#: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Kontorstøtteprogrammer: tekstbehandlere (kword, abiword), regneark (kspread, "
-"gnumeric), pdf fremvisere etc"
-
-#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Spillstasjon"
-
-#: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Underholdningsprogrammer: arkade, bordspill, strategi etc"
-
-#: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimediastasjon"
-
-#: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Lyd og bilde avspilling/redigeringsprogrammer"
-
-#: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internettstasjon"
-
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
-"Web"
-msgstr ""
-"Sett med verktøy for å lese og sende e-post og nyheter (mutt, tin..) og for "
-"se på webben"
-
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Nettverksmaskin (klient)"
-
-#: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Klienter for forskjellige protokoller inkludert ssh"
-
-#: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Konfigurasjon"
-
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Verktøy for å forenkle konfigurasjonen av maskinen din"
-
-#: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Konsollverktøy"
-
-#: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Tekstprogrammer, skall, filverktøy, terminaler"
-
-#: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE-arbeidsstasjon"
-
-#: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"K Desktop Environment, basis grafikkmiljø med en samling av passende verktøy"
-
-#: ../../share/compssUsers:999
-msgid "GNOME Workstation"
-msgstr "GNOME-arbeidsstasjon"
-
-#: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Et grafisk miljø med et brukervennlig sett med applikasjoner og skrivebords-"
-"verktøy"
-
-#: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Andre grafiske skrivebord"
-
-#: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm etc"
-
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C og C++ utviklingsbibliotek, programmer og include-filer"
-
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentasjon"
-
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Bøker og howto's om Linux og fri programvare"
-
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Tredjeparts programvarestøtte"
-
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-#: ../../share/compssUsers:999
-msgid "Mail"
-msgstr "Epost"
-
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix eposttjener"
-
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Database"
-
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL eller MySQL database tjener"
-
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Tjener, Brannmur/ruter"
-
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internett-gateway"
-
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Nettverk datamaskintjener"
-
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS-tjener, SMB-tjener, Proxy-tjener, SSH-tjener"
-
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Sett med verktøy for å lese og sende e-post og nyheter og for å surfe på nett"
-
-#~ msgid ""
-#~ "You can export using NFS or SMB. Please select which you'd like to use."
-#~ msgstr ""
-#~ "Du kan eksportere med NFS eller SMB. Vennligst velg den du ønsker å   "
-#~ "bruke."
-
-#~ msgid ""
-#~ "You can export using NFS or Samba. Please select which you'd like to use."
-#~ msgstr ""
-#~ "Du kan eksportere med NFS eller Samba. Vennligst velg den du ønsker å   "
-#~ "bruke."
-
-#~ msgid "The package %s is going to be removed."
-#~ msgstr "Pakken %s er på vei til å bli fjernet."
-
-#~ msgid "You must be root to read configuration file. \n"
-#~ msgstr "Du må være root for å lese konfigurasjonsfilen. \n"
-
-#~ msgid "Can't open %s!"
-#~ msgstr "Kan ikke åpne %s!"
-
-#~ msgid ""
-#~ "Your card can have 3D hardware acceleration support but only with XFree %"
-#~ "s.\n"
-#~ "Your card is supported by XFree %s which may have a better support in 2D."
-#~ msgstr ""
-#~ "Kortet ditt kan ha støtte for maskinvare 3D akselerasjon, men bare med "
-#~ "XFree %s.\n"
-#~ "Kortet ditt er støttet av XFree %s som kan ha bedre støtte i 2D."
-
-#~ msgid ""
-#~ "Your card can have 3D hardware acceleration support but only with XFree %"
-#~ "s,\n"
-#~ "NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.\n"
-#~ "Your card is supported by XFree %s which may have a better support in 2D."
-#~ msgstr ""
-#~ "Kortet ditt kan ha støtte for maskinvare 3D akselerasjon, men bare med "
-#~ "XFree %s,\n"
-#~ "MERK AT DETTE ER EKSPERIMENTELL STØTTE OG KAN 'FRYSE' MASKINEN DIN.\n"
-#~ "Kortet ditt er støttet av XFree %s som kan ha bedre støtte i 2D."
-
-#~ msgid "Xpmac (installation display driver)"
-#~ msgstr "Xpmac (installasjons skjermdriver)"
-
-#~ msgid "4 billion colors (32 bits)"
-#~ msgstr "4 milliarder farger (32 bits)"
-
-#~ msgid "XFree86 server: %s\n"
-#~ msgstr "XFree86-tjener: %s\n"
-
-#~ msgid "Here is the full list of keyboards available"
-#~ msgstr "Her er den komplette lista over tilgjengelige tastatur"
-
-#~ msgid "Please insert the Boot floppy used in drive %s"
-#~ msgstr "Sett inn en oppstartsdiskett i stasjon %s"
-
-#~ msgid ""
-#~ "Take advantage of valuable benefits, products and services by joining "
-#~ "Mandrake Club, such as:"
-#~ msgstr ""
-#~ "Dra nytte av verdifulle fordeler, produkter og tjenester ved å bli med i "
-#~ "Mandrake Club, som:"
-
-#~ msgid "TCP/IP"
-#~ msgstr "TCP/IP"
-
-#~ msgid "Account"
-#~ msgstr "Konto"
-
-#~ msgid "Wireless"
-#~ msgstr "Trådløs"
-
-#~ msgid ""
-#~ "Due to incompatibilities of the 2.6 series kernel with the LSB runtime\n"
-#~ "tests, the 2.4 series kernel will be installed as the default to insure\n"
-#~ "compliance under the \"LSB\" group selection."
-#~ msgstr ""
-#~ "På grunn av  2.6-serien av kjerners inkompatibiliteter med LSB runtime\n"
-#~ "tester, så vil 2.4-serien av kjernen bli installert som standard for å "
-#~ "forsikre\n"
-#~ "om at systemet følger spesifikasjonen under \"LSB\"-gruppeseksjonen."
-
-#~ msgid "XawTV isn't installed!"
-#~ msgstr "XawTV er ikke installert!"
-
-#~ msgid "Provider dns 1 (optional)"
-#~ msgstr "Tilbyder dns 1 (valgfri)"
-
-#~ msgid "Provider dns 2 (optional)"
-#~ msgstr "Tilbyder dns 2 (valgfri)"
-
-#~ msgid "Ethernet Card"
-#~ msgstr "Ethernettkort"
-
-#~ msgid "DHCP Client"
-#~ msgstr "DHCP-klient"
-
-#~ msgid "Display"
-#~ msgstr "Vis"
-
-#~ msgid "Display configuration"
-#~ msgstr "Vis konfigurasjon"
-
-#~ msgid ""
-#~ "Congratulations, installation is complete.\n"
-#~ "Remove the boot media and press return to reboot.\n"
-#~ "\n"
-#~ "\n"
-#~ "For information on fixes which are available for this release of Mandrake "
-#~ "Linux,\n"
-#~ "consult the Errata available from:\n"
-#~ "\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "\n"
-#~ "Information on configuring your system is available in the post\n"
-#~ "install chapter of the Official Mandrakelinux User's Guide."
-#~ msgstr ""
-#~ "Gratulerer, installasjonen er fullført.\n"
-#~ "Fjern oppstartsmediet og trykk enter for å starte på nytt.\n"
-#~ "\n"
-#~ "\n"
-#~ "For informasjon om endringer som er tilgjengelige for denne utgaven av "
-#~ "Mandrakelinux,\n"
-#~ "sjekk errataen tilgjengelig fra:\n"
-#~ "\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "\n"
-#~ "Informasjon om konfigurering av systemet ditt finnes i post\n"
-#~ "install-kapittelet i Official Mandrakelinux User's Guide."
-
-#~ msgid ""
-#~ "Your new Mandrakelinux operating system and its many applications is the "
-#~ "result of collaborative efforts between MandrakeSoft developers and "
-#~ "Mandrake Linux contributors throughout the world."
-#~ msgstr ""
-#~ "Ditt nye Mandrakelinux-operativsystem og dets mange applikasjoner er "
-#~ "resultatet av samarbeid mellom MandrakeSoft-utviklere og Mandrakelinux-"
-#~ "bidragsytere rundt om i verden."
-
-#~ msgid ""
-#~ "Your new Mandrakelinux distribution and its many applications are the "
-#~ "result of collaborative efforts between MandrakeSoft developers and "
-#~ "Mandrake Linux contributors throughout the world."
-#~ msgstr ""
-#~ "Din nye Mandrakelinux-distribusjon og dets mange applikasjoner er "
-#~ "resultatet av samarbeid mellom MandrakeSoft-utviklere og Mandrakelinux-"
-#~ "bidragsytere rundtom i verden."
-
-#~ msgid "Use tar and bzip2 (rather than tar and gzip)"
-#~ msgstr "Bruk tar og bzip2 (i stedet for tar og gzip)"
-
-#~ msgid ""
-#~ "Change\n"
-#~ "Restore Path"
-#~ msgstr ""
-#~ "Endre\n"
-#~ "gjenopprettelsesfilbane"
-
-#~ msgid "European protocol"
-#~ msgstr "Europeisk protokoll"
-
-#~ msgid "Found \"%s\" interface do you want to use it ?"
-#~ msgstr "Fant \"%s\" grensesnitt - vil du benytte dette?"
-
-#~ msgid "Bewan USB modem"
-#~ msgstr "Bewan USB-modem"
-
-#~ msgid "ISDN configuration has not yet be ported to new wizard layer"
-#~ msgstr ""
-#~ "ISDN-konfigurasjon har ennå ikke blitt portet til det nye veiviserlaget"
-
-#~ msgid "What kind is your ISDN connection?"
-#~ msgstr "Hva slags type er ISDN-tilknytningen din?"
-
-#~ msgid "Do you want to start a new configuration ?"
-#~ msgstr "Vil du starte en ny konfigurasjonen?"
-
-#~ msgid ""
-#~ "I have detected an ISDN PCI card, but I don't know its type. Please "
-#~ "select a PCI card on the next screen."
-#~ msgstr ""
-#~ "Jeg har oppdaget et ISDN PCI-kort, men jeg vet ikke hviklet type. "
-#~ "Vennligst velg et PCI-kort i neste skjermbilde."
-
-#~ msgid "No ISDN PCI card found. Please select one on the next screen."
-#~ msgstr "Ingen ISDN PCI-kort funnet. Vennligst velg et i neste skjermbilde."
-
-#~ msgid "DrakTermServ"
-#~ msgstr "DrakTermServ"
-
-#~ msgid "Under Devel ... please wait."
-#~ msgstr "Under Utvikling ... vennligst vent."
-
-#~ msgid "Windows (FAT32)"
-#~ msgstr "Windows (FAT32)"
-
-#~ msgid ""
-#~ "Please enter the name of the interface connected to the "
-#~ "internet.              \n"
-#~ "                \n"
-#~ "Examples:\n"
-#~ "                ppp+ for modem or DSL connections, \n"
-#~ "                eth0, or eth1 for cable connection, \n"
-#~ "                ippp+ for a isdn connection.\n"
-#~ msgstr ""
-#~ "Vennligst skriv inn navnet på grensesnittet som er koblet til "
-#~ "internett.              \n"
-#~ "                \n"
-#~ "Eksempler:\n"
-#~ "                ppp+ for modem eller DSL-tilkoblinger, \n"
-#~ "                eth0 eller eth1 for kabeltilkobling, \n"
-#~ "                ippp+ for isdntilkobling.\n"
-
-#~ msgid ""
-#~ "You can enter miscellaneous ports. \n"
-#~ "Valid examples are: 139/tcp 139/udp.\n"
-#~ "Have a look at /etc/services for information."
-#~ msgstr ""
-#~ "Du kan angi forskjellige porter.\n"
-#~ "Gyldige eksempler er: 139/tcp 139/udb.\n"
-#~ "Ta en titt på /etc/services for mer informasjon."
-
-#~ msgid ""
-#~ "This uses the same syntax as the command line program 'cdrecord'. "
-#~ "'cdrecord -scanbus' would also show you the device number."
-#~ msgstr ""
-#~ "Dette bruker samme syntax som kommandolinjeprogrammet 'cdrecod'. "
-#~ "'cdrecord -scanbus' vil også vise deg enhetsnummeret."
-
-#~ msgid ""
-#~ "Enter your CD Writer device name\n"
-#~ " ex: 0,1,0"
-#~ msgstr ""
-#~ "Spesifiser din CD-brenners enhetsnavn\n"
-#~ " feks: 0,1,0"
-
-#~ msgid "Tone dialing"
-#~ msgstr "Toneoppringning"
-
-#~ msgid "Pulse dialing"
-#~ msgstr "Pulsoppringning"
-
-#~ msgid "Scientific Workstation"
-#~ msgstr "Vitenskaplig arbeidsstasjon"
-
-#~ msgid "Scientific applications such as gnuplot"
-#~ msgstr "Vitenskapsapplikasjoner som gnuplot"
-
-#~ msgid "DNS/NIS "
-#~ msgstr "DNS/NIS"
-
-#~ msgid "Domain Name and Network Information Server"
-#~ msgstr "Tjener for domenenavn og nettverksinformasjon"
-
-#~ msgid ""
-#~ "If you plan to use aboot, be carefull to leave a free space (2048 sectors "
-#~ "is enough)\n"
-#~ "at the beginning of the disk"
-#~ msgstr ""
-#~ "Hvis du skal bruke aboot, være nøye med å la det være ledig plass (2048 "
-#~ "sektorer er nok)\n"
-#~ "ved begynnelsen av disken"
-
-#~ msgid "I can't add any more partition"
-#~ msgstr "Jeg kan ikke legge til flere partisjoner"
-
-#~ msgid "No wireless network adapter on your system!"
-#~ msgstr "Ikke noen trådløs nettverksadapter på ditt system!"
-
-#~ msgid "Can't create log file!"
-#~ msgstr "Kan ikke opprette logg-fil!"
-
-#~ msgid "dhcp"
-#~ msgstr "dhcp"
-
-#~ msgid "Please select media for backup..."
-#~ msgstr "Vennligst velg media for sikkerhetskopi..."
-
-#~ msgid "pfs"
-#~ msgstr "pfs"
-
-#~ msgid "real_file"
-#~ msgstr "real_file"
-
-#~ msgid "Configuration of a remote printer"
-#~ msgstr "Konfigurasjon av en fjernskriver"
-
-#~ msgid "configure %s"
-#~ msgstr "konfigurer %s"
-
-#~ msgid ""
-#~ "Welcome to the configuration files step !\n"
-#~ "\n"
-#~ "You can now configure the sections of these files.\n"
-#~ "\n"
-#~ "Which file would you like to configure ?\n"
-#~ msgstr ""
-#~ "Velkommen til konfigurasjonsfiler-steget!\n"
-#~ "\n"
-#~ "Du kan nå konfigurere seksjonen over disse filene.\n"
-#~ "\n"
-#~ "Hvilke filer ønsker du å konfigurerer?\n"
-
-#~ msgid "Last but not leat you can also type in your DNS server IP addresses."
-#~ msgstr "Sist, men ikke minst kan du taste inn din DNS-tjeners IP-adresse."
-
-#~ msgid "protocol = "
-#~ msgstr "protokoll ="
-
-#~ msgid "level = "
-#~ msgstr "nivå ="
-
-#~ msgid "authentication_algorithm"
-#~ msgstr "authentication_algorithm"
-
-#~ msgid "Gnome Workstation"
-#~ msgstr "Gnome arbeidstasjon"
-
-#~ msgid "add"
-#~ msgstr "legg til"
-
-#~ msgid "edit"
-#~ msgstr "redigér"
-
-#~ msgid "remove"
-#~ msgstr "fjern"
-
-#~ msgid "Running \"%s\" ..."
-#~ msgstr "Kjører \"%s\" ..."
-
-#~ msgid "utopia 25"
-#~ msgstr "utopia 25"
-
-#~ msgid ""
-#~ "Find all MandrakeSoft products and services at MandrakeStore -- our full "
-#~ "service e-commerce platform."
-#~ msgstr ""
-#~ "Finn alle MandrakeSoft-produkter og tjenester på MandrakeStore -- vår "
-#~ "fulle tjeneste e-handelplattform."
-
-#~ msgid "MandrakeExpert is the primary source for technical support."
-#~ msgstr "MandrakeExpert er den primære kilden for teknisk kundestøtte."
-
-#~ msgid "\t- Participate in online chat with <b>Gaim</b>"
-#~ msgstr "\t- Delta i onlinesamtaler med <b>Gaim</b>"
-
-#~ msgid "\t- <b>GDB:</b> the GNU Project debugger"
-#~ msgstr "\t- GDB: GNU Prosjektavluseren"
-
-#~ msgid "<-- Wizard Previous Step"
-#~ msgstr "<-- Veiviser Forrige Steg"
-
-#~ msgid "Wizard Next Step -->"
-#~ msgstr "Veiviser Neste Steg -->"
-
-#~ msgid "On Hard Drive"
-#~ msgstr "på harddisk"
-
-#~ msgid "Messages"
-#~ msgstr "Meldinger"
-
-#~ msgid "Syslog"
-#~ msgstr "Syslog"
-
-#~ msgid "Compact"
-#~ msgstr "Kompakt"