updated pot file

author: Pablo Saratxaga <pablo@mandriva.com> 2004-10-07 13:03:56 +0000
committer: Pablo Saratxaga <pablo@mandriva.com> 2004-10-07 13:03:56 +0000
commit: 54f5f51c6dcfc30abb2d64781404ba7bdbead24e (patch)
tree: 187082ac2ce0496b9caac98ba7dabaa6dced1caa /perl-install/share/po/ca.po
parent: 91daae81333182f281cc2e68616813379f3bd0e1 (diff)
download: drakx-backup-do-not-use-54f5f51c6dcfc30abb2d64781404ba7bdbead24e.tar
drakx-backup-do-not-use-54f5f51c6dcfc30abb2d64781404ba7bdbead24e.tar.gz
drakx-backup-do-not-use-54f5f51c6dcfc30abb2d64781404ba7bdbead24e.tar.bz2
drakx-backup-do-not-use-54f5f51c6dcfc30abb2d64781404ba7bdbead24e.tar.xz
drakx-backup-do-not-use-54f5f51c6dcfc30abb2d64781404ba7bdbead24e.zip
1 files changed, 9145 insertions, 5295 deletions
diff --git a/perl-install/share/po/ca.po b/perl-install/share/po/ca.po
index 99b92d4f0..8b3c30636 100644
--- a/perl-install/share/po/ca.po
+++ b/perl-install/share/po/ca.po
@@ -8,16 +8,70 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
-"POT-Creation-Date: 2004-06-14 15:48+0200\n"
-"PO-Revision-Date: 2004-04-28 21:01+0200\n"
+"POT-Creation-Date: 2004-10-07 21:57+0200\n"
+"PO-Revision-Date: 2004-10-03 23:13+0200\n"
 "Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.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"
+"X-Generator: KBabel 1.3.1\n"
 
-#: ../move/move.pm:402
+#: ../move/move.pm:292
+#, fuzzy, c-format
+msgid "Which USB key do you want to format?"
+msgstr "Quin tipus d'entrada voleu afegir?"
+
+#: ../move/move.pm:296
+#, c-format
+msgid ""
+"You are about to format a USB device \"%s\". This will delete all data on "
+"it.\n"
+"Make sure that the selected device is the USB key you want to format. \n"
+"We advise you to unplug all other USB storage devices while doing this "
+"operation."
+msgstr ""
+
+#: ../move/move.pm:448 ../move/move.pm:460
+#, fuzzy, c-format
+msgid "Key isn't writable"
+msgstr "No teniu instal·lat XawTV!"
+
+#: ../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 ""
+
+#
+#: ../move/move.pm:452
+#, c-format
+msgid "Retry"
+msgstr "Reintenta"
+
+#: ../move/move.pm:453 ../move/move.pm:497
+#, c-format
+msgid "Continue without USB key"
+msgstr ""
+
+#: ../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 ""
+
+#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1353
+#, c-format
+msgid "Reboot"
+msgstr "Reinicia"
+
+#: ../move/move.pm:473
 #, c-format
 msgid ""
 "Your USB key doesn't have any valid Windows (FAT) partitions.\n"
@@ -32,7 +86,7 @@ msgid ""
 "Operating System."
 msgstr ""
 
-#: ../move/move.pm:412
+#: ../move/move.pm:483
 #, c-format
 msgid ""
 "We didn't detect any USB key on your system. If you\n"
@@ -48,66 +102,27 @@ msgid ""
 "Operating System."
 msgstr ""
 
-#: ../move/move.pm:423
+#: ../move/move.pm:494
 #, c-format
 msgid "Need a key to save your data"
 msgstr ""
 
-#: ../move/move.pm:425
+#: ../move/move.pm:496
 #, c-format
 msgid "Detect USB key again"
 msgstr ""
 
-#: ../move/move.pm:426 ../move/move.pm:456
-#, c-format
-msgid "Continue without USB key"
-msgstr ""
-
-#: ../move/move.pm:437 ../move/move.pm:451
-#, c-format
-msgid "Key isn't writable"
-msgstr ""
-
-#: ../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 ""
-
-#: ../move/move.pm:445 help.pm:418 install_steps_interactive.pm:1306
-#, c-format
-msgid "Reboot"
-msgstr "Reinicia"
-
-#: ../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 ""
-
-#
-#: ../move/move.pm:455
-#, c-format
-msgid "Retry"
-msgstr "Reintenta"
-
-#: ../move/move.pm:466
-#, c-format
+#: ../move/move.pm:517
+#, fuzzy, c-format
 msgid "Setting up USB key"
-msgstr ""
+msgstr "S'està configurant els dispositius ISA PNP: "
 
-#: ../move/move.pm:466
-#, c-format
+#: ../move/move.pm:517
+#, fuzzy, c-format
 msgid "Please wait, setting up system configuration files on USB key..."
-msgstr ""
+msgstr "Espereu si us plau, s'està detectant i configurant els dispositius..."
 
-#: ../move/move.pm:488
+#: ../move/move.pm:546
 #, c-format
 msgid "Enter your user information, password will be used for screensaver"
 msgstr ""
@@ -115,74 +130,74 @@ msgstr ""
 "salvapantalles"
 
 #
-#: ../move/move.pm:498
+#: ../move/move.pm:556
 #, c-format
 msgid "Auto configuration"
 msgstr "Configuració automàtica"
 
-#: ../move/move.pm:498
+#: ../move/move.pm:556
 #, c-format
 msgid "Please wait, detecting and configuring devices..."
 msgstr "Espereu si us plau, s'està detectant i configurant els dispositius..."
 
-#: ../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"
@@ -191,12 +206,12 @@ msgstr ""
 "S'ha produït un error, però no sé com gestionar-lo correctament.\n"
 "Si continueu, és sota la vostra responsabilitat."
 
-#: ../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 "S'ha produït un error"
 
-#: ../move/move.pm:607
+#: ../move/move.pm:666
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -217,32 +232,39 @@ msgid ""
 msgstr ""
 
 #
-#: ../move/move.pm:622
+#: ../move/move.pm:681
 #, c-format
 msgid "Remove system config files"
 msgstr "Elimina fitxers de configuració del sistema"
 
-#: ../move/move.pm:623
+#: ../move/move.pm:682
 #, c-format
 msgid "Simply reboot"
 msgstr "Simplement reinicia"
 
-#: ../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 "Només podeu executar sense suport CDROM"
 
-#: ../move/tree/mdk_totem:81
+#: ../move/tree/mdk_totem:71
 #, c-format
 msgid "Kill those programs"
 msgstr "Mata aquests programes"
 
-#: ../move/tree/mdk_totem:82
+#: ../move/tree/mdk_totem:72
 #, c-format
 msgid "No CDROM support"
 msgstr "Sense suport 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 "Llegiu-ho atentament!"
+
+#: ../move/tree/mdk_totem:77
 #, c-format
 msgid ""
 "You can't use another CDROM when the following programs are running: \n"
@@ -305,22 +327,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 "Escolliu un servidor X"
 
-#: Xconfig/card.pm:184
+#: Xconfig/card.pm:188
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Configuració Multi-head"
 
-#: Xconfig/card.pm:185
+#: Xconfig/card.pm:189
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -329,82 +351,82 @@ msgstr ""
 "El vostre sistema permet l'ús d'una configuració de múltiples capçals.\n"
 "Què voleu fer?"
 
-#: Xconfig/card.pm:251
+#: Xconfig/card.pm:255
 #, c-format
-msgid "Can't install XFree package: %s"
-msgstr "No es pot instal·lar el paquet XFree: %s"
+msgid "Can't install Xorg package: %s"
+msgstr "No es pot instal·lar el paquet Xorg: %s"
 
-#: Xconfig/card.pm:261
+#: Xconfig/card.pm:265
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Seleccioneu la mida de la memòria de la vostra targeta gràfica"
 
-#: Xconfig/card.pm:332
+#: Xconfig/card.pm:352
 #, c-format
-msgid "XFree configuration"
-msgstr "Configuració de l'XFree"
+msgid "Xorg configuration"
+msgstr "Configuració de l'Xorg"
 
-#: Xconfig/card.pm:334
+#: Xconfig/card.pm:354
 #, c-format
-msgid "Which configuration of XFree do you want to have?"
-msgstr "Quina configuració de l'XFree voleu tenir?"
+msgid "Which configuration of Xorg do you want to have?"
+msgstr "Quina configuració de l'Xorg voleu tenir?"
 
-#: Xconfig/card.pm:367
+#: Xconfig/card.pm:387
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Configura tots els capçals independentment"
 
-#: Xconfig/card.pm:368
+#: Xconfig/card.pm:388
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Utilitza l'extensió Xinerama"
 
-#: Xconfig/card.pm:373
+#: Xconfig/card.pm:393
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Configura només la targeta \"%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"
+msgid "Xorg %s with 3D hardware acceleration"
 msgstr "Xfree %s amb acceleració 3D de maquinari"
 
-#: Xconfig/card.pm:394
+#: Xconfig/card.pm:414
 #, c-format
-msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgid "Your card can have 3D hardware acceleration support with Xorg %s."
 msgstr ""
 "La vostra targeta pot tenir acceleració 3D de maquinari amb l'Xfree %s."
 
-#: Xconfig/card.pm:400
+#: Xconfig/card.pm:420
 #, c-format
-msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
-msgstr "XFree %s amb acceleració 3D de maquinari EXPERIMENTAL"
+msgid "Xorg %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "Xorg %s amb acceleració 3D de maquinari EXPERIMENTAL"
 
-#: 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 ""
 "La vostra targeta pot tenir acceleració 3D de maquinari amb l'Xfree %s,\n"
 "TINGUEU EN COMPTE QUE ES TRACTA D'UN SUPORT EXPERIMENTAL; L'ORDINADOR ES POT "
 "PENJAR."
 
-#: 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 "Personalitzada"
 
-#: 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 "Surt"
@@ -414,12 +436,12 @@ msgstr "Surt"
 msgid "Graphic Card"
 msgstr "Targeta 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ó"
@@ -429,14 +451,19 @@ msgstr "Resolució"
 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 "Opcions"
 
-#: Xconfig/main.pm:177
+#: Xconfig/main.pm:167
+#, c-format
+msgid "Your Xorg configuration file is broken, we will ignore it."
+msgstr ""
+
+#: Xconfig/main.pm:184
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -449,38 +476,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: Xconfig/monitor.pm:107
-#, fuzzy, c-format
+#: Xconfig/monitor.pm:111
+#, c-format
 msgid "Choose a monitor for head #%d"
-msgstr "Escolliu un monitor"
+msgstr ""
 
-#: Xconfig/monitor.pm:107
+#: Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Escolliu 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èric"
 
-#: 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 "Venedor"
 
-#: Xconfig/monitor.pm:125
+#: Xconfig/monitor.pm:129
 #, c-format
 msgid "Plug'n Play probing failed. Please select the correct monitor"
 msgstr "L'exploració Plug'n'Play ha fallat. Especifiqueu un monitor"
 
-#: Xconfig/monitor.pm:130
+#: Xconfig/monitor.pm:134
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -504,12 +531,12 @@ msgstr ""
 "el podríeu fer malbé.\n"
 "En cas de dubte, sigueu conservador amb aquest paràmetre."
 
-#: Xconfig/monitor.pm:137
+#: Xconfig/monitor.pm:141
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Velocitat de refresc horitzontal"
 
-#: Xconfig/monitor.pm:138
+#: Xconfig/monitor.pm:142
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Velocitat de refresc vertical"
@@ -534,59 +561,61 @@ msgstr "65.536 colors (16 bits)"
 msgid "16 million colors (24 bits)"
 msgstr "16 milions de colors (24 bits)"
 
-#: Xconfig/resolution_and_depth.pm:130
+#: Xconfig/resolution_and_depth.pm:135
 #, c-format
 msgid "Resolutions"
 msgstr "Resolucions"
 
-#: Xconfig/resolution_and_depth.pm:264
+#: Xconfig/resolution_and_depth.pm:270
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Escolliu la resolució i la profunditat de color"
 
-#: Xconfig/resolution_and_depth.pm:265
+#: Xconfig/resolution_and_depth.pm:271
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Targeta 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 "D'acord"
 
-#: 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 "Cancel·la"
 
 #
-#: 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 "Ajuda"
@@ -680,8 +709,8 @@ msgstr "Resolució: %s\n"
 
 #: Xconfig/various.pm:43
 #, c-format
-msgid "XFree86 driver: %s\n"
-msgstr "Controlador de l'XFree86: %s\n"
+msgid "Xorg driver: %s\n"
+msgstr "Controlador de l'Xorg: %s\n"
 
 #: Xconfig/various.pm:72
 #, c-format
@@ -692,12 +721,12 @@ msgstr "Interfície gràfica a l'inici"
 #, 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 ""
 "Puc configurar el vostre ordinador de manera que executi automàticament la "
 "interfície gràfica durant l'arrencada.\n"
-"Voleu que XFree s'iniciï quan torneu a arrencar l'ordinador?"
+"Voleu que Xorg s'iniciï quan torneu a arrencar l'ordinador?"
 
 #: Xconfig/various.pm:87
 #, c-format
@@ -725,20 +754,57 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr "Quina norma segueix el vostre televisor?"
 
-#: 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 "Espereu si us plau"
 
-#: any.pm:103
+#: any.pm:116
 #, c-format
 msgid "Bootloader installation in progress"
 msgstr "Instal·lació del carregador de l'arrencada en curs"
 
-#: any.pm:142
+#: any.pm:127
+#, c-format
+msgid ""
+"LILO wants to assign a new Volume ID to drive %s.  However, changing\n"
+"the Volume ID of a Windows NT, 2000, or XP boot disk is a fatal Windows "
+"error.\n"
+"This caution does not apply to Windows 95 or 98, or to NT data disks.\n"
+"\n"
+"Assign a new Volume ID?"
+msgstr ""
+
+#: any.pm:138
+#, c-format
+msgid "Installation of bootloader failed. The following error occurred:"
+msgstr ""
+"Ha fallat la instal·lació del carregador de l'arrencada. S'ha produït "
+"l'error següent:"
+
+#: 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 ""
+"Potser us caldrà canviar el dispositiu d'arrencada Open Firmware per\n"
+"habilitar el carregador de l'arrencada. Si no veieu l'indicador del\n"
+"carregador de l'arrencada en tornar a arrencar, premeu\n"
+"Command-Option-O-F en tornar a arrencar i introduïu:\n"
+" setenv boot-device %s,\\\\:tbxi\n"
+" Després, escriviu: shut-down\n"
+"En l'arrencada següent heu de veure l'indicador del carregador de "
+"l'arrencada."
+
+#: any.pm:181
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -753,62 +819,52 @@ msgstr ""
 "\n"
 "En quina unitat arrenqueu?"
 
-#: 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 de la unitat (MBR)"
 
-#: any.pm:166
+#: any.pm:205
 #, c-format
 msgid "First sector of the root partition"
 msgstr "Primer sector de la partició de root"
 
-#: any.pm:168
+#: any.pm:207
 #, c-format
 msgid "On Floppy"
 msgstr "En el disquet"
 
-#: 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 "Omet"
 
-#: any.pm:175
-#, c-format
-msgid "SILO Installation"
-msgstr "Instal·lació del SILO"
-
-#: any.pm:175
+#: any.pm:213
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "Instal·lació del LILO/grub"
 
-#: any.pm:176
+#: any.pm:214
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "On voleu instal·lar el carregador de l'arrencada?"
 
-#: any.pm:197
-#, c-format
-msgid "First sector of boot partition"
-msgstr "Primer sector de la partició d'arrencada"
-
-#: any.pm:209
+#: any.pm:239 standalone/drakboot:307
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "Configuració del tipus d'arrencada"
 
-#: any.pm:211 any.pm:248
+#: any.pm:241 any.pm:275
 #, c-format
 msgid "Bootloader main options"
 msgstr "Opcions principals del carregador de l'arrencada"
 
-#: any.pm:215
+#: any.pm:245
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "Introduïu la mida 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"
@@ -816,214 +872,209 @@ msgstr ""
 "L'opció \"Limita les opcions de la línia d'ordres\" no té cap utilitat sense "
 "una contrasenya"
 
-#: 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 "Les contrasenyes no coincideixen"
 
-#: 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 "Si us plau, torneu-ho a intentar"
 
-#: any.pm:223 any.pm:251 help.pm:768
+#: any.pm:253 any.pm:278
 #, c-format
 msgid "Bootloader to use"
 msgstr "Carregador de l'arrencada a utilitzar"
 
-#: any.pm:225
-#, c-format
-msgid "Bootloader installation"
-msgstr "Instal·lació del carregador de l'arrencada"
-
-#: any.pm:227 any.pm:253 help.pm:768
+#: any.pm:255 any.pm:280
 #, c-format
 msgid "Boot device"
 msgstr "Dispositiu d'arrencada"
 
-#: any.pm:229
+#: any.pm:257
 #, c-format
 msgid "Delay before booting default image"
 msgstr "Demora abans d'arrencar la imatge predeterminada"
 
-#: any.pm:230 help.pm:768
+#: any.pm:258
 #, c-format
 msgid "Enable ACPI"
 msgstr "Habilita l'ACPI"
 
-#: any.pm:232 help.pm:768
+#: any.pm:260
 #, c-format
 msgid "Force no APIC"
 msgstr "Imposa No APIC"
 
-#: any.pm:234
+#: any.pm:262
 #, c-format
 msgid "Force No Local APIC"
 msgstr "Imposa No 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 "Contrasenya"
 
-#: 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 "Contrasenya (un altre cop)"
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "Restrict command line options"
 msgstr "Limita les opcions de la línia d'ordres"
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "restrict"
 msgstr "limita"
 
-#: any.pm:240
+#: any.pm:268
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "Buida /tmp en cada arrencada"
 
-#: any.pm:241
+#: any.pm:269
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Mida exacta de la RAM, si cal (s'han trobat %d MB)"
 
-#: any.pm:243
-#, c-format
-msgid "Enable multiple profiles"
-msgstr "Habilita perfils múltiples"
-
-#: any.pm:252
+#: any.pm:279
 #, c-format
 msgid "Init Message"
 msgstr "Missatge d'inicialització"
 
-#: any.pm:254
+#: any.pm:281
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "Demora per al firmware obert"
 
-#: any.pm:255
+#: any.pm:282
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "Temps màxim d'arrencada del nucli"
 
-#: any.pm:256
+#: any.pm:283
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "Voleu habilitar l'arrencada des de CD?"
 
-#: any.pm:257
+#: any.pm:284
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "Voleu habilitar l'arrencada des d'OF?"
 
-#: any.pm:258
+#: any.pm:285
 #, c-format
 msgid "Default OS?"
 msgstr "SO per defecte?"
 
-#: any.pm:302
+#: any.pm:338
 #, c-format
 msgid "Image"
 msgstr "Imatge"
 
-#: any.pm:303 any.pm:312
+#: any.pm:339 any.pm:349
 #, c-format
 msgid "Root"
 msgstr "Arrel"
 
-#: any.pm:304 any.pm:325
+#: any.pm:340 any.pm:362
 #, c-format
 msgid "Append"
 msgstr "Afegeix"
 
-#: any.pm:306
+#: any.pm:342 standalone/drakboot:309 standalone/drakboot:313
 #, c-format
 msgid "Video mode"
 msgstr "Mode 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 xarxa"
+
+#: 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 "Predeterminat"
 
-#: any.pm:326
+#: any.pm:363
 #, c-format
 msgid "Initrd-size"
 msgstr "Initrd-size"
 
-#: any.pm:328
+#: any.pm:365
 #, c-format
 msgid "NoVideo"
 msgstr "NoVideo"
 
-#: any.pm:339
+#: any.pm:376
 #, c-format
 msgid "Empty label not allowed"
 msgstr "No es permet una etiqueta buida"
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "Heu d'especificar una imatge del nucli"
 
 #
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a root partition"
 msgstr "Heu d'especificar una partició arrel"
 
-#: any.pm:341
+#: any.pm:378
 #, c-format
 msgid "This label is already used"
 msgstr "Aquesta etiqueta ja està en ús"
 
-#: any.pm:354
+#: any.pm:392
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "Quin tipus d'entrada voleu afegir?"
 
-#: 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 "Un altre SO (SunOS...)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "Un altre SO (MacOS...)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "Un altre SO (Windows...)"
 
-#: any.pm:384
+#: any.pm:422
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -1032,74 +1083,74 @@ msgstr ""
 "Aquestes són les diferents entrades en el menú d'arrencada.\n"
 "Podeu afegir-ne més o canviar-ne les existents."
 
-#: any.pm:516
+#: any.pm:572
 #, c-format
 msgid "access to X programs"
 msgstr "accés a programes X"
 
-#: any.pm:517
+#: any.pm:573
 #, c-format
 msgid "access to rpm tools"
 msgstr "accés a les eines rpm"
 
-#: any.pm:518
+#: any.pm:574
 #, c-format
 msgid "allow \"su\""
 msgstr "permet \"su\""
 
-#: any.pm:519
+#: any.pm:575
 #, c-format
 msgid "access to administrative files"
 msgstr "accés a fitxers administratius"
 
-#: any.pm:520
+#: any.pm:576
 #, c-format
 msgid "access to network tools"
 msgstr "accés a les eines de xarxa"
 
-#: any.pm:521
+#: any.pm:577
 #, c-format
 msgid "access to compilation tools"
 msgstr "accés a les eines de compilació"
 
-#: any.pm:527
+#: any.pm:582
 #, c-format
 msgid "(already added %s)"
 msgstr "(ja s'ha afegit %s)"
 
-#: any.pm:532
+#: any.pm:587
 #, c-format
 msgid "This password is too simple"
 msgstr "Aquesta contrasenya és massa senzilla"
 
-#: any.pm:533
+#: any.pm:588
 #, c-format
 msgid "Please give a user name"
 msgstr "Si us plau, introduïu un nom d'usuari"
 
-#: any.pm:534
+#: any.pm:589
 #, c-format
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 "El nom d'usuari només pot contenir lletres en minúscula, números, '-' i '_'"
 
-#: any.pm:535
+#: any.pm:590
 #, c-format
 msgid "The user name is too long"
 msgstr "El nom d'usuari és massa llarg"
 
-#: any.pm:536
+#: any.pm:591
 #, c-format
 msgid "This user name has already been added"
 msgstr "Aquest nom d'usuari ja s'ha afegit"
 
-#: any.pm:540
+#: any.pm:595
 #, c-format
 msgid "Add user"
 msgstr "Afegeix un usuari"
 
-#: any.pm:541
+#: any.pm:596
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -1108,77 +1159,81 @@ msgstr ""
 "Introduïu un usuari\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 "Fet"
 
-#: any.pm:545 help.pm:52
+#: any.pm:600 help.pm:51
 #, c-format
 msgid "Accept user"
 msgstr "Accepta l'usuari"
 
-#: any.pm:556
+#: any.pm:611
 #, c-format
 msgid "Real name"
 msgstr "Nom real"
 
-#: 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 "Nom d'usuari"
+msgid "Login name"
+msgstr "Nom d'accés"
 
-#: any.pm:560
+#: any.pm:615
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: any.pm:562
+#: any.pm:617
 #, c-format
 msgid "Icon"
 msgstr "Icona"
 
-#: any.pm:603 security/l10n.pm:14
+#: any.pm:664 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "Entrada automàtica"
 
 #
-#: any.pm:604
+#: any.pm:665
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr ""
 "Puc configurar el vostre ordinador de manera que entri automàticament amb un "
 "nom d'usuari."
 
-#: any.pm:605 help.pm:52
+#: any.pm:666 help.pm:51
 #, c-format
 msgid "Do you want to use this feature?"
 msgstr "Voleu utilitzar aquesta característica?"
 
-#: any.pm:606
+#: any.pm:667
 #, c-format
 msgid "Choose the default user:"
 msgstr "Escolliu l'usuari per defecte:"
 
-#: any.pm:607
+#: any.pm:668
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "Escolliu el gestor de finestres per executar:"
 
 #
-#: any.pm:619
+#: any.pm:680
 #, c-format
 msgid "Please choose a language to use."
 msgstr "Si us plau, trieu un idioma per utilitzar."
 
-#: any.pm:640
+#: any.pm:681
+#, c-format
+msgid "Language choice"
+msgstr ""
+
+#: any.pm:707
 #, c-format
 msgid ""
 "Mandrakelinux can support multiple languages. Select\n"
@@ -1189,50 +1244,59 @@ msgstr ""
 "els llenguatges que vulgueu instal·lar. Estaran disponibles\n"
 "quan reinicieu el sistema, després que la instal·lació s'hagi completat."
 
-#: any.pm:658 help.pm:660
+#: any.pm:725 help.pm:647
 #, c-format
 msgid "Use Unicode by default"
 msgstr "Utilitza Unicode per defecte"
 
-#: any.pm:659 help.pm:660
+#: any.pm:726 help.pm:647
 #, c-format
 msgid "All languages"
 msgstr "Tots els idiomes"
 
-#: 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ó"
 
-#: any.pm:699
+#: any.pm:766
 #, c-format
 msgid "Please choose your country."
 msgstr "Si us plau, seleccioneu el vostre país."
 
-#: any.pm:701
+#: any.pm:768
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "Aquesta és la llista completa de països"
 
-#: 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 "Altres països"
+
+#: any.pm:777
+#, c-format
+msgid "Input method:"
+msgstr "Mètode d'entrada:"
+
+#: any.pm:778 install_any.pm:420 printer/printerdrake.pm:99
+#, c-format
+msgid "None"
+msgstr "Cap"
 
 #
-#: any.pm:833
+#: any.pm:912
 #, c-format
 msgid "No sharing"
 msgstr "No es comparteix"
 
 #
-#: any.pm:833
+#: any.pm:912
 #, c-format
 msgid "Allow all users"
 msgstr "Permet tots els usuaris"
 
-#: any.pm:837
+#: any.pm:916
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1247,32 +1311,46 @@ msgstr ""
 "\n"
 "\"Personalitzat\" permet configurar cada usuari per separat.\n"
 
-#: any.pm:849
+#: any.pm:928
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
 "Windows."
 msgstr ""
+"NFS: el sistema de compartició de fitxers tradicional de Unix, amb menys "
+"suport a Mac i 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 de compartició de fitxers usat per Windows, Mac OS X i "
+"bastants sistemes Linux moderns."
 
-#: 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 "Podeu exportar utilitzant NFS o SMB. Seleccioneu quin voleu utilitzar."
 
-#: any.pm:883
+#: any.pm:964
 #, c-format
 msgid "Launch userdrake"
 msgstr "Executa 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 "Tanca"
+
+#: any.pm:966
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -1281,97 +1359,196 @@ msgstr ""
 "La compartició per usuari utilitza el grup \"fileshare\".\n"
 "Podeu utilitzar userdrake per a afegir un usuari a aquest grup."
 
-#
-#: authentication.pm:12
+#: authentication.pm:16
 #, c-format
-msgid "Local files"
-msgstr "Fitxers locals"
+msgid "Local file"
+msgstr "Fitxer 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 "Domini de Windows"
 
-#: authentication.pm:12
+#: authentication.pm:20
+#, c-format
+msgid "Active Directory with SFU"
+msgstr ""
+
+#: authentication.pm:21
+#, c-format
+msgid "Active Directory with Winbind"
+msgstr ""
+
+#
+#: authentication.pm:30
+#, c-format
+msgid "Local file:"
+msgstr "Fitxer local:"
+
+#: authentication.pm:30
+#, c-format
+msgid ""
+"Use local for all authentication and information user tell in local file"
+msgstr ""
+
+#: authentication.pm:31
+#, c-format
+msgid "LDAP:"
+msgstr "LDAP:"
+
+#: authentication.pm:31
+#, c-format
+msgid ""
+"Tells your computer to use LDAP for some or all authentication. LDAP "
+"consolidates certain types of information within your organization."
+msgstr ""
+
+#
+#: authentication.pm:32
+#, c-format
+msgid "NIS:"
+msgstr "NIS:"
+
+#: authentication.pm:32
+#, c-format
+msgid ""
+"Allows you to run a group of computers in the same Network Information "
+"Service domain with a common password and group file."
+msgstr ""
+
+#: authentication.pm:33
+#, c-format
+msgid "Windows Domain:"
+msgstr "Domini de Windows:"
+
+#: authentication.pm:33
+#, c-format
+msgid ""
+"Winbind allows the system to retrieve information and authenticate users in "
+"a Windows domain."
+msgstr ""
+
+#: authentication.pm:34
 #, c-format
-msgid "Active Directory"
+msgid "Active Directory with SFU:"
+msgstr ""
+
+#: authentication.pm:34 authentication.pm:35
+#, c-format
+msgid ""
+"Kerberos is a secure system for providing network authentication services."
+msgstr ""
+
+#: authentication.pm:35
+#, c-format
+msgid "Active Directory with Winbind:"
 msgstr ""
 
 #
-#: authentication.pm:38
+#: authentication.pm:60
 #, c-format
 msgid "Authentication LDAP"
 msgstr "Autenticació 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
-#, fuzzy, c-format
+#: authentication.pm:75 fsedit.pm:21
+#, c-format
+msgid "simple"
+msgstr "senzill"
+
+#: 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 ""
+
+#: authentication.pm:85 authentication.pm:123
+#, c-format
 msgid "Authentication Active Directory"
-msgstr "Mètode d'autenticació"
+msgstr ""
 
-#: authentication.pm:51 diskdrake/smbnfs_gtk.pm:181
+#: authentication.pm:86 authentication.pm:125 diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Domain"
 msgstr "Domini"
 
-#: 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 dades LDAP"
+
+#: authentication.pm:90
+#, c-format
+msgid "Use Anonymous BIND "
 msgstr ""
 
-#: authentication.pm:54
+#: authentication.pm:91
 #, c-format
 msgid "LDAP user allowed to browse the Active Directory"
 msgstr ""
 
-#: authentication.pm:55
-#, fuzzy, c-format
+#: authentication.pm:92
+#, c-format
 msgid "Password for user"
-msgstr "La contrasenya és necessària"
+msgstr ""
+
+#: authentication.pm:93
+#, c-format
+msgid "Encryption"
+msgstr "Xifrat"
 
 #
-#: authentication.pm:62
+#: authentication.pm:104
 #, c-format
 msgid "Authentication NIS"
 msgstr "Autenticació NIS"
 
-#: authentication.pm:63
+#: authentication.pm:105
 #, c-format
 msgid "NIS Domain"
 msgstr "Domini del 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 "
@@ -1401,22 +1578,32 @@ msgstr ""
 "L'ordre 'wbinfo -t' comprovarà si els secrets d'autenticació són bons."
 
 #
-#: authentication.pm:71
+#: authentication.pm:123
 #, c-format
 msgid "Authentication Windows Domain"
 msgstr "Autenticació en el domini de Windows"
 
-#: authentication.pm:73
+#: authentication.pm:128
 #, c-format
 msgid "Domain Admin User Name"
 msgstr "Nom d'usuari de l'administrador del domini"
 
-#: authentication.pm:74
+#: authentication.pm:129
 #, c-format
 msgid "Domain Admin Password"
 msgstr "Contrasenya de l'administrador del domini"
 
-#: authentication.pm:149
+#: authentication.pm:130
+#, c-format
+msgid "Use Idmap for store UID/SID "
+msgstr ""
+
+#: authentication.pm:131
+#, c-format
+msgid "Default Idmap "
+msgstr ""
+
+#: authentication.pm:231
 #, c-format
 msgid "Can't use broadcast with no NIS domain"
 msgstr "No es pot utilitzar la difusió sense un domini NIS"
@@ -1426,7 +1613,7 @@ msgstr "No es pot utilitzar la difusió sense un domini NIS"
 # so use only 7bit for this message (and do transliteration or
 # leave it in English, as it is the best for your language)
 #. -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"
@@ -1441,42 +1628,37 @@ msgstr ""
 "per arrencar en el sistema operatiu predeterminat.\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 amb menú gràfic"
 
-#: bootloader.pm:666 help.pm:768
+#: bootloader.pm:788
 #, c-format
 msgid "LILO with text menu"
 msgstr "LILO amb menú de text"
 
-#: 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 hi ha prou espai a /boot"
 
-#: bootloader.pm:1170
+#: bootloader.pm:1266
 #, c-format
 msgid "You can't install the bootloader on a %s partition\n"
 msgstr "No podeu instal·lar el carregador de l'arrencada a una partició %s\n"
 
-#: bootloader.pm:1214
+#: bootloader.pm:1311
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
@@ -1485,7 +1667,7 @@ msgstr ""
 "La configuració del vostre carregador d'arrencada s'ha d'actualitzar ja que "
 "la partició ha estat renumerada"
 
-#: bootloader.pm:1221
+#: bootloader.pm:1326
 #, c-format
 msgid ""
 "The bootloader can't be installed correctly. You have to boot rescue and "
@@ -1494,7 +1676,7 @@ msgstr ""
 "El carregador d'arrencada no s'ha pogut instal·lar correctament. Heu "
 "d'arrencar amb l'opció de rescat i escollir \"%s\""
 
-#: bootloader.pm:1222
+#: bootloader.pm:1327
 #, c-format
 msgid "Re-install Boot Loader"
 msgstr "Reinstal·la el carregador de l'arrencada"
@@ -1555,82 +1737,85 @@ msgstr "El kdesu no hi és"
 msgid "consolehelper missing"
 msgstr "El consolehelper no hi és"
 
-#: 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 "França"
 
-#: 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 Txeca"
 
-#: 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 "Alemanya"
 
 #
-#: 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 "Grècia"
 
 #
-#: 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 "Suècia"
 
-#: 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 "Països Baixos"
 
 #
-#: 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 "Itàlia"
 
 #
-#: 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 "Àustria"
 
-#: 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 "Estats Units"
 
-#: 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"
@@ -1644,67 +1829,61 @@ msgstr ""
 "que el servidor web està configurat com a servidor WebDAV). Si voleu afegir\n"
 "punts de muntatge WebDAV, seleccioneu \"Nou\"."
 
-#: diskdrake/dav.pm:27
+#: diskdrake/dav.pm:25
 #, c-format
 msgid "New"
 msgstr "Nou"
 
-#: 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 "Desmunta"
 
-#: 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 "Munta"
 
-#: 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 "Punt de muntatge"
 
 #
-#: diskdrake/dav.pm:85
+#: diskdrake/dav.pm:83
 #, c-format
 msgid "Please enter the WebDAV server URL"
 msgstr "Si us plau introduïu l'URL del servidor WebDAV"
 
-#: diskdrake/dav.pm:89
+#: diskdrake/dav.pm:87
 #, c-format
 msgid "The URL must begin with http:// or https://"
 msgstr "L'URL ha de començar per 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 "Punt de muntatge: "
 
-#: diskdrake/dav.pm:113 diskdrake/interactive.pm:1240
+#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1239
 #, c-format
 msgid "Options: %s"
 msgstr "Opcions: %s"
 
-#: diskdrake/hd_gtk.pm:96 diskdrake/interactive.pm:1000
-#: diskdrake/interactive.pm:1010 diskdrake/interactive.pm:1070
-#, c-format
-msgid "Read carefully!"
-msgstr "Llegiu-ho atentament!"
-
-#: diskdrake/hd_gtk.pm:96
+#: diskdrake/hd_gtk.pm:95
 #, c-format
 msgid "Please make a backup of your data first"
 msgstr "Si us plau, feu primer una còpia de seguretat de les vostres dades"
 
-#: 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 "
@@ -1714,17 +1893,17 @@ msgstr ""
 "Si penseu utilitzar aboot, assegureu-vos de deixar espai lliure (amb 2048\n"
 "sectors n'hi ha prou) al començament del disc"
 
-#: diskdrake/hd_gtk.pm:156 help.pm:544
+#: diskdrake/hd_gtk.pm:155 help.pm:530
 #, c-format
 msgid "Wizard"
 msgstr "Auxiliar"
 
-#: diskdrake/hd_gtk.pm:189
+#: diskdrake/hd_gtk.pm:188
 #, c-format
 msgid "Choose action"
 msgstr "Trieu una acció"
 
-#: diskdrake/hd_gtk.pm:193
+#: diskdrake/hd_gtk.pm:192
 #, c-format
 msgid ""
 "You have one big Microsoft Windows partition.\n"
@@ -1735,188 +1914,194 @@ msgstr ""
 "Suggereixo que primer en canvieu la mida\n"
 "(feu-hi clic i després feu clic a \"Canvia la mida\")"
 
-#: diskdrake/hd_gtk.pm:195
+#: diskdrake/hd_gtk.pm:194
 #, c-format
 msgid "Please click on a partition"
 msgstr "Si us plau, feu clic a una partició "
 
-#: 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 "Detalls"
 
 #
-#: diskdrake/hd_gtk.pm:255
+#: diskdrake/hd_gtk.pm:254
 #, c-format
 msgid "No hard drives found"
 msgstr "No s'ha trobat cap disc dur!"
 
-#: 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 "Journalised FS"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Swap"
 msgstr "Intercanvi"
 
-#: 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 "Altres"
 
-#: diskdrake/hd_gtk.pm:327 diskdrake/interactive.pm:1172
+#: diskdrake/hd_gtk.pm:326 diskdrake/interactive.pm:1172
 #, c-format
 msgid "Empty"
 msgstr "Buit"
 
-#: diskdrake/hd_gtk.pm:331
+#: diskdrake/hd_gtk.pm:330
 #, c-format
 msgid "Filesystem types:"
 msgstr "Tipus de sistema de fitxers:"
 
-#: 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 "Utilitzeu \"%s\" al seu lloc"
 
-#: 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 "Tipus"
 
-#: diskdrake/hd_gtk.pm:348 diskdrake/interactive.pm:436
+#: diskdrake/hd_gtk.pm:347 diskdrake/interactive.pm:441
 #, c-format
 msgid "Create"
 msgstr "Crea"
 
 #. -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 "Suprimeix"
 
-#: diskdrake/hd_gtk.pm:353
+#: diskdrake/hd_gtk.pm:352
 #, c-format
 msgid "Use ``Unmount'' first"
 msgstr "Utilitzeu primer \"Unmount\""
 
 #
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose another partition"
 msgstr "Trieu una altra partició"
 
 #
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose a partition"
 msgstr "Trieu una partició"
 
 #
-#: diskdrake/interactive.pm:213
+#: diskdrake/interactive.pm:216
 #, c-format
 msgid "Exit"
 msgstr "Surt"
 
-#: diskdrake/interactive.pm:246 help.pm:544
+#: diskdrake/interactive.pm:249 help.pm:530
 #, c-format
 msgid "Undo"
 msgstr "Desfés"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to normal mode"
 msgstr "Canvia al mode normal"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to expert mode"
 msgstr "Canvia al mode expert"
 
-#: diskdrake/interactive.pm:265
+#: diskdrake/interactive.pm:268
 #, c-format
 msgid "Continue anyway?"
 msgstr "Voleu continuar igualment?"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without saving"
 msgstr "Surt sense desar"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without writing the partition table?"
 msgstr "Voleu sortir sense escriure la taula de particions?"
 
 #
-#: diskdrake/interactive.pm:275
+#: diskdrake/interactive.pm:278
 #, c-format
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "Voleu desar les modificacions a /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 ""
 "Us caldrà tornar a arrencar per tal que les modificacions de la taula de "
 "particions tinguin efecte"
 
-#: diskdrake/interactive.pm:295 help.pm:544
+#: diskdrake/interactive.pm:298 help.pm:530
 #, c-format
 msgid "Clear all"
 msgstr "Buida-ho tot"
 
-#: diskdrake/interactive.pm:296 help.pm:544
+#: diskdrake/interactive.pm:299 help.pm:530
 #, c-format
 msgid "Auto allocate"
 msgstr "Assigna automàticament"
 
+#: 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:302
+#: diskdrake/interactive.pm:305
 #, c-format
 msgid "Hard drive information"
 msgstr "Informació del disc dur"
 
-#: diskdrake/interactive.pm:334
+#: diskdrake/interactive.pm:337
 #, c-format
 msgid "All primary partitions are used"
 msgstr "S'utilitzen totes les particions primàries"
 
-#: diskdrake/interactive.pm:335
+#: diskdrake/interactive.pm:338
 #, c-format
 msgid "I can't add any more partitions"
 msgstr "No es pot afegir cap més partició"
 
-#: 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 "
@@ -1926,40 +2111,40 @@ msgstr ""
 "ampliada"
 
 #
-#: diskdrake/interactive.pm:347 help.pm:544
+#: diskdrake/interactive.pm:350 help.pm:530
 #, c-format
 msgid "Save partition table"
 msgstr "Escriu la taula de particions"
 
 #
-#: diskdrake/interactive.pm:348 help.pm:544
+#: diskdrake/interactive.pm:351 help.pm:530
 #, c-format
 msgid "Restore partition table"
 msgstr "Restaura la taula de particions"
 
-#: diskdrake/interactive.pm:349 help.pm:544
+#: diskdrake/interactive.pm:352 help.pm:530
 #, c-format
 msgid "Rescue partition table"
 msgstr "Recupera la taula de particions"
 
 #
-#: diskdrake/interactive.pm:351 help.pm:544
+#: diskdrake/interactive.pm:354 help.pm:530
 #, c-format
 msgid "Reload partition table"
 msgstr "Torna a carregar la taula de particions"
 
 #
-#: diskdrake/interactive.pm:353
+#: diskdrake/interactive.pm:356
 #, c-format
 msgid "Removable media automounting"
 msgstr "Muntatge automàtic dels dispositius extraïbles"
 
-#: diskdrake/interactive.pm:362 diskdrake/interactive.pm:382
+#: diskdrake/interactive.pm:365 diskdrake/interactive.pm:385
 #, c-format
 msgid "Select file"
 msgstr "Seleccioneu el fitxer"
 
-#: diskdrake/interactive.pm:369
+#: diskdrake/interactive.pm:372
 #, c-format
 msgid ""
 "The backup partition table has not the same size\n"
@@ -1968,23 +2153,23 @@ msgstr ""
 "La còpia de seguretat de la taula de particions no té la mateixa mida\n"
 "Voleu continuar igualment?"
 
-#: 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 "Advertència"
 
-#: diskdrake/interactive.pm:384
+#: diskdrake/interactive.pm:387
 #, c-format
 msgid ""
 "Insert a floppy in drive\n"
@@ -1993,94 +2178,94 @@ msgstr ""
 "Inseriu un disquet a la unitat\n"
 "Se'n perdran totes les dades"
 
-#: diskdrake/interactive.pm:395
+#: diskdrake/interactive.pm:398
 #, c-format
 msgid "Trying to rescue partition table"
 msgstr "S'està intentant recuperar la taula de particions"
 
 #
-#: diskdrake/interactive.pm:401
+#: diskdrake/interactive.pm:404
 #, c-format
 msgid "Detailed information"
 msgstr "Informació detallada"
 
-#: diskdrake/interactive.pm:416 diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:419 diskdrake/interactive.pm:717
 #, c-format
 msgid "Resize"
 msgstr "Canvia la mida"
 
-#: diskdrake/interactive.pm:417 diskdrake/interactive.pm:779
+#: diskdrake/interactive.pm:420 diskdrake/interactive.pm:783
 #, c-format
 msgid "Move"
 msgstr "Mou"
 
-#: diskdrake/interactive.pm:418
+#: diskdrake/interactive.pm:421
 #, c-format
 msgid "Format"
 msgstr "Formata"
 
-#: diskdrake/interactive.pm:420
+#: diskdrake/interactive.pm:423
 #, c-format
 msgid "Add to RAID"
 msgstr "Afegeix al RAID"
 
-#: diskdrake/interactive.pm:421
+#: diskdrake/interactive.pm:424
 #, c-format
 msgid "Add to LVM"
 msgstr "Afegeix a l'LVM"
 
-#: diskdrake/interactive.pm:424
+#: diskdrake/interactive.pm:427
 #, c-format
 msgid "Remove from RAID"
 msgstr "Elimina del RAID"
 
-#: diskdrake/interactive.pm:425
+#: diskdrake/interactive.pm:428
 #, c-format
 msgid "Remove from LVM"
 msgstr "Elimina de l'LVM"
 
-#: diskdrake/interactive.pm:426
+#: diskdrake/interactive.pm:429
 #, c-format
 msgid "Modify RAID"
 msgstr "Modifica el RAID"
 
-#: diskdrake/interactive.pm:427
+#: diskdrake/interactive.pm:430
 #, c-format
 msgid "Use for loopback"
 msgstr "Utilitza per a loopback"
 
-#: diskdrake/interactive.pm:467
+#: diskdrake/interactive.pm:472
 #, c-format
 msgid "Create a new partition"
 msgstr "Crea una nova partició"
 
-#: diskdrake/interactive.pm:470
+#: diskdrake/interactive.pm:475
 #, c-format
 msgid "Start sector: "
 msgstr "Sector d'inici: "
 
-#: diskdrake/interactive.pm:472 diskdrake/interactive.pm:881
+#: diskdrake/interactive.pm:477 diskdrake/interactive.pm:884
 #, c-format
 msgid "Size in MB: "
 msgstr "Mida en MB: "
 
-#: diskdrake/interactive.pm:473 diskdrake/interactive.pm:882
+#: diskdrake/interactive.pm:478 diskdrake/interactive.pm:885
 #, c-format
 msgid "Filesystem type: "
 msgstr "Tipus de sistema de fitxers: "
 
-#: diskdrake/interactive.pm:478
+#: diskdrake/interactive.pm:483
 #, c-format
 msgid "Preference: "
 msgstr "Preferència: "
 
 #
-#: diskdrake/interactive.pm:481
+#: diskdrake/interactive.pm:486
 #, c-format
 msgid "Logical volume name "
 msgstr "Nom del volum lògic"
 
-#: diskdrake/interactive.pm:510
+#: diskdrake/interactive.pm:515
 #, c-format
 msgid ""
 "You can't create a new partition\n"
@@ -2092,44 +2277,44 @@ msgstr ""
 "Esborreu primer una partició primària i creeu una partició ampliada."
 
 #
-#: diskdrake/interactive.pm:540
+#: diskdrake/interactive.pm:545
 #, c-format
 msgid "Remove the loopback file?"
 msgstr "Voleu suprimir el fitxer 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 ""
 "Després de canviar el tipus de la partició %s, se'n perdran totes les dades"
 
-#: diskdrake/interactive.pm:570
+#: diskdrake/interactive.pm:576
 #, c-format
 msgid "Change partition type"
 msgstr "Canvia el tipus de partició"
 
-#: 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 "Quin sistema de fitxers voleu?"
 
-#: diskdrake/interactive.pm:579
+#: diskdrake/interactive.pm:585
 #, c-format
 msgid "Switching from ext2 to ext3"
 msgstr "S'està canviant 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 "On voleu muntar el fitxer de loopback %s?"
 
-#: diskdrake/interactive.pm:609
+#: diskdrake/interactive.pm:615
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "On voleu muntar el dispositiu %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"
@@ -2138,50 +2323,50 @@ msgstr ""
 "No es pot anul·lar el punt de muntatge, perquè aquesta partició\n"
 "s'utilitza per al loopback. Elimineu primer el loopback"
 
-#: diskdrake/interactive.pm:639
+#: diskdrake/interactive.pm:645
 #, c-format
 msgid "Where do you want to mount %s?"
 msgstr "On voleu muntar %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 "S'està canviant la mida"
 
-#: diskdrake/interactive.pm:663
+#: diskdrake/interactive.pm:669
 #, c-format
 msgid "Computing FAT filesystem bounds"
 msgstr "S'estan calculant els límits del sistema de fitxers de la FAT"
 
-#: diskdrake/interactive.pm:699
+#: diskdrake/interactive.pm:705
 #, c-format
 msgid "This partition is not resizeable"
 msgstr "No es pot canviar la mida d'aquesta partició"
 
-#: diskdrake/interactive.pm:704
+#: diskdrake/interactive.pm:710
 #, c-format
 msgid "All data on this partition should be backed-up"
 msgstr "Cal fer una còpia de seguretat de totes les dades d'aquesta partició"
 
-#: diskdrake/interactive.pm:706
+#: diskdrake/interactive.pm:712
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr ""
 "Després de canviar la mida de la partició %s, se'n perdran totes les dades"
 
-#: diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:717
 #, c-format
 msgid "Choose the new size"
 msgstr "Escolliu la nova mida"
 
 #
-#: diskdrake/interactive.pm:712
+#: diskdrake/interactive.pm:718
 #, c-format
 msgid "New size in MB: "
 msgstr "Nova mida 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"
@@ -2192,152 +2377,147 @@ msgstr ""
 "les comprovacions del sistema de fitxers es realitzaran el proper cop que "
 "arrenqueu 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 quin disc ho voleu moure?"
 
-#: 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 quin sector ho voleu moure?"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving"
 msgstr "S'està movent"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving partition..."
 msgstr "S'està movent la partició..."
 
-#: diskdrake/interactive.pm:807
+#: diskdrake/interactive.pm:810
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Escolliu un RAID existent al qual afegir-ho"
 
-#: diskdrake/interactive.pm:808 diskdrake/interactive.pm:825
+#: diskdrake/interactive.pm:812 diskdrake/interactive.pm:828
 #, c-format
 msgid "new"
 msgstr "nou"
 
-#: diskdrake/interactive.pm:823
+#: diskdrake/interactive.pm:826
 #, c-format
 msgid "Choose an existing LVM to add to"
 msgstr "Escolliu un LVM existent al qual afegir-ho"
 
-#: diskdrake/interactive.pm:829
+#: diskdrake/interactive.pm:832
 #, c-format
 msgid "LVM name?"
 msgstr "Nom LVM?"
 
-#: diskdrake/interactive.pm:866
+#: diskdrake/interactive.pm:869
 #, c-format
 msgid "This partition can't be used for loopback"
 msgstr "Aquesta partició no es pot utilitzar per al 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 "Nom del fitxer de loopback: "
 
 #
-#: diskdrake/interactive.pm:885
+#: diskdrake/interactive.pm:888
 #, c-format
 msgid "Give a file name"
 msgstr "Proporcioneu un nom de fitxer"
 
-#: diskdrake/interactive.pm:888
+#: diskdrake/interactive.pm:891
 #, c-format
 msgid "File is already used by another loopback, choose another one"
 msgstr "Un altre loopback ja està utilitzant el fitxer, escolliu-ne un altre"
 
-#: diskdrake/interactive.pm:889
+#: diskdrake/interactive.pm:892
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "El fitxer ja existeix. El voleu utilitzar?"
 
 #
-#: diskdrake/interactive.pm:912
+#: diskdrake/interactive.pm:915
 #, c-format
 msgid "Mount options"
 msgstr "Opcions de muntatge"
 
-#: diskdrake/interactive.pm:919
+#: diskdrake/interactive.pm:922
 #, c-format
 msgid "Various"
 msgstr "Diversos"
 
-#: diskdrake/interactive.pm:983
+#: diskdrake/interactive.pm:987
 #, c-format
 msgid "device"
 msgstr "dispositiu"
 
-#: diskdrake/interactive.pm:984
+#: diskdrake/interactive.pm:988
 #, c-format
 msgid "level"
 msgstr "nivell"
 
-#: diskdrake/interactive.pm:985
+#: diskdrake/interactive.pm:989
 #, c-format
-msgid "chunk size"
-msgstr "mida del fragment"
+msgid "chunk size in KiB"
+msgstr "mida del fragment en KB"
 
-#: diskdrake/interactive.pm:1001
+#: diskdrake/interactive.pm:1006
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "Aneu amb compte: aquesta operació és perillosa."
 
-#: diskdrake/interactive.pm:1016
+#: diskdrake/interactive.pm:1021
 #, c-format
 msgid "What type of partitioning?"
 msgstr "Quin tipus de particionament voleu?"
 
-#: diskdrake/interactive.pm:1032
-#, c-format
-msgid "The package %s is needed. Install it?"
-msgstr "Cal instal·lar el paquet %s. Voleu instal·lar-lo?"
-
-#: diskdrake/interactive.pm:1061
+#: diskdrake/interactive.pm:1059
 #, c-format
 msgid "You'll need to reboot before the modification can take place"
 msgstr ""
 "Us caldrà tornar a arrencar per tal que les modificacions tinguin efecte"
 
-#: diskdrake/interactive.pm:1070
+#: diskdrake/interactive.pm:1068
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "La taula de particions de la unitat %s s'escriurà al disc!"
 
-#: diskdrake/interactive.pm:1083
+#: diskdrake/interactive.pm:1081
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Després de formatar la partició %s, se'n perdran totes les dades"
 
 #
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Move files to the new partition"
 msgstr "Mou els fitxers a la nova partició"
 
 #
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Hide files"
 msgstr "Fitxers ocults"
 
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1102
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
@@ -2347,53 +2527,53 @@ msgstr ""
 "(%s)"
 
 #
-#: diskdrake/interactive.pm:1112
+#: diskdrake/interactive.pm:1113
 #, c-format
 msgid "Moving files to the new partition"
 msgstr "S'estan movent els fitxers a la nova partició"
 
-#: diskdrake/interactive.pm:1116
+#: diskdrake/interactive.pm:1117
 #, c-format
 msgid "Copying %s"
 msgstr "S'està copiant %s"
 
-#: diskdrake/interactive.pm:1120
+#: diskdrake/interactive.pm:1121
 #, c-format
 msgid "Removing %s"
 msgstr "S'està esborrant %s"
 
-#: diskdrake/interactive.pm:1134
+#: diskdrake/interactive.pm:1135
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr "la partició %s ara és %s"
 
-#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1217
+#: diskdrake/interactive.pm:1156 diskdrake/interactive.pm:1217
 #, c-format
 msgid "Device: "
 msgstr "Dispositiu: "
 
-#: diskdrake/interactive.pm:1156
-#, fuzzy, c-format
+#: diskdrake/interactive.pm:1157
+#, c-format
 msgid "Devfs name: "
-msgstr "Nom de l'ordinador: "
+msgstr "Nom devfs: "
 
-#: diskdrake/interactive.pm:1157
+#: diskdrake/interactive.pm:1158
 #, c-format
 msgid "Volume label: "
 msgstr ""
 
-#: diskdrake/interactive.pm:1158
+#: diskdrake/interactive.pm:1159
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "Lletra d'unitat de DOS: %s (només és una suposició)\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 "Tipus: "
 
-#: diskdrake/interactive.pm:1166 install_steps_gtk.pm:341
+#: diskdrake/interactive.pm:1167 install_steps_gtk.pm:310
 #, c-format
 msgid "Name: "
 msgstr "Nom: "
@@ -2440,8 +2620,8 @@ msgstr "Muntat\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
@@ -2468,8 +2648,8 @@ msgstr "Nivell %s\n"
 
 #: diskdrake/interactive.pm:1190
 #, c-format
-msgid "Chunk size %s\n"
-msgstr "Mida del fragment %s\n"
+msgid "Chunk size %d KiB\n"
+msgstr "Mida del fragment %d KB\n"
 
 #: diskdrake/interactive.pm:1191
 #, c-format
@@ -2543,17 +2723,17 @@ msgid "on channel %d id %d\n"
 msgstr "al canal %d amb id %d\n"
 
 #
-#: diskdrake/interactive.pm:1257
+#: diskdrake/interactive.pm:1256
 #, c-format
 msgid "Filesystem encryption key"
 msgstr "Clau de xifratge del sistema de fitxers: "
 
-#: diskdrake/interactive.pm:1258
+#: diskdrake/interactive.pm:1257
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Escolliu la clau de xifratge del sistema de fitxers"
 
-#: 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 ""
@@ -2561,24 +2741,24 @@ msgstr ""
 "caràcters)"
 
 #
-#: diskdrake/interactive.pm:1262
+#: diskdrake/interactive.pm:1261
 #, c-format
 msgid "The encryption keys do not match"
 msgstr "Les claus de xifratge no coincideixen"
 
-#: 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 "Clau de xifratge"
 
-#: diskdrake/interactive.pm:1266
+#: diskdrake/interactive.pm:1265
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Clau de xifratge (un altre cop)"
 
 #
-#: diskdrake/removable.pm:47
+#: diskdrake/removable.pm:46
 #, c-format
 msgid "Change type"
 msgstr "Canvia el tipus"
@@ -2613,7 +2793,7 @@ msgstr ""
 "Introduïu el vostre nom d'usuari, la contrasenya i el nom de domini per "
 "accedir a aquesta màquina."
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3495
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3489
 #, c-format
 msgid "Username"
 msgstr "Nom d'usuari"
@@ -2630,28 +2810,73 @@ msgstr "Cerca servidors"
 msgid "Search new servers"
 msgstr "Cerca nous servidors"
 
-#: 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 "Cal instal·lar el paquet %s. Voleu instal·lar-lo?"
 
-#: do_pkgs.pm:26
+#: do_pkgs.pm:21 do_pkgs.pm:36
 #, c-format
 msgid "Mandatory package %s is missing"
 msgstr "El paquet %s necessari falta"
 
 #
-#: do_pkgs.pm:143
+#: do_pkgs.pm:172
 #, c-format
 msgid "Installing packages..."
 msgstr "S'estan instal·lant els paquets..."
 
-#: do_pkgs.pm:217
+#: do_pkgs.pm:216
 #, c-format
 msgid "Removing packages..."
 msgstr "S'estan eliminant els paquets..."
 
-#: fs.pm:416
+#: fs.pm:445 fs.pm:494
+#, c-format
+msgid "Mounting partition %s"
+msgstr "S'està muntant la partició %s"
+
+#: fs.pm:446 fs.pm:495
+#, c-format
+msgid "mounting partition %s in directory %s failed"
+msgstr "El muntatge de la partició %s en el directori %s ha fallat"
+
+#: fs.pm:466 fs.pm:473
+#, c-format
+msgid "Checking %s"
+msgstr "S'està comprovant %s"
+
+#: fs.pm:511 partition_table.pm:387
+#, c-format
+msgid "error unmounting %s: %s"
+msgstr "s'ha produït un error en desmuntar %s: %s"
+
+#: fs.pm:543
+#, c-format
+msgid "Enabling swap partition %s"
+msgstr "S'està habilitant la partició d'intercanvi %s"
+
+#: fs/format.pm:39 fs/format.pm:46
+#, c-format
+msgid "Formatting partition %s"
+msgstr "S'està formatant la partició %s"
+
+#: fs/format.pm:43
+#, c-format
+msgid "Creating and formatting file %s"
+msgstr "S'està creant i formatant el fitxer %s"
+
+#: fs/format.pm:78
+#, c-format
+msgid "I don't know how to format %s in type %s"
+msgstr "No sé com formatar %s amb el tipus %s"
+
+#: fs/format.pm:80
+#, c-format
+msgid "%s formatting of %s failed"
+msgstr "%s formatació de %s ha fallat"
+
+#: fs/mount_options.pm:112
 #, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
@@ -2662,7 +2887,7 @@ msgstr ""
 "més ràpid a l'\"spool\" de grups de discussió per accelerar els servidor de "
 "grups de discussió)."
 
-#: fs.pm:419
+#: fs/mount_options.pm:115
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
@@ -2671,14 +2896,14 @@ msgstr ""
 "Només es pot muntar explícitament (p. ex.,\n"
 "l'opció -a no farà que el sistema de fitxers es munti)."
 
-#: 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 interpretis el dispositius especials de caràcter o bloc en el sistema de "
 "fitxers."
 
-#: fs.pm:424
+#: fs/mount_options.pm:120
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2689,7 +2914,7 @@ msgstr ""
 "muntat. Aquesta opció pot ser útil per a un servidor que tingui\n"
 "sistemes de fitxers amb binaris d'arquitectures diferents a la pròpia."
 
-#: fs.pm:428
+#: fs/mount_options.pm:124
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2700,17 +2925,17 @@ msgstr ""
 "defineix-identificador-grup tinguin efecte (sembla segur,\n"
 "però de fet és força insegur si es té el suidperl(1) instal·lat)."
 
-#: fs.pm:432
+#: fs/mount_options.pm:128
 #, c-format
 msgid "Mount the file system read-only."
 msgstr "Munta el sistema de fitxers només 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 "Totes les E/S del sistema de fitxers s'han de fer sincronitzadament."
 
-#: fs.pm:438
+#: fs/mount_options.pm:134
 #, c-format
 msgid ""
 "Allow an ordinary user to mount the file system. The\n"
@@ -2726,65 +2951,25 @@ msgstr ""
 "nodev (tret que quedin sobreescrites per opcions subsegüents, com en\n"
 "la línia d'opcions user,exec,dev,suid)."
 
-#: fs.pm:446
+#: fs/mount_options.pm:142
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr "Dona accés d'escriptura a usuaris normal"
 
-#: fs.pm:448
+#: fs/mount_options.pm:144
 #, c-format
 msgid "Give read-only access to ordinary users"
 msgstr "Dona accés només d'escriptura als usuaris normal"
 
-#: 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 formatació de %s ha fallat"
-
-#: fs.pm:655
-#, c-format
-msgid "I don't know how to format %s in type %s"
-msgstr "No sé com formatar %s amb el tipus %s"
-
-#: fs.pm:662 fs.pm:669
-#, c-format
-msgid "Formatting partition %s"
-msgstr "S'està formatant la partició %s"
-
-#: fs.pm:666
+#: fs/type.pm:364
 #, c-format
-msgid "Creating and formatting file %s"
-msgstr "S'està creant i formatant el fitxer %s"
-
-#: fs.pm:726 fs.pm:775
-#, c-format
-msgid "Mounting partition %s"
-msgstr "S'està muntant la partició %s"
-
-#: fs.pm:727 fs.pm:776
-#, c-format
-msgid "mounting partition %s in directory %s failed"
-msgstr "El muntatge de la partició %s en el directori %s ha fallat"
-
-#: fs.pm:747 fs.pm:754
-#, c-format
-msgid "Checking %s"
-msgstr "S'està comprovant %s"
-
-#: fs.pm:792 partition_table.pm:639
-#, c-format
-msgid "error unmounting %s: %s"
-msgstr "s'ha produït un error en desmuntar %s: %s"
-
-#: fs.pm:824
-#, c-format
-msgid "Enabling swap partition %s"
-msgstr "S'està habilitant la partició d'intercanvi %s"
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "No podeu utilitzar el JFS per a particions inferiors a 16 MB"
 
-#: fsedit.pm:21
+#: fs/type.pm:365
 #, c-format
-msgid "simple"
-msgstr "senzill"
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "No podeu utilitzar el ReiserFS per a particions inferiors a 32 MB"
 
 #: fsedit.pm:25
 #, c-format
@@ -2796,7 +2981,7 @@ msgstr "amb /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"
@@ -2815,32 +3000,22 @@ msgstr ""
 "\n"
 "Esteu d'acord en perdre totes les particions?\n"
 
-#: fsedit.pm:524
-#, c-format
-msgid "You can't use JFS for partitions smaller than 16MB"
-msgstr "No podeu utilitzar el JFS per a particions inferiors a 16 MB"
-
-#: fsedit.pm:525
-#, c-format
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "No podeu utilitzar el ReiserFS per a particions inferiors a 32 MB"
-
-#: fsedit.pm:544
+#: fsedit.pm:385
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "Els punts de muntatge han de començar amb una /"
 
-#: fsedit.pm:545
+#: fsedit.pm:386
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
 msgstr "Els punts de muntatge només poden contenir caràcters alfanumèrics"
 
-#: fsedit.pm:546
+#: fsedit.pm:387
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Ja hi ha una partició amb el punt de muntatge %s\n"
 
-#: fsedit.pm:548
+#: fsedit.pm:389
 #, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
@@ -2852,12 +3027,12 @@ msgstr ""
 "boot.\n"
 "Si us plau, assegureu-vos d'afegir una partició /boot"
 
-#: fsedit.pm:551
+#: fsedit.pm:392
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr "No podeu utilitzar un volum lògic LVM per al punt de muntatge %s"
 
-#: fsedit.pm:553
+#: fsedit.pm:394
 #, c-format
 msgid ""
 "You've selected a LVM Logical Volume as root (/).\n"
@@ -2868,20 +3043,20 @@ msgstr ""
 "El carregador d'arrencada no ho pot gestionar sense una partició /boot.\n"
 "Si us plau, assegureu-vos d'afegir una partició /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 "
 "multiple PVs)"
 msgstr ""
 
-#: fsedit.pm:559 fsedit.pm:561
+#: fsedit.pm:400 fsedit.pm:402
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "Aquest directori s'ha de mantenir dins del sistema de fitxers arrel"
 
 #
-#: 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 "
@@ -2890,136 +3065,130 @@ msgstr ""
 "Necessiteu un sistema de fitxers real (ext2/ext3, reiserfs, xfs o jfs) per a "
 "aquest punt de muntatge\n"
 
-#: fsedit.pm:567
+#: fsedit.pm:408
 #, c-format
 msgid "You can't use an encrypted file system for mount point %s"
 msgstr ""
 "No podeu utilitzar un sistema d'arxius xifrat per al punt de muntatge %s"
 
 #
-#: fsedit.pm:628
+#: fsedit.pm:469
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "No hi ha prou espai per a l'assignació automàtica"
 
-#: fsedit.pm:630
+#: fsedit.pm:471
 #, c-format
 msgid "Nothing to do"
 msgstr "Res a fer"
 
-#: fsedit.pm:726
+#: fsedit.pm:569
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "S'ha produït un error en obrir %s per escriure: %s"
 
-#: harddrake/data.pm:55
+#: harddrake/data.pm:61
 #, c-format
 msgid "Floppy"
 msgstr "Disquet"
 
-#: 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 "Disc"
 
-#: 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 "Gravadors 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 "Targeta de vídeo"
 
-#: harddrake/data.pm:133
+#: harddrake/data.pm:139
 #, c-format
 msgid "Tvcard"
 msgstr "Targeta de TV"
 
 #
-#: harddrake/data.pm:142
+#: harddrake/data.pm:148
 #, c-format
 msgid "Other MultiMedia devices"
 msgstr "Altres sispositius multimèdia"
 
-#: harddrake/data.pm:151
+#: harddrake/data.pm:157
 #, c-format
 msgid "Soundcard"
 msgstr "Targeta de so"
 
-#: harddrake/data.pm:160
+#: harddrake/data.pm:166
 #, c-format
 msgid "Webcam"
 msgstr "Webcam"
 
-#: harddrake/data.pm:174
+#: harddrake/data.pm:181
 #, c-format
 msgid "Processors"
 msgstr "Processadors"
 
-#: harddrake/data.pm:183
+#: harddrake/data.pm:191
 #, c-format
 msgid "ISDN adapters"
 msgstr "Adaptadors XDSI"
 
-#: harddrake/data.pm:192
+#: harddrake/data.pm:201
 #, c-format
 msgid "Ethernetcard"
 msgstr "Targeta 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 "Adaptadors ADSL"
 
-#: harddrake/data.pm:230
+#: harddrake/data.pm:243
 #, c-format
 msgid "AGP controllers"
 msgstr "Controladors AGP"
 
-#: harddrake/data.pm:239
+#: harddrake/data.pm:252
 #, c-format
 msgid "Bridges and system controllers"
 msgstr "Ponts i controladors 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 "Impressora"
 
-#: harddrake/data.pm:257 help.pm:991 install_steps_interactive.pm:920
-#, c-format
-msgid "Mouse"
-msgstr "Ratolí"
-
 #: harddrake/data.pm:271
 #, c-format
 msgid "Joystick"
@@ -3031,9 +3200,9 @@ msgid "(E)IDE/ATA controllers"
 msgstr "Controladors (E)IDE/ATA"
 
 #: harddrake/data.pm:290
-#, fuzzy, c-format
+#, c-format
 msgid "SATA controllers"
-msgstr "Controladors AGP"
+msgstr "Controladors SATA"
 
 #: harddrake/data.pm:299
 #, c-format
@@ -3042,51 +3211,73 @@ msgstr "Controladors Firewire"
 
 #: harddrake/data.pm:308
 #, c-format
+msgid "PCMCIA controllers"
+msgstr "Controladors PCMCIA"
+
+#: harddrake/data.pm:321
+#, c-format
 msgid "SCSI controllers"
 msgstr "Controladors SCSI"
 
-#: harddrake/data.pm:317
+#: harddrake/data.pm:330
 #, c-format
 msgid "USB controllers"
 msgstr "Controladors USB"
 
-#: harddrake/data.pm:326
-#, fuzzy, c-format
+#: harddrake/data.pm:339
+#, c-format
 msgid "USB ports"
-msgstr "Impressora USB"
+msgstr "Ports USB"
 
-#: harddrake/data.pm:335
+#: harddrake/data.pm:348
 #, c-format
 msgid "SMBus controllers"
 msgstr "Controladors SMBus"
 
+#: harddrake/data.pm:357
+#, c-format
+msgid "UPS"
+msgstr "SAI"
+
+#: 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 "Teclat"
+
+#: harddrake/data.pm:379 help.pm:855 install_steps_interactive.pm:985
+#, c-format
+msgid "Mouse"
+msgstr "Ratolí"
+
 #
-#: harddrake/data.pm:344
+#: harddrake/data.pm:393
 #, c-format
 msgid "Scanner"
 msgstr "Escàner"
 
-#: harddrake/data.pm:354 standalone/harddrake2:336
+#: harddrake/data.pm:403 standalone/harddrake2:431
 #, c-format
 msgid "Unknown/Others"
 msgstr "Desconegut/Altres"
 
-#: 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 "Espereu si us plau... s'està aplicant la configuració"
 
-#: harddrake/sound.pm:186
+#: harddrake/sound.pm:206
 #, c-format
 msgid "No alternative driver"
 msgstr "No hi ha cap controlador alternatiu"
 
-#: 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 "
@@ -3096,12 +3287,12 @@ msgstr ""
 "de so (%s), que actualment fa servir \"%s\""
 
 #
-#: harddrake/sound.pm:193
+#: harddrake/sound.pm:213
 #, c-format
 msgid "Sound configuration"
 msgstr "Configuració de so"
 
-#: harddrake/sound.pm:195
+#: harddrake/sound.pm:215
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
@@ -3110,7 +3301,7 @@ msgstr ""
 "Aquí podeu seleccionar un controlador alternatiu (tant OSS com ALSA) per ala "
 "targeta de so (%s)"
 
-#: harddrake/sound.pm:197
+#: harddrake/sound.pm:217
 #, c-format
 msgid ""
 "\n"
@@ -3123,7 +3314,7 @@ msgstr ""
 "La vostra targeta fa servir actualment el controlador %s \"%s\" (el "
 "controlador per defecte per a aquesta targeta és \"%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 "
@@ -3158,24 +3349,24 @@ msgstr ""
 "- la nova API d'ALSA que proporciona moltes característiques millorades però "
 "que necessita fer servir la llibreria 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 "Resolució de problemes"
 
-#: 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 ""
 "L'antic controlador \"%s\" ha estat desaprovat.\n"
 "\n"
@@ -3184,12 +3375,12 @@ msgstr ""
 "El nou controlador \"%s\" només s'usarà en la següent arrencada."
 
 #
-#: harddrake/sound.pm:234
+#: harddrake/sound.pm:254
 #, c-format
 msgid "No open source driver"
 msgstr "No hi ha cap programa de control de codi obert"
 
-#: 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 "
@@ -3199,34 +3390,35 @@ msgstr ""
 "però n'hi ha un de propietat a \"%s\"."
 
 #
-#: harddrake/sound.pm:238
+#: harddrake/sound.pm:258
 #, c-format
 msgid "No known driver"
 msgstr "No hi ha cap controlador conegut"
 
-#: harddrake/sound.pm:239
+#: harddrake/sound.pm:259
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
 msgstr "No hi ha cap controlador conegut per a la vostra targeta de so (%s)"
 
-#: harddrake/sound.pm:243
+#: harddrake/sound.pm:263
 #, c-format
 msgid "Unknown driver"
 msgstr "Controlador desconegut"
 
-#: harddrake/sound.pm:244
+#: harddrake/sound.pm:264
 #, c-format
 msgid "Error: The \"%s\" driver for your sound card is unlisted"
 msgstr ""
 "Error: el programa de control \"%s\" per a la vostra targeta de so no és a "
 "la llista"
 
-#: harddrake/sound.pm:257
+#: harddrake/sound.pm:278
 #, c-format
 msgid "Sound trouble shooting"
 msgstr "Resolució de problemes amb el so"
 
-#: 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"
@@ -3270,17 +3462,18 @@ msgstr ""
 "- \"/sbin/fuser -v /dev/dsp\" us dirà quin programa utilitza la targeta de "
 "so.\n"
 
-#: harddrake/sound.pm:284
+#: harddrake/sound.pm:307
 #, c-format
 msgid "Let me pick any driver"
 msgstr "Deixa'm agafar qualsevol programa de control"
 
-#: harddrake/sound.pm:287
+#: harddrake/sound.pm:310
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr "Selecció d'un programa de control arbitrari"
 
-#: 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 "
@@ -3370,9 +3563,9 @@ msgstr "habilita l'ús de la ràdio"
 #, 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 ""
 "Abans de continuar, llegiu atentament les clàusules de la llicència. "
 "Cobreix\n"
@@ -3381,8 +3574,8 @@ msgstr ""
 "llicència, feu clic al quadre \"%s\"; si no, prémer el botó \"%s\"\n"
 "reiniciarà el vostre ordinador."
 
-#: 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 "Accepta"
@@ -3390,42 +3583,41 @@ msgstr "Accepta"
 #: 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 ""
 "El GNU/Linux és un sistema multiusuari; això vol dir que cada usuari pot\n"
 "tenir les seves pròpies preferències, els seus propis fitxers, etc. Podeu "
@@ -3447,7 +3639,7 @@ msgstr ""
 "petita errada podria significar que el sistema deixés de funcionar. Si "
 "cometeu\n"
 "una errada greu com a usuari normal el pitjor que pot passar és que perdeu\n"
-"algunes dades, però sense afectar a tot el sistema.\n"
+"algunes daDES, però sense afectar a tot el sistema.\n"
 "\n"
 "Primer, heu d'introduir el vostre nom real. Per suposat, això no és "
 "obligatori,\n"
@@ -3480,23 +3672,28 @@ msgstr ""
 "trieu l'usuari i el gestor de finestres desitjat i feu clic a \"%s\".\n"
 "Si no hi esteu interessat, desactiveu el quadre \"%s\"."
 
-#: help.pm:52 help.pm:197 help.pm:444 help.pm:691 help.pm:784 help.pm:1005
-#: install_steps_gtk.pm:277 interactive.pm:403 interactive/newt.pm:308
-#: network/netconnect.pm:271 network/tools.pm:166 printer/printerdrake.pm:3090
-#: standalone/drakTermServ:397 standalone/drakbackup:3920
-#: standalone/drakbackup:4014 standalone/drakbackup:4031
-#: standalone/drakbackup:4049 ugtk2.pm:510
+#: help.pm:51 printer/printerdrake.pm:1488 printer/printerdrake.pm:1608
+#, c-format
+msgid "User name"
+msgstr "Nom d'usuari"
+
+#: 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 "Següent"
 
-#: 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 "Avançat"
 
-#: help.pm:55
+#: help.pm:54
 #, c-format
 msgid ""
 "Listed here are the existing Linux partitions detected on your hard drive.\n"
@@ -3570,36 +3767,45 @@ msgstr ""
 "Amb unitats de disc SCSI, una \"a\" significa \"ID SCSI més baixa\",\n"
 "una \"b\" significa \"segona ID SCSI més baixa\", 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 ""
 "La instal·lació del Mandrakelinux està repartida en diversos CD-ROM. Si\n"
 "un dels paquets escollits està en un altre CD-ROM, DrakX expulsarà el CD\n"
-"actual i us demanarà que n'inseriu un altre."
+"actual i us demanarà que n'inseriu un altre. Si no teniu el CD necessari a\n"
+"mà, premeu \"%s\" i els paquets corresponents no s'instal·laran."
 
-#: 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"
@@ -3609,9 +3815,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"
@@ -3621,32 +3837,29 @@ 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 ""
 "Ha arribat el moment d'indicar els programes que voleu instal·lar en el\n"
 "sistema. Mandrakelinux té milers de paquets, i per facilitar-ne la\n"
 "gestió s'han distribuït en grups d'aplicacions similars.\n"
 "\n"
-"Els paquets s'agrupen segons l'ús que vulgueu donar a l'ordinador.\n"
 "Mandrakelinux agrupa els paquets en quatre categories. Podeu mesclar i fer\n"
 "coincidir aplicacions de grups diversos, de manera que una instal·lació\n"
 "d'``Estació de treball'' pot perfectament tenir instal·lades aplicacions\n"
-"de la categoria ``Desenvolupament'' \n"
+"de la categoria ``Servidor'' \n"
 " * \"%s\": si voleu utilitzar l'ordinador com a estació de treball,\n"
 "seleccioneu un o més grups de la categoria estació de treball.\n"
 "\n"
-" * \"%s\": si penseu utilitzar la vostra màquina per programar, escolliu "
-"els\n"
-"grups adients d'aquesta categoria.\n"
+" * \"%s\": si penseu utilitzar la vostra màquina per programar, escolliu\n"
+"els grups adients d'aquesta categoria. El grup especial \"LSB\"\n"
+"configurarà el vostre sistema per tal que compleixi tant com sigui\n"
+"possible amb les especificacions Linux Standard Base.\n"
+"\n"
+"   Seleccionar el grup \"LSB\" també instal·larà un kernel \"2.4\",\n"
+"en comptes del \"2.6\". Això es fa per assegurar que els sistema\n"
+"compleixi al 100%% amb LSB. Si no seleccioneu el grup \"LSB\"\n"
+"encara tindreu un sistema que compleix la LSB quasi al 100%%.\n"
 "\n"
 " * \"%s\":  si l'ordinador s'ha d'utilitzar com a servidor, seleccioneu\n"
 "quins dels serveis més habituals voleu instal·lar\n"
@@ -3656,7 +3869,16 @@ msgstr ""
 "interfície gràfica.\n"
 "\n"
 "Si moveu el cursor per sobre d'un nom de grup veureu una breu explicació\n"
-"d'aquest grup. Si desseleccioneu tots els grups quan estigueu fent una\n"
+"d'aquest grup.\n"
+"\n"
+"Podeu marcar la casella \"%s\", que és útil si esteu familiaritzat amb els\n"
+"diversos paquets o si voleu tenir un control total sobre el que "
+"s'instal·larà.\n"
+"\n"
+"Si heu començat la instal·lació en el mode \"%s\", podeu desseleccionar \n"
+"tots els grups si voleu evitar que s'instal·li cap paquet nou. Això és\n"
+"útil per reparar o actualitzar un sistema existent.\n"
+"Si desseleccioneu tots els grups quan estigueu fent una\n"
 "instal·lació normal (i no una actualització), se us presentarà un diàleg \n"
 "proposant-vos diferents opcions per a una instal·lació mínima:\n"
 "\n"
@@ -3668,96 +3890,87 @@ msgstr ""
 "\n"
 " * \"%s\": instal·la el nombre mínim de paquets necessari per aconseguir un\n"
 "sistema Linux operatiu, només amb una interfície de línia d'ordres. Aquesta\n"
-"instal·lació ocupa uns 65 MB.\n"
-"\n"
-"Podeu marcar la casella \"%s\", que és útil si esteu familiaritzat amb els\n"
-"diversos paquets o si voleu tenir un control total sobre el que "
-"s'instal·larà.\n"
-"\n"
-"Si heu començat la instal·lació en el mode \"%s\", podeu desseleccionar \n"
-"tots els grups si voleu evitar que s'instal·li cap paquet nou. Això és "
-"útil \n"
-"per reparar o actualitzar un sistema existent."
+"instal·lació ocupa uns 65 MB."
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:23
 #, c-format
 msgid "Workstation"
 msgstr "Estació de treball"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:64 share/compssUsers.pl:162
+#: share/compssUsers.pl:164
 #, c-format
 msgid "Development"
 msgstr "Desenvolupament"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:144
 #, c-format
 msgid "Graphical Environment"
 msgstr "Entorn gràfic"
 
+#: help.pm:146 install_steps_gtk.pm:242 install_steps_interactive.pm:646
+#, c-format
+msgid "Individual package selection"
+msgstr "Selecció individual de paquets"
+
 #
-#: help.pm:137 install_steps_interactive.pm:552
+#: help.pm:146 help.pm:588
+#, c-format
+msgid "Upgrade"
+msgstr "Actualitza"
+
+#
+#: help.pm:146 install_steps_interactive.pm:600
 #, c-format
 msgid "With X"
 msgstr "Amb X"
 
-#: help.pm:137
+#: help.pm:146
 #, c-format
 msgid "With basic documentation"
 msgstr "Amb la documentació bàsica"
 
 #
-#: help.pm:137
+#: help.pm:146
 #, c-format
 msgid "Truly minimal install"
 msgstr "Instal·lació mínima real"
 
-#: help.pm:137 install_steps_gtk.pm:272 install_steps_interactive.pm:598
-#, c-format
-msgid "Individual package selection"
-msgstr "Selecció individual de paquets"
-
-#
-#: help.pm:137 help.pm:602
-#, c-format
-msgid "Upgrade"
-msgstr "Actualitza"
-
-#: help.pm:140
-#, c-format
+#: help.pm:149
+#, fuzzy, c-format
 msgid ""
-"If you told the installer that you wanted to individually select packages,\n"
-"it will present a tree containing all packages classified by groups and\n"
-"subgroups. While browsing the tree, you can select entire groups,\n"
-"subgroups, or individual packages.\n"
+"If you choose to install packages individually, the installer will present\n"
+"a tree containing all packages classified by groups and subgroups. While\n"
+"browsing the tree, you can select entire groups, subgroups, or individual\n"
+"packages.\n"
 "\n"
-"Whenever you select a package on the tree, a description appears on the\n"
-"right to let you know the purpose of the package.\n"
+"Whenever you select a package on the tree, a description will appear on the\n"
+"right to let you know the purpose of that package.\n"
 "\n"
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
-"you will be asked to confirm that you really want those servers to be\n"
+"you'll be asked to confirm that you really want those servers to be\n"
 "installed. By default Mandrakelinux will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
-"the time the distribution was shipped, it is entirely possible that that\n"
+"the time the distribution was shipped, it is entirely possible that\n"
 "security holes were discovered after this version of Mandrakelinux was\n"
-"finalized. If you do not know what a particular service is supposed to do\n"
-"or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
-"install the listed services and they will be started automatically by\n"
-"default during boot. !!\n"
+"finalized. If you don't know what a particular service is supposed to do or\n"
+"why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
+"the listed services and they will be started automatically at boot time. !!\n"
 "\n"
 "The \"%s\" option is used to disable the warning dialog which appears\n"
 "whenever the installer automatically selects a package to resolve a\n"
-"dependency issue. Some packages have relationships between each them such\n"
-"that installation of one package requires that some other program is also\n"
-"required to be installed. The installer can determine which packages are\n"
-"required to satisfy a dependency to successfully complete the installation.\n"
+"dependency issue. Some packages depend on others and the installation of\n"
+"one particular package may require the installation of another package. The\n"
+"installer can determine which packages are required to satisfy a dependency\n"
+"to successfully complete the installation.\n"
 "\n"
 "The tiny floppy disk icon at the bottom of the list allows you to load a\n"
 "package list created during a previous installation. This is useful if you\n"
 "have a number of machines that you wish to configure identically. Clicking\n"
-"on this icon will ask you to insert a floppy disk previously created at the\n"
-"end of another installation. See the second tip of last step on how to\n"
-"create such a floppy."
+"on this icon will ask you to insert the floppy disk created at the end of\n"
+"another installation. See the second tip of the last step on how to create\n"
+"such a floppy."
 msgstr ""
 "Si heu dit a l'instal·lador que volíeu seleccionar els paquets "
 "individualment\n"
@@ -3799,126 +4012,67 @@ msgstr ""
 "pas\n"
 "per saber com crear aquest disquet."
 
-#: 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 "Dependències automàtiques"
 
-#: 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 ""
-"Ara configurareu la connexió a Internet/xarxa. Si voleu connectar\n"
-"el vostre ordinador a Internet o a una xarxa local, feu clic a \"%s\".\n"
-"Mandrakelinux intentarà detectar automàticament els dispositius\n"
-"de xarxa i els mòdems. Si aquesta detecció falla, desactiveu la\n"
-"casella \"%s\". També podeu decidir no configurar la xarxa, o\n"
-"fer-ho més endavant; en aquest cas feu clic al botó \"%s\" per\n"
-"passar al pas següent.\n"
-"\n"
-"En configurar la xarxa, les opcions de connexió disponibles són:\n"
-"mòdem tradicional, winmodem, mòdem XDSI, connexió ADSL, mòdem de cable, i\n"
-"finalment una connexió LAN senzilla (Ethernet).\n"
-"\n"
-"No explicarem cada opció de configuració; només cal que us assegureu\n"
-"que el vostre proveïdor d'Internet o administrador del sistema us ha\n"
-"facilitat tots els paràmetres, com ara l'adreça IP, la passarel·la\n"
-"per defecte, els servidors DNS, etc.\n"
-"\n"
-"En quant a les connexions amb winmodem. Els winmodems són mòdems especials\n"
-"integrats de gama baixa que necessiten programari addicional per funcionar.\n"
-"Alguns d'aquests mòdems funcionen a Mandrakelinux, i d'altres no. Podeu\n"
-"consultar una llista de mòdems suportats a LinModems.\n"
-"\n"
-"Podeu consultar el capítol sobre connexions a Internet de la ``Guia\n"
-"d'iniciació'' per conèixer els detalls de la configuració, o\n"
-"simplement espereu fins que el sistema estigui instal·lat i\n"
-"utilitzeu el programa que s'hi indica per configurar la connexió."
-
-#: help.pm:197
-#, c-format
-msgid "Use auto detection"
-msgstr "Utilitza la detecció automàtica"
-
-#: 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\": feu clic al botó \"%s\" per obrir l'auxiliar de configuració de la\n"
-"impressora. Consulteu el capítol corresponent de la ``Guia d'iniciació'' "
-"per\n"
-"tenir més informació en quant a la configuració de noves impressores.\n"
+"impressora. Consulteu el capítol corresponent de la ``Guia d'iniciació''\n"
+"per tenir més informació en quant a la configuració de noves impressores.\n"
 "La interfície que apareix és similar a la que s'utilitza durant la "
 "instal·lació."
 
-#: 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 "Configura"
 
-#: help.pm:206
-#, c-format
+#: help.pm:189
+#, fuzzy, c-format
 msgid ""
-"This dialog is used to choose which services you wish to start at boot\n"
+"This dialog is used to select which services you wish to start at boot\n"
 "time.\n"
 "\n"
-"DrakX will list all the services available on the current installation.\n"
-"Review each one carefully and uncheck those which are not needed at boot\n"
+"DrakX will list all services available on the current installation. Review\n"
+"each one of them carefully and uncheck those which aren't needed at boot\n"
 "time.\n"
 "\n"
 "A short explanatory text will be displayed about a service when it is\n"
-"selected. However, if you are not sure whether a service is useful or not,\n"
+"selected. However, if you're not sure whether a service is useful or not,\n"
 "it is safer to leave the default behavior.\n"
 "\n"
 "!! At this stage, be very careful if you intend to use your machine as a\n"
-"server: you will probably not want to start any services that you do not\n"
-"need. Please remember that several services can be dangerous if they are\n"
-"enabled on a server. In general, select only the services you really need.\n"
-"!!"
+"server: you probably don't want to start any services which you don't need.\n"
+"Please remember that some services can be dangerous if they're enabled on a\n"
+"server. In general, select only those services you really need. !!"
 msgstr ""
 "En aquest diàleg escollireu els serveis que voleu que s'iniciïn durant "
 "l'arrencada.\n"
@@ -3940,7 +4094,7 @@ msgstr ""
 "en un servidor. En general, seleccioneu només els serveis que realment "
 "necessiteu."
 
-#: help.pm:224
+#: help.pm:206
 #, c-format
 msgid ""
 "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to\n"
@@ -3948,13 +4102,13 @@ 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 gestiona l'hora en GMT (Greenwich Mean Time) i el tradueix a\n"
 "l'hora local d'acord amb la zona horària seleccionada. Si el rellotge de la\n"
@@ -3962,7 +4116,7 @@ msgstr ""
 "i\n"
 "això informarà a GNU/Linux que el rellotge del sistema i el rellotge del\n"
 "maquinari són a la mateixa zona horària. Això és convenient quan la màquina\n"
-"també té instal·lat un altre sistema operatiu, com ara Windows.\n"
+"també té instal·lat un altre sistema operatiu.\n"
 "\n"
 "L'opció \"%s\" regularà automàticament l'hora connectant-se a un servidor\n"
 "horari remot d'Internet. Per tal que funcioni aquesta funció us caldrà "
@@ -3973,27 +4127,27 @@ msgstr ""
 "de la vostra xarxa local també podran utilitzar."
 
 #
-#: 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 "El rellotge del vostre ordinador està regulat per GMT"
 
-#: help.pm:235
+#: help.pm:217
 #, c-format
 msgid "Automatic time synchronization"
 msgstr "Sincronització automàtica de la hora"
 
-#: 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 ""
 "Targeta gràfica\n"
@@ -4006,39 +4160,41 @@ msgstr ""
 "acceleració 3D, se us demanarà que trieu el servidor que us sigui\n"
 "més convenient."
 
-#: help.pm:249
-#, c-format
+#: help.pm:231
+#, fuzzy, c-format
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
 "WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"
 "\n"
-"You will be presented with a list of different parameters to change to get\n"
-"an optimal graphical display: Graphic Card\n"
+"You'll see a list of different parameters to change to get an optimal\n"
+"graphical display.\n"
+"\n"
+"Graphic Card\n"
 "\n"
 "   The installer will normally automatically detect and configure the\n"
-"graphic card installed on your machine. If it is not the case, you can\n"
+"graphic card installed on your machine. If this is not correct, you can\n"
 "choose from this list the card you actually have installed.\n"
 "\n"
 "   In the situation where different servers are available for your card,\n"
-"with or without 3D acceleration, you are asked to choose the server that\n"
+"with or without 3D acceleration, you're asked to choose the server which\n"
 "best suits your needs.\n"
 "\n"
 "\n"
 "\n"
 "Monitor\n"
 "\n"
-"   The installer will normally automatically detect and configure the\n"
-"monitor connected to your machine. If it is incorrect, you can choose from\n"
-"this list the monitor you actually have connected to your computer.\n"
+"   Normally the installer will automatically detect and configure the\n"
+"monitor connected to your machine. If it is not correct, you can choose\n"
+"from this list the monitor which is connected to your computer.\n"
 "\n"
 "\n"
 "\n"
 "Resolution\n"
 "\n"
 "   Here you can choose the resolutions and color depths available for your\n"
-"hardware. Choose the one that best suits your needs (you will be able to\n"
-"change that after installation though). A sample of the chosen\n"
+"graphics hardware. Choose the one which best suits your needs (you will be\n"
+"able to make changes after the installation). A sample of the chosen\n"
 "configuration is shown in the monitor picture.\n"
 "\n"
 "\n"
@@ -4047,21 +4203,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 ""
 "L'X (per sistema X Window) és el cor de la interfície gràfica de GNU/Linux\n"
 "de què depenen tots els entorns gràfics (KDE, GNOME, AfterStep, "
@@ -4119,14 +4275,14 @@ msgstr ""
 "l'ordinador ha d'actuar com a servidor, o si no heu aconseguit\n"
 "configurar la pantalla."
 
-#: 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"
@@ -4134,14 +4290,14 @@ msgstr ""
 "monitor que teniu connectat a l'ordinador. Si no és correcte, podreu triar\n"
 "d'aquesta llista el monitor que realment teniu connectat a l'ordinador."
 
-#: 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"
@@ -4151,26 +4307,26 @@ msgstr ""
 "canviar-la després de la instal·lació). Al monitor veureu una mostra de la\n"
 "configuració triada."
 
-#: 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 cas que hi hagi diferents servidors disponibles per a la vostra\n"
 "targeta, amb o sense acceleració 3D, se us demanarà que escolliu\n"
 "el servidor que més us convingui."
 
-#: help.pm:324
-#, c-format
+#: help.pm:308
+#, fuzzy, c-format
 msgid ""
 "Options\n"
 "\n"
-"   Here you can choose whether you want to have your machine automatically\n"
-"switch to a graphical interface at boot. Obviously, you want to check\n"
-"\"%s\" if your machine is to act as a server, or if you were not successful\n"
-"in getting the display configured."
+"   This steps allows you to choose whether you want your machine to\n"
+"automatically switch to a graphical interface at boot. Obviously, you may\n"
+"want to check \"%s\" if your machine is to act as a server, or if you were\n"
+"not successful in getting the display configured."
 msgstr ""
 "Opcions\n"
 "\n"
@@ -4179,62 +4335,63 @@ msgstr ""
 "ha\n"
 "de ser un servidor, o si no heu pogut configurar la pantalla."
 
-#: help.pm:332
-#, c-format
+#: help.pm:316
+#, fuzzy, c-format
 msgid ""
-"At this point, you need to decide where you want to install the Mandrake\n"
-"Linux operating system on your hard drive. If your hard drive is empty or\n"
-"if an existing operating system is using all the available space you will\n"
-"have to partition the drive. Basically, partitioning a hard drive consists\n"
-"of logically dividing it to create the space needed to install your new\n"
+"You now need to decide where you want to install the Mandrakelinux\n"
+"operating system on your hard drive. If your hard drive is empty or if an\n"
+"existing operating system is using all the available space you will have to\n"
+"partition the drive. Basically, partitioning a hard drive means to\n"
+"logically divide it to create the space needed to install your new\n"
 "Mandrakelinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
-"and can lead to lost data if there is an existing operating system already\n"
-"installed on the drive, partitioning can be intimidating and stressful if\n"
-"you are an inexperienced user. Fortunately, DrakX includes a wizard which\n"
+"and can lead to data losses, partitioning can be intimidating and stressful\n"
+"for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on your hard drive configuration, several options are available:\n"
+"Depending on the configuration of your hard drive, several options are\n"
+"available:\n"
 "\n"
-" * \"%s\": this option will perform an automatic partitioning of your blank\n"
+" * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
-" * \"%s\": the wizard has detected one or more existing Linux partitions on\n"
+" * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
 "your hard drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\": if Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
-"data, provided you have previously defragmented the Windows partition.\n"
-"Backing up your data is strongly recommended.. Using this option is\n"
+"data, provided you've previously defragmented the Windows partition.\n"
+"Backing up your data is strongly recommended. Using this option is\n"
 "recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
 "procedure, the size of your Microsoft Windows partition will be smaller\n"
-"then when you started. You will have less free space under Microsoft\n"
-"Windows to store your data or to install new software.\n"
+"than when you started. You'll have less free space under Microsoft Windows\n"
+"to store your data or to install new software.\n"
 "\n"
-" * \"%s\": if you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrakelinux system,\n"
-"choose this option. Be careful, because you will not be able to undo your\n"
-"choice after you confirm.\n"
+" * \"%s\". If you want to delete all data and all partitions present on\n"
+"your hard drive and replace them with your new Mandrakelinux system, choose\n"
+"this option. Be careful, because you won't be able to undo this operation\n"
+"after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\": this will simply erase everything on the drive and begin fresh,\n"
-"partitioning everything from scratch. All data on your disk will be lost.\n"
+" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+"Microsoft Windows. Choosing this option will simply erase everything on the\n"
+"drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-" * \"%s\": choose this option if you want to manually partition your hard\n"
+" * \"%s\". Choose this option if you want to manually partition your hard\n"
 "drive. Be careful -- it is a powerful but dangerous choice and you can very\n"
 "easily lose all your data. That's why this option is really only\n"
 "recommended if you have done something like this before and have some\n"
@@ -4279,7 +4436,7 @@ msgstr ""
 "``Esborrar completament el disc\") o canviar la mida de la partició FAT o\n"
 "NTFS de Windows. Aquest canvi de mida es pot dur a terme sense cap pèrdua "
 "de\n"
-"dades, sempre que la partició de Windows hagi estat desfragmentada\n"
+"daDES, sempre que la partició de Windows hagi estat desfragmentada\n"
 "prèviament. És molt recomenable, fer una còpia de seguretat de les dades.\n"
 "Aquesta opció és la més recomanable si voleu utilitzar tant Mandrakelinux\n"
 "com Microsoft Windows al mateix ordinador.\n"
@@ -4310,52 +4467,53 @@ msgstr ""
 "d'experiència. Trobareu més instruccions sobre la utilitat DiskDrake a la\n"
 "secció ``Gestió de les particions'' de la ``Guia d'iniciació''."
 
-#: help.pm:389 install_interactive.pm:95
+#: help.pm:374 install_interactive.pm:95
 #, c-format
 msgid "Use free space"
 msgstr "Utilitza l'espai lliure"
 
-#: help.pm:389
+#: help.pm:374
 #, c-format
 msgid "Use existing partition"
 msgstr "Utilitza les particions existents"
 
-#: 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 "Utilitza l'espai lliure de la partició de Windows"
 
-#: help.pm:389 install_interactive.pm:211
+#: help.pm:374 install_interactive.pm:213
 #, c-format
 msgid "Erase entire disk"
 msgstr "Esborra tot el disc"
 
-#: help.pm:389
+#: help.pm:374
 #, c-format
 msgid "Remove Windows"
 msgstr "Elimina Windows"
 
-#: help.pm:389 install_interactive.pm:226
+#: help.pm:374 install_interactive.pm:228
 #, c-format
 msgid "Custom disk partitioning"
 msgstr "Particionament personalitzat de disc"
 
-#: help.pm:392
-#, c-format
+#: help.pm:377
+#, fuzzy, c-format
 msgid ""
 "There you are. Installation is now complete and your GNU/Linux system is\n"
-"ready to use. Just click \"%s\" to reboot the system. Don't forget to\n"
-"remove the installation media (CD-ROM or floppy). The first thing you\n"
+"ready to be used. Just click on \"%s\" to reboot the system. Don't forget\n"
+"to remove the installation media (CD-ROM or floppy). The first thing you\n"
 "should see after your computer has finished doing its hardware tests is the\n"
-"bootloader menu, giving you the choice of which operating system to start.\n"
+"boot-loader menu, giving you the choice of which operating system to start.\n"
 "\n"
 "The \"%s\" button shows two more buttons to:\n"
 "\n"
-" * \"%s\": to create an installation floppy disk that will automatically\n"
-"perform a whole installation without the help of an operator, similar to\n"
-"the installation you just configured.\n"
+" * \"%s\": enables you to create an installation floppy disk which will\n"
+"automatically perform a whole installation without the help of an operator,\n"
+"similar to the installation you've just configured.\n"
 "\n"
-"   Note that two different options are available after clicking the button:\n"
+"   Note that two different options are available after clicking on that\n"
+"button:\n"
 "\n"
 "    * \"%s\". This is a partially automated installation. The partitioning\n"
 "step is the only interactive procedure.\n"
@@ -4363,13 +4521,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 ""
 "Ja ho teniu. S'ha completat la instal·lació i el vostre sistema GNU/Linux\n"
 "està preparat per fer-se servir. Simplement premeu \"%s\" per reiniciar el\n"
@@ -4404,52 +4567,48 @@ msgstr ""
 "tecla\n"
 "F1, i escriviu >>linux defcfg=\"floppy\"<<."
 
-#: help.pm:418
+#: help.pm:409
 #, c-format
 msgid "Generate auto-install floppy"
 msgstr "Genera un disquet per a la instal·lació automàtica"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Replay"
 msgstr "Repeteix"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Automated"
 msgstr "Automàtica"
 
-#: help.pm:418 install_steps_interactive.pm:1319
+#: help.pm:409 install_steps_interactive.pm:1366
 #, c-format
 msgid "Save packages selection"
 msgstr "Desa la selecció de paquets"
 
-#: help.pm:421
-#, c-format
+#: help.pm:412
+#, fuzzy, c-format
 msgid ""
-"Any partitions that have been newly defined must be formatted for use\n"
-"(formatting means creating a file system).\n"
-"\n"
-"At this time, you may wish to reformat some already existing partitions to\n"
-"erase any data they contain. If you wish to do that, please select those\n"
-"partitions as well.\n"
+"If you chose to reuse some legacy GNU/Linux partitions, you may wish to\n"
+"reformat some of them and erase any data they contain. To do so, please\n"
+"select those partitions as well.\n"
 "\n"
-"Please note that it is not necessary to reformat all pre-existing\n"
+"Please note that it's not necessary to reformat all pre-existing\n"
 "partitions. You must reformat the partitions containing the operating\n"
-"system (such as \"/\", \"/usr\" or \"/var\") but you do not have to\n"
-"reformat partitions containing data that you wish to keep (typically\n"
-"\"/home\").\n"
+"system (such as \"/\", \"/usr\" or \"/var\") but you don't have to reformat\n"
+"partitions containing data that you wish to keep (typically \"/home\").\n"
 "\n"
-"Please be careful when selecting partitions. After formatting, all data on\n"
-"the selected partitions will be deleted and you will not be able to recover\n"
-"it.\n"
+"Please be careful when selecting partitions. After the formatting is\n"
+"completed, all data on the selected partitions will be deleted and you\n"
+"won't be able to recover it.\n"
 "\n"
-"Click on \"%s\" when you are ready to format the partitions.\n"
+"Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
 "Mandrakelinux operating system installation.\n"
 "\n"
-"Click on \"%s\" if you wish to select partitions that will be checked for\n"
+"Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
 msgstr ""
 "Per poder utilitzar les particions que s'acaben de definir cal formatar-les\n"
@@ -4475,29 +4634,29 @@ msgstr ""
 "Feu clic a \"%s\" si voleu seleccionar particions on cercar-hi blocs "
 "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"
 
-#: help.pm:447
-#, c-format
+#: help.pm:434
+#, fuzzy, c-format
 msgid ""
-"At the time you are installing Mandrakelinux, it is likely that some\n"
-"packages will have been updated since the initial release. Bugs may have\n"
-"been fixed, security issues resolved. To allow you to benefit from these\n"
-"updates, you are now able to download them from the Internet. Check \"%s\"\n"
-"if you have a working Internet connection, or \"%s\" if you prefer to\n"
-"install updated packages later.\n"
+"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"have been updated since the initial release. Bugs may have been fixed,\n"
+"security issues resolved. To allow you to benefit from these updates,\n"
+"you're now able to download them from the Internet. Check \"%s\" if you\n"
+"have a working Internet connection, or \"%s\" if you prefer to install\n"
+"updated packages later.\n"
 "\n"
-"Choosing \"%s\" will display a list of places from which updates can be\n"
-"retrieved. You should choose one near to you. A package-selection tree will\n"
-"appear: review the selection, and press \"%s\" to retrieve and install the\n"
-"selected package(s), or \"%s\" to abort."
+"Choosing \"%s\" will display a list of web locations from which updates can\n"
+"be retrieved. You should choose one near to you. A package-selection tree\n"
+"will appear: review the selection, and press \"%s\" to retrieve and install\n"
+"the selected package(s), or \"%s\" to abort."
 msgstr ""
 "Ara esteu instal·lant Mandrakelinux, és probable que alguns paquets\n"
 "hagin estat actualitzats desde la data de llançament. Alguns errors poden\n"
@@ -4513,28 +4672,27 @@ msgstr ""
 "un arbre de selecció de paquets: comproveu la selecció i premeu \"%s\" per\n"
 "baixar i instal·lar els paquets seleccionats, o \"%s\" per abandonar."
 
-#: 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 "Instal·la"
 
-#: help.pm:460
-#, c-format
+#: help.pm:447
+#, fuzzy, c-format
 msgid ""
-"At this point, DrakX will allow you to choose the security level desired\n"
-"for the machine. As a rule of thumb, the security level should be set\n"
-"higher if the machine will contain crucial data, or if it will be a machine\n"
-"directly exposed to the Internet. The trade-off of a higher security level\n"
-"is generally obtained at the expense of ease of use.\n"
+"At this point, DrakX will allow you to choose the security level you desire\n"
+"for your machine. As a rule of thumb, the security level should be set\n"
+"higher if the machine is to contain crucial data, or if it's to be directly\n"
+"exposed to the Internet. The trade-off that a higher security level is\n"
+"generally obtained at the expense of ease of use.\n"
 "\n"
-"If you do not know what to choose, stay with the default option. You will\n"
-"be able to change that security level later with tool draksec from the\n"
-"Mandrake Control Center.\n"
+"If you don't know what to choose, keep the default option. You'll be able\n"
+"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"Control Center.\n"
 "\n"
-"The \"%s\" field can inform the system of the user on this computer who\n"
-"will be responsible for security. Security messages will be sent to that\n"
-"address."
+"Fill the \"%s\" field with the e-mail address of the person responsible for\n"
+"security. Security messages will be sent to that address."
 msgstr ""
 "Ara és el moment de triar el nivell de seguretat desitjat per a la màquina.\n"
 "Com a norma general, el nivell de seguretat ha de ser més alt si la màquina\n"
@@ -4544,17 +4702,17 @@ msgstr ""
 "\n"
 "Si no sabeu quin escollir, deixeu l'opció per defecte.. Podreu canviar\n"
 "el nivell de seguretat més tard amb l'eina draksec del\n"
-"Centre de Control Mandrake.\n"
+"Centre de Control Mandrakelinux.\n"
 "\n"
 "El camp \"%s\" pot informar l'usuari del sistema qui serà el responsable\n"
 "de la seguretat. Els missatges de seguretat s'enviaran a aquesta adreça."
 
-#: help.pm:472
+#: help.pm:458
 #, c-format
 msgid "Security Administrator"
 msgstr "Administrador de seguretat"
 
-#: 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"
@@ -4705,17 +4863,17 @@ msgstr ""
 "del disc RAM per a situacions d'emergència durant l'arrencada."
 
 #
-#: help.pm:544
+#: help.pm:530
 #, c-format
 msgid "Removable media auto-mounting"
 msgstr "Muntatge automàtic dels dispositius extraïbles"
 
-#: help.pm:544
+#: help.pm:530
 #, c-format
 msgid "Toggle between normal/expert mode"
 msgstr "Commuta entre els modes normal i expert"
 
-#: help.pm:547
+#: help.pm:533
 #, c-format
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
@@ -4782,40 +4940,40 @@ msgstr ""
 "\"Nom Windows\" és la lletra de la vostra unitat de disc sota Windows (el\n"
 "primer disc o partició s'anomena \"C:\")."
 
-#: help.pm:578
-#, c-format
+#: help.pm:564
+#, fuzzy, c-format
 msgid ""
-"\"%s\": check the current country selection. If you are not in this\n"
-"country, click on the \"%s\" button and choose another one. If your country\n"
-"is not in the first list shown, click the \"%s\" button to get the complete\n"
-"country list."
+"\"%s\": check the current country selection. If you're not in this country,\n"
+"click on the \"%s\" button and choose another. If your country isn't in the\n"
+"list shown, click on the \"%s\" button to get the complete country list."
 msgstr ""
 "\"%s\": comproveu que la selecció del país és correcta. Si no sou a\n"
 "aquest país, feu clic al botó \"%s\" i seleccioneu-ne un altre.\n"
 "Si el vostre país no és a la primera llista, feu clic al botó \"%s\" per\n"
 "obtenir una llista de països completa."
 
-#: help.pm:584
-#, c-format
+#: help.pm:569
+#, fuzzy, 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 ""
 "Aquest pas només s'activa si s'ha trobat una partició GNU/Linux antiga\n"
@@ -4837,29 +4995,28 @@ msgstr ""
 "fases de configuració queden disponibles, de manera similar a una\n"
 "instal·lació estàndard.\n"
 "\n"
-"L'opció ``Actualitza'' ha de funcionar correctament en sistemes Mandrake\n"
-"Linux amb la versió \"8.1\" o posteriors. No es recomana realitzar una\n"
+"L'opció “Actualitza” ha de funcionar correctament en sistemes Mandrakelinux\n"
+"amb la versió \"8.1\" o posteriors. No es recomana realitzar una\n"
 "actualització en versions de Mandrakelinux anteriors a la \"8.1\"."
 
-#: help.pm:605
-#, c-format
+#: help.pm:591
+#, fuzzy, c-format
 msgid ""
-"Depending on the language you chose in section , DrakX will automatically\n"
-"select a particular type of keyboard configuration. Check that the\n"
-"selection suits you or choose another keyboard layout.\n"
+"Depending on the language you chose (), DrakX will automatically select a\n"
+"particular type of keyboard configuration. Check that the selection suits\n"
+"you or choose another keyboard layout.\n"
 "\n"
-"Also, you may not have a keyboard that corresponds exactly to your\n"
+"Also, you may not have a keyboard which corresponds exactly to your\n"
 "language: for example, if you are an English-speaking Swiss native, you may\n"
 "have a Swiss keyboard. Or if you speak English and are located in Quebec,\n"
 "you may find yourself in the same situation where your native language and\n"
-"country-set keyboard do not match. In either case, this installation step\n"
+"country-set keyboard don't match. In either case, this installation step\n"
 "will allow you to select an appropriate keyboard from a list.\n"
 "\n"
-"Click on the \"%s\" button to be presented with the complete list of\n"
-"supported keyboards.\n"
+"Click on the \"%s\" button to be shown a list of supported keyboards.\n"
 "\n"
 "If you choose a keyboard layout based on a non-Latin alphabet, the next\n"
-"dialog will allow you to choose the key binding that will switch the\n"
+"dialog will allow you to choose the key binding which will switch the\n"
 "keyboard between the Latin and non-Latin layouts."
 msgstr ""
 "DrakX seleccionarà automàticament la configuració de teclat correcta\n"
@@ -4882,25 +5039,27 @@ msgstr ""
 "següent us permetrà escollir la tecla que servirà per canviar entre les\n"
 "configuracions llatina i no llatina."
 
-#: help.pm:624
-#, c-format
+#: help.pm:609
+#, fuzzy, 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"
@@ -4909,19 +5068,19 @@ 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 ""
 "L'idioma preferit que trieu afectarà a l'idioma de la documentació,\n"
 "l'instal·lador i a tot el sistema en general. Seleccioneu primer la\n"
@@ -4962,43 +5121,46 @@ msgstr ""
 "l'executeu com a usuari normal, només es canviarà l'idioma d'aquest\n"
 "usuari concret."
 
-#: help.pm:660
+#: help.pm:647
 #, c-format
 msgid "Espanol"
 msgstr "Espanyol"
 
-#: help.pm:663
-#, c-format
+#: help.pm:650
+#, fuzzy, 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 generalment detecta el nombre de botons que té el vostre ratolí.\n"
 "Si no pot, assumeix que teniu un ratolí de dos botons i el configurarà per\n"
@@ -5020,7 +5182,7 @@ msgstr ""
 "funciona bé, premeu la barra d'espai o la tecla [Intro] per cancel·lar la\n"
 "prova i tornar a la llista.\n"
 "\n"
-"De vegades, la roda del ratolí no es detecta automàticament. En aquest cas,\n"
+"De vegaDES, la roda del ratolí no es detecta automàticament. En aquest cas,\n"
 "haureu de seleccionar-lo a la llista. Assegureu-vos de triar el que\n"
 "correspon al port a què esta connectat el ratolí. Després de seleccionar un\n"
 "ratolí i prémer el botó \"%s\", a la pantalla apareixerà un ratolí. Mogueu "
@@ -5030,12 +5192,17 @@ msgstr ""
 "cursor\n"
 "de la pantalla es mou quan moveu el ratolí."
 
-#: help.pm:691
+#: help.pm:681
 #, c-format
 msgid "with Wheel emulation"
 msgstr "amb emulació de rodeta"
 
-#: help.pm:694
+#: help.pm:681
+#, c-format
+msgid "Universal | Any PS/2 & USB mice"
+msgstr "Universal | Qualsevol ratolí PS/2 o USB"
+
+#: help.pm:684
 #, c-format
 msgid ""
 "Please select the correct port. For example, the \"COM1\" port under\n"
@@ -5044,16 +5211,16 @@ msgstr ""
 "Si us plau, seleccioneu el port correcte. Per exemple, el port \"COM1\" a\n"
 "Windows s'anomena \"ttyS0\" a GNU/Linux."
 
-#: help.pm:698
-#, c-format
+#: help.pm:688
+#, fuzzy, 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"
@@ -5062,27 +5229,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 ""
 "Aquesta és la decisió més important quant a la seguretat del vostre sistema\n"
 "GNU/Linux: heu d'introduir la contrasenya de l'usuari \"root\". El \"root\"\n"
@@ -5107,7 +5273,7 @@ msgstr ""
 "\n"
 "La contrasenya no es mostrarà per pantalla quan la teclegeu. Per tant,\n"
 "haureu d'escriure-la dues vegades per reduir la probabilitat d'errors en\n"
-"l'escriptura. Si, malauradament, feu el mateix error dues vegades, haureu\n"
+"l'escriptura. Si, malauradament, feu el mateix error dues vegaDES, haureu\n"
 "d'usar aquesta contrasenya ``incorrecta'' el primer cop que us connecteu.\n"
 "\n"
 "Si voleu que aquest ordinador sigui controlat per un servidor\n"
@@ -5121,194 +5287,35 @@ msgstr ""
 "connectarà a Internet o si confieu absolutament en tothom que utilitza\n"
 "l'ordinador, podeu triar tenir \"%s\"."
 
-#: help.pm:733
+#: help.pm:722
 #, c-format
 msgid "authentication"
 msgstr "autenticació"
 
 #. -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 "Sense contrasenya"
 
-#: 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 ""
-"Aquest diàleg us permet ajustar el carregador d'arrencada:\n"
-"\n"
-" * \"%s\": hi ha tres opcions per al carregador d'arrencada:\n"
-"\n"
-"    * \"%s\": si preferiu el GRUB (menú de text).\n"
-"\n"
-"    * \"%s\": si preferiu el LILO amb la seva interfície de menús de text.\n"
-"\n"
-"    * \"%s\": si preferiu el LILO amb la seva interfície gràfica.\n"
-"\n"
-" * \"%s\": en la majoria de casos, no heu de canviar l'opció\n"
-"per defecte (\"%s\"), però,si ho preferiu, el carregador d'arrencada\n"
-"pot instal·lar-se en el segon disc dur (\"%s\"), o fins i tot en un \n"
-"disquet (\"%s\").\n"
-"\n"
-" * \"%s\": quan s'arrenca o es torna a arrencar l'ordinador, aquest\n"
-"és el temps de què disposa l'usuari per escollir una entrada diferent\n"
-"de l'entrada per defecte en el menú d'arrencada.\n"
-"\n"
-" * \"%s\": ACPI és un nou estàndard (aparegut durant l'any 2002) per a la\n"
-"gestió d'energia, principalment dels portàtils. Si sabeu que el vostre\n"
-"maquinari el suporta i que el necessiteu marqueu aquesta opció.\n"
-"\n"
-" * \"%s\": Si heu tingut problemes de maquinari al vostre ordinador\n"
-"(conflictes IRQ, poca estabilitat, penjades de l'ordinador, ...) haurieu de\n"
-"probar a desactivar APIC marcant aquesta opció.\n"
-"\n"
-"!! Tingueu en compte que si escolliu no instal·lar un carregador\n"
-"d'arrencada (seleccionant \"%s\"), heu d'estar segurs que teniu alguna\n"
-"manera d'arrencar el vostre sistema Mandrakelinux! Assegureu-vos de\n"
-"saber què feu abans de canviar alguna de les opcions!!\n"
-"\n"
-"Si feu clic al botó \"%s\" d'aquest diàleg accedireu a algunes opcions\n"
-"avançades, reservades normalment als usuaris experts."
-
-#: 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 abans d'arrencar la imatge predeterminada"
-
-#: 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 ""
-"Un cop configurats els paràmetres generals del carregador de l'arrencada, \n"
-"es mostrarà la llista d'opcions de càrrega que es veurà en arrencar la "
-"màquina.\n"
-"\n"
-"Si hi ha algun altre sistema operatiu instal·lat en el vostre ordinador, "
-"s'afegirà\n"
-"automàticament al menú d'arrencada. Podeu ajustar les opcions existents "
-"fent\n"
-"clic a \"%s\" per crear una nova entrada, i seleccionant una entrada i fent "
-"clic\n"
-"a \"%s\" o a \"%s\" per modificar-la o eliminar-la. \"%s\" valida els "
-"canvis.\n"
-"\n"
-"També és possible que no vulgueu permetre l'accés a aquests sistemes "
-"operatius\n"
-"a qualsevol que vagi a la consola i reiniciï l'ordinador; en aquest cas, "
-"podeu suprimir\n"
-"les entrades corresponents a aquests sistemes operatius per eliminar-los del "
-"menú\n"
-"del carregador d'arrencada, però aleshores us caldrà un disc d'arrencada per "
-"poder-los\n"
-"arrencar!"
-
-#: 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 "Afegeix"
-
-#
-#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#, c-format
-msgid "Modify"
-msgstr "Modifica"
-
-#
-#: 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 "Elimina"
-
-#: help.pm:787
-#, c-format
+#: help.pm:725
+#, fuzzy, 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 i GRUB són carregadors d'arrencada de GNU/Linux. Normalment,\n"
 "aquesta fase es realitza de manera totalment automàtica. DrakX analitzarà\n"
@@ -5326,33 +5333,33 @@ msgstr ""
 "\"%s\" no s'instal·larà cap carregador d'arrencada. Utilitzeu-lo només si\n"
 "sabeu que esteu fent."
 
-#: help.pm:803
-#, c-format
+#: help.pm:742
+#, fuzzy, 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 ""
 "Ara cal seleccionar el sistema d'impressió del vostre ordinador. Altres\n"
 "sistemes operatius us poden oferir un, però el Mandrakelinux n'ofereix\n"
@@ -5382,19 +5389,24 @@ msgstr ""
 "Si ara feu una tria, i després veieu que el sistema d'impressió no us\n"
 "agrada, podeu canviar-lo executant el PrinterDrake des del Centre de "
 "control\n"
-"de Mandrake i fent clic al botó Expert."
+"de Mandrakelinux i fent clic al botó Expert."
 
-#: 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 "Expert"
+
+#: help.pm:768
 #, c-format
 msgid ""
 "DrakX will first detect any IDE devices present in your computer. It will\n"
@@ -5428,7 +5440,7 @@ msgstr ""
 "voleu configurar-ne les opcions. Convé que deixeu que DrakX comprovi\n"
 "el maquinari per saber les opcions específiques de la targeta que calen per "
 "inicialitzar\n"
-"l'adaptador. La majoria de vegades, DrakX realitzarà aquest pas sense "
+"l'adaptador. La majoria de vegaDES, DrakX realitzarà aquest pas sense "
 "problemes.\n"
 "\n"
 "Si DrakX no pot comprovar les opcions per determinar automàticament els "
@@ -5436,244 +5448,74 @@ msgstr ""
 "que s'han de passar al maquinari, us caldrà configurar el controlador "
 "manualment."
 
-#: 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 ""
-"Podeu afegir entrades addicionals per al yaboot, ja sigui per a altres\n"
-"sistemes operatius, nuclis alternatius, o per a una imatge per a arrencades\n"
-"d'emergència.\n"
-"\n"
-"Per a altres SO, l'entrada només consta d'una etiqueta i de la\n"
-"partició arrel.\n"
-"\n"
-"Per Linux, hi ha unes quantes opcions possibles:\n"
-"\n"
-" * Etiqueta: el nom a escriure en l'indicador del yaboot per\n"
-"seleccionar aquesta opció d'arrencada.\n"
-"\n"
-" * Imatge: el nom del nucli a arrencar. Normalment, vmlinux o una\n"
-"variació de vmlinux amb una extensió.\n"
-"\n"
-" * Arrel: el dispositiu arrel o '/' per a la instal·lació del Linux.\n"
-"\n"
-" * Addició: en maquinari Apple, l'opció d'addició de nuclis s'utilitza\n"
-"força sovint per auxiliar en la inicialització de maquinari de vídeo o per\n"
-"habilitar l'emulació del botó del ratolí de teclat per als 2n i 3r botons,\n"
-"que sovint no existeixen en un ratolí Apple convencional. Alguns exemples\n"
-"d'això són:\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: aquesta opció es pot utilitzar per carregar els mòduls inicials,\n"
-"abans que el dispositiu d'arrencada estigui disponible, o per carregar\n"
-"una imatge de disc RAM en una situació d'arrencada d'emergència.\n"
-"\n"
-" * Initrd-size: la mida per defecte del disc RAM sol ser de 4096 kB.\n"
-"Si necessiteu assignar un disc RAM gran, podeu utilitzar aquesta opció\n"
-"per indicar un disc RAM més gran que el predeterminat.\n"
-"\n"
-" * Lectura-Escriptura: normalment, la partició arrel es munta inicialment "
-"com de\n"
-"només lectura per permetre una comprovació del sistema de fitxers abans que "
-"el\n"
-"sistema esdevingui \"viu\". Podeu substituir el valor per defecte amb "
-"aquesta opció.\n"
-"\n"
-" * Sense Vídeo: en cas que el maquinari de vídeo d'Apple resulti "
-"especialment\n"
-"problemàtic, podeu seleccionar aquesta opció per arrencar en mode 'no-"
-"vídeo',\n"
-"amb el suport nadiu framebuffer.\n"
-"\n"
-" * Per defecte: seleccioneu aquesta entrada com a selecció per defecte del\n"
-"Linux; se selecciona prement simplement Retorn a l'indicador del yaboot.\n"
-"Aquesta entrada també es ressaltarà amb un ``*'' si premeu Tab per veure "
-"les\n"
-"seleccions d'arrencada."
-
-#: 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 és un carregador d'arrencada per a maquinari Macintosh NewWorld.\n"
-"Pot arrencar tant GNU/Linux com MacOS o MacOSX. Normalment,\n"
-"MacOS i MacOSX es detecten i instal·len correctament en el menú del\n"
-"carregador d'arrencada; si no és així, però, en aquesta pantalla podeu\n"
-"afegir una entrada manualment. Aneu amb compte de triar els paràmetres\n"
-"correctes.\n"
-"\n"
-"Les opcions principals del Yaboot són:\n"
-"\n"
-" * Missatge d'inicialització: un senzill missatge de text que apareix abans\n"
-"de l'indicador d'arrencada.\n"
-"\n"
-" * Dispositiu d'arrencada: indica on voleu situar la informació necessària\n"
-"per arrencar el GNU/Linux. Normalment, haureu configurat abans una partició\n"
-"bootstrap que contindrà aquesta informació.\n"
-"\n"
-" * Demora de l'Open Firmware: a diferència del LILO, amb el Yaboot hi ha\n"
-"dues demores disponibles. La primera d'elles es mesura en segons i, en\n"
-"aquest punt, podeu triar entre CD, arrencada OF, MacOS o Linux.\n"
-"\n"
-" * Temps màxim d'arrencada del nucli: aquest temps màxim és similar a la\n"
-"demora d'arrencada del LILO. Després de seleccionar el Linux tindreu aquest\n"
-"temps en increments de 0,1 segons abans que se seleccioni la descripció per\n"
-"defecte del nucli.\n"
-"\n"
-" * Habilita l'arrencada des de CD: si activeu aquesta opció podreu triar\n"
-"``C'' per a CD al primer indicador de l'arrencada.\n"
-"\n"
-" * Habilita l'arrencada OF: si activeu aquesta opció podreu triar ``N`` per\n"
-"a Open Firmware al primer indicador de l'arrencada.\n"
-"\n"
-" * SO per defecte: podeu seleccionar amb quin SO, per defecte, s'arrencarà\n"
-"quan la demora de l'Open Firmware venci."
-
-#: help.pm:926
-#, c-format
+#: help.pm:786
+#, fuzzy, 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 es detecta una targeta de so al vostre sistema, es mostra aquí.\n"
 "Si veieu que la targeta de so que es mostra no és la que realment teniu al\n"
 "sistema, podeu fer clic al botó i seleccionar un altre programa de control."
 
-#: 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 "Targeta de so"
 
-#: help.pm:932
-#, c-format
+#: help.pm:791
+#, fuzzy, 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 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\": 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\": 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"
+" * \"%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 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"
-"\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"
@@ -5683,10 +5525,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 ""
@@ -5751,61 +5595,60 @@ msgstr ""
 "en el vostre ordinador. Si teniu previst utilitzar aquesta màquina com\n"
 "a servidor, és aconsellable que reviseu aquesta configuració."
 
-#: help.pm:991 install_steps_interactive.pm:110
-#: install_steps_interactive.pm:887 standalone/keyboarddrake:23
-#, c-format
-msgid "Keyboard"
-msgstr "Teclat"
-
-#: 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 "Fus horari"
 
-#: help.pm:991
-#, c-format
-msgid "Graphical Interface"
-msgstr "Interfície gràfica"
-
-#: help.pm:991 install_steps_interactive.pm:987
+#: help.pm:855 install_steps_interactive.pm:1052
 #, c-format
 msgid "TV card"
 msgstr "Targeta de TV"
 
-#: help.pm:991
+#: help.pm:855
 #, c-format
 msgid "ISDN card"
 msgstr "Targeta XDSI"
 
+#: help.pm:855
+#, c-format
+msgid "Graphical Interface"
+msgstr "Interfície gràfica"
+
 #
-#: help.pm:991 install_steps_interactive.pm:1005 standalone/drakbackup:2010
+#: help.pm:855 install_steps_interactive.pm:1070 standalone/drakbackup:2030
 #, c-format
 msgid "Network"
 msgstr "Xarxa"
 
+#: help.pm:855 install_steps_interactive.pm:1085
+#, c-format
+msgid "Proxies"
+msgstr "Intermediaris"
+
 #
-#: help.pm:991 install_steps_interactive.pm:1031
+#: help.pm:855 install_steps_interactive.pm:1096
 #, c-format
 msgid "Security Level"
 msgstr "Nivell de seguretat:"
 
-#: help.pm:991 install_steps_interactive.pm:1045
+#: help.pm:855 install_steps_interactive.pm:1110
 #, c-format
 msgid "Firewall"
 msgstr "Tallafoc"
 
-#: help.pm:991 install_steps_interactive.pm:1059
+#: help.pm:855 install_steps_interactive.pm:1124
 #, c-format
 msgid "Bootloader"
 msgstr "Carregador d'arrencada"
 
 #
-#: 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 "Serveis"
 
-#: help.pm:994
+#: help.pm:858
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
@@ -5816,7 +5659,7 @@ msgstr ""
 "Mandrakelinux. Aneu amb compte, totes les dades actuals es perdran i no\n"
 "es podran recuperar!"
 
-#: help.pm:999
+#: help.pm:863
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
@@ -5835,7 +5678,17 @@ msgstr ""
 "Feu clic a \"%s\" per aturar aquesta operació sense perdre cap dada\n"
 "ni partició d'aquest disc."
 
-#: install2.pm:119
+#: help.pm:869
+#, c-format
+msgid "Next ->"
+msgstr "Següent ->"
+
+#: 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 "
@@ -5847,12 +5700,81 @@ msgstr ""
 "d'arrencada no està sincronitzat amb el suport d'instal·lació (si us plau, "
 "creeu un nou disquet d'arrencada)"
 
-#: install2.pm:169
+#: install2.pm:167
 #, c-format
 msgid "You must also format %s"
 msgstr "També heu de formatar %s"
 
-#: install_any.pm:402
+#: install_any.pm:390
+#, c-format
+msgid ""
+"The following installation media have been found.\n"
+"If you want to skip some of them, you can unselect them now."
+msgstr ""
+
+#: install_any.pm:411
+#, c-format
+msgid "Do you have further supplementary media?"
+msgstr ""
+
+#. -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 ""
+
+#: 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 "Xarxa (http)"
+
+#
+#: install_any.pm:420
+#, c-format
+msgid "Network (ftp)"
+msgstr "Xarxa (ftp)"
+
+#
+#: install_any.pm:464 standalone/drakbackup:112
+#, c-format
+msgid "No device found"
+msgstr "No s'ha trobat cap dispositiu"
+
+#: install_any.pm:468
+#, c-format
+msgid "Insert the CD"
+msgstr "Inseriu el CD"
+
+#: install_any.pm:492
+#, c-format
+msgid "Insert the CD 1 again"
+msgstr "Inseriu el CD 1 un altre cop"
+
+#: install_any.pm:502 install_any.pm:506
+#, c-format
+msgid "URL of the mirror?"
+msgstr ""
+
+#: install_any.pm:532
+#, fuzzy, c-format
+msgid "Can't find hdlist file on this mirror"
+msgstr "No s'ha trobat %s a %s"
+
+#. -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"
@@ -5877,7 +5799,8 @@ msgstr ""
 "\n"
 "Voleu realment instal·lar aquests servidors?\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"
@@ -5890,17 +5813,17 @@ msgstr ""
 "\n"
 "Voleu realment suprimir aquests paquets?\n"
 
-#: install_any.pm:818
+#: install_any.pm:1116
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Inseriu un disquet formatat amb FAT a la unitat %s"
 
-#: install_any.pm:822
+#: install_any.pm:1120
 #, c-format
 msgid "This floppy is not FAT formatted"
 msgstr "Aquest disquet no està formatat amb FAT"
 
-#: install_any.pm:834
+#: install_any.pm:1132
 #, c-format
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
@@ -5909,12 +5832,17 @@ msgstr ""
 "Per utilitzar aquesta selecció de paquets que heu desat, arrenqueu la "
 "instal·lació amb \"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 "S'ha produït un error en llegir el fitxer %s"
 
-#: install_any.pm:987
+#: install_any.pm:1361
+#, fuzzy, c-format
+msgid "%s (was %s)"
+msgstr "%s (Port %s)"
+
+#: install_any.pm:1396
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
@@ -5924,13 +5852,13 @@ msgstr ""
 "sistemes de fitxers. Si us plau, comproveu el vostre maquinari per trobar el "
 "problema"
 
-#: install_gtk.pm:161
+#: install_gtk.pm:160
 #, c-format
 msgid "System installation"
 msgstr "Instal·lació del sistema"
 
 #
-#: install_gtk.pm:164
+#: install_gtk.pm:163
 #, c-format
 msgid "System configuration"
 msgstr "Configuració del sistema"
@@ -5967,7 +5895,7 @@ msgstr ""
 "Voleu continuar igualment?"
 
 #
-#: 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 "Heu de tenir una partició FAT muntada en /boot/efi"
@@ -6028,7 +5956,7 @@ msgstr "A quina partició voleu canviar-li la mida?"
 #, 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 la FAT no pot gestionar la vostra partició. \n"
 "S'ha produït l'error següent: %s"
@@ -6050,7 +5978,8 @@ msgstr ""
 "començar la instal·lació del Mandrakelinux."
 
 #
-#: 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"
@@ -6077,54 +6006,54 @@ msgstr ""
 "de les vostres dades.\n"
 "Quan estigueu segur, premeu D'acord."
 
-#: install_interactive.pm:176
+#: install_interactive.pm:178
 #, c-format
 msgid "Which size do you want to keep for Windows on"
 msgstr "Quina mida voleu deixar per a la partició de Windows?"
 
-#: install_interactive.pm:177
+#: install_interactive.pm:179
 #, c-format
 msgid "partition %s"
 msgstr "partició %s"
 
-#: install_interactive.pm:186
+#: install_interactive.pm:188
 #, c-format
 msgid "Resizing Windows partition"
 msgstr "S'està redimensionant la partició de Windows"
 
-#: install_interactive.pm:191
+#: install_interactive.pm:193
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "Ha fallat el redimensionament 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 hi ha cap partició FAT a la qual canviar la mida (o no queda prou espai)"
 
-#: install_interactive.pm:211
+#: install_interactive.pm:213
 #, c-format
 msgid "Remove Windows(TM)"
 msgstr "Elimina el 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 "Teniu més d'un disc dur; en quin voleu instal·lar el 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 ""
 "Es perdran TOTES les particions, i les dades que contenen, de la unitat %s"
 
-#: install_interactive.pm:230
+#: install_interactive.pm:232
 #, c-format
 msgid "Use fdisk"
 msgstr "Utilitza l'fdisk"
 
-#: install_interactive.pm:233
+#: install_interactive.pm:235
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -6133,33 +6062,34 @@ msgstr ""
 "Ara podeu fer les particions a %s.\n"
 "Quan acabeu, no oblideu desar-les utilitzant 'w'"
 
-#: install_interactive.pm:269
+#: install_interactive.pm:271
 #, c-format
 msgid "I can't find any room for installing"
 msgstr "No es pot trobar espai per a la instal·lació"
 
-#: install_interactive.pm:273
+#: install_interactive.pm:275
 #, c-format
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr ""
 "L'auxiliar de particionament del DrakX ha trobat les solucions següents:"
 
-#: install_interactive.pm:279
+#: install_interactive.pm:281
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Ha fallat el particionament: %s"
 
-#: install_interactive.pm:286
+#: install_interactive.pm:288
 #, c-format
 msgid "Bringing up the network"
 msgstr "S'està activant la xarxa"
 
-#: install_interactive.pm:291
+#: install_interactive.pm:293
 #, c-format
 msgid "Bringing down the network"
 msgstr "S'està desactivant la xarxa"
 
-#: install_messages.pm:9
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_messages.pm:10
 #, fuzzy, c-format
 msgid ""
 "Introduction\n"
@@ -6177,7 +6107,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 +6129,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 +6137,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 +6174,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 +6188,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,14 +6208,14 @@ 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 ""
 "Introducció\n"
 "\n"
 "D'ara endavant, hom es referirà al sistema operatiu i als diferents\n"
 "components disponibles en la distribució Mandrakelinux com als\n"
 "\"Productes de programari\". Els Productes de programari inclouen,\n"
-"però no estan restringits a, el conjunt de programes, mètodes, regles\n"
+"però no estan restringits a, el conjunt de programes, mètoDES, regles\n"
 "i documentació relativa al sistema operatiu i els diferents\n"
 "components de la distribució Mandrakelinux.\n"
 "\n"
@@ -6293,7 +6223,7 @@ msgstr ""
 "1. Acord de llicència\n"
 "\n"
 "Si us plau, llegiu atentament aquest document. Aquest document és un\n"
-"acord de llicència entre la vostra persona i MandrakeSoft S.A., que\n"
+"acord de llicència entre la vostra persona i Mandrakesoft S.A., que\n"
 "s'aplica als Productes de programari. Pel fet d'instal·lar, duplicar\n"
 "o utilitzar els Productes de programari en qualsevol forma esteu\n"
 "acceptant explícitament, i expressant el vostre acord a avenir-vos a\n"
@@ -6311,20 +6241,20 @@ msgstr ""
 "\n"
 "Els Productes de programari i documentació adjunta es subministren\n"
 "\"tal com són\", sense cap garantia, fins al punt permés per la llei.\n"
-"MandrakeSoft S.A. no serà, sota cap circumstància, i fins al punt\n"
+"Mandrakesoft S.A. no serà, sota cap circumstància, i fins al punt\n"
 "permés per la llei, responsable de cap dany especial, incidental ni\n"
 "directe (incloent, sense limitar-se a, els danys per pèrdua de\n"
 "negocis, interrupció de negocis, pèrdues financeres, multes i costes\n"
 "judicials, o qualsevol altre dany que resultin d'un judici, o\n"
 "qualsevol altre pèrdua d'importància) que resulti de l'ús o de la\n"
 "impossibilitat d'utilitzar els Productes de programari, fins i tot si\n"
-"MandrakeSoft S.A. ha estat avisat de la possibilitat que\n"
+"Mandrakesoft S.A. ha estat avisat de la possibilitat que\n"
 "s'esdevinguin aquests danys.\n"
 "\n"
 "RESPONSABILITAT LIMITADA RELATIVA A LA POSSESSIÓ O UTILITZACIÓ DE PROGRAMARI "
 "PROHIBIT EN ALGUNS PAÏSOS\n"
 "\n"
-"Fins al punt permés per la llei, MandrakeSoft S.A. o els seus\n"
+"Fins al punt permés per la llei, Mandrakesoft S.A. o els seus\n"
 "distribuïdors no seran, sota cap circumstància, responsables de cap\n"
 "dany especial, incidental ni directe (incloent, sense limitar-se a,\n"
 "els danys per pèrdua de negocis, interrupció de negocis, pèrdues\n"
@@ -6349,9 +6279,9 @@ msgstr ""
 "cobreixen. Si us plau, llegiu atentament les clàusules i condicions\n"
 "de l'acord de llicència de cada component abans d'utilitzar-lo.\n"
 "Qualsevol pregunta sobre la llicència d'un component s'ha d'adreçar\n"
-"al seu autor i no a MandrakeSoft.\n"
-"Els programes desenvolupats per MandrakeSoft S.A. es regeixen per la\n"
-"llicència GPL.La documentació escrita per MandrakeSoft S.A. està regida per "
+"al seu autor i no a Mandrakesoft.\n"
+"Els programes desenvolupats per Mandrakesoft S.A. es regeixen per la\n"
+"llicència GPL.La documentació escrita per Mandrakesoft S.A. està regida per "
 "una\n"
 "llicència específica; consulteu la documentació per a més\n"
 "informació.\n"
@@ -6363,11 +6293,11 @@ msgstr ""
 "pertanyen als seus autors respectius i estan protegits per les lleis\n"
 "de propietat intel·lectual i de copyright aplicables als programes\n"
 "informàtics.\n"
-"MandrakeSoft S.A. es reserva els drets de modificar o adaptar els\n"
+"Mandrakesoft S.A. es reserva els drets de modificar o adaptar els\n"
 "Productes de programari, totalment o parcialment, per tots els\n"
 "mitjans i amb totes les finalitats.\n"
 "\"Mandrake\", \"Mandrakelinux\" i els logotips associats son marques\n"
-"registrades de MandrakeSoft S.A.\n"
+"registrades de Mandrakesoft S.A.\n"
 "\n"
 "\n"
 "5. Lleis rectores \n"
@@ -6382,9 +6312,9 @@ msgstr ""
 "preferiblement fora dels tribunals. Com a últim recurs, el litigi es\n"
 "portarà als tribunals competents de París, França.\n"
 "Per a qualsevol tema relacionat amb aquest document, poseu-vos en\n"
-"contacte amb MandrakeSoft S.A.\n"
+"contacte amb 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"
@@ -6405,7 +6335,8 @@ msgstr ""
 "patent és aplicable\n"
 "consulteu les lleis locals."
 
-#: 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"
@@ -6470,7 +6401,7 @@ msgstr ""
 "propietat intel·lectual i de copyright aplicables als programes\n"
 "informàtics.\n"
 
-#: install_messages.pm:128
+#: install_messages.pm:131
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
@@ -6503,30 +6434,31 @@ msgstr ""
 "l'últim capítol d'instal·lació de la Guia Oficial de l'Usuari del\n"
 "Mandrakelinux."
 
-#: 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 "Duplica el punt de muntatge %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 ""
 "Alguns paquets importants no s'han instal·lat correctament.\n"
 "La vostra unitat de CD-ROM, o bé el CD-ROM, són defectuosos.\n"
-"Comproveu el CD-ROM en un ordinador instal·lat mitjançant \"rpm -qpl "
-"Mandrake/RPMS/*.rpm\"\n"
+"Comproveu el CD-ROM en un ordinador instal·lat mitjançant \"rpm -qpl media/"
+"main/*.rpm\"\n"
 
-#: install_steps.pm:533
+#: install_steps.pm:603
 #, c-format
 msgid "No floppy drive available"
 msgstr "No hi ha cap unitat de disquet disponible"
@@ -6536,7 +6468,7 @@ msgstr "No hi ha cap unitat de disquet disponible"
 msgid "Entering step `%s'\n"
 msgstr "S'està entrant en el pas '%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"
@@ -6549,67 +6481,67 @@ msgstr ""
 "mode text. Per fer-ho, premeu 'F1' en arrencar des del CD-ROM i escriviu "
 "'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ó del grup de paquets"
 
-#: 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 "Mida total: %d / %d MB"
 
-#: install_steps_gtk.pm:340
+#: install_steps_gtk.pm:309
 #, c-format
 msgid "Bad package"
 msgstr "Paquet incorrecte"
 
-#: install_steps_gtk.pm:342
+#: install_steps_gtk.pm:311
 #, c-format
 msgid "Version: "
 msgstr "Versió: "
 
-#: install_steps_gtk.pm:343
+#: install_steps_gtk.pm:312
 #, c-format
 msgid "Size: "
 msgstr "Mida:"
 
-#: 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 "Importància:"
 
-#: install_steps_gtk.pm:377
+#: install_steps_gtk.pm:346
 #, c-format
 msgid "You can't select/unselect this package"
 msgstr "No podeu seleccionar/desseleccionar aquest paquet"
 
-#: install_steps_gtk.pm:381
+#: install_steps_gtk.pm:350
 #, c-format
 msgid "due to missing %s"
 msgstr "degut a que falten %s"
 
-#: install_steps_gtk.pm:382
+#: install_steps_gtk.pm:351
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "degut a %s no satisfetes"
 
-#: install_steps_gtk.pm:383
+#: install_steps_gtk.pm:352
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: install_steps_gtk.pm:384
+#: install_steps_gtk.pm:353
 #, c-format
 msgid "in order to keep %s"
 msgstr "per tal de mantenir %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"
@@ -6617,27 +6549,27 @@ msgstr ""
 "No podeu seleccionar aquest paquet perquè no queda prou espai per instal·lar-"
 "lo"
 
-#: install_steps_gtk.pm:392
+#: install_steps_gtk.pm:361
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Ara s'instal·laran els paquets següents"
 
-#: install_steps_gtk.pm:393
+#: install_steps_gtk.pm:362
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Ara s'eliminaran els paquets següents"
 
-#: install_steps_gtk.pm:417
+#: install_steps_gtk.pm:386
 #, c-format
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Aquest paquet és obligatori; no es pot desseleccionar"
 
-#: 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 podeu desseleccionar aquest paquet; ja està instal·lat"
 
-#: install_steps_gtk.pm:422
+#: install_steps_gtk.pm:391
 #, c-format
 msgid ""
 "This package must be upgraded.\n"
@@ -6646,227 +6578,230 @@ msgstr ""
 "Aquest paquet s'ha d'actualitzar.\n"
 "Esteu segur que voleu desseleccionar-lo?"
 
-#: 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 podeu desseleccionar aquest paquet; s'ha d'actualitzar"
 
-#: install_steps_gtk.pm:430
+#: install_steps_gtk.pm:399
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Mostra automàticament els paquets seleccionats"
 
 #
-#: install_steps_gtk.pm:435
+#: install_steps_gtk.pm:404
 #, c-format
 msgid "Load/Save on floppy"
 msgstr "Carrega/Desa al disquet"
 
 #
-#: install_steps_gtk.pm:436
+#: install_steps_gtk.pm:405
 #, c-format
 msgid "Updating package selection"
 msgstr "S'està actualitzant la selecció de paquets"
 
 #
-#: install_steps_gtk.pm:441
+#: install_steps_gtk.pm:410
 #, c-format
 msgid "Minimal install"
 msgstr "Instal·lació 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 "Escolliu els paquets que voleu instal·lar"
 
-#: 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 "S'està instal·lant"
 
-#: install_steps_gtk.pm:477
-#, c-format
-msgid "No details"
-msgstr "Sense detalls"
-
-#: install_steps_gtk.pm:478
+#: install_steps_gtk.pm:447
 #, c-format
 msgid "Estimating"
 msgstr "S'està estimant"
 
-#: install_steps_gtk.pm:484
+#: install_steps_gtk.pm:453
 #, c-format
 msgid "Time remaining "
 msgstr "Temps restant "
 
-#: install_steps_gtk.pm:496
+#: install_steps_gtk.pm:464
 #, c-format
 msgid "Please wait, preparing installation..."
 msgstr "Espereu si us plau, s'està preparant la instal·lació..."
 
-#: install_steps_gtk.pm:557
+#: install_steps_gtk.pm:474
+#, c-format
+msgid "No details"
+msgstr "Sense detalls"
+
+#: install_steps_gtk.pm:527
 #, c-format
 msgid "%d packages"
 msgstr "%d paquets"
 
-#: install_steps_gtk.pm:562
+#: install_steps_gtk.pm:532
 #, c-format
 msgid "Installing package %s"
 msgstr "S'està instal·lant el paquet %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 "Rebutja"
 
-#: 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 ""
-"Canvieu el CD-ROM!\n"
-"\n"
+"Canvieu el Cd-Rom!\n"
 "Si us plau, inseriu el CD-ROM etiquetat com \"%s\" a la unitat i després\n"
 "premeu D'acord.\n"
-"Si no el teniu, premeu Cancel·la per no fer la instal·lació des d'aquest CD-"
-"ROM."
+"Si no el teniu, premeu Cancel·la per no fer la instal·lació des d'aquest 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 "S'ha produït un error en ordenar els paquets:"
 
-#: 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 "Voleu seguir igualment?"
 
-#: 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 "S'ha produït un error en instal·lar els paquets:"
 
-#: 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 configurat(da)"
 
-#: install_steps_interactive.pm:81
+#: install_steps_interactive.pm:86
 #, c-format
 msgid "Do you want to recover your system?"
 msgstr "Voleu recuperar el vostre sistema?"
 
-#: install_steps_interactive.pm:82
+#: install_steps_interactive.pm:87
 #, c-format
 msgid "License agreement"
 msgstr "Acord de llicència"
 
+#: install_steps_interactive.pm:91
+#, c-format
+msgid "Release Notes"
+msgstr ""
+
 #
-#: install_steps_interactive.pm:111
+#: install_steps_interactive.pm:121
 #, c-format
 msgid "Please choose your keyboard layout."
 msgstr "Si us plau, seleccioneu la disposició del vostre teclat."
 
-#: install_steps_interactive.pm:113
-#, fuzzy, c-format
+#: install_steps_interactive.pm:123
+#, c-format
 msgid "Here is the full list of available keyboards"
-msgstr "Aquesta és la llista completa de països"
+msgstr "Aquesta és la llista completa de teclats disponibles"
 
-#: install_steps_interactive.pm:143
+#: install_steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Instal·la/Actualitza"
 
-#: install_steps_interactive.pm:144
+#: install_steps_interactive.pm:154
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Es tracta d'una instal·lació o d'una actualització?"
 
 #
-#: install_steps_interactive.pm:150
+#: install_steps_interactive.pm:160
 #, c-format
 msgid "Upgrade %s"
 msgstr "Actualitza %s"
 
-#: install_steps_interactive.pm:160
+#: install_steps_interactive.pm:170
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Clau de xifratge per a %s"
 
 #
-#: install_steps_interactive.pm:177
+#: install_steps_interactive.pm:187
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Si us plau, seleccioneu el tipus del vostre ratolí."
 
-#: install_steps_interactive.pm:186 standalone/mousedrake:46
+#: install_steps_interactive.pm:196 standalone/mousedrake:46
 #, c-format
 msgid "Mouse Port"
 msgstr "Port del ratolí"
 
-#: 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 "Si us plau, seleccioneu el port sèrie a què està connectat el ratolí."
 
-#: install_steps_interactive.pm:197
+#: install_steps_interactive.pm:207
 #, c-format
 msgid "Buttons emulation"
 msgstr "Emulació dels botons"
 
-#: install_steps_interactive.pm:199
+#: install_steps_interactive.pm:209
 #, c-format
 msgid "Button 2 Emulation"
 msgstr "Emulació del botó 2"
 
-#: install_steps_interactive.pm:200
+#: install_steps_interactive.pm:210
 #, c-format
 msgid "Button 3 Emulation"
 msgstr "Emulació del botó 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 "S'estan configurant les targetes 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 "S'està configurant l'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 hi ha particions disponibles"
 
-#: install_steps_interactive.pm:251
+#: install_steps_interactive.pm:261
 #, c-format
 msgid "Scanning partitions to find mount points"
 msgstr "S'estan explorant les particions per trobar els punts de muntatge"
 
-#: install_steps_interactive.pm:258
+#: install_steps_interactive.pm:268
 #, c-format
 msgid "Choose the mount points"
 msgstr "Escolliu els punts de muntatge"
 
-#: 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 "
@@ -6876,17 +6811,17 @@ msgstr ""
 "continuarà, però per iniciar el sistema necessitareu crear la partició de "
 "bootstrap amb el DiskDrake"
 
-#: install_steps_interactive.pm:325
+#: install_steps_interactive.pm:337
 #, c-format
 msgid "Choose the partitions you want to format"
 msgstr "Escolliu les particions que voleu formatar"
 
-#: install_steps_interactive.pm:327
+#: install_steps_interactive.pm:339
 #, c-format
 msgid "Check bad blocks?"
 msgstr "Voleu comprovar els blocs incorrectes?"
 
-#: 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, "
@@ -6895,36 +6830,50 @@ msgstr ""
 "És impossible de comprovar el sistema de fitxers %s. Voleu reparar els "
 "errors? (Vigileu, podríeu perdre dades.)"
 
-#: install_steps_interactive.pm:362
+#: install_steps_interactive.pm:374
 #, c-format
 msgid "Not enough swap space to fulfill installation, please add some"
 msgstr ""
 "No hi ha prou espai d'intercanvi per completar la instal·lació; si us plau, "
 "afegiu-ne"
 
-#: install_steps_interactive.pm:369
+#: install_steps_interactive.pm:381
 #, c-format
 msgid "Looking for available packages and rebuilding rpm database..."
 msgstr ""
 "S'estan cercant els paquets disponibles i reconstruint la base de dades "
 "d'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 "S'estan cercant els paquets disponibles..."
 
-#: install_steps_interactive.pm:373
+#: install_steps_interactive.pm:385
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "S'estan cercant els paquets ja instal·lats..."
 
-#: install_steps_interactive.pm:377
+#: install_steps_interactive.pm:389
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "S'estan cercant els paquets a actualitzar"
 
-#: 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 ""
+"S'està contactant amb el servidor Mandrakelinux per obtenir la llista de "
+"rèpliques disponibles..."
+
+#: install_steps_interactive.pm:411 install_steps_interactive.pm:839
+#, c-format
+msgid "Choose a mirror from which to get the packages"
+msgstr "Escolliu una rèplica des de la qual aconseguir els paquets"
+
+#: install_steps_interactive.pm:451
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%d "
@@ -6933,7 +6882,7 @@ msgstr ""
 "Al vostre sistema no li queda prou espai per a la instal·lació o "
 "actualització (%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"
@@ -6944,46 +6893,46 @@ msgstr ""
 "automàtica."
 
 #
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Load from floppy"
 msgstr "Carrega des del disquet"
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Save on floppy"
 msgstr "Desa al disquet"
 
 #
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Package selection"
 msgstr "Selecció de paquets"
 
 #
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Loading from floppy"
 msgstr "S'està carregant des del disquet"
 
 #
-#: install_steps_interactive.pm:450
+#: install_steps_interactive.pm:504
 #, c-format
 msgid "Insert a floppy containing package selection"
 msgstr "Inseriu un disquet amb la selecció de paquets"
 
-#: install_steps_interactive.pm:533
+#: install_steps_interactive.pm:581
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "La mida seleccionada és superior a la disponible"
 
 #
-#: install_steps_interactive.pm:548
+#: install_steps_interactive.pm:596
 #, c-format
 msgid "Type of install"
 msgstr "Tipus d'instal·lació"
 
-#: install_steps_interactive.pm:549
+#: install_steps_interactive.pm:597
 #, c-format
 msgid ""
 "You haven't selected any group of packages.\n"
@@ -6992,22 +6941,22 @@ msgstr ""
 "No heu seleccionat cap grup de paquets.\n"
 "Escolliu la instal·lació mínima que voleu:"
 
-#: install_steps_interactive.pm:553
+#: install_steps_interactive.pm:601
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Amb la documentació bàsica (recomanat!)"
 
-#: install_steps_interactive.pm:554
+#: install_steps_interactive.pm:602
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Instal·lació realment mínima (especialment no urpmi)"
 
-#: install_steps_interactive.pm:597 standalone/drakxtv:50
+#: install_steps_interactive.pm:645 standalone/drakxtv:52
 #, c-format
 msgid "All"
 msgstr "Tots"
 
-#: 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 +6967,17 @@ msgstr ""
 "Si no teniu cap d'aquests CD, feu clic a 'Cancel·la'.\n"
 "Si només falten alguns CD, desseleccioneu-los i feu clic a 'D'acord'."
 
-#: install_steps_interactive.pm:646
+#: install_steps_interactive.pm:699
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "CD-ROM etiquetat com \"%s\""
 
-#: install_steps_interactive.pm:666
+#: install_steps_interactive.pm:720
 #, c-format
 msgid "Preparing installation"
 msgstr "S'està preparant la instal·lació"
 
-#: install_steps_interactive.pm:675
+#: install_steps_interactive.pm:729
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -7037,17 +6986,17 @@ msgstr ""
 "S'està instal·lant el paquet %s\n"
 "%d%%"
 
-#: install_steps_interactive.pm:721
+#: install_steps_interactive.pm:778
 #, c-format
 msgid "Post-install configuration"
 msgstr "Configuració posterior a la instal·lació"
 
-#: install_steps_interactive.pm:727
+#: install_steps_interactive.pm:784
 #, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
 msgstr "Inseriu el disquet d'Actualització de Mòduls a la unitat %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 +7006,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 ""
 "Ara teniu l'oportunitat de baixar paquets actualitzats. Aquests paquets\n"
 "han estat actualitzats després de la publicació de la distribució. Poden "
@@ -7069,193 +7018,174 @@ msgstr ""
 "\n"
 "Voleu instal·lar les actualitzacions?"
 
-#
-#: install_steps_interactive.pm:769
-#, c-format
-msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
-msgstr ""
-"S'està contactant amb el servidor Mandrakelinux per obtenir la llista de "
-"rèpliques disponibles..."
-
-#: install_steps_interactive.pm:774
-#, c-format
-msgid "Choose a mirror from which to get the packages"
-msgstr "Escolliu una rèplica des de la qual aconseguir els paquets"
-
-#: install_steps_interactive.pm:788
+#: install_steps_interactive.pm:853
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr ""
 "S'està contactant amb la rèplica per obtenir la llista dels paquets "
 "disponibles..."
 
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "No es pot contactar amb la rèplica: %s"
 
 #
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
 #, c-format
 msgid "Would you like to try again?"
 msgstr "Voleu tornar-ho a provar?"
 
-#: install_steps_interactive.pm:818 standalone/drakclock:45
+#: install_steps_interactive.pm:883 standalone/drakclock:46
 #, c-format
 msgid "Which is your timezone?"
 msgstr "En quina zona horària us trobeu?"
 
-#: install_steps_interactive.pm:823
+#: install_steps_interactive.pm:888
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "Sincronització automàtica de la hora (usant 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 "Resum"
 
 #
-#: 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 "Maquinari"
 
-#: 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 remot"
 
-#: install_steps_interactive.pm:932
+#: install_steps_interactive.pm:997
 #, c-format
 msgid "No printer"
 msgstr "Cap impressora"
 
 #
-#: install_steps_interactive.pm:974
+#: install_steps_interactive.pm:1039
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Teniu una targeta de so ISA?"
 
-#: install_steps_interactive.pm:976
-#, fuzzy, c-format
+#: install_steps_interactive.pm:1041
+#, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
-"Executeu \"sndconfig\" després de la instal·lació per configurar la targeta "
+"Executeu \"alsacont\" després de la instal·lació per configurar la targeta "
 "de so"
 
-#: install_steps_interactive.pm:978
+#: install_steps_interactive.pm:1043
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "No s'ha detectat cap targeta de so. Proveu amb \"harddrake\" després de la "
 "instal·lació"
 
-#: install_steps_interactive.pm:998
+#: install_steps_interactive.pm:1063
 #, c-format
 msgid "Graphical interface"
 msgstr "Interfície 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 "Xarxa i Internet"
 
-#: install_steps_interactive.pm:1020
-#, c-format
-msgid "Proxies"
-msgstr "Intermediaris"
-
-#: install_steps_interactive.pm:1021
+#: install_steps_interactive.pm:1086
 #, c-format
 msgid "configured"
 msgstr "configurat"
 
-#: 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 "Seguretat"
 
 #
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, c-format
 msgid "activated"
 msgstr "activat"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, c-format
 msgid "disabled"
 msgstr "inhabilita"
 
-#: install_steps_interactive.pm:1058
+#: install_steps_interactive.pm:1123
 #, c-format
 msgid "Boot"
 msgstr "Arrencada"
 
 #. -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 a %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 "Serveis: %d activats per %d registrats"
 
-#: 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 heu configurat X. Segur que ho voleu així?"
 
-#: install_steps_interactive.pm:1141
+#: install_steps_interactive.pm:1205
 #, c-format
 msgid "Set root password and network authentication methods"
 msgstr "Estableix la contrasenya de root i els mètodes d'autenticació de xarxa"
 
-#: install_steps_interactive.pm:1142
+#: install_steps_interactive.pm:1206
 #, c-format
 msgid "Set root password"
 msgstr "Estableix la contrasenya 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 ""
 "Aquesta contrasenya és massa curta (ha de tenir com a mínim %d caràcters)"
 
-#: 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 "Autenticació"
 
-#: install_steps_interactive.pm:1188
+#: install_steps_interactive.pm:1254
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "S'està preparant el carregador de l'arrencada..."
 
-#: install_steps_interactive.pm:1198
+#: install_steps_interactive.pm:1264
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
@@ -7268,12 +7198,12 @@ msgstr ""
 "La instal·lació continuarà, però us caldrà utilitzar el BootX\n"
 "o algun altre mètode per arrencar l'ordinador"
 
-#: install_steps_interactive.pm:1204
+#: install_steps_interactive.pm:1270
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "Voleu utilitzar l'aboot?"
 
-#: install_steps_interactive.pm:1207
+#: install_steps_interactive.pm:1273
 #, c-format
 msgid ""
 "Error installing aboot, \n"
@@ -7283,39 +7213,7 @@ msgstr ""
 "Voleu intentar igualment la instal·lació encara que això destrueixi la "
 "primera partició?"
 
-#
-#: install_steps_interactive.pm:1218
-#, c-format
-msgid "Installing bootloader"
-msgstr "S'està instal·lant el carregador de l'arrencada"
-
-#: install_steps_interactive.pm:1225
-#, c-format
-msgid "Installation of bootloader failed. The following error occured:"
-msgstr ""
-"Ha fallat la instal·lació del carregador de l'arrencada. S'ha produït "
-"l'error següent:"
-
-#: 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 ""
-"Potser us caldrà canviar el dispositiu d'arrencada Open Firmware per\n"
-"habilitar el carregador de l'arrencada. Si no veieu l'indicador del\n"
-"carregador de l'arrencada en tornar a arrencar, premeu\n"
-"Command-Option-O-F en tornar a arrencar i introduïu:\n"
-" setenv boot-device %s,\\\\:tbxi\n"
-" Després, escriviu: shut-down\n"
-"En l'arrencada següent heu de veure l'indicador del carregador de "
-"l'arrencada."
-
-#: 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 "
@@ -7324,22 +7222,22 @@ msgstr ""
 "En quest nivell de seguretat, l'accés a les particions de Windows està "
 "restringit a l'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 "Inseriu un disquet en blanc a la unitat %s"
 
-#: install_steps_interactive.pm:1280
+#: install_steps_interactive.pm:1327
 #, c-format
 msgid "Please insert another floppy for drivers disk"
 msgstr "Si us plau inseriu un altre disquet pel disquet de controladors"
 
-#: install_steps_interactive.pm:1282
+#: install_steps_interactive.pm:1329
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "S'està creant el disquet d'instal·lació automàtica"
 
-#: install_steps_interactive.pm:1294
+#: install_steps_interactive.pm:1341
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -7350,12 +7248,12 @@ msgstr ""
 "\n"
 "Segur que voleu sortir ara?"
 
-#: install_steps_interactive.pm:1309
+#: install_steps_interactive.pm:1356
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "Genera un disquet per a la instal·lació 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"
@@ -7376,7 +7274,8 @@ msgstr ""
 msgid "Mandrakelinux Installation %s"
 msgstr "Instal·lació del Mandrakelinux %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 "
@@ -7389,17 +7288,39 @@ msgstr ""
 msgid "Choose a file"
 msgstr "Trieu un fitxer"
 
+#: 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 "Afegeix"
+
+#
+#: interactive.pm:295 interactive/gtk.pm:482
+#, c-format
+msgid "Modify"
+msgstr "Modifica"
+
+#
+#: 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 "Elimina"
+
 #: interactive.pm:372
 #, c-format
 msgid "Basic"
 msgstr "Bàsic"
 
-#: 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 "Fi"
 
-#: interactive/newt.pm:83
+#: interactive/newt.pm:92
 #, c-format
 msgid "Do"
 msgstr "Fes"
@@ -7479,585 +7400,778 @@ msgstr ""
 msgid "Re-submit"
 msgstr "Torna a enviar"
 
-#: keyboard.pm:161 keyboard.pm:193
+#: keyboard.pm:163 keyboard.pm:194
 #, c-format
-msgid "Czech (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTZ)"
 msgstr "Txec (QWERTZ)"
 
-#: keyboard.pm:162 keyboard.pm:195
+#: keyboard.pm:164 keyboard.pm:196
 #, c-format
-msgid "German"
+msgid ""
+"_: keyboard\n"
+"German"
 msgstr "Alemany"
 
-#: 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 "Espanyol"
 
-#: keyboard.pm:165 keyboard.pm:205
+#: keyboard.pm:167 keyboard.pm:207
 #, c-format
-msgid "Finnish"
+msgid ""
+"_: keyboard\n"
+"Finnish"
 msgstr "Finè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 "Noruec"
 
-#: keyboard.pm:168
+#: keyboard.pm:170
 #, c-format
-msgid "Polish"
+msgid ""
+"_: keyboard\n"
+"Polish"
 msgstr "Polonès"
 
-#: keyboard.pm:169 keyboard.pm:255
+#: keyboard.pm:171 keyboard.pm:264
 #, c-format
-msgid "Russian"
+msgid ""
+"_: keyboard\n"
+"Russian"
 msgstr "Rus"
 
-#: keyboard.pm:171 keyboard.pm:259
+#: keyboard.pm:173 keyboard.pm:268
 #, c-format
-msgid "Swedish"
+msgid ""
+"_: keyboard\n"
+"Swedish"
 msgstr "Suec"
 
-#: keyboard.pm:172 keyboard.pm:278
+#: keyboard.pm:174 keyboard.pm:287
 #, c-format
 msgid "UK keyboard"
 msgstr "Teclat Regne Unit"
 
-#: keyboard.pm:173 keyboard.pm:279
+#: keyboard.pm:175 keyboard.pm:288
 #, c-format
 msgid "US keyboard"
 msgstr "Teclat Estats Units"
 
 #
-#: keyboard.pm:175
+#: keyboard.pm:177
 #, c-format
-msgid "Albanian"
+msgid ""
+"_: keyboard\n"
+"Albanian"
 msgstr "Albanès"
 
-#: keyboard.pm:176
+#: keyboard.pm:178
 #, c-format
-msgid "Armenian (old)"
+msgid ""
+"_: keyboard\n"
+"Armenian (old)"
 msgstr "Armeni (antic)"
 
-#: keyboard.pm:177
+#: keyboard.pm:179
 #, c-format
-msgid "Armenian (typewriter)"
+msgid ""
+"_: keyboard\n"
+"Armenian (typewriter)"
 msgstr "Armeni (màquina d'escriure)"
 
-#: keyboard.pm:178
+#: keyboard.pm:180
 #, c-format
-msgid "Armenian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Armenian (phonetic)"
 msgstr "Armeni (fonètic)"
 
-#: keyboard.pm:179
+#: keyboard.pm:181
 #, c-format
-msgid "Arabic"
+msgid ""
+"_: keyboard\n"
+"Arabic"
 msgstr "Àrab"
 
-#: keyboard.pm:180
+#: keyboard.pm:182
 #, c-format
-msgid "Azerbaidjani (latin)"
+msgid ""
+"_: keyboard\n"
+"Azerbaidjani (latin)"
 msgstr "Azerbaidjanès (llatí)"
 
-#: 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 "Bengalí"
 
 #
-#: keyboard.pm:184
+#: keyboard.pm:185
 #, c-format
-msgid "Bulgarian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (phonetic)"
 msgstr "Búlgar (fonètic)"
 
 #
-#: keyboard.pm:185
+#: keyboard.pm:186
 #, c-format
-msgid "Bulgarian (BDS)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (BDS)"
 msgstr "Búlgar (BDS)"
 
-#: keyboard.pm:186
+#: keyboard.pm:187
 #, c-format
-msgid "Brazilian (ABNT-2)"
+msgid ""
+"_: keyboard\n"
+"Brazilian (ABNT-2)"
 msgstr "Brasiler (ABNT-2)"
 
-#: keyboard.pm:189
+#: keyboard.pm:188
 #, c-format
-msgid "Bosnian"
+msgid ""
+"_: keyboard\n"
+"Bosnian"
 msgstr "Bosnià"
 
-#: keyboard.pm:190
+#: keyboard.pm:189
 #, c-format
-msgid "Belarusian"
+msgid ""
+"_: keyboard\n"
+"Belarusian"
 msgstr "Bielorrús"
 
 #: keyboard.pm:191
 #, c-format
-msgid "Swiss (German layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (German layout)"
 msgstr "Suís (disposició alemanya)"
 
-#: keyboard.pm:192
+#: keyboard.pm:193
 #, c-format
-msgid "Swiss (French layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (French layout)"
 msgstr "Suís (disposició francesa)"
 
-#: keyboard.pm:194
+#: keyboard.pm:195
 #, c-format
-msgid "Czech (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTY)"
 msgstr "Txec (QWERTY)"
 
-#: keyboard.pm:196
+#: keyboard.pm:197
 #, c-format
-msgid "German (no dead keys)"
+msgid ""
+"_: keyboard\n"
+"German (no dead keys)"
 msgstr "Alemany (sense tecles inoperatives)"
 
-#: 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 "Danès"
 
-#: keyboard.pm:199
+#: keyboard.pm:200
 #, c-format
-msgid "Dvorak (US)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (US)"
 msgstr "Dvorak (Estats Units)"
 
-#: keyboard.pm:200
-#, fuzzy, c-format
-msgid "Dvorak (Esperanto)"
-msgstr "Dvorak (Noruec)"
-
 #: keyboard.pm:201
 #, c-format
-msgid "Dvorak (Norwegian)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Esperanto)"
+msgstr "Dvorak (Esperanto)"
+
+#: keyboard.pm:202
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Dvorak (Norwegian)"
 msgstr "Dvorak (Noruec)"
 
 #
-#: keyboard.pm:202
+#: keyboard.pm:203
 #, c-format
-msgid "Dvorak (Swedish)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Swedish)"
 msgstr "Dvorak (Suec)"
 
-#: keyboard.pm:203
+#: keyboard.pm:205
 #, c-format
-msgid "Estonian"
+msgid ""
+"_: keyboard\n"
+"Estonian"
 msgstr "Estonià"
 
-#: keyboard.pm:207
+#: keyboard.pm:209
 #, c-format
-msgid "Georgian (\"Russian\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Russian\" layout)"
 msgstr "Georgià (disposició \"russa\")"
 
-#: keyboard.pm:208
+#: keyboard.pm:210
 #, c-format
-msgid "Georgian (\"Latin\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Latin\" layout)"
 msgstr "Georgià (disposició \"llatina\")"
 
-#: keyboard.pm:209
+#: keyboard.pm:211
 #, c-format
-msgid "Greek"
+msgid ""
+"_: keyboard\n"
+"Greek"
 msgstr "Grec"
 
-#: keyboard.pm:210
+#: keyboard.pm:212
 #, c-format
-msgid "Greek (polytonic)"
+msgid ""
+"_: keyboard\n"
+"Greek (polytonic)"
 msgstr "Grec (politònic)"
 
-#: 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 "Hongarès"
 
-#: 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 "Israelià"
 
-#: keyboard.pm:217
+#: keyboard.pm:220
 #, c-format
-msgid "Israeli (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Israeli (phonetic)"
 msgstr "Israelià (fonètic)"
 
-#: keyboard.pm:218
+#: keyboard.pm:221
 #, c-format
-msgid "Iranian"
+msgid ""
+"_: keyboard\n"
+"Iranian"
 msgstr "Iranià"
 
-#: 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 "Italià"
 
-#: 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 tecles"
 
-#: 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 "Teclat coreà"
 
-#: keyboard.pm:230
-#, fuzzy, c-format
-msgid "Kyrgyz keyboard"
-msgstr "Teclat Regne Unit"
+#: keyboard.pm:234
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Kyrgyz"
+msgstr ""
 
-#: keyboard.pm:231
+#: keyboard.pm:235
 #, c-format
-msgid "Latin American"
+msgid ""
+"_: keyboard\n"
+"Latin American"
 msgstr "Espanyol sud-americà"
 
 #
-#: keyboard.pm:232
+#: keyboard.pm:236
 #, c-format
-msgid "Laotian"
+msgid ""
+"_: keyboard\n"
+"Laotian"
 msgstr "Laosià"
 
-#: keyboard.pm:233
+#: keyboard.pm:238
 #, c-format
-msgid "Lithuanian AZERTY (old)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (old)"
 msgstr "Lituà AZERTY (antic)"
 
-#: keyboard.pm:235
+#: keyboard.pm:241
 #, c-format
-msgid "Lithuanian AZERTY (new)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (new)"
 msgstr "Lituà AZERTY (nou)"
 
-#: keyboard.pm:236
+#: keyboard.pm:243
 #, c-format
-msgid "Lithuanian \"number row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"number row\" QWERTY"
 msgstr "Lituà \"fila de números\" QWERTY"
 
-#: keyboard.pm:237
+#: keyboard.pm:245
 #, c-format
-msgid "Lithuanian \"phonetic\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"phonetic\" QWERTY"
 msgstr "Lituà \"fonètic\" QWERTY"
 
 #
-#: keyboard.pm:238
+#: keyboard.pm:246
 #, c-format
-msgid "Latvian"
+msgid ""
+"_: keyboard\n"
+"Latvian"
 msgstr "Letó"
 
-#: keyboard.pm:239
+#: keyboard.pm:247
 #, c-format
-msgid "Malayalam"
+msgid ""
+"_: keyboard\n"
+"Malayalam"
 msgstr "Malaialam"
 
-#: keyboard.pm:240
+#: keyboard.pm:248
 #, c-format
-msgid "Macedonian"
+msgid ""
+"_: keyboard\n"
+"Macedonian"
 msgstr "Macedoni"
 
-#: keyboard.pm:241
+#: keyboard.pm:249
 #, c-format
-msgid "Myanmar (Burmese)"
+msgid ""
+"_: keyboard\n"
+"Myanmar (Burmese)"
 msgstr "Myanmar (Burmese)"
 
 #
-#: keyboard.pm:242
+#: keyboard.pm:250
 #, c-format
-msgid "Mongolian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Mongolian (cyrillic)"
 msgstr "Mongol (ciríl·lic)"
 
-#: keyboard.pm:243
+#: keyboard.pm:251
 #, c-format
-msgid "Maltese (UK)"
+msgid ""
+"_: keyboard\n"
+"Maltese (UK)"
 msgstr "Maltès (Regne Unit)"
 
-#: keyboard.pm:244
+#: keyboard.pm:252
 #, c-format
-msgid "Maltese (US)"
+msgid ""
+"_: keyboard\n"
+"Maltese (US)"
 msgstr "Maltès (Estats Units)"
 
-#: 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 "Polonès (disposició qwerty)"
 
-#: keyboard.pm:249
+#: keyboard.pm:257
 #, c-format
-msgid "Polish (qwertz layout)"
+msgid ""
+"_: keyboard\n"
+"Polish (qwertz layout)"
 msgstr "Polonès (disposició 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 "Canadenc (Quebec)"
 
 #
-#: keyboard.pm:253
+#: keyboard.pm:262
 #, c-format
-msgid "Romanian (qwertz)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwertz)"
 msgstr "Romanès (qwertz)"
 
 #
-#: keyboard.pm:254
+#: keyboard.pm:263
 #, c-format
-msgid "Romanian (qwerty)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwerty)"
 msgstr "Romanès (qwerty)"
 
-#: keyboard.pm:256
+#: keyboard.pm:265
 #, c-format
-msgid "Russian (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Russian (phonetic)"
 msgstr "Rus (fonètic)"
 
-#: keyboard.pm:257
+#: keyboard.pm:266
 #, c-format
-msgid "Saami (norwegian)"
+msgid ""
+"_: keyboard\n"
+"Saami (norwegian)"
 msgstr "Saami (Noruec)"
 
-#: keyboard.pm:258
+#: keyboard.pm:267
 #, c-format
-msgid "Saami (swedish/finnish)"
+msgid ""
+"_: keyboard\n"
+"Saami (swedish/finnish)"
 msgstr "Saami (suec/finès)"
 
-#: keyboard.pm:260
+#: keyboard.pm:269
 #, c-format
-msgid "Slovenian"
+msgid ""
+"_: keyboard\n"
+"Slovenian"
 msgstr "Eslovè"
 
-#: keyboard.pm:261
+#: keyboard.pm:270
 #, c-format
-msgid "Slovakian (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTZ)"
 msgstr "Eslovac (QWERTZ)"
 
-#: keyboard.pm:262
+#: keyboard.pm:271
 #, c-format
-msgid "Slovakian (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTY)"
 msgstr "Eslovac (QWERTY)"
 
 #
-#: keyboard.pm:264
+#: keyboard.pm:273
 #, c-format
-msgid "Serbian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Serbian (cyrillic)"
 msgstr "Serbi (ciríl·lic)"
 
-#: keyboard.pm:265
+#: keyboard.pm:274
 #, c-format
-msgid "Syriac"
+msgid ""
+"_: keyboard\n"
+"Syriac"
 msgstr "Siri"
 
-#: keyboard.pm:266
+#: keyboard.pm:275
 #, c-format
-msgid "Syriac (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Syriac (phonetic)"
 msgstr "Siri (fonètic)"
 
-#: 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 "Tàmil (disposició ISCII)"
 
-#: keyboard.pm:270
+#: keyboard.pm:279
 #, c-format
-msgid "Tamil (Typewriter-layout)"
+msgid ""
+"_: keyboard\n"
+"Tamil (Typewriter-layout)"
 msgstr "Tàmil (disposició de màquina d'escriure)"
 
-#: keyboard.pm:271
+#: keyboard.pm:280
 #, c-format
-msgid "Thai keyboard"
+msgid ""
+"_: keyboard\n"
+"Thai"
 msgstr "Teclat tai"
 
 #
-#: keyboard.pm:273
+#: keyboard.pm:282
 #, c-format
-msgid "Tajik keyboard"
+msgid ""
+"_: keyboard\n"
+"Tajik"
 msgstr "Teclat tadjik"
 
-#: keyboard.pm:274
+#: keyboard.pm:283
 #, c-format
-msgid "Turkish (traditional \"F\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (traditional \"F\" model)"
 msgstr "Turc (tradicional, model \"F\")"
 
-#: keyboard.pm:275
+#: keyboard.pm:284
 #, c-format
-msgid "Turkish (modern \"Q\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (modern \"Q\" model)"
 msgstr "Turc (modern, model \"Q\")"
 
-#: keyboard.pm:277
+#: keyboard.pm:286
 #, c-format
-msgid "Ukrainian"
+msgid ""
+"_: keyboard\n"
+"Ukrainian"
 msgstr "Ucraïnès"
 
-#: keyboard.pm:280
+#: keyboard.pm:289
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Teclat Estats Units (internacional)"
 
 #
-#: keyboard.pm:281
+#: keyboard.pm:290
 #, c-format
-msgid "Uzbek (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Uzbek (cyrillic)"
 msgstr "Uzbek (ciríl·lic)"
 
-#: keyboard.pm:282
+#: keyboard.pm:292
 #, c-format
-msgid "Vietnamese \"numeric row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamita \"fila numèrica\" QWERTY"
 
 #
-#: keyboard.pm:283
+#: keyboard.pm:293
 #, c-format
-msgid "Yugoslavian (latin)"
+msgid ""
+"_: keyboard\n"
+"Yugoslavian (latin)"
 msgstr "Iugoslau (llatí)"
 
-#: keyboard.pm:290
+#: keyboard.pm:300
 #, c-format
 msgid "Right Alt key"
 msgstr "Tecla d'Alternativa Gràfica"
 
-#: keyboard.pm:291
+#: keyboard.pm:301
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Les dues tecles de Majúscules simultàniament"
 
-#: keyboard.pm:292
+#: keyboard.pm:302
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Tecles de Control i de Majúscules simultàniament"
 
-#: keyboard.pm:293
+#: keyboard.pm:303
 #, c-format
 msgid "CapsLock key"
 msgstr "Tecla de Fixació de Majúscules"
 
-#: keyboard.pm:294
+#: keyboard.pm:304
+#, fuzzy, c-format
+msgid "Shift and CapsLock keys simultaneously"
+msgstr "Tecles de Control i d'Alternativa simultàniament"
+
+#: keyboard.pm:305
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Tecles de Control i d'Alternativa simultàniament"
 
-#: keyboard.pm:295
+#: keyboard.pm:306
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Tecles d'Alternativa i de Majúscules simultàniament"
 
-#: keyboard.pm:296
+#: keyboard.pm:307
 #, c-format
 msgid "\"Menu\" key"
 msgstr "tecla de \"Menú\""
 
-#: keyboard.pm:297
+#: keyboard.pm:308
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Tecla de \"Windows\" Esquerra"
 
-#: keyboard.pm:298
+#: keyboard.pm:309
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Tecla de \"Windows\" Dreta"
 
-#: keyboard.pm:299
+#: keyboard.pm:310
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Les dues tecles Ctrl simultàniament"
 
-#: keyboard.pm:300
+#: keyboard.pm:311
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Les dues tecles Alt simultàniament"
 
-#: keyboard.pm:301
+#: keyboard.pm:312
 #, c-format
 msgid "Left Shift key"
 msgstr "Tecla Maj Esquerra"
 
-#: keyboard.pm:302
+#: keyboard.pm:313
 #, c-format
 msgid "Right Shift key"
 msgstr "Tecla Maj dreta"
 
-#: keyboard.pm:303
+#: keyboard.pm:314
 #, c-format
 msgid "Left Alt key"
 msgstr "Tecla Alt esquerra"
 
-#: keyboard.pm:304
+#: keyboard.pm:315
 #, c-format
 msgid "Left Control key"
 msgstr "Tecla de control esquerra"
 
-#: keyboard.pm:305
+#: keyboard.pm:316
 #, c-format
 msgid "Right Control key"
 msgstr "Tecla Control dret"
 
-#: keyboard.pm:336
+#: keyboard.pm:347
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -8068,7 +8182,7 @@ msgstr ""
 "permetran canviar entre diferents disposicions de teclat\n"
 "(p.ex., llatina i no llatina)"
 
-#: keyboard.pm:341
+#: keyboard.pm:352
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -8076,1166 +8190,1190 @@ msgid ""
 "key to switch between the different keyboard layouts."
 msgstr ""
 
-#: 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 "Afganistan"
-
-#: 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 "Unió dels Emirats Àrabs"
 
-#: lang.pm:172
+#: lang.pm:184
+#, c-format
+msgid "Afghanistan"
+msgstr "Afganistan"
+
+#: lang.pm:185
 #, c-format
 msgid "Antigua and Barbuda"
 msgstr "Antigua i Barbuda"
 
-#: lang.pm:173
+#: lang.pm:186
 #, c-format
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: lang.pm:174
+#: lang.pm:187
 #, c-format
 msgid "Albania"
 msgstr "Albània"
 
-#: lang.pm:175
+#: lang.pm:188
 #, c-format
 msgid "Armenia"
 msgstr "Armènia"
 
-#: lang.pm:176
+#: lang.pm:189
 #, c-format
 msgid "Netherlands Antilles"
 msgstr "Antilles Holandeses"
 
-#: lang.pm:177
+#: lang.pm:190
 #, c-format
 msgid "Angola"
 msgstr "Angola"
 
-#: lang.pm:178
+#: lang.pm:191
 #, c-format
 msgid "Antarctica"
 msgstr "Antàrtida"
 
-#: 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 "Austràlia"
 
-#: lang.pm:183
+#: lang.pm:196
 #, c-format
 msgid "Aruba"
 msgstr "Aruba"
 
-#: lang.pm:184
+#: lang.pm:197
 #, c-format
 msgid "Azerbaijan"
 msgstr "Azerbaitjan"
 
-#: lang.pm:185
+#: lang.pm:198
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr "Bòsnia i Hercegovina"
 
-#: lang.pm:186
+#: lang.pm:199
 #, c-format
 msgid "Barbados"
 msgstr "Barbados"
 
-#: lang.pm:187
+#: lang.pm:200
 #, c-format
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: lang.pm:189
+#: lang.pm:202
 #, c-format
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: lang.pm:190
+#: lang.pm:203 network/adsl_consts.pm:126 network/adsl_consts.pm:134
 #, c-format
 msgid "Bulgaria"
 msgstr "Bulgària"
 
-#: 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 "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"
 
-#: lang.pm:196
+#: lang.pm:209
 #, c-format
 msgid "Bolivia"
 msgstr "Bolívia"
 
-#: 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 "Bahames"
 
-#: lang.pm:199
+#: lang.pm:212
 #, c-format
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: lang.pm:200
+#: lang.pm:213
 #, c-format
 msgid "Bouvet Island"
 msgstr "Illa Bouvet"
 
-#: lang.pm:201
+#: lang.pm:214
 #, c-format
 msgid "Botswana"
 msgstr "Botswana"
 
-#: lang.pm:202
+#: lang.pm:215
 #, c-format
 msgid "Belarus"
 msgstr "Bielorrússia"
 
-#: lang.pm:203
+#: lang.pm:216
 #, c-format
 msgid "Belize"
 msgstr "Belize"
 
-#: 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 "Illes 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 Centrefricana"
 
-#: 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 "Suïssa"
 
-#: lang.pm:210
+#: lang.pm:223
 #, c-format
 msgid "Cote d'Ivoire"
 msgstr "Costa d'Ivori"
 
-#: lang.pm:211
+#: lang.pm:224
 #, c-format
 msgid "Cook Islands"
 msgstr "Illes Cook"
 
-#: lang.pm:212
+#: lang.pm:225
 #, c-format
 msgid "Chile"
 msgstr "Xile"
 
-#: lang.pm:213
+#: lang.pm:226
 #, c-format
 msgid "Cameroon"
 msgstr "Camerun"
 
-#: 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 "Xina"
 
-#: lang.pm:215
+#: lang.pm:228
 #, c-format
 msgid "Colombia"
 msgstr "Colòmbia"
 
-#: lang.pm:217
+#: lang.pm:230
+#, c-format
+msgid "Serbia & Montenegro"
+msgstr "Sèrbia i Montenegro"
+
+#: lang.pm:231
 #, c-format
 msgid "Cuba"
 msgstr "Cuba"
 
-#: lang.pm:218
+#: lang.pm:232
 #, c-format
 msgid "Cape Verde"
 msgstr "Cap Verd"
 
-#: lang.pm:219
+#: lang.pm:233
 #, c-format
 msgid "Christmas Island"
 msgstr "Illa Christmas"
 
-#: lang.pm:220
+#: lang.pm:234
 #, c-format
 msgid "Cyprus"
 msgstr "Xipre"
 
-#: 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 "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 "Algèria"
 
-#: lang.pm:228
+#: lang.pm:242
 #, c-format
 msgid "Ecuador"
 msgstr "Equador"
 
-#: lang.pm:229
+#: lang.pm:243
 #, c-format
 msgid "Estonia"
 msgstr "Estònia"
 
-#: lang.pm:230
+#: lang.pm:244
 #, c-format
 msgid "Egypt"
 msgstr "Egipte"
 
-#: lang.pm:231
+#: lang.pm:245
 #, c-format
 msgid "Western Sahara"
 msgstr "Sàhara Occidental"
 
-#: 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 "Espanya"
 
-#: lang.pm:234
+#: lang.pm:248
 #, c-format
 msgid "Ethiopia"
 msgstr "Etiòpia"
 
-#: lang.pm:235 network/adsl_consts.pm:127
+#: lang.pm:249 network/adsl_consts.pm:402
 #, c-format
 msgid "Finland"
 msgstr "Finlàndia"
 
-#: 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 "Illes Malvines (Falkland)"
 
-#: lang.pm:238
+#: lang.pm:252
 #, c-format
 msgid "Micronesia"
 msgstr "Micronèsia"
 
-#: lang.pm:239
+#: lang.pm:253
 #, c-format
 msgid "Faroe Islands"
 msgstr "Illes Fèroe"
 
-#: 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 "Regne Unit"
 
-#: lang.pm:243
+#: lang.pm:257
 #, c-format
 msgid "Grenada"
 msgstr "Grenada"
 
-#: lang.pm:244
+#: lang.pm:258
 #, c-format
 msgid "Georgia"
 msgstr "Geòrgia"
 
-#: lang.pm:245
+#: lang.pm:259
 #, c-format
 msgid "French Guiana"
 msgstr "Guaiana 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 "Groenlàndia"
 
-#: lang.pm:249
+#: lang.pm:263
 #, c-format
 msgid "Gambia"
 msgstr "Gàmbia"
 
-#: 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 Equatorial"
 
-#: lang.pm:254
+#: lang.pm:268
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "Illes Geòrgia del Sud i Sandwich del Sud"
 
-#: 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 "Xina (Hong Kong)"
 
-#: lang.pm:260
+#: lang.pm:274
 #, c-format
 msgid "Heard and McDonald Islands"
 msgstr "Illa Heard i Illes McDonald"
 
-#: lang.pm:261
+#: lang.pm:275
 #, c-format
 msgid "Honduras"
 msgstr "Hondures"
 
-#: lang.pm:262
+#: lang.pm:276
 #, c-format
 msgid "Croatia"
 msgstr "Croàcia"
 
-#: 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 "Hongria"
 
-#: lang.pm:265
+#: lang.pm:279
 #, c-format
 msgid "Indonesia"
 msgstr "Indonèsia"
 
 #
-#: 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 "Índia"
 
-#: lang.pm:269
+#: lang.pm:283
 #, c-format
 msgid "British Indian Ocean Territory"
 msgstr "Territori Britànic de l'Oceà Índic"
 
-#: lang.pm:270
+#: lang.pm:284
 #, c-format
 msgid "Iraq"
 msgstr "Iraq"
 
-#: lang.pm:271
+#: lang.pm:285
 #, c-format
 msgid "Iran"
 msgstr "Iran"
 
-#: lang.pm:272
+#: lang.pm:286
 #, c-format
 msgid "Iceland"
 msgstr "Islàndia"
 
-#: lang.pm:274
+#: lang.pm:288
 #, c-format
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: lang.pm:275
+#: lang.pm:289
 #, c-format
 msgid "Jordan"
 msgstr "Jordània"
 
-#: lang.pm:276
+#: lang.pm:290
 #, c-format
 msgid "Japan"
 msgstr "Japó"
 
-#: lang.pm:277
+#: lang.pm:291
 #, c-format
 msgid "Kenya"
 msgstr "Kenya"
 
-#: lang.pm:278
+#: lang.pm:292
 #, c-format
 msgid "Kyrgyzstan"
 msgstr "Kirguizistan"
 
-#: lang.pm:279
+#: lang.pm:293
 #, c-format
 msgid "Cambodia"
 msgstr "Cambodja"
 
-#: 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 Christopher i Nevis"
 
-#: lang.pm:283
+#: lang.pm:297
 #, c-format
 msgid "Korea (North)"
 msgstr "Corea (Nord)"
 
-#: 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 "Illes Caiman"
 
-#: 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 "Líban"
 
-#: 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 "Libèria"
 
-#: 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 "Lituània"
 
-#: lang.pm:296
+#: lang.pm:310
 #, c-format
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: lang.pm:297
+#: lang.pm:311
 #, c-format
 msgid "Latvia"
 msgstr "Letònia"
 
-#: lang.pm:298
+#: lang.pm:312
 #, c-format
 msgid "Libya"
 msgstr "Líbia"
 
-#: lang.pm:299
+#: lang.pm:313 network/adsl_consts.pm:487
 #, c-format
 msgid "Morocco"
 msgstr "Marroc"
 
-#: lang.pm:300
+#: lang.pm:314
 #, c-format
 msgid "Monaco"
 msgstr "Mònaco"
 
-#: lang.pm:301
+#: lang.pm:315
 #, c-format
 msgid "Moldova"
 msgstr "Moldàvia"
 
-#: lang.pm:302
+#: lang.pm:316
 #, c-format
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: lang.pm:303
+#: lang.pm:317
 #, c-format
 msgid "Marshall Islands"
 msgstr "Illes Marshall"
 
-#: lang.pm:304
+#: lang.pm:318
 #, c-format
 msgid "Macedonia"
 msgstr "Macedònia"
 
-#: 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 "Mongòlia"
 
-#: lang.pm:308
+#: lang.pm:322
 #, c-format
 msgid "Northern Mariana Islands"
 msgstr "Illes Marianes del Nord"
 
-#: lang.pm:309
+#: lang.pm:323
 #, c-format
 msgid "Martinique"
 msgstr "Martinica"
 
-#: lang.pm:310
+#: lang.pm:324
 #, c-format
 msgid "Mauritania"
 msgstr "Mauritània"
 
-#: 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 "Maurici"
 
-#: lang.pm:314
+#: lang.pm:328
 #, c-format
 msgid "Maldives"
 msgstr "Maldives"
 
-#: lang.pm:315
+#: lang.pm:329
 #, c-format
 msgid "Malawi"
 msgstr "Malawi"
 
-#: lang.pm:316
+#: lang.pm:330
 #, c-format
 msgid "Mexico"
 msgstr "Mèxic"
 
-#: lang.pm:317
+#: lang.pm:331
 #, c-format
 msgid "Malaysia"
 msgstr "Malàisia"
 
-#: lang.pm:318
+#: lang.pm:332
 #, c-format
 msgid "Mozambique"
 msgstr "Moçambic"
 
-#: lang.pm:319
+#: lang.pm:333
 #, c-format
 msgid "Namibia"
 msgstr "Namíbia"
 
-#: lang.pm:320
+#: lang.pm:334
 #, c-format
 msgid "New Caledonia"
 msgstr "Nova Caledònia"
 
-#: 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 "Illa Norfolk"
 
-#: lang.pm:323
+#: lang.pm:337
 #, c-format
 msgid "Nigeria"
 msgstr "Nigèria"
 
-#: 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 "Nova Zelanda"
 
-#: lang.pm:331
+#: lang.pm:345
 #, c-format
 msgid "Oman"
 msgstr "Oman"
 
-#: 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 "Polinèsia francesa"
 
-#: lang.pm:335
+#: lang.pm:349
 #, c-format
 msgid "Papua New Guinea"
 msgstr "Papua Nova Guinea"
 
-#: lang.pm:336
+#: lang.pm:350
 #, c-format
 msgid "Philippines"
 msgstr "Filipines"
 
-#: 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 "Polònia"
 
-#: lang.pm:339
+#: lang.pm:353
 #, c-format
 msgid "Saint Pierre and Miquelon"
 msgstr "Saint Pierre i 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 "Paraguai"
 
-#: 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 "Rússia"
 
-#: lang.pm:350
+#: lang.pm:364
 #, c-format
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: lang.pm:351
+#: lang.pm:365
 #, c-format
 msgid "Saudi Arabia"
 msgstr "Aràbia Saudita"
 
-#: lang.pm:352
+#: lang.pm:366
 #, c-format
 msgid "Solomon Islands"
 msgstr "Illes Salomó"
 
-#: 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 "Singapur"
 
-#: 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 "Eslovènia"
 
-#: lang.pm:359
+#: lang.pm:373
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "Illes Svalbard i Jan Mayen"
 
-#: lang.pm:360
+#: lang.pm:374
 #, c-format
 msgid "Slovakia"
 msgstr "Eslovàquia"
 
-#: 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 "Somàlia"
 
-#: 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 "Sao Tome i 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 "Síria"
 
-#: lang.pm:369
+#: lang.pm:383
 #, c-format
 msgid "Swaziland"
 msgstr "Swazilàndia"
 
-#: lang.pm:370
+#: lang.pm:384
 #, c-format
 msgid "Turks and Caicos Islands"
 msgstr "Illes Turks i Caicos"
 
-#: lang.pm:371
+#: lang.pm:385
 #, c-format
 msgid "Chad"
 msgstr "Txad"
 
-#: lang.pm:372
+#: lang.pm:386
 #, c-format
 msgid "French Southern Territories"
 msgstr "Territoris francesos del Sud"
 
-#: 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 "Tailàndia"
 
-#: lang.pm:375
+#: lang.pm:389
 #, c-format
 msgid "Tajikistan"
 msgstr "Tadjikistan"
 
-#: 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 "Turkmenistan"
 
-#: lang.pm:379
+#: lang.pm:393
 #, c-format
 msgid "Tunisia"
 msgstr "Tunísia"
 
-#: lang.pm:380
+#: lang.pm:394
 #, c-format
 msgid "Tonga"
 msgstr "Tonga"
 
-#: lang.pm:381
+#: lang.pm:395
 #, c-format
 msgid "Turkey"
 msgstr "Turquia"
 
-#: lang.pm:382
+#: lang.pm:396
 #, c-format
 msgid "Trinidad and Tobago"
 msgstr "Trinitat i 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 "Tanzània"
 
-#: lang.pm:386
+#: lang.pm:400
 #, c-format
 msgid "Ukraine"
 msgstr "Ucraïna"
 
-#: 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 "Illes Perifèriques Menors dels EUA"
 
-#: lang.pm:390
+#: lang.pm:404
 #, c-format
 msgid "Uruguay"
 msgstr "Uruguai"
 
-#: lang.pm:391
+#: lang.pm:405
 #, c-format
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
 #
-#: lang.pm:392
+#: lang.pm:406
 #, c-format
 msgid "Vatican"
 msgstr "Vaticà"
 
-#: lang.pm:393
+#: lang.pm:407
 #, c-format
 msgid "Saint Vincent and the Grenadines"
 msgstr "Saint Vincent i les Grenadines"
 
-#: lang.pm:394
+#: lang.pm:408
 #, c-format
 msgid "Venezuela"
 msgstr "Veneçuela"
 
-#: lang.pm:395
+#: lang.pm:409
 #, c-format
 msgid "Virgin Islands (British)"
 msgstr "Illes Verge Britàniques"
 
-#: lang.pm:396
+#: lang.pm:410
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr "Illes Verge Americanes"
 
-#: 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 i Futuna"
 
-#: lang.pm:400
+#: lang.pm:414
 #, c-format
 msgid "Samoa"
 msgstr "Samoa"
 
-#: lang.pm:401
+#: lang.pm:415
 #, c-format
 msgid "Yemen"
 msgstr "Iemen"
 
-#: lang.pm:402
+#: lang.pm:416
 #, c-format
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: lang.pm:403
-#, c-format
-msgid "Serbia & Montenegro"
-msgstr "Sèrbia i 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 "Zàmbia"
 
-#: 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 "Hauríeu d'instal·lar els següents paquets: %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 "Benvingut a %s"
 
-#: loopback.pm:32
+#: loopback.pm:31
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "Muntatges circulars %s\n"
 
-#: lvm.pm:115
+#: lvm.pm:116
 #, c-format
 msgid "Remove the logical volumes first\n"
 msgstr "Elimineu primer els volums lògics\n"
 
-#: modules/interactive.pm:21 standalone/drakconnect:982
+#: modules/interactive.pm:21 standalone/drakconnect:1033
 #, c-format
 msgid "Parameters"
 msgstr "Paràmetres"
 
-#: modules/interactive.pm:21 standalone/draksec:44
+#: modules/interactive.pm:21 standalone/draksec:51
 #, c-format
 msgid "NONE"
 msgstr "CAP"
@@ -9251,12 +9389,10 @@ msgstr "Configuració dels mòduls"
 msgid "You can configure each parameter of the module here."
 msgstr "Ara podeu configurar cada paràmetre del mòdul."
 
-# #msgid "Found %s %s interfaces"
-# #msgstr "S'han trobat interfícies %2$s %1$s"
 #: modules/interactive.pm:63
 #, c-format
-msgid "Found %s %s interfaces"
-msgstr "S'han trobat interfícies %s %s"
+msgid "Found %s interfaces"
+msgstr "S'han trobat interfícies %s"
 
 #: modules/interactive.pm:64
 #, c-format
@@ -9311,12 +9447,12 @@ msgid "Module options:"
 msgstr "Opcions del mòdul:"
 
 #. -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 "Quin controlador de %s he de provar?"
 
-#: 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"
@@ -9333,17 +9469,17 @@ msgstr ""
 "cerqui al vostre ordinador la informació que necessita? Aquesta recerca\n"
 "podria penjar l'ordinador, però això no causaria cap dany."
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Autoprobe"
 msgstr "Exploració automàtica"
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Specify options"
 msgstr "Especifica les opcions"
 
-#: modules/interactive.pm:143
+#: modules/interactive.pm:144
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -9402,11 +9538,11 @@ msgstr "Ratolí PS2 genèric amb rodeta"
 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àtic"
@@ -9552,49 +9688,54 @@ msgstr "Universal"
 msgid "Any PS/2 & USB mice"
 msgstr "Qualsevol ratolí PS/2 o 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 ""
+
+#: mouse.pm:93 standalone/drakconnect:358 standalone/drakvpn:1140
 #, c-format
 msgid "none"
 msgstr "cap"
 
-#: mouse.pm:94
+#: mouse.pm:95
 #, c-format
 msgid "No mouse"
 msgstr "Cap ratolí"
 
-#: mouse.pm:514
+#: mouse.pm:546
 #, c-format
 msgid "Please test the mouse"
 msgstr "Si us plau proveu el ratolí."
 
-#: mouse.pm:516
+#: mouse.pm:548
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Per activar el ratolí,"
 
-#: mouse.pm:517
+#: mouse.pm:549
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "MOVEU LA RODETA!"
 
 #: network/adsl.pm:19
 #, c-format
-msgid "use pppoe"
-msgstr "utilitza pppoe"
+msgid "use PPPoE"
+msgstr "utilitza PPPoE"
 
 #: network/adsl.pm:20
 #, c-format
-msgid "use pptp"
-msgstr "utilitza pptp"
+msgid "use PPTP"
+msgstr "utilitza PPTP"
 
 #: network/adsl.pm:21
 #, c-format
-msgid "use dhcp"
-msgstr "utilitza dhcp"
+msgid "use DHCP"
+msgstr "utilitza DHCP"
 
 #: network/adsl.pm:22
 #, c-format
-msgid "Alcatel speedtouch usb"
+msgid "Alcatel Speedtouch USB"
 msgstr "Alcatel Speedtouch USB"
 
 #: network/adsl.pm:22 network/adsl.pm:23 network/adsl.pm:24
@@ -9604,37 +9745,37 @@ msgstr " - s'ha detectat"
 
 #: network/adsl.pm:23
 #, c-format
-msgid "Sagem (using pppoa) usb"
-msgstr "USB Sagem (utilitzant el pppoa)"
+msgid "Sagem (using PPPoA) USB"
+msgstr "Sagem USB (utilitzant PPPoA)"
 
 #: network/adsl.pm:24
 #, c-format
-msgid "Sagem (using dhcp) usb"
-msgstr "USB Sagem (utilitzant el dhcp)"
+msgid "Sagem (using DHCP) USB"
+msgstr "Sagem USB (utilitzant 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 "Connecta't 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 manera més habitual de connectar amb ADSL és pppoe.\n"
-"Algunes connexions utilitzen pptp, unes poques utilitzen dhcp.\n"
-"Si no ho sabeu, escolliu 'utilitza pppoe'"
+"Algunes connexions utilitzen PPTP, unes poques utilitzen DHCP.\n"
+"Si no ho sabeu, escolliu 'utilitza 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 "Tipus de connexió ADSL :"
 
-#: network/drakfirewall.pm:12
+#: network/drakfirewall.pm:12 share/compssUsers.pl:84
 #, c-format
 msgid "Web Server"
 msgstr "Servidor Web"
@@ -9690,7 +9831,7 @@ msgstr "Petició echo (ping)"
 #: network/drakfirewall.pm:65
 #, c-format
 msgid "BitTorrent"
-msgstr ""
+msgstr "BitTorrent"
 
 #: network/drakfirewall.pm:131
 #, c-format
@@ -9708,8 +9849,8 @@ msgid ""
 msgstr ""
 "Configuració del drakfirewall\n"
 "\n"
-"Aquí es configura un tallafocs personal per a aquest ordinador Linux "
-"Mandrake.\n"
+"Aquí es configura un tallafocs personal per a aquest ordinador "
+"Mandrakelinux.\n"
 "Per a una potent solució de tallafocs dedicada, consulteu si us plau la \n"
 "distribució especialitzada MandrakeSecurity Firewall."
 
@@ -9767,111 +9908,112 @@ msgstr "Tot (sense tallafoc)"
 msgid "Other ports"
 msgstr "Altres ports"
 
-#: 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 ""
 
-#: 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 ho 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 "Selecció manual"
 
-#: network/netconnect.pm:88
+#: network/netconnect.pm:89
 #, c-format
 msgid "Internal ISDN card"
 msgstr "Targeta XDSI 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 "Gestionat"
 
-#: network/netconnect.pm:99
+#: network/netconnect.pm:100
 #, c-format
 msgid "Master"
 msgstr "Mestre"
 
 #
-#: 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 "Secundari"
 
-#: network/netconnect.pm:102
+#: network/netconnect.pm:103
 #, c-format
 msgid "Auto"
 msgstr "Automàtic"
 
 #
-#: 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ó 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 "Protocol per a la resta del món"
 
 #
-#: network/netconnect.pm:113 standalone/drakconnect:541
+#: network/netconnect.pm:114 standalone/drakconnect:539
 #, c-format
 msgid "European protocol (EDSS1)"
 msgstr "Protocol europeu (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"
@@ -9880,166 +10022,171 @@ msgstr ""
 "Protocol per a la resta del món\n"
 "Cap canal D (línies punt a punt)"
 
-#: 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 "Protocol de configuració d'ordinadors dinàmic (DHCP)"
 
 #
-#: network/netconnect.pm:155
+#: network/netconnect.pm:159
 #, c-format
 msgid "Manual TCP/IP configuration"
 msgstr "Configuració TCP/IP manual"
 
-#: network/netconnect.pm:156
+#: network/netconnect.pm:160
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr "Protocol de tunneling punt a punt (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 ""
+
+#: network/netconnect.pm:167
 #, c-format
 msgid "Bridged Ethernet LLC"
 msgstr ""
 
-#: network/netconnect.pm:163
+#: network/netconnect.pm:168
 #, c-format
 msgid "Bridged Ethernet VC"
 msgstr ""
 
-#: network/netconnect.pm:164
+#: network/netconnect.pm:169
 #, c-format
 msgid "Routed IP LLC"
 msgstr ""
 
-#: network/netconnect.pm:165
+#: network/netconnect.pm:170
 #, c-format
 msgid "Routed IP VC"
 msgstr ""
 
-#: 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 "Basat en 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 "Basat en 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ó de xarxa i internet"
 
-#: network/netconnect.pm:234
+#: network/netconnect.pm:242
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(detectat al 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 "(detectat %s)"
 
-#: network/netconnect.pm:236
+#: network/netconnect.pm:244
 #, c-format
 msgid "(detected)"
 msgstr "(detectat)"
 
-#: network/netconnect.pm:238
+#: network/netconnect.pm:246
 #, c-format
 msgid "Modem connection"
 msgstr "Connexió del mòdem"
 
-#: network/netconnect.pm:239
+#: network/netconnect.pm:247
 #, c-format
 msgid "ISDN connection"
 msgstr "Connexió XDSI"
 
 #
-#: network/netconnect.pm:240
+#: network/netconnect.pm:248
 #, c-format
 msgid "ADSL connection"
 msgstr "Connexió ADSL"
 
-#: network/netconnect.pm:241
+#: network/netconnect.pm:249
 #, c-format
 msgid "Cable connection"
 msgstr "Connexió per cable"
 
-#: network/netconnect.pm:242
+#: network/netconnect.pm:250
 #, c-format
 msgid "LAN connection"
 msgstr "Connexió LAN"
 
-#: network/netconnect.pm:243 network/netconnect.pm:257
+#: network/netconnect.pm:251 network/netconnect.pm:265
 #, c-format
 msgid "Wireless connection"
 msgstr "Connexió sense fils"
 
 #
-#: network/netconnect.pm:253
+#: network/netconnect.pm:261
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "Escolliu la connexió que voleu configurar"
 
-#: network/netconnect.pm:270
+#: network/netconnect.pm:279
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -10052,133 +10199,132 @@ msgstr ""
 "\n"
 "Premeu \"%s\" per continuar."
 
-#: network/netconnect.pm:278 network/netconnect.pm:788
+#: network/netconnect.pm:287 network/netconnect.pm:839
 #, c-format
 msgid "Connection Configuration"
 msgstr "Configuració de la connexió"
 
-#: 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 "Si us plau, ompliu o marqueu el camp inferior"
 
-#: network/netconnect.pm:286 standalone/drakconnect:532
+#: network/netconnect.pm:295 standalone/drakconnect:530
 #, c-format
 msgid "Card IRQ"
 msgstr "IRQ de la targeta"
 
-#: network/netconnect.pm:287 standalone/drakconnect:533
+#: network/netconnect.pm:296 standalone/drakconnect:531
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "Targeta de memòria (DMA)"
 
-#: network/netconnect.pm:288 standalone/drakconnect:534
+#: network/netconnect.pm:297 standalone/drakconnect:532
 #, c-format
 msgid "Card IO"
 msgstr "E/S de la Targeta"
 
-#: 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 Targeta"
 
-#: network/netconnect.pm:290
+#: network/netconnect.pm:299
 #, c-format
 msgid "Card IO_1"
 msgstr "E/S_1 de la Targeta"
 
-#: network/netconnect.pm:291
+#: network/netconnect.pm:300
 #, c-format
 msgid "Your personal phone number"
 msgstr "El vostre telèfon particular"
 
-#: 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 "Nom del proveïdor (p.ex. proveïdor.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èfon del proveïdor"
 
-#: network/netconnect.pm:294
+#: network/netconnect.pm:303
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "DNS 1 del proveïdor (opcional)"
 
-#: network/netconnect.pm:295
+#: network/netconnect.pm:304
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "DNS 2 del proveïdor (opcional)"
 
-#: network/netconnect.pm:296 standalone/drakconnect:429
+#: network/netconnect.pm:305 standalone/drakconnect:420
 #, c-format
 msgid "Dialing mode"
 msgstr "Mode de marcatge"
 
 #
-#: 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 "Velocitat de la connexió"
 
-#: network/netconnect.pm:298 standalone/drakconnect:439
+#: network/netconnect.pm:307 standalone/drakconnect:430
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "Temps màxim per connectar (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 "Entrada del compte (nom d'usuari)"
 
-#: 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 "Contrasenya del compte"
 
-#: 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 "Escolliu la interfície de xarxa 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 "Dispositiu de xarxa"
 
-#: 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 XDSI extern"
 
 #
-#. -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 "Seleccioneu un dispositiu!"
 
-#: 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ó de l'XDSI"
 
-#: network/netconnect.pm:384
+#: network/netconnect.pm:387
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "Quin tipus de targeta teniu?"
 
-#: network/netconnect.pm:394
+#: network/netconnect.pm:397
 #, c-format
 msgid ""
 "\n"
@@ -10193,34 +10339,48 @@ msgstr ""
 "\n"
 "Si teniu una targeta PCMCIA, cal que en sapigueu l'\"irq\" i l'\"io\".\n"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Continue"
 msgstr "Continua"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Abort"
 msgstr "Abandona"
 
-#: network/netconnect.pm:404
+#: network/netconnect.pm:407
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "Quina d'aquestes targetes XDSI teniu?"
 
-#: network/netconnect.pm:419
+#: network/netconnect.pm:425
+#, c-format
+msgid ""
+"A CAPI driver is available for this modem. This CAPI driver can offer more "
+"capabilities than the free driver (like sending faxes). Which driver do you "
+"want to use?"
+msgstr ""
+
+#: network/netconnect.pm:427 standalone/drakconnect:116 standalone/drakups:247
+#: standalone/harddrake2:117
+#, c-format
+msgid "Driver"
+msgstr "Controlador"
+
+#: network/netconnect.pm:439
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "Quin protocol voleu utilitzar?"
 
-#: 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 "Protocol"
 
-#: network/netconnect.pm:433
+#: network/netconnect.pm:453
 #, c-format
 msgid ""
 "Select your provider.\n"
@@ -10229,13 +10389,13 @@ msgstr ""
 "Seleccioneu el vostre proveïdor.\n"
 "Si no és a la llista, seleccioneu \"No és a la llista\""
 
-#: 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 "Proveïdor:"
 
-#: network/netconnect.pm:450
+#: network/netconnect.pm:470
 #, c-format
 msgid ""
 "Your modem isn't supported by the system.\n"
@@ -10244,126 +10404,121 @@ msgstr ""
 "El vostre mòdem no està suportat pel sistema.\n"
 "Doneu un cop d'ull a http://www.linmodems.org"
 
-#: network/netconnect.pm:462
+#: network/netconnect.pm:482
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "Escolliu 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 "Només s'accepten nuclis de la sèrie 2.4 o superior."
-
-#: network/netconnect.pm:510
+#: network/netconnect.pm:530
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr ""
 "Si us plau, seleccioneu el port sèrie al qual teniu connectat el mòdem."
 
 #
-#: network/netconnect.pm:539
+#: network/netconnect.pm:561
 #, c-format
 msgid "Select your provider:"
 msgstr "Seleccioneu el vostre proveïdor:"
 
-#: network/netconnect.pm:568
+#: network/netconnect.pm:589
 #, c-format
 msgid "Dialup: account options"
 msgstr "Marcatge: Opcions del compte"
 
-#: network/netconnect.pm:571
+#: network/netconnect.pm:592
 #, c-format
 msgid "Connection name"
 msgstr "Nom de la connexió"
 
-#: network/netconnect.pm:572
+#: network/netconnect.pm:593
 #, c-format
 msgid "Phone number"
 msgstr "Número de telèfon"
 
-#: network/netconnect.pm:573
+#: network/netconnect.pm:594
 #, c-format
 msgid "Login ID"
 msgstr "ID d'entrada"
 
-#: network/netconnect.pm:588 network/netconnect.pm:621
+#: network/netconnect.pm:609 network/netconnect.pm:642
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr "Marcatge: Paràmetres IP"
 
-#: network/netconnect.pm:591
+#: network/netconnect.pm:612
 #, c-format
 msgid "IP parameters"
 msgstr "Paràmetres 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 "Adreça IP"
 
-#: network/netconnect.pm:593
+#: network/netconnect.pm:614
 #, c-format
 msgid "Subnet mask"
 msgstr "Màscara de la subxarxa"
 
-#: network/netconnect.pm:605
+#: network/netconnect.pm:626
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr "Marcatge: Paràmetres 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 "Nom de domini"
 
-#: 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 "Segon servidor DNS (opcional)"
 
 #
-#: network/netconnect.pm:612
+#: network/netconnect.pm:633
 #, c-format
 msgid "Set hostname from IP"
 msgstr "Estableix el nom de la màquina a partir de la IP"
 
-#: network/netconnect.pm:624 standalone/drakconnect:343
+#: network/netconnect.pm:645 standalone/drakconnect:334
 #, c-format
 msgid "Gateway"
 msgstr "Passarel·la"
 
-#: network/netconnect.pm:625
+#: network/netconnect.pm:646
 #, c-format
 msgid "Gateway IP address"
 msgstr "Adreça IP de la passarel·la"
 
-#: network/netconnect.pm:649
+#: network/netconnect.pm:677
 #, c-format
 msgid "ADSL configuration"
 msgstr "Configuració ADSL"
 
-#: network/netconnect.pm:681
+#: network/netconnect.pm:717
 #, c-format
 msgid "Please choose your ADSL provider"
 msgstr "Si us plau, seleccioneu el vostre proveïdor ADSL"
 
-#: network/netconnect.pm:699
+#: network/netconnect.pm:735
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10374,32 +10529,32 @@ msgstr ""
 "Podeu proporcionar-lo ara a través d'un disquet o la vostra partició de\n"
 "windows, o fer-ho més tard."
 
-#: network/netconnect.pm:703 network/netconnect.pm:708
+#: network/netconnect.pm:739 network/netconnect.pm:744
 #, c-format
 msgid "Use a floppy"
 msgstr "Usa un disquet"
 
-#: network/netconnect.pm:703 network/netconnect.pm:712
+#: network/netconnect.pm:739 network/netconnect.pm:748
 #, c-format
 msgid "Use my Windows partition"
 msgstr "Usa la meva partició de Windows"
 
-#: network/netconnect.pm:703 network/netconnect.pm:715
+#: network/netconnect.pm:739 network/netconnect.pm:751
 #, c-format
 msgid "Do it later"
 msgstr "Fes-ho després"
 
-#: network/netconnect.pm:722
+#: network/netconnect.pm:758
 #, c-format
 msgid "Firmware copy failed, file %s not found"
 msgstr "La còpia del firmware ha fallat. no s'ha trobat el fitxer %s"
 
-#: network/netconnect.pm:729
+#: network/netconnect.pm:765
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr "La còpia del firmware ha tingut èxit"
 
-#: network/netconnect.pm:744
+#: network/netconnect.pm:780
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10412,22 +10567,22 @@ msgstr ""
 "%s\n"
 "i copieu l'mgmt.o que és a /usr/share/speedtouch"
 
-#: network/netconnect.pm:797
+#: network/netconnect.pm:849
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr "ID de camí virtual (VPI):"
 
-#: network/netconnect.pm:798
+#: network/netconnect.pm:850
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr "ID de circuit virtual (VCI):"
 
-#: network/netconnect.pm:800
+#: network/netconnect.pm:853
 #, c-format
-msgid "Encapsulation :"
+msgid "Encapsulation:"
 msgstr "Encapsulat :"
 
-#: network/netconnect.pm:817
+#: network/netconnect.pm:870
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -10440,41 +10595,41 @@ msgstr ""
 "\n"
 "Podeu trobar un controlador a http://eciadsl.flashtux.org/"
 
-#: network/netconnect.pm:829
+#: network/netconnect.pm:882
 #, c-format
 msgid "Manually load a driver"
-msgstr ""
+msgstr "Carrega un controlador manualment"
 
-#: network/netconnect.pm:844
-#, c-format
+#: network/netconnect.pm:898
+#, fuzzy, 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 ""
 "ATENCIÓ: Aquest dispositiu ja es va configurar per connectar-se a Internet.\n"
 "Només cal que accepteu per mantenir-lo configurat.\n"
 "Si modifiqueu els camps inferiors, sobreescriureu aquesta configuració."
 
-#: network/netconnect.pm:857 network/netconnect.pm:1228
+#: network/netconnect.pm:912 network/netconnect.pm:1340
 #, c-format
 msgid ""
 "Congratulations, the network and Internet configuration is finished.\n"
 "\n"
 msgstr "Felicitats, la configuració de xarxa i d'Internet ha finalitzat.\n"
 
-#: network/netconnect.pm:871
+#: network/netconnect.pm:929
 #, c-format
 msgid "Zeroconf hostname resolution"
 msgstr ""
 
-#: 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 "S'està configurant el dispositiu de xarxa %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. "
@@ -10483,7 +10638,7 @@ msgstr ""
 "Es poden usar els següents protocols per configurar una connexió ethernet. "
 "Si us plau escolliu el que voleu usar"
 
-#: network/netconnect.pm:907
+#: network/netconnect.pm:964
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -10495,93 +10650,99 @@ msgstr ""
 "punts (per exemple, 1.2.3.4)."
 
 #
-#: network/netconnect.pm:914
+#: network/netconnect.pm:971
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr "Assigna un nom d'ordinador a partir de l'adreça DHCP"
 
-#: network/netconnect.pm:915
+#: network/netconnect.pm:972
 #, c-format
 msgid "DHCP host name"
 msgstr "Nom DHCP de l'ordinador"
 
-#: 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 "Submàscara de xarxa"
 
-#: 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 ""
 "Fes el seguiment de l'identificador de la targeta de xarxa (d'utilitat per a "
 "portàtils)"
 
-#: network/netconnect.pm:923 standalone/drakconnect:423
+#: network/netconnect.pm:980 standalone/drakconnect:414
 #, c-format
 msgid "Network Hotplugging"
 msgstr "\"Hotplugging\" de xarxa"
 
 #
-#: network/netconnect.pm:924 standalone/drakconnect:417
+#: network/netconnect.pm:982 standalone/drakconnect:408
 #, c-format
 msgid "Start at boot"
 msgstr "Inicia en l'arrencada"
 
-#: network/netconnect.pm:926 standalone/drakconnect:833
+#: network/netconnect.pm:985 standalone/drakconnect:884
 #, c-format
 msgid "DHCP client"
 msgstr "Client 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 "L'adreça IP ha d'estar en 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 "Atenció: l'adreça IP %s està reservada, normalment!"
 
-#: 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 ja és en ús\n"
+
+#: network/netconnect.pm:1030 network/netconnect.pm:1059
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
 msgstr "Si us plau introduïu els paràmetres per aquesta targeta sense fils:"
 
-#: network/netconnect.pm:972 standalone/drakconnect:389
+#: network/netconnect.pm:1033 standalone/drakconnect:380
 #, c-format
 msgid "Operating Mode"
 msgstr "Mode de funcionament"
 
-#: network/netconnect.pm:974 standalone/drakconnect:390
+#: network/netconnect.pm:1035 standalone/drakconnect:381
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Nom de la xarxa (ESSID)"
 
 #
-#: network/netconnect.pm:975 standalone/drakconnect:391
+#: network/netconnect.pm:1036 standalone/drakconnect:382
 #, c-format
 msgid "Network ID"
 msgstr "ID de xarxa"
 
-#: network/netconnect.pm:976 standalone/drakconnect:392
+#: network/netconnect.pm:1037 standalone/drakconnect:383
 #, c-format
 msgid "Operating frequency"
 msgstr "Freqüència de funcionament"
 
-#: network/netconnect.pm:977 standalone/drakconnect:393
+#: network/netconnect.pm:1038 standalone/drakconnect:384
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: network/netconnect.pm:978 standalone/drakconnect:394
+#: network/netconnect.pm:1039 standalone/drakconnect:385
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Taxa 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 "
@@ -10590,7 +10751,7 @@ msgstr ""
 "La freqüència ha de tenir el sufix k, M o G (per exemple, \"2,46G\" per a la "
 "freqüència de 2,46 GHz), or afegir prou '0' (zeros)."
 
-#: 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 "
@@ -10599,12 +10760,12 @@ msgstr ""
 "La velocitat ha de tenir el sufix k, M o G (per exemple, \"11M\" per a 11M), "
 "o afegir prou '0' (zeros)."
 
-#: 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 "
@@ -10618,33 +10779,33 @@ msgid ""
 "or off."
 msgstr ""
 
-#: network/netconnect.pm:1009 standalone/drakconnect:406
+#: network/netconnect.pm:1070 standalone/drakconnect:397
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentació"
 
-#: network/netconnect.pm:1010 standalone/drakconnect:407
+#: network/netconnect.pm:1071 standalone/drakconnect:398
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr "Arguments extra per a 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 ""
 
 #. -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 "Arguments extra per a 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"
@@ -10656,12 +10817,12 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:1027 standalone/drakconnect:409
+#: network/netconnect.pm:1088 standalone/drakconnect:400
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr "Arguments extra per a lwpriv"
 
-#: network/netconnect.pm:1028
+#: network/netconnect.pm:1089
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10679,29 +10840,7 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:1055
-#, c-format
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"No s'ha detectat cap adaptador de xarxa ethernet al sistema.\n"
-"No puc configurar aquest tipus de connexió."
-
-#: network/netconnect.pm:1059 standalone/drakgw:261 standalone/drakpxe:142
-#, c-format
-msgid "Choose the network interface"
-msgstr "Escolliu la interfície de xarxa"
-
-#: network/netconnect.pm:1060
-#, c-format
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet."
-msgstr ""
-"Si us plau, seleccioneu quin adaptador de xarxa voleu utilitzar per\n"
-"connectar-vos a Internet."
-
-#: network/netconnect.pm:1081
+#: network/netconnect.pm:1163
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -10713,86 +10852,88 @@ msgstr ""
 "Aquest nom ha de ser complet, com ara \"mybox.mylab.myco.com\".\n"
 "També podeu introduir l'adreça IP de la passarel·la, si en teniu 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 ""
 "Finalment però no menys important podeu introduir les adreces IP dels "
 "vostres servidors DNS."
 
-#: network/netconnect.pm:1087 standalone/drakconnect:946
+#: network/netconnect.pm:1169 standalone/drakconnect:997
 #, c-format
 msgid "Host name (optional)"
 msgstr "Nom de l'ordinador (opcional)"
 
-#: network/netconnect.pm:1087
+#: network/netconnect.pm:1169
 #, c-format
 msgid "Host name"
 msgstr "Nom de l'ordinador"
 
-#: 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 "Domini de cerca"
 
-#: 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 ""
 
-#: network/netconnect.pm:1094
+#: network/netconnect.pm:1176
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr "Passarel·la (e.g. %s)"
 
-#: network/netconnect.pm:1096
+#: network/netconnect.pm:1178
 #, c-format
 msgid "Gateway device"
 msgstr "Dispositiu de la passarel·la"
 
-#: network/netconnect.pm:1105
+#: network/netconnect.pm:1187
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "L'adreça del servidor DNS ha d'estar en 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 "L'adreça de la passarel·la ha d'estar en 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 ""
 
-#: network/netconnect.pm:1122
+#: network/netconnect.pm:1207
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Nom Zeroconf de l'ordinador"
 
-#: network/netconnect.pm:1125
+#: network/netconnect.pm:1210
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "El nom de l'ordinador del Zeroconf no ha de contenir cap ."
 
-#: network/netconnect.pm:1135
+#: network/netconnect.pm:1220
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -10804,35 +10945,56 @@ msgstr ""
 "\n"
 
 #
-#: network/netconnect.pm:1137
+#: network/netconnect.pm:1222
 #, c-format
 msgid "Internet connection"
 msgstr "Connexió 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ó és completa, voleu aplicar els paràmetres?"
 
-#: network/netconnect.pm:1155
+#: network/netconnect.pm:1240
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "Voleu iniciar la connexió en arrencar?"
 
-#: network/netconnect.pm:1172
+#
+#: network/netconnect.pm:1258
 #, c-format
-msgid "The network needs to be restarted. Do you want to restart it ?"
+msgid "Automatically at boot"
+msgstr "Automàticament en arrencar"
+
+#: network/netconnect.pm:1260
+#, c-format
+msgid "By using Net Applet in the system tray"
+msgstr ""
+
+#: network/netconnect.pm:1262
+#, c-format
+msgid "Manually (the interface would still be activated at boot)"
+msgstr ""
+
+#: network/netconnect.pm:1271
+#, c-format
+msgid "How do you want to dial this connection?"
+msgstr "Com voleu marcar aquesta connexió?"
+
+#: network/netconnect.pm:1284
+#, c-format
+msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr "Cal reiniciar la xarxa. La voleu reiniciar?"
 
-#: network/netconnect.pm:1179 network/netconnect.pm:1244
+#: network/netconnect.pm:1291 network/netconnect.pm:1356
 #, c-format
 msgid "Network Configuration"
 msgstr "Configuració de xarxa"
 
-#: 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 ""
@@ -10840,27 +11002,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 "Voleu intentar connectar-vos a Internet ara?"
 
-#: network/netconnect.pm:1196 standalone/drakconnect:978
+#: network/netconnect.pm:1308 standalone/drakconnect:1029
 #, c-format
 msgid "Testing your connection..."
 msgstr "S'està comprovant la vostra connexió..."
 
-#: network/netconnect.pm:1212
+#: network/netconnect.pm:1324
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "Ara, el sistema està connectat a Internet."
 
-#: network/netconnect.pm:1213
+#: network/netconnect.pm:1325
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "Per raons de seguretat, ara es desconnectarà."
 
-#: network/netconnect.pm:1214
+#: network/netconnect.pm:1326
 #, c-format
 msgid ""
 "The system doesn't seem to be connected to the Internet.\n"
@@ -10869,7 +11031,7 @@ msgstr ""
 "No sembla que el sistema estigui connectat a Internet.\n"
 "Intenteu tornar a configurar la connexió."
 
-#: network/netconnect.pm:1231
+#: network/netconnect.pm:1343
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
@@ -10878,10 +11040,10 @@ msgstr ""
 "Després d'això, és recomanable que reinicieu l'entorn X per\n"
 "evitar problemes deguts al canvi de nom de l'ordinador."
 
-#: 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 ""
@@ -10889,7 +11051,7 @@ msgstr ""
 "Proveu la connexió via net_monitor o mcc. Si la connexió no funciona "
 "correctament, torneu a executar la configuració."
 
-#: network/netconnect.pm:1245
+#: network/netconnect.pm:1357
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -10902,7 +11064,7 @@ msgstr ""
 "Feu clic a 'D'acord' per conservar la configuració, o a 'Cancel·la' per "
 "tornar a configurar la connexió a Internet i a la xarxa local.\n"
 
-#: network/netconnect.pm:1333
+#: network/netconnect.pm:1393
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
@@ -10911,28 +11073,28 @@ msgstr ""
 "Hi ha hagut un error no esperat:\n"
 "%s"
 
-#: network/network.pm:315
+#: network/network.pm:316
 #, c-format
 msgid "Proxies configuration"
 msgstr "Configuració dels servidors intermediaris (proxies)"
 
-#: network/network.pm:316
+#: network/network.pm:317
 #, c-format
 msgid "HTTP proxy"
 msgstr "Intermediari per a HTTP"
 
-#: network/network.pm:317
+#: network/network.pm:318
 #, c-format
 msgid "FTP proxy"
 msgstr "Intermediari per a FTP"
 
-#: network/network.pm:320
+#: network/network.pm:321
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "El servidor intermediari ha de ser http://..."
 
 #
-#: network/network.pm:321
+#: network/network.pm:322
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "L'URL ha de començar amb 'ftp:' o 'http:'"
@@ -10951,7 +11113,7 @@ msgstr ""
 "Atenció! S'ha detectat una configuració existent del tallafoc. Potser us "
 "caldrà fer algun ajustament manual després de la instal·lació."
 
-#: 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"
@@ -10968,12 +11130,12 @@ msgstr ""
 "\t\teth0, o eth1 per a connexions de cable, \n"
 "\t\tippp+ per a connexions XDSI.\n"
 
-#: network/tools.pm:165
+#: network/tools.pm:197
 #, c-format
 msgid "Insert floppy"
 msgstr "Inseriu un disquet"
 
-#: 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 "
@@ -10982,22 +11144,22 @@ msgstr ""
 "Inseriu un disquet formatat amb FAT a la unitat %s amb %s a el directori "
 "arrel i premeu %s"
 
-#: network/tools.pm:167
+#: network/tools.pm:199
 #, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr "Error d'accés al disquet, no s'ha pogut muntar el dispositiu %s"
 
-#: partition_table.pm:645
+#: partition_table.pm:393
 #, c-format
 msgid "mount failed: "
 msgstr "ha fallat el muntatge: "
 
-#: partition_table.pm:750
+#: partition_table.pm:498
 #, c-format
 msgid "Extended partition not supported on this platform"
 msgstr "Aquesta plataforma no suporta particions ampliades"
 
-#: 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"
@@ -11008,22 +11170,22 @@ msgstr ""
 "L'única solució és moure les particions primàries per fer que el forat quedi "
 "contigu a les particions ampliades"
 
-#: partition_table.pm:855
+#: partition_table.pm:602
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Ha fallat la restauració des del fitxer %s: %s"
 
-#: partition_table.pm:857
+#: partition_table.pm:604
 #, c-format
 msgid "Bad backup file"
 msgstr "Fitxer de còpia de seguretat incorrecte"
 
-#: partition_table.pm:877
+#: partition_table.pm:624
 #, c-format
 msgid "Error writing to file %s"
 msgstr "S'ha produït un error en escriure al fitxer %s"
 
-#: partition_table/raw.pm:187
+#: partition_table/raw.pm:238
 #, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -11036,27 +11198,27 @@ msgstr ""
 "Això vol dir que qualsevol cosa que s'escrigui al disc acabarà amb dates "
 "aleatòries i malmeses."
 
-#: pkgs.pm:24
+#: pkgs.pm:23
 #, c-format
 msgid "must have"
 msgstr "s'ha de tenir"
 
-#: pkgs.pm:25
+#: pkgs.pm:24
 #, c-format
 msgid "important"
 msgstr "important"
 
-#: pkgs.pm:26
+#: pkgs.pm:25
 #, c-format
 msgid "very nice"
 msgstr "molt bonic"
 
-#: pkgs.pm:27
+#: pkgs.pm:26
 #, c-format
 msgid "nice"
 msgstr "bonic"
 
-#: pkgs.pm:28
+#: pkgs.pm:27
 #, c-format
 msgid "maybe"
 msgstr "potser"
@@ -11071,7 +11233,7 @@ msgstr "(en %s)"
 msgid "(on this machine)"
 msgstr "(en aquest ordinador)"
 
-#: printer/cups.pm:115 standalone/printerdrake:197
+#: printer/cups.pm:115 standalone/printerdrake:203
 #, c-format
 msgid "Configured on other machines"
 msgstr "Configurat a d'altres ordinadors"
@@ -11081,302 +11243,312 @@ msgstr "Configurat a d'altres ordinadors"
 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 " (Predeterminat)"
 
-#: 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 (servidor remot)"
+
+#: printer/data.pm:133
+#, c-format
+msgid "Remote CUPS"
+msgstr "CUPS remot"
+
 #: 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 "Model desconegut"
 
-#: printer/main.pm:29
+#: printer/main.pm:27
 #, c-format
 msgid "Local printer"
 msgstr "Impressora local"
 
-#: printer/main.pm:30
+#: printer/main.pm:28
 #, c-format
 msgid "Remote printer"
 msgstr "Impressora remota"
 
 #
-#: printer/main.pm:31
+#: printer/main.pm:29
 #, c-format
 msgid "Printer on remote CUPS server"
 msgstr "Impressora en servidor CUPS remot"
 
 #
-#: 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 "Impressora en servidor lpd remot"
 
-#: printer/main.pm:33
+#: printer/main.pm:31
 #, c-format
 msgid "Network printer (TCP/Socket)"
 msgstr "Impressora de xarxa (TCP/Socket)"
 
 #
-#: printer/main.pm:34
+#: printer/main.pm:32
 #, c-format
 msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "Impressora en servidor SMB/Windows 95/98/NT"
 
 #
-#: printer/main.pm:35
+#: printer/main.pm:33
 #, c-format
 msgid "Printer on NetWare server"
 msgstr "Impressora en 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 "Entreu un dispositiu URI d'impressora"
 
-#: printer/main.pm:37
+#: printer/main.pm:35
 #, c-format
 msgid "Pipe job into a command"
 msgstr "Redirecciona el treball cap a una ordre"
 
-#: 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 "Model desconegut"
 
-#: printer/main.pm:332 standalone/printerdrake:196
+#: printer/main.pm:346 standalone/printerdrake:202
 #, c-format
 msgid "Configured on this machine"
 msgstr "Configurat en aquest ordinador"
 
-#: 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 port paral·lel #%s"
 
-#: printer/main.pm:341 printer/printerdrake.pm:965
+#: printer/main.pm:355 printer/printerdrake.pm:1072
 #, c-format
 msgid ", USB printer #%s"
 msgstr ", impressora USB #%s"
 
-#: printer/main.pm:343
+#: printer/main.pm:357
 #, c-format
 msgid ", USB printer"
 msgstr ", impressora USB"
 
-#: printer/main.pm:348
+#: printer/main.pm:362
 #, c-format
 msgid ", multi-function device on parallel port #%s"
 msgstr ", dispositiu multifunció en port paral·lel #%s"
 
-#: printer/main.pm:351
+#: printer/main.pm:365
 #, c-format
 msgid ", multi-function device on a parallel port"
 msgstr ", dispositiu multifunció en un port paral·lel"
 
-#: printer/main.pm:353
+#: printer/main.pm:367
 #, c-format
 msgid ", multi-function device on USB"
 msgstr ", dispositiu multifunció en USB"
 
-#: printer/main.pm:355
+#: printer/main.pm:369
 #, c-format
 msgid ", multi-function device on HP JetDirect"
 msgstr ", dispositiu multifunció en HP JetDirect"
 
-#: printer/main.pm:357
+#: printer/main.pm:371
 #, c-format
 msgid ", multi-function device"
 msgstr ", dispositiu multifunció"
 
-#: printer/main.pm:360
+#: printer/main.pm:375
 #, c-format
 msgid ", printing to %s"
 msgstr ", imprimint a %s"
 
-#: printer/main.pm:362
+#: printer/main.pm:378
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
 msgstr " en servidor LPD \"%s\", impressora \"%s\""
 
-#: printer/main.pm:364
+#: printer/main.pm:381
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
 msgstr ", host TCP/IP \"%s\", port %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\", recurs compartit \"%s\""
 
-#: printer/main.pm:372
+#: printer/main.pm:391
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
 msgstr " en servidor Novell \"%s\", impressora \"%s\""
 
-#: printer/main.pm:374
+#: printer/main.pm:394
 #, c-format
 msgid ", using command %s"
 msgstr ", utilitzant l'ordre %s"
 
-#: printer/main.pm:389
+#: printer/main.pm:409
 #, c-format
 msgid "Parallel port #%s"
 msgstr "Port paral·lel #%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 "Impressora USB #%s"
 
-#: printer/main.pm:394
+#: printer/main.pm:414
 #, c-format
 msgid "USB printer"
 msgstr "Impressora USB"
 
-#: printer/main.pm:399
+#: printer/main.pm:419
 #, c-format
 msgid "Multi-function device on parallel port #%s"
 msgstr "Dispositiu multifunció en port paral·lel #%s"
 
-#: printer/main.pm:402
+#: printer/main.pm:422
 #, c-format
 msgid "Multi-function device on a parallel port"
 msgstr "Dispositiu multifunció en un port paral·lel"
 
-#: printer/main.pm:404
+#: printer/main.pm:424
 #, c-format
 msgid "Multi-function device on USB"
 msgstr "Dispositiu multifunció en USB"
 
-#: printer/main.pm:406
+#: printer/main.pm:426
 #, c-format
 msgid "Multi-function device on HP JetDirect"
 msgstr "Dispositiu multifunció en HP JetDirect"
 
-#: printer/main.pm:408
+#: printer/main.pm:428
 #, c-format
 msgid "Multi-function device"
 msgstr "Dispositiu multifunció"
 
-#: printer/main.pm:411
+#: printer/main.pm:432
 #, c-format
 msgid "Prints into %s"
 msgstr "Imprimeix a %s"
 
-#: printer/main.pm:413
+#: printer/main.pm:435
 #, c-format
 msgid "LPD server \"%s\", printer \"%s\""
 msgstr "Servidor LPD \"%s\", impressora \"%s\""
 
-#: printer/main.pm:415
+#: printer/main.pm:438
 #, c-format
 msgid "TCP/IP host \"%s\", port %s"
 msgstr "Host TCP/IP \"%s\", port %s"
 
-#: printer/main.pm:419
+#: printer/main.pm:443
 #, c-format
 msgid "SMB/Windows server \"%s\", share \"%s\""
 msgstr "Servidor SMB/Windows \"%s\", recurs compartit \"%s\""
 
-#: printer/main.pm:423
+#: printer/main.pm:448
 #, c-format
 msgid "Novell server \"%s\", printer \"%s\""
 msgstr "Servidor Novell \"%s\", impressora \"%s\""
 
-#: printer/main.pm:425
+#: printer/main.pm:451
 #, c-format
 msgid "Uses command %s"
 msgstr "Utilitza l'ordre %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 "Impressora en cru (raw) (Cap 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 "Xarxa(es) local(s)"
 
-#: printer/main.pm:1088 printer/printerdrake.pm:195
+#: printer/main.pm:1149 printer/printerdrake.pm:221
 #, c-format
 msgid "Interface \"%s\""
 msgstr "Interfície \"%s\""
 
 #
-#: printer/main.pm:1090
+#: printer/main.pm:1151
 #, c-format
 msgid "Network %s"
 msgstr "Xarxa %s"
 
-#: printer/main.pm:1092
+#: printer/main.pm:1153
 #, c-format
 msgid "Host %s"
 msgstr "Ordinador %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"
@@ -11390,12 +11562,12 @@ msgstr ""
 "penjarà i l'activarà allà on la impressora estigui connectada.\n"
 
 #
-#: printer/printerdrake.pm:62
+#: printer/printerdrake.pm:61
 #, c-format
 msgid "CUPS printer configuration"
 msgstr "Configuració de la impressora 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 "
@@ -11404,7 +11576,7 @@ msgstr ""
 "Aquí podeu decidir si s'ha de poder accedir a les impressores connectades a "
 "aquesta màquina des de màquines remotes, i des de quines d'elles."
 
-#: printer/printerdrake.pm:64
+#: printer/printerdrake.pm:63
 #, c-format
 msgid ""
 "You can also decide here whether printers on remote machines should be "
@@ -11413,44 +11585,39 @@ msgstr ""
 "També podeu decidir aquí si aquesta màquina ha de poder accedir "
 "automàticament a les impressores de màquines remotes."
 
-#: printer/printerdrake.pm:67
+#: printer/printerdrake.pm:66
 #, c-format
 msgid "The printers on this machine are available to other computers"
 msgstr "Les impressores d'aquesta màquina són accessibles a altres ordinadors"
 
-#: printer/printerdrake.pm:69
+#: printer/printerdrake.pm:71
 #, c-format
 msgid "Automatically find available printers on remote machines"
 msgstr "Cerca automàticament impressores disponibles en màquines remotes"
 
-#: printer/printerdrake.pm:71
+#: printer/printerdrake.pm:76
 #, c-format
 msgid "Printer sharing on hosts/networks: "
 msgstr "Compartició d'impressores a ordinadors centrals/xarxes:"
 
 #
-#: printer/printerdrake.pm:73
+#: printer/printerdrake.pm:78
 #, c-format
 msgid "Custom configuration"
 msgstr "Configuració personalitzada"
 
-#: 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 "Cap màquina remota"
 
-#: printer/printerdrake.pm:88
+#: printer/printerdrake.pm:94
 #, c-format
 msgid "Additional CUPS servers: "
 msgstr "Servidors CUPS addicionals:"
 
-#: printer/printerdrake.pm:93
-#, c-format
-msgid "None"
-msgstr "Cap"
-
-#: 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 "
@@ -11473,20 +11640,20 @@ msgstr ""
 "opcionalment el o els números de port."
 
 #
-#: printer/printerdrake.pm:100
+#: printer/printerdrake.pm:109
 #, c-format
 msgid "Japanese text printing mode"
 msgstr "Mode d'impressió de text en 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 ""
 "Si ho activeu podreu imprimir fitxers de text en japonès. Utilitzeu aquest "
@@ -11498,12 +11665,12 @@ msgstr ""
 "activeu aquesta funció."
 
 #
-#: printer/printerdrake.pm:105
+#: printer/printerdrake.pm:117
 #, c-format
 msgid "Automatic correction of CUPS configuration"
 msgstr "Correcció automàtica de la configuració 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 "
@@ -11533,12 +11700,38 @@ msgstr ""
 "Si alguna d'aquestes mesures us porta problemes desactiveu aquesta opció, "
 "però us caldrà anar amb compte amb aquest punts."
 
-#: 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 remot CUPS i dimoni CUPS no local"
+
+#: printer/printerdrake.pm:135
+#, c-format
+msgid "On"
+msgstr ""
+
+#: printer/printerdrake.pm:137 printer/printerdrake.pm:492
+#: printer/printerdrake.pm:519
+#, c-format
+msgid "Off"
+msgstr ""
+
+#: printer/printerdrake.pm:138 printer/printerdrake.pm:501
+#, c-format
+msgid ""
+"In this mode the local CUPS daemon will be stopped and all printing requests "
+"go directly to the server specified below. Note that it is not possible to "
+"define local print queues then and if the specified server is down it cannot "
+"be printed at all from this machine."
+msgstr ""
+
+#: printer/printerdrake.pm:155 printer/printerdrake.pm:230
 #, c-format
 msgid "Sharing of local printers"
 msgstr "Compartició d'impressores locals"
 
-#: printer/printerdrake.pm:130
+#: printer/printerdrake.pm:156
 #, c-format
 msgid ""
 "These are the machines and networks on which the locally connected printer"
@@ -11547,30 +11740,30 @@ msgstr ""
 "Aquestes són les màquines i xarxes en què la impressora o impressores "
 "connectades localment han d'estar disponibles:"
 
-#: printer/printerdrake.pm:141
+#: printer/printerdrake.pm:167
 #, c-format
 msgid "Add host/network"
 msgstr "Afegeix ordinador/xarxa"
 
-#: printer/printerdrake.pm:147
+#: printer/printerdrake.pm:173
 #, c-format
 msgid "Edit selected host/network"
 msgstr "Edita l'ordinador/xarxa seleccionada"
 
 #
-#: printer/printerdrake.pm:156
+#: printer/printerdrake.pm:182
 #, c-format
 msgid "Remove selected host/network"
 msgstr "Elimina l'ordinador/xarxa 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 "Adreça IP de l'ordinador/xarxa:"
 
-#: printer/printerdrake.pm:206
+#: printer/printerdrake.pm:231
 #, c-format
 msgid ""
 "Choose the network or host on which the local printers should be made "
@@ -11579,33 +11772,33 @@ msgstr ""
 "Trieu la xara o ordinadors en què les impressores locals han d'estar "
 "disponibles:"
 
-#: printer/printerdrake.pm:213
+#: printer/printerdrake.pm:238
 #, c-format
 msgid "Host/network IP address missing."
 msgstr "L'adreça IP de l'ordinador/xarxa no hi és."
 
-#: printer/printerdrake.pm:221
+#: printer/printerdrake.pm:246
 #, c-format
 msgid "The entered host/network IP is not correct.\n"
 msgstr "La IP de l'ordinador/xarxa no és 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 "Exemples d'IP correctes:\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 "Aquest ordinador/xarxa ja és a la llista, no es pot tornar a afegir.\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 "Accés a les impressores en servidor CUPS remots"
 
-#: 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 "
@@ -11616,109 +11809,127 @@ msgstr ""
 "Només us cal fer això si els servidors no difonen la informació de les seves "
 "impressores en la xarxa local."
 
-#: printer/printerdrake.pm:328
+#: printer/printerdrake.pm:352
 #, c-format
 msgid "Add server"
 msgstr "Afegeix un servidor"
 
-#: printer/printerdrake.pm:334
+#: printer/printerdrake.pm:358
 #, c-format
 msgid "Edit selected server"
 msgstr "Edita el servidor seleccionat"
 
 #
-#: printer/printerdrake.pm:343
+#: printer/printerdrake.pm:367
 #, c-format
 msgid "Remove selected server"
 msgstr "Elimina el servidor seleccionat"
 
-#: 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 ""
 "Introduïu l'adreça IP i port de l'ordinador les impressores del qual voleu "
 "utilitzar."
 
-#: 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 s'indica cap port, per defecte s'agafarà el 631."
 
-#: printer/printerdrake.pm:393
+#: printer/printerdrake.pm:416
 #, c-format
 msgid "Server IP missing!"
 msgstr "El servidor IP no hi és!"
 
 #
-#: printer/printerdrake.pm:399
+#: printer/printerdrake.pm:422
 #, c-format
 msgid "The entered IP is not correct.\n"
 msgstr "La IP introduïda no és 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 port ha de ser enter!"
 
-#: 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 "Aquest servidor ja és a la llista, no es pot tornar a afegir.\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 "Actiu, Nom o IP del servidor remot:"
+
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:3942
+#: printer/printerdrake.pm:4007
+#, c-format
+msgid "CUPS server name or IP address missing."
+msgstr "L'adreça IP o el nom del servidor CUPS no hi és."
+
+#: 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 "S'estan llegint dades de la impressora..."
+
+#
+#: printer/printerdrake.pm:581
 #, c-format
 msgid "Restarting CUPS..."
 msgstr "S'està reiniciant el CUPS"
 
-#: printer/printerdrake.pm:502
+#: printer/printerdrake.pm:606
 #, c-format
 msgid "Select Printer Connection"
 msgstr "Seleccioneu la connexió de la impressora"
 
-#: printer/printerdrake.pm:503
+#: printer/printerdrake.pm:607
 #, c-format
 msgid "How is the printer connected?"
 msgstr "Com està connectada la impressora?"
 
 #
-#: printer/printerdrake.pm:505
+#: printer/printerdrake.pm:609
 #, c-format
 msgid ""
 "\n"
@@ -11729,7 +11940,7 @@ msgstr ""
 "No cal configurar aquí les impressores de servidors CUPS remots; aquestes "
 "impressores es detectaran automàticament."
 
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:4012
+#: printer/printerdrake.pm:612 printer/printerdrake.pm:4315
 #, c-format
 msgid ""
 "\n"
@@ -11740,7 +11951,7 @@ msgstr ""
 "ATENCIÓ: No hi ha cap connexió de xarxa local activa, no es poden ni "
 "detectar ni provar les impressores remotes!"
 
-#: printer/printerdrake.pm:515
+#: printer/printerdrake.pm:619
 #, c-format
 msgid ""
 "Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
@@ -11749,22 +11960,22 @@ msgstr ""
 "URI de dispositiu)"
 
 #
-#: printer/printerdrake.pm:545
+#: printer/printerdrake.pm:649
 #, c-format
 msgid "Checking your system..."
 msgstr "S'està comprovant el vostre sistema..."
 
-#: printer/printerdrake.pm:561
+#: printer/printerdrake.pm:665
 #, c-format
 msgid "and one unknown printer"
 msgstr "i una impressora desconeguda"
 
-#: printer/printerdrake.pm:563
+#: printer/printerdrake.pm:667
 #, c-format
 msgid "and %d unknown printers"
 msgstr "i %d impressores desconegudes"
 
-#: printer/printerdrake.pm:567
+#: printer/printerdrake.pm:671
 #, c-format
 msgid ""
 "The following printers\n"
@@ -11777,7 +11988,7 @@ msgstr ""
 "%s%s\n"
 "estan connectades directament al vostre sistema"
 
-#: printer/printerdrake.pm:569
+#: printer/printerdrake.pm:673
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11790,7 +12001,7 @@ msgstr ""
 "%s%s\n"
 "està connectada directament al vostre sistema"
 
-#: printer/printerdrake.pm:570
+#: printer/printerdrake.pm:674
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11803,7 +12014,7 @@ msgstr ""
 "%s%s\n"
 "està connectada directament al vostre sistema"
 
-#: printer/printerdrake.pm:574
+#: printer/printerdrake.pm:678
 #, c-format
 msgid ""
 "\n"
@@ -11812,7 +12023,7 @@ msgstr ""
 "\n"
 "Hi ha una impressora desconeguda connectada directament a l'ordinador."
 
-#: printer/printerdrake.pm:575
+#: printer/printerdrake.pm:679
 #, c-format
 msgid ""
 "\n"
@@ -11821,20 +12032,20 @@ msgstr ""
 "\n"
 "Hi ha %d impressores desconegudes connectades directament a l'ordinador."
 
-#: printer/printerdrake.pm:578
+#: printer/printerdrake.pm:682
 #, c-format
 msgid ""
 "There are no printers found which are directly connected to your machine"
 msgstr "No s'ha trobat cap impressora connectada directament a l'ordinador"
 
 #
-#: printer/printerdrake.pm:581
+#: printer/printerdrake.pm:685
 #, c-format
 msgid " (Make sure that all your printers are connected and turned on).\n"
 msgstr ""
 " (Assegureu-vos que totes les impressores estan connectades i engegades.)\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 "
@@ -11843,22 +12054,22 @@ msgstr ""
 "Voleu habilitar la impressió a les impressores anteriors o a les impressores "
 "de la xarxa 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 "Voleu habilitar la impressió a les impressores de la xarxa 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 "Voleu habilitar la impressió a les impressores anteriors?\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 "Esteu segur que voleu habilitar la impressió en aquesta 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 "
@@ -11867,50 +12078,44 @@ msgstr ""
 "NOTA: Segons el model de la impressora i el sistema d'impressió, "
 "s'instal·laran fins a %d MB de programari addicional."
 
-#: printer/printerdrake.pm:629
+#: printer/printerdrake.pm:742
 #, c-format
 msgid "Searching for new printers..."
 msgstr "S'estan cercant noves impressores..."
 
-#: printer/printerdrake.pm:713
+#: printer/printerdrake.pm:797
 #, c-format
-msgid "Configuring printer ..."
-msgstr "S'està configurant la impressora..."
+msgid "Found printer on %s..."
+msgstr "S'ha trobat una impressora a %s..."
 
-#: printer/printerdrake.pm:714 printer/printerdrake.pm:769
-#: printer/printerdrake.pm:3790
-#, c-format
-msgid "Configuring printer \"%s\"..."
-msgstr "S'està configurant la impressora \"%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ó del model d'impressora"
 
 #
-#: 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 "Quin és el model de la vostra impressora?"
 
-#: printer/printerdrake.pm:743
+#: printer/printerdrake.pm:831
 #, c-format
 msgid ""
 "\n"
@@ -11923,7 +12128,7 @@ msgstr ""
 "El Printerdrake no ha pogut determinar de quin model és la impressora %s. Si "
 "us plau, escolliu el model correcte de la llista."
 
-#: 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 "
@@ -11932,23 +12137,25 @@ msgstr ""
 "Si la vostra impressora no és a la llista, escolliu-ne una de compatible "
 "(mireu el manual de la impressora) o una de similar."
 
-#
-#: 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 "S'està configurant la impressora a %s..."
+
+#: printer/printerdrake.pm:849 printer/printerdrake.pm:4096
 #, c-format
-msgid "Configuring applications..."
-msgstr "S'estan configurant les aplicacions..."
+msgid "Configuring printer \"%s\"..."
+msgstr "S'està configurant la impressora \"%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 "Afegiu una impressora"
 
-#: printer/printerdrake.pm:832
+#: printer/printerdrake.pm:933
 #, c-format
 msgid ""
 "\n"
@@ -11971,7 +12178,7 @@ msgstr ""
 "proporcionarà accés als controladors disponibles de les impressores, les "
 "seves opcions i els tipus de connexions d'impressores."
 
-#: printer/printerdrake.pm:845
+#: printer/printerdrake.pm:946
 #, c-format
 msgid ""
 "\n"
@@ -12010,7 +12217,7 @@ msgstr ""
 "Feu clic a \"Següent\" quan estigueu a punt, o a \"Cancel·la\" si no voleu "
 "configurar ara les impressores."
 
-#: printer/printerdrake.pm:854
+#: printer/printerdrake.pm:955
 #, c-format
 msgid ""
 "\n"
@@ -12037,7 +12244,7 @@ msgstr ""
 "Feu clic a \"Següent\" quan estigueu a punt, o a \"Cancel·la\" si no voleu "
 "configurar ara les impressores."
 
-#: printer/printerdrake.pm:862
+#: printer/printerdrake.pm:963
 #, c-format
 msgid ""
 "\n"
@@ -12075,7 +12282,7 @@ msgstr ""
 "Feu clic a \"Següent\" quan estigueu a punt, o a \"Cancel·la\" si no voleu "
 "configurar ara les impressores."
 
-#: printer/printerdrake.pm:871
+#: printer/printerdrake.pm:972
 #, c-format
 msgid ""
 "\n"
@@ -12103,26 +12310,26 @@ msgstr ""
 "configurar ara les impressores."
 
 #
-#: printer/printerdrake.pm:880
+#: printer/printerdrake.pm:981
 #, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr "Detecta automàticament les impressores connectades a aquesta màquina"
 
-#: printer/printerdrake.pm:883
+#: printer/printerdrake.pm:984
 #, c-format
 msgid "Auto-detect printers connected directly to the local network"
 msgstr ""
 "Detecta automàticament les impressores connectades directament a la xarxa "
 "local"
 
-#: printer/printerdrake.pm:886
+#: printer/printerdrake.pm:987
 #, c-format
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr ""
 "Detecta automàticament les impressores connectades a màquines amb Microsoft "
 "Windows"
 
-#: printer/printerdrake.pm:902
+#: printer/printerdrake.pm:1003
 #, c-format
 msgid ""
 "\n"
@@ -12146,74 +12353,74 @@ msgstr ""
 "seleccioneu \"Impressora\" en la secció \"Maquinari\" del Centre de Control %"
 "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 s'han pogut instal·lar els paquets %s!"
 
-#: printer/printerdrake.pm:939
+#: printer/printerdrake.pm:1040
 #, c-format
 msgid "Skipping Windows/SMB server auto-detection"
 msgstr "S'està saltant la detecció automàtica de servidors 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ó automàtica d'impressores"
 
-#: printer/printerdrake.pm:945
+#: printer/printerdrake.pm:1046
 #, c-format
 msgid "Detecting devices..."
 msgstr "S'estan detectant els dispositius..."
 
-#: printer/printerdrake.pm:967
+#: printer/printerdrake.pm:1075
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ", impressora de xarxa \"%s\", port %s"
 
 #
-#: printer/printerdrake.pm:969
+#: printer/printerdrake.pm:1078
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ", impressora \"%s\" en servidor SMB/Windows \"%s\""
 
-#: printer/printerdrake.pm:973
+#: printer/printerdrake.pm:1082
 #, c-format
 msgid "Detected %s"
 msgstr "S'ha detectat %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 "Impressora en el port paral·lel #%s"
 
-#: printer/printerdrake.pm:981
+#: printer/printerdrake.pm:1093
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "Impressora de xarxa \"%s\", port %s"
 
 #
-#: printer/printerdrake.pm:983
+#: printer/printerdrake.pm:1096
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "Impressora \"%s\" en servidor SMB/Windows \"%s\""
 
 #
-#: printer/printerdrake.pm:1062
+#: printer/printerdrake.pm:1177
 #, c-format
 msgid "Local Printer"
 msgstr "Impressora 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/"
@@ -12227,34 +12434,34 @@ msgstr ""
 "impressora USB: /dev/usb/lp1, etc.)."
 
 #
-#: printer/printerdrake.pm:1067
+#: printer/printerdrake.pm:1182
 #, c-format
 msgid "You must enter a device or file name!"
 msgstr "Heu d'entrar un nom de dispositiu o de fitxer!"
 
 #
-#: printer/printerdrake.pm:1076
+#: printer/printerdrake.pm:1191
 #, c-format
 msgid "No printer found!"
 msgstr "No s'ha trobat cap impressora!"
 
 #
-#: printer/printerdrake.pm:1084
+#: printer/printerdrake.pm:1199
 #, c-format
 msgid "Local Printers"
 msgstr "Impressores locals"
 
-#: printer/printerdrake.pm:1085
+#: printer/printerdrake.pm:1200
 #, c-format
 msgid "Available printers"
 msgstr "Impressores 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 "La impressora següent s'ha detectat automàticament."
 
-#: 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 "
@@ -12263,7 +12470,7 @@ msgstr ""
 "Si no és el que voleu configurar, introduïu un nom de dispositiu/nom de "
 "fitxer en la línia d'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"
@@ -12271,12 +12478,12 @@ msgstr ""
 "Alternativament, podeu indicar el nom de dispositiu/nom de fitxer en la "
 "línia d'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 "Aquesta és la llista d'impressores que es detecten automàticament."
 
-#: 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 "
@@ -12285,7 +12492,7 @@ msgstr ""
 "Si us plau, escolliu la impressora que voleu configurar o introduïu un nom "
 "de dispositiu/nom de fitxer en la línia d'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 "
@@ -12295,7 +12502,7 @@ msgstr ""
 "d'impressió o introduïu un nom de dispositiu/nom de fitxer en la línia "
 "d'entrada"
 
-#: printer/printerdrake.pm:1100
+#: printer/printerdrake.pm:1215
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
@@ -12306,12 +12513,12 @@ msgstr ""
 "impressora no ha estat correctament detectada, o si preferiu personalitzar-"
 "ne la configuració, habiliteu \"Configuració manual\"."
 
-#: printer/printerdrake.pm:1101
+#: printer/printerdrake.pm:1216
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr "Actualment no ha hi disponible cap possibilitat alternativa"
 
-#: printer/printerdrake.pm:1104
+#: printer/printerdrake.pm:1219
 #, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -12325,13 +12532,13 @@ msgstr ""
 "activeu \"Configuració manual\"."
 
 #
-#: printer/printerdrake.pm:1105
+#: printer/printerdrake.pm:1220
 #, c-format
 msgid "Please choose the printer to which the print jobs should go."
 msgstr ""
 "Si us plau, seleccioneu la impressora on han d'anar les tasques d'impressió."
 
-#: 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 "
@@ -12341,13 +12548,13 @@ msgstr ""
 "dispositiu/nom de fitxer en la línia d'entrada"
 
 #
-#: printer/printerdrake.pm:1108
+#: printer/printerdrake.pm:1223
 #, c-format
 msgid "Please choose the port that your printer is connected to."
 msgstr ""
 "Si us plau, seleccioneu el port al qual teniu connectada la impressora."
 
-#: printer/printerdrake.pm:1110
+#: printer/printerdrake.pm:1225
 #, c-format
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
@@ -12358,27 +12565,27 @@ msgstr ""
 "etc.)."
 
 #
-#: printer/printerdrake.pm:1114
+#: printer/printerdrake.pm:1229
 #, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr "Heu d'escollir/introduir una impressora/dispositiu!"
 
-#: 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 "S'està avortant"
 
-#: printer/printerdrake.pm:1189
+#: printer/printerdrake.pm:1304
 #, c-format
 msgid "Remote lpd Printer Options"
 msgstr "Opcions de la impressora lpd remota"
 
 #
-#: 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 "
@@ -12389,68 +12596,68 @@ msgstr ""
 "en aquell servidor."
 
 #
-#: printer/printerdrake.pm:1191
+#: printer/printerdrake.pm:1306
 #, c-format
 msgid "Remote host name"
 msgstr "Nom de l'ordinador remot"
 
 #
-#: printer/printerdrake.pm:1192
+#: printer/printerdrake.pm:1307
 #, c-format
 msgid "Remote printer name"
 msgstr "Nom de la impressora remota"
 
 #
-#: printer/printerdrake.pm:1195
+#: printer/printerdrake.pm:1310
 #, c-format
 msgid "Remote host name missing!"
 msgstr "Falta el nom de l'ordinador remot!"
 
 #
-#: printer/printerdrake.pm:1199
+#: printer/printerdrake.pm:1314
 #, c-format
 msgid "Remote printer name missing!"
 msgstr "Falta el nom de la impressora 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ó"
 
-#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
+#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
 #, c-format
 msgid "Detected model: %s %s"
 msgstr "Model detectat: %s %s"
 
 #
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
 #, c-format
 msgid "Scanning network..."
 msgstr "S'està escanejant la xarxa..."
 
-#: 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 ", impressora \"%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 "Impressora \"%s\" en el servidor \"%s\""
 
-#: printer/printerdrake.pm:1366
+#: printer/printerdrake.pm:1481
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Opcions de la impressora 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 "
@@ -12464,7 +12671,7 @@ msgstr ""
 "de compartició de la impressora a què voleu accedir i el nom d'usuari,\n"
 "contrasenya i informació de grup si són necessaris."
 
-#: printer/printerdrake.pm:1368
+#: printer/printerdrake.pm:1483
 #, c-format
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
@@ -12474,48 +12681,48 @@ msgstr ""
 "la seleccioneu a la llista i que hi afegiu el nom d'usuari, la contrasenya i "
 "el grup de treball, si són necessaris."
 
-#: printer/printerdrake.pm:1370
+#: printer/printerdrake.pm:1485
 #, c-format
 msgid "SMB server host"
 msgstr "Ordinadordel 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 "Nom de compartició"
 
-#: printer/printerdrake.pm:1375
+#: printer/printerdrake.pm:1490
 #, c-format
 msgid "Workgroup"
 msgstr "Grup de treball"
 
 #
-#: printer/printerdrake.pm:1377
+#: printer/printerdrake.pm:1492
 #, c-format
 msgid "Auto-detected"
 msgstr "Detectada automàticament"
 
-#: printer/printerdrake.pm:1387
+#: printer/printerdrake.pm:1502
 #, c-format
 msgid "Either the server name or the server's IP must be given!"
 msgstr "Cal que subministreu o bé el nom del servidor o bé la seva IP!"
 
-#: printer/printerdrake.pm:1391
+#: printer/printerdrake.pm:1506
 #, c-format
 msgid "Samba share name missing!"
 msgstr "Falta el nom de compartició de Samba!"
 
-#: printer/printerdrake.pm:1397
+#: printer/printerdrake.pm:1512
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr "AVÍS DE SEGURETAT!"
 
-#: 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 "
@@ -12560,7 +12767,7 @@ msgstr ""
 "la impressió en aquest ordinador amb el tipus de connexió \"%s\".\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 "
@@ -12573,7 +12780,7 @@ msgstr ""
 "ordinador amb el tipus de connexió \"%s\" en el 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) "
@@ -12587,13 +12794,13 @@ msgstr ""
 "Realment voleu continuar configurant aquesta impressora tal com s'està fent "
 "ara?"
 
-#: printer/printerdrake.pm:1489
+#: printer/printerdrake.pm:1604
 #, c-format
 msgid "NetWare Printer Options"
 msgstr "Opcions de la impressora 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 "
@@ -12609,43 +12816,43 @@ msgstr ""
 "són\n"
 "necessaris."
 
-#: printer/printerdrake.pm:1491
+#: printer/printerdrake.pm:1606
 #, c-format
 msgid "Printer Server"
 msgstr "Servidor de la impressora"
 
-#: printer/printerdrake.pm:1492
+#: printer/printerdrake.pm:1607
 #, c-format
 msgid "Print Queue Name"
 msgstr "Nom de la cua d'impressió"
 
-#: printer/printerdrake.pm:1497
+#: printer/printerdrake.pm:1612
 #, c-format
 msgid "NCP server name missing!"
 msgstr "Falta el nom del Servidor NCP!"
 
-#: printer/printerdrake.pm:1501
+#: printer/printerdrake.pm:1616
 #, c-format
 msgid "NCP queue name missing!"
 msgstr "Falta el nom de la cua 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 ", ordinador \"%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 "Ordinador \"%s\", port %s"
 
 #
-#: printer/printerdrake.pm:1618
+#: printer/printerdrake.pm:1733
 #, c-format
 msgid "TCP/Socket Printer Options"
 msgstr "Opcions de la impressora per a TCP/Socket"
 
-#: 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 "
@@ -12656,7 +12863,7 @@ msgstr ""
 "9100) en els quadres de text."
 
 #
-#: 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 "
@@ -12670,29 +12877,29 @@ msgstr ""
 "variar. Mireu el manual del vostre maquinari."
 
 #
-#: printer/printerdrake.pm:1625
+#: printer/printerdrake.pm:1740
 #, c-format
 msgid "Printer host name or IP missing!"
 msgstr "Falta el nom o la IP de l'ordinador de la impressora!"
 
 #
-#: printer/printerdrake.pm:1648
+#: printer/printerdrake.pm:1763
 #, c-format
 msgid "Printer host name or IP"
 msgstr "Nom o IP de l'ordinador de la impressora"
 
 #
-#: printer/printerdrake.pm:1704
+#: printer/printerdrake.pm:1819
 #, c-format
 msgid "Refreshing Device URI list..."
 msgstr "S'està la llista de URI de dispositiu..."
 
-#: printer/printerdrake.pm:1707 printer/printerdrake.pm:1709
+#: printer/printerdrake.pm:1822 printer/printerdrake.pm:1824
 #, c-format
 msgid "Printer Device URI"
 msgstr "Dispositiu URI d'impressora"
 
-#: 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 "
@@ -12703,17 +12910,17 @@ msgstr ""
 "complir les especificacions CUPS o Foomatic. Cal remarcar que alguns gestors "
 "de cues no accepten tots els tipus d'URI."
 
-#: printer/printerdrake.pm:1731
+#: printer/printerdrake.pm:1846
 #, c-format
 msgid "A valid URI must be entered!"
 msgstr "Heu d'entrar un URI vàlid!"
 
-#: printer/printerdrake.pm:1834
+#: printer/printerdrake.pm:1949
 #, c-format
 msgid "Pipe into command"
 msgstr "Condueix cap a una ordre"
 
-#: 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 "
@@ -12722,17 +12929,17 @@ msgstr ""
 "Aquí podeu indicar qualsevol línia d'ordres arbitrària a la qual s'ha de "
 "conduir la tasca en comptes d'enviar-se directament a la impressora."
 
-#: printer/printerdrake.pm:1836
+#: printer/printerdrake.pm:1951
 #, c-format
 msgid "Command line"
 msgstr "Línia d'ordres"
 
-#: printer/printerdrake.pm:1840
+#: printer/printerdrake.pm:1955
 #, c-format
 msgid "A command line must be entered!"
 msgstr "S'ha d'introduir una línia d'ordres!"
 
-#: printer/printerdrake.pm:1873
+#: printer/printerdrake.pm:1988
 #, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
@@ -12744,81 +12951,81 @@ msgstr ""
 "V100), una HP PhotoSmart or una HP LaserJet 2200?"
 
 #
-#: printer/printerdrake.pm:1887
+#: printer/printerdrake.pm:2005
 #, c-format
 msgid "Installing HPOJ package..."
 msgstr "S'està instal·lant el paquet HPOJ..."
 
-#: printer/printerdrake.pm:1894
+#: printer/printerdrake.pm:2012
 #, c-format
 msgid "Only printing will be possible on the %s."
 msgstr ""
 
-#: printer/printerdrake.pm:1903 printer/printerdrake.pm:2025
+#: printer/printerdrake.pm:2022 printer/printerdrake.pm:2148
 #, c-format
 msgid "Checking device and configuring HPOJ..."
 msgstr "S'està comprovant el dispositiu i configurant l'HPOJ..."
 
 #
-#: printer/printerdrake.pm:1946
+#: printer/printerdrake.pm:2065
 #, c-format
 msgid "Installing SANE packages..."
 msgstr "S'estan instal·lant els paquets SANE..."
 
-#: printer/printerdrake.pm:1956
+#: printer/printerdrake.pm:2078
 #, c-format
 msgid "Scanning on the %s will not be possible."
 msgstr ""
 
 #
-#: printer/printerdrake.pm:1983
+#: printer/printerdrake.pm:2105
 #, c-format
 msgid "Installing mtools packages..."
 msgstr "S'estan instal·lant els paquets mtools..."
 
-#: printer/printerdrake.pm:1990
+#: printer/printerdrake.pm:2113
 #, c-format
 msgid "Photo memory card access on the %s will not be possible."
 msgstr ""
 "L'accés a la targeta de memòria per a fotografies a %s no serà possible"
 
-#: printer/printerdrake.pm:2005
+#: printer/printerdrake.pm:2128
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr "S'està explorant el dispositiu HP multifunció"
 
-#: printer/printerdrake.pm:2013
+#: printer/printerdrake.pm:2136
 #, c-format
 msgid "Photo memory card access on your HP multi-function device"
 msgstr ""
 "Accés a la targeta de memòria per a fotografies en el vostre dispositiu "
 "multifunció HP"
 
-#: printer/printerdrake.pm:2062
+#: printer/printerdrake.pm:2185
 #, c-format
 msgid "Making printer port available for CUPS..."
 msgstr "S'està posant a disposició del CUPS el port d'impressora..."
 
 #
-#: 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 "S'està llegint la base de dades d'impressores..."
 
-#: printer/printerdrake.pm:2281
+#: printer/printerdrake.pm:2404
 #, c-format
 msgid "Enter Printer Name and Comments"
 msgstr "Introduïu el nom de la impressora i comentaris"
 
-#: 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 nom de la impressora només pot constar de lletres, números i el caràcter "
 "de subratllat"
 
-#: 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"
@@ -12827,7 +13034,7 @@ msgstr ""
 "La impressora \"%s\" ja existeix,\n"
 "realment voleu sobreescriure la seva configuració?"
 
-#: printer/printerdrake.pm:2300
+#: printer/printerdrake.pm:2423
 #, c-format
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
@@ -12836,37 +13043,37 @@ msgstr ""
 "Cada impressora necessita un nom (per exemple \"impressora\"). Els camps de "
 "Descripció i Ubicació no són necessaris. Són comentaris per als usuaris."
 
-#: printer/printerdrake.pm:2301
+#: printer/printerdrake.pm:2424
 #, c-format
 msgid "Name of printer"
 msgstr "Nom de la impressora"
 
-#: 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ó"
 
-#: 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ó"
 
 #
-#: printer/printerdrake.pm:2320
+#: printer/printerdrake.pm:2443
 #, c-format
 msgid "Preparing printer database..."
 msgstr "S'està preparant la base de dades d'impressores..."
 
 #
-#: printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2559
 #, c-format
 msgid "Your printer model"
 msgstr "El model de la vostra impressora"
 
-#: printer/printerdrake.pm:2439
+#: printer/printerdrake.pm:2560
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -12893,19 +13100,19 @@ msgstr ""
 "%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 model és correcte"
 
 #
-#: 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 "Selecciona el model manualment"
 
-#: printer/printerdrake.pm:2472
+#: printer/printerdrake.pm:2593
 #, c-format
 msgid ""
 "\n"
@@ -12920,12 +13127,12 @@ msgstr ""
 "de la impressora. Cerqueu el model correcte a la llista quan estigui "
 "ressaltat un model erroni o bé \"Impressora bàsica\"."
 
-#: printer/printerdrake.pm:2491
+#: printer/printerdrake.pm:2612
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
 msgstr "Instal·la un fitxer PPD subministrat pel fabricant"
 
-#: printer/printerdrake.pm:2522
+#: printer/printerdrake.pm:2643
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
@@ -12934,7 +13141,7 @@ msgstr ""
 "Tota impressora PostScript es distribueix amb un fitxer PPD que descriu les "
 "opcions de la impressora i les seves característiques."
 
-#: 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 "
@@ -12943,12 +13150,12 @@ msgstr ""
 "El fitxer normalment està al CD en el que venen els controladors de Windows "
 "i Mac."
 
-#: 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 "També es poden trobar fitxers PPD a les pàgines web dels fabricants."
 
-#: 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 "
@@ -12957,7 +13164,7 @@ msgstr ""
 "Si teniu Windows instal·lat en el vostre ordinador, també podeu buscar el "
 "fitxer PPD a la vostra partició de 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 "
@@ -12965,7 +13172,7 @@ msgid ""
 "printer's hardware"
 msgstr ""
 
-#: printer/printerdrake.pm:2527
+#: printer/printerdrake.pm:2648
 #, c-format
 msgid ""
 "Here you can choose the PPD file to be installed on your machine, it will "
@@ -12974,60 +13181,53 @@ msgstr ""
 "Aquí podeu escollir el fitxer PPD que s'instal·larà al vostre ordinador, "
 "serà usat per configurar la vostra impressora."
 
-#: printer/printerdrake.pm:2529
+#: printer/printerdrake.pm:2650
 #, c-format
 msgid "Install PPD file from"
 msgstr "Instal·la el fitxer PPD des de"
 
-#: 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 "Disquet"
 
-#: 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 "Una altra ubicació"
 
-#: printer/printerdrake.pm:2548
+#: printer/printerdrake.pm:2669
 #, c-format
 msgid "Select PPD file"
 msgstr "Seleccioneu el fitxer PPD"
 
-#: printer/printerdrake.pm:2552
+#: printer/printerdrake.pm:2673
 #, c-format
 msgid "The PPD file %s does not exist or is unreadable!"
 msgstr "El fitxer PPD %s no existeix o no és pot llegir!"
 
-#: printer/printerdrake.pm:2558
+#: printer/printerdrake.pm:2679
 #, c-format
 msgid "The PPD file %s does not conform with the PPD specifications!"
 msgstr "El fitxer PPD %s no compleix les especificacions PPD!"
 
 #
-#: printer/printerdrake.pm:2569
+#: printer/printerdrake.pm:2690
 #, c-format
 msgid "Installing PPD file..."
 msgstr "S'està instal·lant el fitxer PPD..."
 
 #
-#: printer/printerdrake.pm:2682
+#: printer/printerdrake.pm:2807
 #, c-format
 msgid "OKI winprinter configuration"
 msgstr "Configuració de la OKI winprinter"
 
-#: printer/printerdrake.pm:2683
+#: printer/printerdrake.pm:2808
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -13045,12 +13245,12 @@ msgstr ""
 "no funcionarà. El controlador de la impressora ignorarà el tipus de connexió."
 
 #
-#: printer/printerdrake.pm:2707 printer/printerdrake.pm:2736
+#: printer/printerdrake.pm:2833 printer/printerdrake.pm:2863
 #, c-format
 msgid "Lexmark inkjet configuration"
 msgstr "Configuració de Lexmark inkjet"
 
-#: printer/printerdrake.pm:2708
+#: printer/printerdrake.pm:2834
 #, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -13063,7 +13263,7 @@ msgstr ""
 "d'impressió. Si us plau, connecteu la vostra impressora a un port local o "
 "configureu-la en l'ordinador on està connectada."
 
-#: printer/printerdrake.pm:2737
+#: printer/printerdrake.pm:2864
 #, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -13088,12 +13288,12 @@ msgstr ""
 "programa."
 
 #
-#: printer/printerdrake.pm:2746
+#: printer/printerdrake.pm:2874
 #, c-format
 msgid "Lexmark X125 configuration"
 msgstr "Configuració 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 "
@@ -13106,12 +13306,37 @@ msgstr ""
 "d'impressió. Si us plau, connecteu la vostra impressora a un port USB local "
 "o configureu-la en l'ordinador on està connectada."
 
-#: printer/printerdrake.pm:2765
+#
+#: printer/printerdrake.pm:2897
+#, c-format
+msgid "Samsung ML/QL-85G configuration"
+msgstr "Configuració de Samsung ML/QL-85G"
+
+#: printer/printerdrake.pm:2898 printer/printerdrake.pm:2925
+#, fuzzy, 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 per aquesta impressora només suporten impressores connectaves "
+"localment via USB, i no amb impressores en ordinadors remots o servidors "
+"d'impressió. Si us plau, connecteu la vostra impressora a un port USB local "
+"o configureu-la en l'ordinador on està connectada."
+
+#
+#: printer/printerdrake.pm:2924
+#, c-format
+msgid "Canon LBP-460/660 configuration"
+msgstr "Configuració de Canon LBP-460/660"
+
+#: printer/printerdrake.pm:2943
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr "Penjada de microprogramari per a l'HP LaserJet 1000"
 
-#: printer/printerdrake.pm:2878
+#: printer/printerdrake.pm:3056
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -13130,27 +13355,27 @@ msgstr ""
 "impressió pot ser molt lenta."
 
 #
-#: printer/printerdrake.pm:3003
+#: printer/printerdrake.pm:3181
 #, c-format
 msgid "Printer default settings"
 msgstr "Paràmetres per defecte de la impressora"
 
-#: printer/printerdrake.pm:3010
+#: printer/printerdrake.pm:3188
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "L'opció %s ha de ser un número enter!"
 
-#: printer/printerdrake.pm:3014
+#: printer/printerdrake.pm:3192
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "L'opció %s ha de ser un número!"
 
-#: printer/printerdrake.pm:3018
+#: printer/printerdrake.pm:3196
 #, c-format
 msgid "Option %s out of range!"
 msgstr "L'opció %s està fora de rang!"
 
-#: printer/printerdrake.pm:3069
+#: printer/printerdrake.pm:3247
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
@@ -13160,12 +13385,12 @@ msgstr ""
 "com a impressora predeterminada?"
 
 #
-#: printer/printerdrake.pm:3084
+#: printer/printerdrake.pm:3262
 #, c-format
 msgid "Test pages"
 msgstr "Pàgines de prova"
 
-#: printer/printerdrake.pm:3085
+#: printer/printerdrake.pm:3263
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -13179,63 +13404,63 @@ msgstr ""
 "Normalment n'hi ha prou d'imprimir la pàgina de prova estàndard."
 
 #
-#: printer/printerdrake.pm:3089
+#: printer/printerdrake.pm:3267
 #, c-format
 msgid "No test pages"
 msgstr "Cap pàgina de prova"
 
 #
-#: printer/printerdrake.pm:3090
+#: printer/printerdrake.pm:3268
 #, c-format
 msgid "Print"
 msgstr "Imprimeix"
 
 #
-#: printer/printerdrake.pm:3115
+#: printer/printerdrake.pm:3293
 #, c-format
 msgid "Standard test page"
 msgstr "Pàgina de prova estàndard"
 
-#: printer/printerdrake.pm:3118
+#: printer/printerdrake.pm:3296
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr "Pàgina de prova alternativa (Carta)"
 
 #
-#: printer/printerdrake.pm:3121
+#: printer/printerdrake.pm:3299
 #, c-format
 msgid "Alternative test page (A4)"
 msgstr "Pàgina de prova alternativa (A4)"
 
 #
-#: printer/printerdrake.pm:3123
+#: printer/printerdrake.pm:3301
 #, c-format
 msgid "Photo test page"
 msgstr "Pàgina de prova de fotografia"
 
 #
-#: printer/printerdrake.pm:3127
+#: printer/printerdrake.pm:3305
 #, c-format
 msgid "Do not print any test page"
 msgstr "No imprimeixis cap pàgina de prova"
 
-#: printer/printerdrake.pm:3135 printer/printerdrake.pm:3300
+#: printer/printerdrake.pm:3313 printer/printerdrake.pm:3485
 #, c-format
 msgid "Printing test page(s)..."
 msgstr "S'esta(n) imprimint la(es) pàgina(es) de prova..."
 
-#: printer/printerdrake.pm:3150
+#: printer/printerdrake.pm:3331
 #, c-format
 msgid "Could not install the %s package!"
 msgstr "No es pot instal·lar el paquet %s!"
 
 #
-#: printer/printerdrake.pm:3152
+#: printer/printerdrake.pm:3333
 #, c-format
 msgid "Skipping photo test page."
 msgstr "S'està saltant la pàgina de prova de fotografia."
 
-#: printer/printerdrake.pm:3169
+#: printer/printerdrake.pm:3350
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -13251,7 +13476,7 @@ msgstr ""
 "\n"
 
 #
-#: printer/printerdrake.pm:3173
+#: printer/printerdrake.pm:3354
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -13260,18 +13485,18 @@ msgstr ""
 "La(es) pàgina(es) de prova s'ha(n) enviat a la impressora.\n"
 "Pot passar un cert temps abans no comenci la impressió.\n"
 
-#: printer/printerdrake.pm:3180
+#: printer/printerdrake.pm:3364
 #, c-format
 msgid "Did it work properly?"
 msgstr "Ha funcionat correctament?"
 
 #
-#: printer/printerdrake.pm:3201 printer/printerdrake.pm:4397
+#: printer/printerdrake.pm:3386 printer/printerdrake.pm:4689
 #, c-format
 msgid "Raw printer"
 msgstr "Impressora en cru (raw)"
 
-#: 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 "
@@ -13284,7 +13509,7 @@ msgstr ""
 "<fitxer>\" o \"kprinter <fitxer>\". Les eines gràfiques us permeten escollir "
 "la impressora i modificar-ne els paràmetres fàcilment.\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 "
@@ -13295,8 +13520,8 @@ msgstr ""
 "diàlegs d'impressió de moltes aplicacions, però ara no heu de subministrar "
 "el fitxer perquè el fitxer per imprimir ja el proporciona l'aplicació.\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"
@@ -13309,7 +13534,7 @@ msgstr ""
 "d'impressió concret. Simplement afegiu els paràmetres desitjats a la línia "
 "d'ordres, p.ex.: \"%s <fitxer>\". "
 
-#: 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 "
@@ -13320,7 +13545,7 @@ msgstr ""
 "llista de sota o feu clic al botó \"Imprimeix la llista d'opcions\".%s%s%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"
@@ -13330,7 +13555,7 @@ msgstr ""
 "impressora 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 "
@@ -13339,8 +13564,8 @@ msgstr ""
 "Per imprimir un fitxer des de la línia d'ordres (finestra de terminal) useu "
 "l'ordre \"%s <fitxer>\".\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 "
@@ -13351,7 +13576,7 @@ msgstr ""
 "diàlegs d'impressió de moltes aplicacions. Però ara no heu de subministrar "
 "el fitxer perquè el fitxer per imprimir ja el proporciona l'aplicació.\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 "
@@ -13360,7 +13585,7 @@ msgstr ""
 "Per veure una llista de les opcions disponibles per a la impressora actual "
 "feu clic sobre el botó \"Imprimeix la llista d'opcions\"."
 
-#: 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 "
@@ -13369,7 +13594,7 @@ msgstr ""
 "Per imprimir un fitxer des de la línia d'ordres (finestra de terminal) "
 "utilitzeu l'ordre \"%s <fitxer>\" o \"%s <fitxer>\".\n"
 
-#: printer/printerdrake.pm:3272
+#: printer/printerdrake.pm:3457
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -13386,7 +13611,7 @@ msgstr ""
 "tots el treballs d'impressió immediatament en fer-hi clic. Això és útil, per "
 "exemple, quan se us enganxa el paper en la impressora.\n"
 
-#: printer/printerdrake.pm:3276
+#: printer/printerdrake.pm:3461
 #, c-format
 msgid ""
 "\n"
@@ -13399,44 +13624,34 @@ msgstr ""
 "treball d'impressió concret. Simplement afegiu els paràmetres que vulgueu a "
 "la línia d'ordres, p.ex. \"%s <fitxer>\".\n"
 
-#: printer/printerdrake.pm:3286
+#: printer/printerdrake.pm:3471
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr "S'està imprimint/escanejant/llegint targetes de fotos en \"%s\""
 
-#: printer/printerdrake.pm:3287
+#: printer/printerdrake.pm:3472
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "S'està imprimint/escanejant en \"%s\""
 
-#: printer/printerdrake.pm:3289
+#: printer/printerdrake.pm:3474
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr "S'està imprimint o llegint una targeta de fotos en \"%s\""
 
-#: printer/printerdrake.pm:3290
+#: printer/printerdrake.pm:3475
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "S'està imprimint en la impressora \"%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 "Tanca"
-
 #
-#: printer/printerdrake.pm:3296
+#: printer/printerdrake.pm:3481
 #, c-format
 msgid "Print option list"
 msgstr "Imprimeix la llista d'opcions"
 
-#: printer/printerdrake.pm:3317
-#, c-format
+#: printer/printerdrake.pm:3502
+#, fuzzy, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
 "Now you can scan with \"scanimage\" (\"scanimage -d hp:%s\" to specify the "
@@ -13446,7 +13661,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 ""
 "El vostre dispositiu multifunció ha estat configurat automàticament per "
 "poder escanejar. Ara podeu escanejar amb \"scanimage\" (\"scanimage -d hp:%s"
@@ -13458,7 +13675,7 @@ msgstr ""
 "\n"
 "No utilitzeu \"scannerdrake\" amb aquest dispositiu!"
 
-#: printer/printerdrake.pm:3343
+#: printer/printerdrake.pm:3528
 #, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -13483,19 +13700,13 @@ msgstr ""
 "cantonada superior dreta de les llistes de fitxers."
 
 #
-#: printer/printerdrake.pm:3365 printer/printerdrake.pm:3767
-#, c-format
-msgid "Reading printer data..."
-msgstr "S'estan llegint dades de la impressora..."
-
-#
-#: 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 "Configuració de la transferència de la impressió"
 
-#: printer/printerdrake.pm:3386
+#: printer/printerdrake.pm:3571
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -13512,7 +13723,7 @@ msgstr ""
 "No totes les cues d'impressió poden ser transferides degut a les raons "
 "següents:\n"
 
-#: printer/printerdrake.pm:3389
+#: printer/printerdrake.pm:3574
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
@@ -13521,7 +13732,7 @@ msgstr ""
 "CUPS no permet l'ús d'impressores en servidors Novell ni que les impressores "
 "enviïn les dades dins d'una ordre formada arbitràriament.\n"
 
-#: printer/printerdrake.pm:3391
+#: printer/printerdrake.pm:3576
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
@@ -13530,12 +13741,12 @@ msgstr ""
 "PDQ només funciona amb impressores locals, impressores LPD remotes, i "
 "impressores de 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 i LPRng no funcionen amb impressores IPP.\n"
 
-#: printer/printerdrake.pm:3395
+#: printer/printerdrake.pm:3580
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
@@ -13544,7 +13755,7 @@ msgstr ""
 "A més, les cues que no han estat creades amb aquest programa o amb "
 "\"foomatic-configure\" no es poden transferir."
 
-#: printer/printerdrake.pm:3396
+#: printer/printerdrake.pm:3581
 #, c-format
 msgid ""
 "\n"
@@ -13555,7 +13766,7 @@ msgstr ""
 "Tampoc poden transferir-se les impressores configurades amb els fitxers PPD "
 "proporcionats pels seus fabricants o amb controladors nadius per a CUPS."
 
-#: printer/printerdrake.pm:3397
+#: printer/printerdrake.pm:3582
 #, c-format
 msgid ""
 "\n"
@@ -13566,17 +13777,17 @@ msgstr ""
 "Marqueu les impressores que voleu transferir i feu clic a \n"
 "\"Transfereix\"."
 
-#: printer/printerdrake.pm:3400
+#: printer/printerdrake.pm:3585
 #, c-format
 msgid "Do not transfer printers"
 msgstr "No transfereixis cap impressora"
 
-#: printer/printerdrake.pm:3401 printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3586 printer/printerdrake.pm:3602
 #, c-format
 msgid "Transfer"
 msgstr "Transfereix"
 
-#: printer/printerdrake.pm:3413
+#: printer/printerdrake.pm:3598
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -13588,17 +13799,17 @@ msgstr ""
 "També podeu escriure un nom nou o ometre aquesta impressora."
 
 #
-#: printer/printerdrake.pm:3434
+#: printer/printerdrake.pm:3619
 #, c-format
 msgid "New printer name"
 msgstr "Nou nom d'impressora"
 
-#: printer/printerdrake.pm:3437
+#: printer/printerdrake.pm:3622
 #, c-format
 msgid "Transferring %s..."
 msgstr "S'està transferint %s..."
 
-#: printer/printerdrake.pm:3448
+#: printer/printerdrake.pm:3633
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
@@ -13609,31 +13820,31 @@ msgstr ""
 "s?"
 
 #
-#: printer/printerdrake.pm:3458
+#: printer/printerdrake.pm:3643
 #, c-format
 msgid "Refreshing printer data..."
 msgstr "S'estan refrescant les dades de les impressores..."
 
 #
-#: printer/printerdrake.pm:3467
+#: printer/printerdrake.pm:3652
 #, c-format
 msgid "Starting network..."
 msgstr "S'està arrencant la xarxa..."
 
 #
-#: 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 "Configureu la xarxa ara"
 
 #
-#: printer/printerdrake.pm:3509
+#: printer/printerdrake.pm:3696
 #, c-format
 msgid "Network functionality not configured"
 msgstr "La funcionalitat de xarxa no ha estat configurada"
 
-#: printer/printerdrake.pm:3510
+#: printer/printerdrake.pm:3697
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -13647,12 +13858,12 @@ msgstr ""
 "impressora que esteu configurant ara. Què voleu fer?"
 
 #
-#: printer/printerdrake.pm:3513
+#: printer/printerdrake.pm:3700
 #, c-format
 msgid "Go on without configuring the network"
 msgstr "Continua sense configurar la xarxa"
 
-#: printer/printerdrake.pm:3547
+#: printer/printerdrake.pm:3735
 #, c-format
 msgid ""
 "The network configuration done during the installation cannot be started "
@@ -13668,7 +13879,7 @@ msgstr ""
 "impressora, també usant el Centre de Control %s, secció \"Maquinari\"/"
 "\"Impressores\""
 
-#: printer/printerdrake.pm:3548
+#: printer/printerdrake.pm:3736
 #, c-format
 msgid ""
 "The network access was not running and could not be started. Please check "
@@ -13680,30 +13891,30 @@ msgstr ""
 "remota una altra vegada."
 
 #
-#: printer/printerdrake.pm:3558
+#: printer/printerdrake.pm:3746
 #, c-format
 msgid "Restarting printing system..."
 msgstr "S'està reiniciant el sistema d'impressió..."
 
 #
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, c-format
 msgid "high"
 msgstr "alt"
 
 #
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, c-format
 msgid "paranoid"
 msgstr "paranoic"
 
-#: printer/printerdrake.pm:3598
+#: printer/printerdrake.pm:3778
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr ""
 "S'està instal·lant un sistema d'impressió amb el nivell de seguretat %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 %"
@@ -13729,12 +13940,12 @@ msgstr ""
 "Realment voleu configurar la impressió en aquest ordinador?"
 
 #
-#: printer/printerdrake.pm:3633
+#: printer/printerdrake.pm:3814
 #, c-format
 msgid "Starting the printing system at boot time"
 msgstr "S'està iniciant el sistema d'impressió en arrencar l'ordinador"
 
-#: printer/printerdrake.pm:3634
+#: printer/printerdrake.pm:3815
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -13756,76 +13967,161 @@ msgstr ""
 "\n"
 "Voleu tornar a habilitar l'arrencada automàtica del sistema d'impressió?"
 
-#: printer/printerdrake.pm:3655 printer/printerdrake.pm:3889
+#: printer/printerdrake.pm:3837
 #, c-format
 msgid "Checking installed software..."
 msgstr "S'està comprovant el programari instal·lat..."
 
-#: printer/printerdrake.pm:3661
+#: printer/printerdrake.pm:3843
 #, c-format
-msgid "Removing %s ..."
+msgid "Removing %s..."
 msgstr "S'està eliminant %s"
 
 #
-#: printer/printerdrake.pm:3665
+#: printer/printerdrake.pm:3847
 #, c-format
 msgid "Could not remove the %s printing system!"
 msgstr "No s'ha pogut eliminar el sistema d'impressió %s!"
 
 #
-#: printer/printerdrake.pm:3674
+#: printer/printerdrake.pm:3863
 #, c-format
-msgid "Installing %s ..."
+msgid "Installing %s..."
 msgstr "S'està instal·lant %s..."
 
 #
-#: printer/printerdrake.pm:3678
+#: printer/printerdrake.pm:3867
 #, c-format
 msgid "Could not install the %s printing system!"
 msgstr "No s'ha pogut instal·lar el sistema d'impressió %s!"
 
+#: printer/printerdrake.pm:3934
+#, c-format
+msgid ""
+"In this mode there is no local printing system, all printing requests go "
+"directly to the server specified below. Note that it is not possible to "
+"define local print queues then and if the specified server is down it cannot "
+"be printed at all from this machine."
+msgstr ""
+
+#: printer/printerdrake.pm:3936
+#, c-format
+msgid ""
+"Enter the host name or IP of your CUPS server and click OK if you want to "
+"use this mode, click \"Quit\" otherwise."
+msgstr ""
+
 #
-#: printer/printerdrake.pm:3727
+#: printer/printerdrake.pm:3950
+#, c-format
+msgid "Name or IP of remote server:"
+msgstr "Nom o IP del servidor remot:"
+
+#
+#: printer/printerdrake.pm:3970
 #, c-format
 msgid "Setting Default Printer..."
 msgstr "Establint la impressora per defecte..."
 
 #
-#: printer/printerdrake.pm:3747
+#: printer/printerdrake.pm:3989
+#, fuzzy, c-format
+msgid "Local CUPS printing system or remote CUPS server?"
+msgstr "Impressora en servidor CUPS remot"
+
+#: printer/printerdrake.pm:3990
+#, c-format
+msgid "The CUPS printing system can be used in two ways: "
+msgstr ""
+
+#: printer/printerdrake.pm:3992
+#, c-format
+msgid "1. The CUPS printing system can run locally. "
+msgstr ""
+
+#: printer/printerdrake.pm:3993
+#, c-format
+msgid ""
+"Then locally connected printers can be used and remote printers on other "
+"CUPS servers in the same network are automatically discovered. "
+msgstr ""
+
+#: printer/printerdrake.pm:3994
+#, c-format
+msgid ""
+"Disadvantage of this approach is, that more resources on the local machine "
+"are needed: Additional software packages need to be installed, the CUPS "
+"daemon has to run in the background and needs some memory, and the IPP port "
+"(port 631) is opened. "
+msgstr ""
+
+#: printer/printerdrake.pm:3996
+#, c-format
+msgid "2. All printing requests are immediately sent to a remote CUPS server. "
+msgstr ""
+
+#: printer/printerdrake.pm:3997
+#, c-format
+msgid ""
+"Here local resource occupation is reduced to a minimum. No CUPS daemon is "
+"started or port opened, no software infrastructure for setting up local "
+"print queues is installed, so less memory and disk space is used. "
+msgstr ""
+
+#: printer/printerdrake.pm:3998
+#, c-format
+msgid ""
+"Disadvantage is that it is not possible to define local printers then and if "
+"the specified server is down it cannot be printed at all from this machine. "
+msgstr ""
+
+#: printer/printerdrake.pm:4000
+#, c-format
+msgid "How should CUPS be set up on your machine?"
+msgstr ""
+
+#: printer/printerdrake.pm:4004 printer/printerdrake.pm:4019
+#: printer/printerdrake.pm:4023 printer/printerdrake.pm:4029
+#, c-format
+msgid "Remote server, specify Name or IP here:"
+msgstr ""
+
+#
+#: printer/printerdrake.pm:4018
+#, c-format
+msgid "Local CUPS printing system"
+msgstr "Sistema d'impressió CUPS local"
+
+#
+#: printer/printerdrake.pm:4056
 #, c-format
 msgid "Select Printer Spooler"
 msgstr "Seleccioneu la cua d'impressió"
 
 #
-#: printer/printerdrake.pm:3748
+#: printer/printerdrake.pm:4057
 #, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "Quin sistema d'impressió (cua) voleu utilitzar?"
 
-#: printer/printerdrake.pm:3799
+#: printer/printerdrake.pm:4105
 #, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr "No s'ha pogut configurar la impressora \"%s\"!"
 
 #
-#: printer/printerdrake.pm:3812
+#: printer/printerdrake.pm:4118
 #, c-format
 msgid "Installing Foomatic..."
 msgstr "S'està instal·lant el Foomatic..."
 
-#: printer/printerdrake.pm:3818
+#: printer/printerdrake.pm:4124
 #, c-format
 msgid "Could not install %s packages, %s cannot be started!"
 msgstr "No s'han pogut instal·lar els paquets %s, no es pot iniciar %s!"
 
-#: printer/printerdrake.pm:3910
-#, c-format
-msgid "Could not install necessary packages, %s cannot be started!"
-msgstr ""
-"No s'han pogut instal·lar els paquets necessaris, no es pot 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 "
@@ -13836,12 +14132,12 @@ msgstr ""
 "impressora per modificar-ne els paràmetres, per fer-la la impressora per "
 "defecte o per veure la informació de la impressora."
 
-#: printer/printerdrake.pm:4039
+#: printer/printerdrake.pm:4344
 #, c-format
 msgid "Display all available remote CUPS printers"
 msgstr "Mostra totes les impressores CUPS remotes disponibles"
 
-#: printer/printerdrake.pm:4040
+#: printer/printerdrake.pm:4345
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr ""
@@ -13849,192 +14145,159 @@ msgstr ""
 "remotes disponibles)"
 
 #
-#: printer/printerdrake.pm:4050
+#: printer/printerdrake.pm:4356
 #, c-format
 msgid "CUPS configuration"
 msgstr "Configuració de CUPS"
 
 #
-#: printer/printerdrake.pm:4062
+#: printer/printerdrake.pm:4368
 #, c-format
 msgid "Change the printing system"
 msgstr "Modifica el sistema d'impressió"
 
-#: printer/printerdrake.pm:4071
+#: printer/printerdrake.pm:4377
 #, c-format
 msgid "Normal Mode"
 msgstr "Mode normal"
 
-#: printer/printerdrake.pm:4072
+#: printer/printerdrake.pm:4378
 #, c-format
 msgid "Expert Mode"
 msgstr "Mode expert"
 
-#: 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 "Opcions de la impressora"
 
 #
-#: printer/printerdrake.pm:4379
+#: printer/printerdrake.pm:4668
 #, c-format
 msgid "Modify printer configuration"
 msgstr "Modifica la configuració de la impressora"
 
-#: 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 ""
-"Impressora %s\n"
+"Impressora %s%s\n"
 "Quines modificacions voleu fer en aquesta impressora?"
 
-#: printer/printerdrake.pm:4385
+#: printer/printerdrake.pm:4675
+#, c-format
+msgid "This printer is disabled"
+msgstr "Aquesta impressora està deshabilitada"
+
+#: printer/printerdrake.pm:4677
 #, c-format
 msgid "Do it!"
 msgstr "Fes-ho!"
 
 #
-#: printer/printerdrake.pm:4390 printer/printerdrake.pm:4448
+#: printer/printerdrake.pm:4682 printer/printerdrake.pm:4737
 #, c-format
 msgid "Printer connection type"
 msgstr "Tipus de connexió de la impressora"
 
 #
-#: printer/printerdrake.pm:4391 printer/printerdrake.pm:4452
+#: printer/printerdrake.pm:4683 printer/printerdrake.pm:4743
 #, c-format
 msgid "Printer name, description, location"
 msgstr "Nom de la impressora, descripció, ubicació"
 
-#: printer/printerdrake.pm:4393 printer/printerdrake.pm:4471
+#: printer/printerdrake.pm:4685 printer/printerdrake.pm:4761
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr "Fabricant de la impressora, model, controlador"
 
-#: printer/printerdrake.pm:4394 printer/printerdrake.pm:4472
+#: printer/printerdrake.pm:4686 printer/printerdrake.pm:4762
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr "Fabricant de la impressora, model"
 
-#: 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 "Fes que aquesta sigui la impressora 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 "Afegeix aquesta impressora a Star Office/OpenOffice.org/GIMP"
+msgid "Enable Printer"
+msgstr "Habilita la impressora"
 
-#: 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 "Suprimeix aquesta impressora de Star Office/OpenOffice.org/GIMP"
+msgid "Disable Printer"
+msgstr "Deshabilita la impressora"
 
 #
-#: printer/printerdrake.pm:4404 printer/printerdrake.pm:4500
+#: printer/printerdrake.pm:4701 printer/printerdrake.pm:4788
 #, c-format
 msgid "Print test pages"
 msgstr "Imprimeix la(es) pàgina(es) de prova"
 
 #
-#: 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 "Aprengueu a utilitzar la impressora"
 
 #
-#: printer/printerdrake.pm:4406 printer/printerdrake.pm:4504
+#: printer/printerdrake.pm:4703 printer/printerdrake.pm:4792
 #, c-format
 msgid "Remove printer"
 msgstr "Suprimeix la impressora"
 
-#: printer/printerdrake.pm:4460
+#: printer/printerdrake.pm:4750
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "S'està suprimint la impressora antiga \"%s\"..."
 
-#: printer/printerdrake.pm:4491
+#: printer/printerdrake.pm:4781
 #, c-format
-msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
-msgstr "S'està afegint la impressora a Star Office/OpenOffice.org/GIMP"
+msgid "Printer \"%s\" is now enabled."
+msgstr "La impressora \"%s\" està habilitada."
 
-#: printer/printerdrake.pm:4493
+#: printer/printerdrake.pm:4786
 #, c-format
-msgid ""
-"The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"S'ha afegit correctament la impressora \"%s\" a Star Office/OpenOffice.org/"
-"GIMP."
+msgid "Printer \"%s\" is now disabled."
+msgstr "La impressora \"%s\" està deshabilitada."
 
-#: printer/printerdrake.pm:4494
-#, c-format
-msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"És impossible d'afegir la impressora \"%s\" a Star Office/OpenOffice.org/"
-"GIMP."
-
-#: printer/printerdrake.pm:4496
-#, c-format
-msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
-msgstr "S'està suprimint la impressora d'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 impressora \"%s\" ha estat suprimida d'Star Office/OpenOffice.org/GIMP "
-"amb èxit."
-
-#: printer/printerdrake.pm:4499
-#, c-format
-msgid ""
-"Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"És impossible de suprimir la impressora \"%s\" d'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 "Voleu realment suprimir la impressora \"%s\"?"
 
-#: printer/printerdrake.pm:4547
+#: printer/printerdrake.pm:4827
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "S'està suprimint la impressora \"%s\"..."
 
 #
-#: printer/printerdrake.pm:4571
+#: printer/printerdrake.pm:4851
 #, c-format
 msgid "Default printer"
 msgstr "Impressora predeterminada"
 
-#: printer/printerdrake.pm:4572
+#: printer/printerdrake.pm:4852
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr "La impressora \"%s\" és ara la impressora per defecte."
 
-#: raid.pm:37
-#, c-format
-msgid "Can't add a partition to _formatted_ RAID md%d"
+#: raid.pm:36
+#, fuzzy, c-format
+msgid "Can't add a partition to _formatted_ RAID %s"
 msgstr "No es pot afegir una partició a un RAID _formatat_ md%d"
 
-#: raid.pm:139
-#, c-format
-msgid "mkraid failed (maybe raidtools are missing?)"
-msgstr "L'mkraid ha fallat (potser manquen les eines del RAID (raidtools)?)"
-
-#: raid.pm:139
-#, c-format
-msgid "mkraid failed"
-msgstr "L'mkraid ha fallat"
-
-#: raid.pm:155
+#: raid.pm:132
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "No hi ha prou particions per al nivell RAID %d\n"
@@ -14061,16 +14324,16 @@ msgid "Could not set permissions of firmware file %s!"
 msgstr "No s'han pogut establir els permissos del fitxer 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 ""
@@ -14104,7 +14367,8 @@ msgstr " Accepta/Rebutja l'eco icmp."
 msgid "Allow/Forbid autologin."
 msgstr "Permet/Impedeix l'entrada 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"
@@ -14119,22 +14383,22 @@ msgstr ""
 "\n"
 "Altrament només es permet /etc/issue."
 
-#: security/help.pm:25
+#: security/help.pm:27
 #, c-format
 msgid "Allow/Forbid reboot by the console user."
 msgstr "Permet/Impedeix tornar a arrencar per l'usuari de la consola."
 
-#: security/help.pm:27
+#: security/help.pm:29
 #, c-format
 msgid "Allow/Forbid remote root login."
 msgstr "Permet/Impedeix l'entrada de root remota."
 
-#: security/help.pm:29
+#: security/help.pm:31
 #, c-format
 msgid "Allow/Forbid direct root login."
 msgstr "Permet/Impedeix l'entrada 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 "
@@ -14143,7 +14407,16 @@ msgstr ""
 "Permet/Impedeix la llista d'usuaris del sistema en els gestors de pantalla "
 "(kdm i 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 ""
+
+#: security/help.pm:40
 #, c-format
 msgid ""
 "Allow/Forbid X connections:\n"
@@ -14162,7 +14435,7 @@ msgstr ""
 "\n"
 "- NONE (cap connexió)."
 
-#: security/help.pm:41
+#: security/help.pm:48
 #, c-format
 msgid ""
 "The argument specifies if clients are authorized to connect\n"
@@ -14171,7 +14444,8 @@ msgstr ""
 "L'argument indica si els clients estan autoritzar a connectar\n"
 "al servidor X des de la xarxa en el port 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"
@@ -14198,7 +14472,7 @@ msgstr ""
 "Per autoritzar els serveis que us calguin, utilitzeu /etc/hosts.allow\n"
 "(vegeu hosts.allow(5))."
 
-#: security/help.pm:54
+#: security/help.pm:63
 #, c-format
 msgid ""
 "If SERVER_LEVEL (or SECURE_LEVEL if absent)\n"
@@ -14218,7 +14492,7 @@ msgstr ""
 " El /etc/security/msec/server és utilitzat per chkconfig --add per decidir\n"
 "afegir un servei si és present al fitxer durant la instal·lació dels paquets."
 
-#: security/help.pm:63
+#: security/help.pm:72
 #, c-format
 msgid ""
 "Enable/Disable crontab and at for users.\n"
@@ -14231,42 +14505,48 @@ msgstr ""
 "Posa els usuaris autoritzats a /etc/cron.allow i /etc/at.allow\n"
 "(vegeu man at(1) i crontab(1))."
 
-#: security/help.pm:68
+#: security/help.pm:77
 #, c-format
 msgid "Enable/Disable syslog reports to console 12"
 msgstr ""
 
-#: security/help.pm:70
+#: security/help.pm:79
 #, c-format
 msgid ""
 "Enable/Disable name resolution spoofing protection.  If\n"
-"\"alert\" is true, also reports to syslog."
+"\"%s\" is true, also reports to syslog."
 msgstr ""
 "Habilita/Deshabilita la protecció contra falsejament de resolució de noms.  "
 "Si\n"
-"\"alert\" és cert, informa també al registre del sistema."
+"\"%s\" és cert, informa també al registre del sistema."
 
-#: security/help.pm:73
+#
+#: security/help.pm:80 standalone/draksec:213
+#, c-format
+msgid "Security Alerts:"
+msgstr "Alarmes de seguretat:"
+
+#: security/help.pm:82
 #, c-format
 msgid "Enable/Disable IP spoofing protection."
 msgstr "Habilita/Inhabilita la protecció contra falsejament de la IP."
 
-#: security/help.pm:75
+#: security/help.pm:84
 #, c-format
 msgid "Enable/Disable libsafe if libsafe is found on the system."
 msgstr "Habilita/Inhabilita el libsafe si és que es troba al sistema."
 
-#: security/help.pm:77
+#: security/help.pm:86
 #, c-format
 msgid "Enable/Disable the logging of IPv4 strange packets."
 msgstr "Habilita/Inhabilita el registre de paquets IPv4 estranys."
 
-#: security/help.pm:79
+#: security/help.pm:88
 #, c-format
 msgid "Enable/Disable msec hourly security check."
 msgstr "Habilita/Inhabilita la comprovació de seguretat msec horària."
 
-#: 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."
@@ -14274,49 +14554,49 @@ msgstr ""
 " S'està habilitant su només per a membres del grup wheel o permet su des de "
 "qualsevol usuari."
 
-#: security/help.pm:83
+#: security/help.pm:92
 #, c-format
 msgid "Use password to authenticate users."
 msgstr "Utilitza una contrasenya per autenticar usuaris."
 
-#: security/help.pm:85
+#: security/help.pm:94
 #, c-format
 msgid "Activate/Disable ethernet cards promiscuity check."
 msgstr ""
 "Activa/Inhabilita la comprovació de promiscuïtat de les targetes Ethernet."
 
-#: security/help.pm:87
+#: security/help.pm:96
 #, c-format
 msgid " Activate/Disable daily security check."
 msgstr " Activa/Inhabilita la comprovació diària de seguretat."
 
-#: security/help.pm:89
+#: security/help.pm:98
 #, c-format
 msgid " Enable/Disable sulogin(8) in single user level."
 msgstr " Habilita/Deshabilita sulogin(8) en nivell monousuari."
 
-#: 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 ""
 "Afegiu el nom com a excepció al maneig, per part de l'msec, de l'antiguitat "
 "de contrasenyes."
 
-#: security/help.pm:93
+#: security/help.pm:102
 #, c-format
 msgid "Set password aging to \"max\" days and delay to change to \"inactive\"."
 msgstr ""
 "Definiu l'antiguitat de la contrasenya a \"max\" dies i temps en canviar a "
 "\"inactive\"."
 
-#: security/help.pm:95
+#: security/help.pm:104
 #, c-format
 msgid "Set the password history length to prevent password reuse."
 msgstr ""
 "Defineix la llargària de l'historial de contrasenyes per prevenir la "
 "reutilització de contrasenyes."
 
-#: security/help.pm:97
+#: security/help.pm:106
 #, c-format
 msgid ""
 "Set the password minimum length and minimum number of digit and minimum "
@@ -14325,20 +14605,20 @@ msgstr ""
 "Defineix la llargada mínima de la contrasenya i el nombre mínim de xifres i "
 "de lletres en majúscules."
 
-#: security/help.pm:99
+#: security/help.pm:108
 #, c-format
 msgid "Set the root umask."
 msgstr "Defineix umask de root."
 
-#: security/help.pm:100
+#: security/help.pm:109
 #, c-format
 msgid "if set to yes, check open ports."
 msgstr "si és \"sí\", comprova els ports oberts"
 
-#: 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"
@@ -14348,64 +14628,64 @@ msgid ""
 msgstr ""
 "si és \"sí\", comprova :\n"
 "\n"
-" - les contrasenyes buides, \n"
+" - les contrasenyes buiDES, \n"
 "\n"
 " - les que no hi són a /etc/shadow\n"
 "\n"
 " - usuaris amb l'identificador 0 que no sigui 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 és \"sí\", comprova els permisos dels fitxers a casa dels usuaris"
 
-#: 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 és \"sí\", comprova si els dispositius de xarxa són en mode promiscu."
 
-#: security/help.pm:110
+#: security/help.pm:119
 #, c-format
 msgid "if set to yes, run the daily security checks."
 msgstr "si és \"sí\", executa les comprovacions diàries de seguretat."
 
-#: security/help.pm:111
+#: security/help.pm:120
 #, c-format
 msgid "if set to yes, check additions/removals of sgid files."
 msgstr "si és \"sí\", comprova les addicions/supressions dels fitxers sgid."
 
-#: security/help.pm:112
+#: security/help.pm:121
 #, c-format
 msgid "if set to yes, check empty password in /etc/shadow."
 msgstr "si és \"sí\", comprova la contrasenya buida a /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 és \"sí\", comprova la suma de control dels fitxers 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 és \"sí\", comprova addicions/eliminacions dels fitxers arrel suid."
 
-#: security/help.pm:115
+#: security/help.pm:124
 #, c-format
 msgid "if set to yes, report unowned files."
 msgstr "si és \"sí\", informa dels fitxers sense propietari"
 
-#: security/help.pm:116
+#: security/help.pm:125
 #, c-format
 msgid "if set to yes, check files/directories writable by everybody."
 msgstr "si és \"sí\", comprova els fitxers/directoris que tothom pot escriure."
 
-#: security/help.pm:117
+#: security/help.pm:126
 #, c-format
 msgid "if set to yes, run chkrootkit checks."
 msgstr "si és \"sí\", executa les comprovacions 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."
@@ -14413,53 +14693,53 @@ msgstr ""
 "si es defineix, envia l'informe de correu a aquesta adreça electrònica; si "
 "no, envia'l al root."
 
-#: security/help.pm:119
+#: security/help.pm:128
 #, c-format
 msgid "if set to yes, report check result by mail."
 msgstr "si és \"sí\", l'informa comprova el resultat per correu."
 
-#: security/help.pm:120
+#: security/help.pm:129
 #, c-format
 msgid "Do not send mails if there's nothing to warn about"
 msgstr "No enviïs correus si no hi ha res del que avisar"
 
-#: security/help.pm:121
+#: security/help.pm:130
 #, c-format
 msgid "if set to yes, run some checks against the rpm database."
 msgstr ""
 "si és \"sí\", executa determinades comprovacions de la base de dades rpm."
 
-#: security/help.pm:122
+#: security/help.pm:131
 #, c-format
 msgid "if set to yes, report check result to syslog."
 msgstr ""
 "si és \"sí\", informa del resultat de la comprovació al registre del sistema."
 
-#: security/help.pm:123
+#: security/help.pm:132
 #, c-format
 msgid "if set to yes, reports check result to tty."
 msgstr "si és \"sí\", informa dels resultats de la comprovació a tty."
 
-#: security/help.pm:125
+#: security/help.pm:134
 #, c-format
 msgid "Set shell commands history size. A value of -1 means unlimited."
 msgstr ""
 "Defineix la mida de l'historial d'ordres de l'intèrpret d'ordres. El valor -"
 "1 indica il·limitada."
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Set the shell timeout. A value of zero means no timeout."
 msgstr ""
 "Defineix el temps màxim d'espera per a l'intèrpret d'ordres. El valor zero "
 "indica 'sense temps màxim'."
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Timeout unit is second"
 msgstr "La unitat del temps d'espera és el segon"
 
-#: security/help.pm:129
+#: security/help.pm:138
 #, c-format
 msgid "Set the user umask."
 msgstr "Defineix la umask de l'usuari."
@@ -14506,215 +14786,220 @@ msgstr "Llista els usuaris en el sistema en gestors de pantalla (kdm i gdm)"
 
 #: security/l10n.pm:20
 #, c-format
+msgid "Export display when passing from root to the other users"
+msgstr ""
+
+#: security/l10n.pm:21
+#, c-format
 msgid "Allow X Window connections"
 msgstr "Permet connexions X Windows"
 
-#: security/l10n.pm:21
+#: security/l10n.pm:22
 #, c-format
 msgid "Authorize TCP connections to X Window"
 msgstr "Autoritza connexions TCP a les X Window"
 
-#: security/l10n.pm:22
+#: security/l10n.pm:23
 #, c-format
 msgid "Authorize all services controlled by tcp_wrappers"
 msgstr "Autoritza tots els serveis control·lats per tcp_wrappers"
 
-#: security/l10n.pm:23
+#: security/l10n.pm:24
 #, c-format
 msgid "Chkconfig obey msec rules"
 msgstr "Chkconfig obeeix les regles msec"
 
-#: security/l10n.pm:24
+#: security/l10n.pm:25
 #, c-format
 msgid "Enable \"crontab\" and \"at\" for users"
 msgstr "Habilita \"crontab\" i \"at\" pels usuaris"
 
-#: security/l10n.pm:25
+#: security/l10n.pm:26
 #, c-format
 msgid "Syslog reports to console 12"
 msgstr ""
 
-#: security/l10n.pm:26
+#: security/l10n.pm:27
 #, c-format
 msgid "Name resolution spoofing protection"
 msgstr ""
 
-#: security/l10n.pm:27
+#: security/l10n.pm:28
 #, c-format
 msgid "Enable IP spoofing protection"
 msgstr "Habilita la protecció contra falsejament de la IP."
 
-#: security/l10n.pm:28
+#: security/l10n.pm:29
 #, c-format
 msgid "Enable libsafe if libsafe is found on the system"
 msgstr "Habilita/Inhabilita el libsafe si és que es troba al sistema."
 
-#: security/l10n.pm:29
+#: security/l10n.pm:30
 #, c-format
 msgid "Enable the logging of IPv4 strange packets"
 msgstr "Habilita el registre de paquets IPv4 estranys"
 
-#: security/l10n.pm:30
+#: security/l10n.pm:31
 #, c-format
 msgid "Enable msec hourly security check"
 msgstr "Habilita la comprovació de seguretat msec horària"
 
-#: security/l10n.pm:31
+#: security/l10n.pm:32
 #, c-format
 msgid "Enable su only from the wheel group members or for any user"
 msgstr "Habilita su només per a membres del grup wheel o per qualsevol usuari"
 
-#: security/l10n.pm:32
+#: security/l10n.pm:33
 #, c-format
 msgid "Use password to authenticate users"
 msgstr "Utilitza una contrasenya per autenticar usuaris."
 
-#: security/l10n.pm:33
+#: security/l10n.pm:34
 #, c-format
 msgid "Ethernet cards promiscuity check"
 msgstr "Comprovació de promiscuïtat de les targetes Ethernet"
 
-#: security/l10n.pm:34
+#: security/l10n.pm:35
 #, c-format
 msgid "Daily security check"
 msgstr "Comprovació de seguretat diària"
 
-#: security/l10n.pm:35
+#: security/l10n.pm:36
 #, c-format
 msgid "Sulogin(8) in single user level"
 msgstr "Sulogin(8) en nivell monousuari"
 
-#: security/l10n.pm:36
+#: security/l10n.pm:37
 #, c-format
 msgid "No password aging for"
 msgstr "Sense envelliment de contrasenya per"
 
-#: security/l10n.pm:37
+#: security/l10n.pm:38
 #, c-format
 msgid "Set password expiration and account inactivation delays"
 msgstr ""
 
-#: security/l10n.pm:38
+#: security/l10n.pm:39
 #, c-format
 msgid "Password history length"
 msgstr "Longitud de la història de contrasenyes"
 
-#: 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 de la contrasenya i el nombre de dígits i lletres en "
 "majúscules"
 
-#: security/l10n.pm:40
+#: security/l10n.pm:41
 #, c-format
 msgid "Root umask"
 msgstr "Umask de root"
 
-#: security/l10n.pm:41
+#: security/l10n.pm:42
 #, c-format
 msgid "Shell history size"
 msgstr "Mida de la història de l'intèrpret de comandes"
 
-#: security/l10n.pm:42
+#: security/l10n.pm:43
 #, c-format
 msgid "Shell timeout"
 msgstr "Temps màxim d'espera per a l'intèrpret d'ordres"
 
 #
-#: security/l10n.pm:43
+#: security/l10n.pm:44
 #, c-format
 msgid "User umask"
 msgstr "Umask d'usuari"
 
-#: security/l10n.pm:44
+#: security/l10n.pm:45
 #, c-format
 msgid "Check open ports"
 msgstr "Comprova els ports oberts"
 
-#: security/l10n.pm:45
+#: security/l10n.pm:46
 #, c-format
 msgid "Check for unsecured accounts"
 msgstr ""
 
-#: security/l10n.pm:46
+#: security/l10n.pm:47
 #, c-format
 msgid "Check permissions of files in the users' home"
 msgstr "Comprova els permisos dels fitxers al home dels usuaris"
 
-#: security/l10n.pm:47
+#: security/l10n.pm:48
 #, c-format
 msgid "Check if the network devices are in promiscuous mode"
 msgstr "Comprova si els dispositius de xarxa són en mode promiscu"
 
-#: security/l10n.pm:48
+#: security/l10n.pm:49
 #, c-format
 msgid "Run the daily security checks"
 msgstr "Executa les comprovacions diàries de seguretat"
 
-#: security/l10n.pm:49
+#: security/l10n.pm:50
 #, c-format
 msgid "Check additions/removals of sgid files"
 msgstr "Comprova les addicions/supressions dels fitxers sgid."
 
-#: security/l10n.pm:50
+#: security/l10n.pm:51
 #, c-format
 msgid "Check empty password in /etc/shadow"
 msgstr "Comprova la contrasenya buida a /etc/shadow"
 
-#: security/l10n.pm:51
+#: security/l10n.pm:52
 #, c-format
 msgid "Verify checksum of the suid/sgid files"
 msgstr "Comprova la suma de control dels fitxers suid/sgid"
 
-#: security/l10n.pm:52
+#: security/l10n.pm:53
 #, c-format
 msgid "Check additions/removals of suid root files"
 msgstr "Comprova addicions/eliminacions de fitxers suid root."
 
-#: security/l10n.pm:53
+#: security/l10n.pm:54
 #, c-format
 msgid "Report unowned files"
 msgstr "Informa dels fitxers sense propietari"
 
-#: security/l10n.pm:54
+#: security/l10n.pm:55
 #, c-format
 msgid "Check files/directories writable by everybody"
 msgstr "Comprova els fitxers/directoris que tothom pot escriure"
 
-#: security/l10n.pm:55
+#: security/l10n.pm:56
 #, c-format
 msgid "Run chkrootkit checks"
 msgstr "Executa les comprovacions chkrootkit"
 
-#: security/l10n.pm:56
+#: security/l10n.pm:57
 #, c-format
 msgid "Do not send mails when unneeded"
 msgstr "No enviïs correus quan no faci falta"
 
-#: 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 es defineix, envia l'informe de correu a aquesta adreça electrònica; si "
 "no, envia'l al root"
 
-#: security/l10n.pm:58
+#: security/l10n.pm:59
 #, c-format
 msgid "Report check result by mail"
 msgstr "Informa el resultat de la comprovació per correu"
 
-#: security/l10n.pm:59
+#: security/l10n.pm:60
 #, c-format
 msgid "Run some checks against the rpm database"
 msgstr "Executa determinades comprovacions de la base de dades rpm"
 
-#: security/l10n.pm:60
+#: security/l10n.pm:61
 #, c-format
 msgid "Report check result to syslog"
 msgstr "Informa del resultat de la comprovació al registre del sistema"
 
-#: security/l10n.pm:61
+#: security/l10n.pm:62
 #, c-format
 msgid "Reports check result to tty"
 msgstr "Informa dels resultats de la comprovació a tty"
@@ -14989,7 +15274,7 @@ msgid ""
 "Linuxconf will sometimes arrange to perform various tasks\n"
 "at boot-time to maintain the system configuration."
 msgstr ""
-"De vegades, el Linuxconf determinarà que s'han de fer algunes tasques\n"
+"De vegaDES, el Linuxconf determinarà que s'han de fer algunes tasques\n"
 "en iniciar l'ordinador per mantenir la configuració del sistema."
 
 #: services.pm:50
@@ -15063,10 +15348,10 @@ msgstr ""
 #, c-format
 msgid ""
 "Automatically switch on numlock key locker under console\n"
-"and XFree at boot."
+"and Xorg at boot."
 msgstr ""
 "Engega automàticament a l'arrencada la tecla de fixació del \n"
-"teclat numèric a la consola i sota XFree."
+"teclat numèric a la consola i sota Xorg."
 
 #: services.pm:66
 #, c-format
@@ -15164,7 +15449,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 protocol rwho permet que els usuaris remots obtinguin una llista\n"
 "de tots els usuaris que estan connectats a un ordinador que està\n"
@@ -15194,8 +15479,8 @@ msgstr "Carrega els controladors per a dispositius USB."
 #
 #: services.pm:91
 #, c-format
-msgid "Starts the X Font Server (this is mandatory for XFree to run)."
-msgstr "Inicia l'X Font Server (això és necessari perquè l'XFree funcioni)."
+msgid "Starts the X Font Server (this is mandatory for Xorg to run)."
+msgstr "Inicia l'X Font Server (això és necessari perquè l'Xorg funcioni)."
 
 #: services.pm:117 services.pm:159
 #, c-format
@@ -15243,7 +15528,7 @@ msgstr "aturat"
 
 #: services.pm:215
 #, c-format
-msgid "Services and deamons"
+msgid "Services and daemons"
 msgstr "Serveis i dimonis"
 
 #: services.pm:221
@@ -15255,7 +15540,7 @@ msgstr ""
 "Malauradament no hi ha més informació\n"
 "sobre aquest servei."
 
-#: services.pm:226 ugtk2.pm:1176
+#: services.pm:226 ugtk2.pm:1214
 #, c-format
 msgid "Info"
 msgstr "Informació"
@@ -15271,804 +15556,1246 @@ msgid "On boot"
 msgstr "En arrencar"
 
 #
-#: services.pm:244
+#: services.pm:246
 #, c-format
 msgid "Start"
 msgstr "Inicia"
 
 #
-#: services.pm:244
+#: services.pm:246
 #, c-format
 msgid "Stop"
 msgstr "Atura"
 
-#: 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>Felicitats per triar Mandrakelinux!</b>"
+msgid "<b>What is Mandrakelinux?</b>"
+msgstr "<b>Què és 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 "Benvingut al món del Codi Font Obert!"
+msgid "Welcome to <b>Mandrakelinux</b>!"
+msgstr "Benvingut al <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 ""
-"El vostre nou sistema operatiu Mandrakelinux i les seves múltiples "
-"aplicacions són el resultat de l'esforç col·laboratiu dels desenvolupadors "
-"de MandrakeSoft i els contribuïdors de Mandrakelinux al voltant del món."
 
-#: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19
-#: share/advertising/ppp-01.pl:19
+#: share/advertising/01.pl:19
+#, fuzzy, c-format
+msgid ""
+"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"is also one of the <b>most widely used</b> Linux distributions worldwide!"
+msgstr ""
+"Mandrakelinux és ampliament coneguda com la distribució de Linux més "
+"amigable, fàcil d'instal·lar i usar."
+
+#: share/advertising/02.pl:13
+#, c-format
+msgid "<b>Open Source</b>"
+msgstr "<b>Open Source</b>"
+
+#: share/advertising/02.pl:15
 #, c-format
+msgid "Welcome to the <b>world of open source</b>!"
+msgstr "Benvingut al <b>món del Codi Font Obert</b>!"
+
+#: share/advertising/02.pl:17
+#, fuzzy, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of this "
-"latest release."
+"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 ""
-"Voldríem donar les gràcies a tothom que hagi participat en el "
-"desenvolupament d'aquesta versió."
+"Mandrakelinux està compromès amb el model de codi font obert i respecta "
+"completament la General Public License. Aquesta nova versió és el resultat "
+"de l'esforç col·laboratiu dels desenvolupadors de Mandrakesoft i els "
+"contribuïdors de Mandrakelinux al voltant del món."
+
+#: share/advertising/02.pl:19
+#, c-format
+msgid ""
+"We would like to <b>thank</b> everyone who participated in the development "
+"of this latest release."
+msgstr ""
+"Voldríem <b>agrair</b> a tothom que hagi participat en el desenvolupament "
+"d'aquesta versió."
 
-#: share/advertising/dis-02.pl:13
+#: share/advertising/03.pl:13
 #, c-format
-msgid "<b>Discovery</b>"
-msgstr "<b>Discovery</b>"
+msgid "<b>The GPL</b>"
+msgstr "<b>La GPL</b>"
 
-#: share/advertising/dis-02.pl:15
+#: share/advertising/03.pl:15
 #, 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."
+"Most of the software included in the distribution and all of the "
+"Mandrakelinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
-"Discovery és la distribució de Linux més amigable i fàcil d'usar. Inclou "
-"programari escollit a mà per tasques d'oficina, multimèdia i d'internet."
+"La major part dels programes inclosos en aquesta distribució i totes les "
+"eines de Mandrakelinux estan llicenciades sota la <b>General Public License</"
+"b>."
 
-#: share/advertising/dis-02.pl:17
+#: share/advertising/03.pl:17
 #, c-format
-msgid "The menu is task-oriented, with a single selected application per task."
-msgstr "El menú està orientat a tasques, amb una sola aplicació per tasca."
+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 ""
+"La GPL és el cor del model de codi font obert, garanteix la <b>llibertat</b> "
+"d'usar, estudiar, distribuir i millorar els programes de qualsevol forma que "
+"es vulgui sempre que aquestes modificacions siguin alhora GPL."
 
-#: share/advertising/dis-03.pl:13
+#: share/advertising/03.pl:19
 #, c-format
-msgid "<b>The KDE Choice</b>"
-msgstr "<b>La tria de KDE</b>"
+msgid ""
+"The main benefit of this is that the number of developers is virtually "
+"<b>unlimited</b>, resulting in <b>very high quality</b> software."
+msgstr ""
+"El benefici principal d'aquest fet es que el número de desenvolupadors és "
+"virtualment <b>il·limitat</b>, resultant en programes de <b>una qualitat "
+"molt alta</b>."
+
+#: share/advertising/04.pl:13
+#, c-format
+msgid "<b>Join the Community</b>"
+msgstr "<b>Uniu-vos a la comunitat</b>"
 
-#: share/advertising/dis-03.pl:15
+#: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"The powerful Open Source graphical desktop environment KDE is the desktop of "
-"choice for the Discovery Pack."
+"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 ""
-"El potent entorn gràfic d'escriptori de Codi Obert KDE és l'escriptori triat "
-"pel Discovery Pack."
 
-#: share/advertising/dis-04.pl:13
+#: share/advertising/04.pl:17
 #, c-format
-msgid "<b>OpenOffice.org</b>: The complete Linux office suite."
-msgstr "<b>OpenOffice.org</b>: El paquet d'oficina complet per a Linux."
+msgid ""
+"To <b>learn more</b> about our dynamic community, please visit <b>www."
+"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"php3</b> if you would like to get <b>involved</b> in the development."
+msgstr ""
+
+#: share/advertising/05.pl:13
+#, c-format
+msgid "<b>Download Version</b>"
+msgstr "<b>Versió de descàrrega</b>"
 
-#: share/advertising/dis-04.pl:15
+#: share/advertising/05.pl:15
 #, c-format
 msgid ""
-"<b>WRITER</b> is a powerful word processor for creating all types of text "
-"documents. Documents may include images, diagrams and tables."
+"You are now installing <b>Mandrakelinux Download</b>. This is the free "
+"version that Mandrakesoft wants to keep <b>available to everyone</b>."
 msgstr ""
-"<b>WRITER</b> és un potent editor de text per crear tot tipus de documents "
-"de text. Els documents poden incloure imatges, diagrames i taules."
 
-#: share/advertising/dis-04.pl:16
+#: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"<b>CALC</b> is a feature-packed spreadsheet which enables you to compute, "
-"analyze and manage all of your data."
+"The Download version <b>cannot include</b> all the software that is not open "
+"source. Therefore, you won't find in the Download version:"
 msgstr ""
-"<b>CALC</b> és un full de càlcul amb moltes possibilitats que us permet "
-"computar, analitzar i gestionar totes les vostres dades."
 
-#: share/advertising/dis-04.pl:17
+#: share/advertising/05.pl:18
 #, c-format
 msgid ""
-"<b>IMPRESS</b> is the fastest, most powerful way to create effective "
-"multimedia presentations."
+"\t* <b>Proprietary drivers</b> (such as drivers for NVIDIA®, ATI™, etc.)."
 msgstr ""
-"<b>IMPRESS</b> és la forma més ràpida i potent de crear presentacions "
-"multimèdia."
 
-#: share/advertising/dis-04.pl:18
+#: share/advertising/05.pl:19
 #, c-format
 msgid ""
-"<b>DRAW</b> will produce everything from simple diagrams to dynamic 3D "
-"illustrations."
+"\t* <b>Proprietary software</b> (such as Acrobat® Reader®, RealPlayer®, "
+"Flash™, etc.)."
 msgstr ""
-"<b>DRAW</b> por produir de tot, des de diagrames simples a il·lustracions 3D "
-"dinàmiques."
 
-#: share/advertising/dis-05.pl:13 share/advertising/dis-06.pl:13
+#: share/advertising/05.pl:21
 #, c-format
-msgid "<b>Surf The Internet</b>"
-msgstr "<b>Navega per Internet</b>"
+msgid ""
+"You won't have access to the <b>services included</b> in the other "
+"Mandrakesoft products either."
+msgstr ""
 
-#: share/advertising/dis-05.pl:15
+#: share/advertising/06.pl:13
 #, c-format
-msgid "Discover the new integrated personal information suite KDE Kontact."
+msgid "<b>Discovery, Your First Linux Desktop</b>"
 msgstr ""
 
-#: share/advertising/dis-05.pl:17
+#: share/advertising/06.pl:15
 #, c-format
+msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgstr "Esteu instal·lant <b>Mandrakelinux Discovery</b>."
+
+#: share/advertising/06.pl:17
+#, fuzzy, c-format
 msgid ""
-"More than just a full-featured email client, <b>Kontact</b> also includes an "
-"address book, a calendar and scheduling program, plus a tool for taking "
-"notes!"
+"Discovery is the <b>easiest</b> and most <b>user-friendly</b> Linux "
+"distribution. It includes a hand-picked selection of <b>premium software</b> "
+"for office, multimedia and Internet activities. Its menu is task-oriented, "
+"with a single application per task."
 msgstr ""
-"Més que només un complet client de correu, <b>Kontact</b> també inclou una "
-"llibreta d'adreces, un calendari i un planificador, a més d'una eina "
-"d'agafar notes!"
+"Discovery és la distribució de Linux més amigable i fàcil d'usar. Inclou "
+"programari escollit a mà per tasques d'oficina, multimèdia i d'internet."
 
-#: share/advertising/dis-06.pl:15
+#: share/advertising/07.pl:13
 #, c-format
-msgid "You can also:"
-msgstr "També podeu:"
+msgid "<b>PowerPack, The Ultimate Linux Desktop</b>"
+msgstr ""
 
-#: share/advertising/dis-06.pl:16
+#: share/advertising/07.pl:15
 #, c-format
-msgid "\t- browse the Web"
-msgstr "\t navegar per la Web"
+msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgstr "Esteu instal·lant <b>Mandrakelinux PowerPack</b>."
 
-#: share/advertising/dis-06.pl:17
+#: share/advertising/07.pl:17
 #, c-format
-msgid "\t- chat"
-msgstr "\t xatejar"
+msgid ""
+"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"includes <b>thousands of applications</b> - everything from the most popular "
+"to the most advanced."
+msgstr ""
 
-#: share/advertising/dis-06.pl:18
+#: share/advertising/08.pl:13
 #, c-format
-msgid "\t- organize a video-conference"
-msgstr "\t- organitzar una vídeo conferència"
+msgid "<b>PowerPack+, The Linux Solution for Desktops and Servers</b>"
+msgstr ""
 
-#: share/advertising/dis-06.pl:19
+#: share/advertising/08.pl:15
 #, c-format
-msgid "\t- create your own Web site"
-msgstr "\t crear la vostra pàgina web"
+msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgstr "Esteu instal·lant <b>Mandrakelinux PowerPack+</b>."
 
-#: share/advertising/dis-06.pl:20
+#: share/advertising/08.pl:17
 #, c-format
-msgid "\t- ..."
-msgstr "\t- ..."
+msgid ""
+"PowerPack+ is a <b>full-featured Linux solution</b> for small to medium-"
+"sized <b>networks</b>. PowerPack+ includes thousands of <b>desktop "
+"applications</b> and a comprehensive selection of world-class <b>server "
+"applications</b>."
+msgstr ""
 
-#: share/advertising/dis-07.pl:13
+#: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Multimedia</b>: Software for every need!"
-msgstr "<b>Multimèdia</b>: Programari per totes les necessitats!"
+msgid "<b>Mandrakesoft Products</b>"
+msgstr "<b>Productes de Mandrakesoft</b>"
 
-#: share/advertising/dis-07.pl:15
+#: share/advertising/09.pl:15
 #, c-format
-msgid "Listen to audio CDs with <b>KsCD</b>."
-msgstr "Escolteu CD d'àudio amb <b>KsCD</b>."
+msgid ""
+"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"products."
+msgstr ""
 
-#: share/advertising/dis-07.pl:17
+#: share/advertising/09.pl:17
 #, c-format
-msgid "Listen to music files and watch videos with <b>Totem</b>."
-msgstr "Escolteu fitxers musicals i mireu vídeos amb <b>Totem</b>."
+msgid "The Mandrakelinux 10.1 products are:"
+msgstr "Els productes Mandrakelinux 10.1 són:"
 
-#: share/advertising/dis-07.pl:19
+#: share/advertising/09.pl:18
 #, c-format
-msgid "View and edit images and photos with <b>GQview</b> and <b>The Gimp!</b>"
-msgstr "Veieu i editeu imatges i fotos amb <b>GQview</b>i <b>El Gimp</b>"
+msgid "\t* <b>Discovery</b>, Your First Linux Desktop."
+msgstr ""
 
-#: share/advertising/dis-08.pl:13 share/advertising/ppp-08.pl:13
-#: share/advertising/pwp-07.pl:13
+#: share/advertising/09.pl:19
 #, c-format
-msgid "<b>Mandrake Control Center</b>"
-msgstr "<b>Centre de Control Mandrake</b>"
+msgid "\t* <b>PowerPack</b>, The Ultimate Linux Desktop."
+msgstr ""
 
-#: share/advertising/dis-08.pl:15 share/advertising/ppp-08.pl:15
-#: share/advertising/pwp-07.pl:15
+#: share/advertising/09.pl:20
 #, c-format
-msgid ""
-"The Mandrake Control Center is an essential collection of Mandrake-specific "
-"utilities for simplifying the configuration of your computer."
+msgid "\t* <b>PowerPack+</b>, The Linux Solution for Desktops and Servers."
 msgstr ""
-"El Centre de Control Mandrake és una col·lecció essencial de utilitats "
-"específiques de Mandrake per simplificar la configuració del vostre "
-"ordinador."
 
-#: share/advertising/dis-08.pl:17 share/advertising/ppp-08.pl:17
-#: share/advertising/pwp-07.pl:17
+#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
-"Conegui tots els productes i serveis de MandrakeSoft a <b>MandrakeStore</b> "
-"-- la nostra plataforma de serveis de comerç electrònic."
 
-#: 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 "Passeu-vos avui per <b>www.mandrakestore.com</b>"
+msgid ""
+"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"bootable CD-Rom."
+msgstr ""
 
-#
-#: 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 "Esdeveniu un membre del <b>MandrakeClub</b>!"
+msgid ""
+"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"ultra-compact “LaCie Mobile Hard Drive”."
+msgstr ""
 
-#: share/advertising/dis-10.pl:15 share/advertising/dwd-07.pl:15
-#: share/advertising/ppp-10.pl:15 share/advertising/pwp-09.pl:15
+#: share/advertising/11.pl:13
+#, fuzzy, c-format
+msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgstr "Conegui les nostres <b>Solucions Personals</b>:"
+
+#: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Take advantage of valuable benefits, products and services by joining "
-"MandrakeClub, such as:"
+"Below are the Mandrakesoft products designed to meet the <b>professional "
+"needs</b>:"
 msgstr ""
 
-#: share/advertising/dis-10.pl:16 share/advertising/dwd-07.pl:16
-#: share/advertising/ppp-10.pl:17 share/advertising/pwp-09.pl:16
+#: share/advertising/11.pl:16
 #, c-format
-msgid "\t- Full access to commercial applications"
-msgstr "\t- Accés complet a aplicacions comercials"
+msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgstr ""
 
-#: share/advertising/dis-10.pl:17 share/advertising/dwd-07.pl:17
-#: share/advertising/ppp-10.pl:18 share/advertising/pwp-09.pl:17
+#: share/advertising/11.pl:17
 #, c-format
-msgid "\t- Special download mirror list exclusively for MandrakeClub Members"
-msgstr "\t- Llista de rèpliques exclusiva pels membres del MandrakeClub"
+msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgstr ""
 
-#: share/advertising/dis-10.pl:18 share/advertising/dwd-07.pl:18
-#: share/advertising/ppp-10.pl:19 share/advertising/pwp-09.pl:18
+#: share/advertising/11.pl:18
 #, c-format
-msgid "\t- Voting for software to put in Mandrakelinux"
-msgstr "\t- Votació dels programes a posar en Mandrakelinux"
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgstr ""
 
-#: share/advertising/dis-10.pl:19 share/advertising/dwd-07.pl:19
-#: share/advertising/ppp-10.pl:20 share/advertising/pwp-09.pl:19
+#: share/advertising/12.pl:13
 #, c-format
-msgid "\t- Special discounts for products and services at MandrakeStore"
-msgstr "\t- Descomptes especials en productes i serveis de MandrakeStore"
+msgid "<b>The KDE Choice</b>"
+msgstr "<b>La tria de 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- i molt 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 ""
 
-#: 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 "Per més informació visiteu <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 ""
 
-#: share/advertising/dis-11.pl:13
+#: share/advertising/12.pl:19
 #, c-format
-msgid "Do you require assistance?"
-msgstr "Necessiteu ajuda?"
+msgid ""
+"KDE also includes a lot of <b>well integrated applications</b> such as "
+"Konqueror, the web browser and Kontact, the personal information manager."
+msgstr ""
+
+#: share/advertising/13-a.pl:13 share/advertising/13-b.pl:13
+#, fuzzy, c-format
+msgid "<b>Choose your Favorite Desktop Environment</b>"
+msgstr "<b>Escolliu el vostre entorn gràfic d'escriptori!</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/13-a.pl:15
 #, c-format
-msgid "<b>MandrakeExpert</b> is the primary source for technical support."
-msgstr "<b>MandrakeExpert</b> és la font primària per suport tècnic."
+msgid ""
+"With PowerPack, you will have the choice of the <b>graphical desktop "
+"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+msgstr ""
 
-#: share/advertising/dis-11.pl:17 share/advertising/dwd-08.pl:18
-#: share/advertising/ppp-11.pl:17 share/advertising/pwp-10.pl:17
+#: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
 msgid ""
-"If you have Linux questions, subscribe to MandrakeExpert at <b>www."
-"mandrakeexpert.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 ""
-"Si teniu preguntes en quant a Linux, apunteu-vos a MandrakeExpert <b>www."
-"mandrakeexpert.com</b>"
 
-#: share/advertising/dwd-01.pl:17
+#: share/advertising/13-a.pl:19 share/advertising/13-b.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."
+"But we advise you to try all available ones (including <b>GNOME</b>, "
+"<b>IceWM</b>, etc.) and pick your favorite."
+msgstr ""
+
+#: share/advertising/13-b.pl:15
+#, c-format
+msgid ""
+"With PowerPack+, you will have the choice of the <b>graphical desktop "
+"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
 msgstr ""
-"Mandrakelinux està compromès amb el model de codi font obert i respecta "
-"completament la General Public License. Aquesta nova versió és el resultat "
-"de l'esforç col·laboratiu dels desenvolupadors de MandrakeSoft i els "
-"contribuïdors de Mandrakelinux al voltant del món."
 
-#: share/advertising/dwd-02.pl:13
+#: share/advertising/14.pl:13
 #, c-format
-msgid "<b>Join the Mandrakelinux community!</b>"
-msgstr "<b>Uniu-vos a la comunitat Mandrakelinux!</b>"
+msgid "<b>OpenOffice.org</b>"
+msgstr "<b>OpenOffice.org</b>"
 
-#: share/advertising/dwd-02.pl:15
+#: share/advertising/14.pl:15
+#, c-format
+msgid "With Discovery, you will discover <b>OpenOffice.org</b>."
+msgstr ""
+
+#: share/advertising/14.pl:17
 #, c-format
 msgid ""
-"If you would like to get involved, please subscribe to the \"Cooker\" "
-"mailing list by visiting <b>mandrake-linux.com/cooker</b>"
+"It is a <b>full-featured office suite</b> that includes word processor, "
+"spreadsheet, presentation and drawing applications."
 msgstr ""
-"Si voleu involucrar-vos, apunteu-vos a la llista de correu \"Cooker\" "
-"visitant <b>mandrake-linux.com/cooker</b>"
 
-#: share/advertising/dwd-02.pl:17
+#: share/advertising/14.pl:19
 #, c-format
 msgid ""
-"To learn more about our dynamic community, please visit <b>www.mandrake-"
-"linux.com</b>!"
+"OpenOffice.org can read and write most types of <b>Microsoft® Office</b> "
+"documents such as Word, Excel and PowerPoint® files."
 msgstr ""
-"Per aprendre més en quant a la nostra dinàmica comunitat visiteu <b>www."
-"mandrake-linux.com</b>!"
 
-#: share/advertising/dwd-03.pl:13
+#: share/advertising/15.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Què és Mandrakelinux?</b>"
+msgid "<b>Kontact</b>"
+msgstr "<b>Kontact</b>"
 
-#: share/advertising/dwd-03.pl:15
+#: share/advertising/15.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux is an Open Source distribution created with thousands of the "
-"choicest applications from the Free Software world. Mandrakelinux is one of "
-"the most widely used Linux distributions worldwide!"
+"Discovery includes <b>Kontact</b>, the new KDE <b>groupware solution</b>."
 msgstr ""
 
-#: share/advertising/dwd-03.pl:17
-#, c-format
+#: share/advertising/15.pl:17
+#, fuzzy, 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 inclou els famosos entorns gràfics KDE i GNOME, a més de les "
-"últimes versions de les aplicacions de Codi Font Obert més populars."
+"Més que només un complet client de correu, <b>Kontact</b> també inclou una "
+"llibreta d'adreces, un calendari i un planificador, a més d'una eina "
+"d'agafar notes!"
 
-#: 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 és ampliament coneguda com la distribució de Linux més "
-"amigable, fàcil d'instal·lar i usar."
 
-#: share/advertising/dwd-04.pl:15
+#: share/advertising/16.pl:13
 #, c-format
-msgid "Find out about our <b>Personal Solutions</b>:"
-msgstr "Conegui les nostres <b>Solucions Personals</b>:"
+msgid "<b>Surf the Internet</b>"
+msgstr "<b>Navega per Internet</b>"
 
-#: share/advertising/dwd-04.pl:16
+#: share/advertising/16.pl:15
 #, c-format
-msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
+msgid "Discovery will give you access to <b>every Internet resource</b>:"
 msgstr ""
-"\t- Conegui Mandrakelinux en un CD autoarrancable amb <b>MandrakeMove</b>"
 
-#: share/advertising/dwd-04.pl:17
+#: share/advertising/16.pl:16
 #, c-format
-msgid ""
-"\t- If you use Linux mostly for Office, Internet and Multimedia tasks, "
-"<b>Discovery</b> perfectly meets your needs"
+msgid "\t* Browse the <b>Web</b> with Konqueror."
+msgstr "\t* Navegar per la <b>xarxa</b> amb Konqueror."
+
+#: share/advertising/16.pl:17
+#, c-format
+msgid "\t* <b>Chat</b> online with your friends using Kopete."
 msgstr ""
-"\t- Si useu Linux a l'oficina, per internet o per tasques multimèdia, "
-"<b>Discovery</b> és perfecte per a les vostres necessitats"
 
-#: share/advertising/dwd-04.pl:18
+#: share/advertising/16.pl:18
 #, c-format
-msgid ""
-"\t- If you appreciate the largest selection of software including powerful "
-"development tools, <b>PowerPack</b> is for you"
+msgid "\t* <b>Transfer</b> files with KBear."
+msgstr "\t* <b>Transferir</b> fitxers amb KBear."
+
+#: 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 ""
-"\t- Si aprecieu la selecció de programari més gran, incloent eines de "
-"desenvolupament, <b>PowerPack</b> és per tu"
 
-#: share/advertising/dwd-04.pl:19
+#: share/advertising/17.pl:15
 #, c-format
-msgid ""
-"\t- If you require a full-featured Linux solution customized for small to "
-"medium-sized networks, choose <b>PowerPack+</b>"
+msgid "Discovery will also make <b>multimedia</b> very easy for you:"
 msgstr ""
-"\t- Si necessiteu una solució Linux per a xarxes de petites a mitjanes, "
-"escolliu <b>PowerPack+</b>"
 
-#: share/advertising/dwd-05.pl:13
+#: share/advertising/17.pl:16
 #, c-format
-msgid "Find out also our <b>Business Solutions</b>!"
-msgstr "Conegui també les nostres <b>Solucions per empreses</b>!"
+msgid "\t* Watch your favorite <b>videos</b> with Kaffeine."
+msgstr ""
 
-#: share/advertising/dwd-05.pl:15
+#: share/advertising/17.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."
+msgid "\t* Listen to your <b>music files</b> with amaroK."
 msgstr ""
 
-#: share/advertising/dwd-05.pl:17
+#: share/advertising/17.pl:18
 #, c-format
+msgid "\t* Edit and create <b>images</b> with the GIMP."
+msgstr "\t* Editar i crear <b>imatges</b> amb El Gimp."
+
+#: share/advertising/18.pl:13
+#, c-format
+msgid "<b>Enjoy the Wide Range of Applications</b>"
+msgstr ""
+
+#: share/advertising/18.pl:15
+#, fuzzy, 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."
+"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"<b>all of your tasks</b>:"
+msgstr ""
+"Al menú de Mandrakelinux trobareu aplicacions fàcils d'usar per totes les "
+"tasques:"
+
+#: share/advertising/18.pl:16
+#, c-format
+msgid "\t* Create, edit and share office documents with <b>OpenOffice.org</b>."
 msgstr ""
+"\t* Crear, editar i compartir documents d'oficina amb <b>OpenOffice.org</b>"
 
-#: share/advertising/dwd-05.pl:19
+#: share/advertising/18.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* Manage your personal data with the integrated personal information "
+"suites <b>Kontact</b> and <b>Evolution</b>."
 msgstr ""
 
-#: share/advertising/dwd-06.pl:15
+#: share/advertising/18.pl:18
 #, c-format
+msgid "\t* Browse the web with <b>Mozilla</b> and <b>Konqueror</b>."
+msgstr "\t* Navegar per la xarxa amb <b>Mozilla</b> i <b>Konqueror</b>"
+
+#: share/advertising/18.pl:19
+#, c-format
+msgid "\t* Participate in online chat with <b>Kopete</b>."
+msgstr "\t* Participar en xats en línia amb <b>Kopete</b>"
+
+#: share/advertising/18.pl:20
+#, fuzzy, c-format
 msgid ""
-"Find all MandrakeSoft products at <b>MandrakeStore</b> -- our full service e-"
-"commerce platform."
+"\t* Listen to your <b>audio CDs</b> and <b>music files</b>, watch your "
+"<b>videos</b>."
+msgstr "\t* Escolteu CD d'àudio i fitxers de música amb KsCD i <b>Totem</b>"
+
+#: share/advertising/18.pl:21
+#, c-format
+msgid "\t* Edit and create images with the <b>GIMP</b>."
+msgstr "\t* Editar imatges i fotos amb <b>El Gimp</b>"
+
+#: share/advertising/19.pl:13
+#, c-format
+msgid "<b>Development Environments</b>"
+msgstr "<b>Entorns de desenvolupament</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 ""
-"Conegui tots els productes de MandrakeSoft a <b>MandrakeStore</b> -- la "
-"nostra plataforma de serveis de comerç electrònic."
 
-#: share/advertising/dwd-06.pl:17
+#: share/advertising/19.pl:17
 #, c-format
 msgid ""
-"Find out also support incidents if you have any problems, from standard to "
-"professional support, from 1 to 50 incidents, take the one which meets "
-"perfectly your needs!"
+"You will enjoy the powerful, integrated development environment from KDE, "
+"<b>KDevelop</b>, which will let you program in a lot of languages."
 msgstr ""
 
-#
-#: share/advertising/dwd-07.pl:13
+#: share/advertising/19.pl:19
 #, c-format
-msgid "<b>Become a MandrakeClub member!</b>"
-msgstr "<b>Esdeveniu un membre del MandrakeClub!</b>"
+msgid ""
+"PowerPack also ships with <b>GCC</b>, the leading Linux compiler and <b>GDB</"
+"b>, the associated debugger."
+msgstr ""
 
-#: share/advertising/dwd-08.pl:14 share/advertising/ppp-11.pl:13
-#: share/advertising/pwp-10.pl:13
+#: share/advertising/20.pl:13
 #, c-format
-msgid "<b>Do you require assistance?</b>"
-msgstr "<b>Necessiteu ajuda?</b>"
+msgid "<b>Development Editors</b>"
+msgstr "<b>Editors de desenvolupament</b>"
 
-#: share/advertising/dwd-09.pl:16
+#: share/advertising/20.pl:15
 #, c-format
-msgid "<b>Note</b>"
-msgstr "<b>Nota</b>"
+msgid "PowerPack will let you choose between those <b>popular editors</b>:"
+msgstr ""
 
-#: share/advertising/dwd-09.pl:18
+#: share/advertising/20.pl:16
 #, c-format
-msgid "This is the Mandrakelinux <b>Download version</b>."
-msgstr "Això és Mandrakelinux <b>versió de descàrrega</b>."
+msgid "\t* <b>Emacs</b>: a customizable and real time display editor."
+msgstr ""
 
-#: share/advertising/dwd-09.pl:20
+#: share/advertising/20.pl:17
 #, c-format
 msgid ""
-"The free download version does not include commercial software, and "
-"therefore may not work with certain modems (such as some ADSL and RTC) and "
-"video cards (such as ATI® and NVIDIA®)."
+"\t* <b>XEmacs</b>: another open source text editor and application "
+"development system."
 msgstr ""
-"La versió de descarrega gratuïta no inclou programari comercial, i per tant, "
-"pot no funcionar amb alguns mòdems (com ADSL i RTC) i targetes gràfiques "
-"(com ATI® i NVIDIA®)."
+"\t* <b>XEmacs</b>: un altre editor de text i sistema de desenvolupament "
+"d'aplicacions de codi font obert"
 
-#: 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 ""
-"La vostra nova distribució Mandrakelinux i les seves múltiples aplicacions "
-"són el resultat de l'esforç col·laboratiu dels desenvolupadors de "
-"MandrakeSoft i els contribuïdors de Mandrakelinux al voltant del món."
+"\t* <b>Vim</b>: editor de text avançat amb més característiques que el vi "
+"estàndard"
 
-#: 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>Llenguatges de desenvolupament</b>"
 
-#: share/advertising/ppp-02.pl:15
+#: share/advertising/21.pl:15
 #, c-format
 msgid ""
-"PowerPack+ is a full-featured Linux solution for small to medium-sized "
-"networks. PowerPack+ increases the value of the standard PowerPack by adding "
-"a comprehensive selection of world-class server applications."
+"With all these <b>powerful tools</b>, you will be able to write applications "
+"in <b>dozens of programming languages</b>:"
 msgstr ""
 
-#: share/advertising/ppp-02.pl:17
+#: share/advertising/21.pl:16
 #, c-format
-msgid ""
-"It is the only Mandrakelinux product that includes the groupware solution."
+msgid "\t* The famous <b>C language</b>."
 msgstr ""
 
-#: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13
+#: share/advertising/21.pl:17
 #, c-format
-msgid "<b>Choose your graphical Desktop environment!</b>"
-msgstr "<b>Escolliu el vostre entorn gràfic d'escriptori!</b>"
+msgid "\t* Object oriented languages:"
+msgstr ""
 
-#: share/advertising/ppp-03.pl:15 share/advertising/pwp-03.pl:15
+#: 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 ""
+
+#: 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
+#, fuzzy, c-format
+msgid "\t* And many more."
+msgstr "\t* i altres"
+
+#: share/advertising/22.pl:13
+#, c-format
+msgid "<b>Development Tools</b>"
+msgstr "<b>Eines de desenvolupament</b>"
+
+#: share/advertising/22.pl:17
 #, c-format
 msgid ""
-"When you log into your Mandrakelinux system for the first time, you can "
-"choose between several popular graphical desktops environments, including: "
-"KDE, GNOME, WindowMaker, IceWM, and others."
+"With the powerful integrated development environment <b>KDevelop</b> and the "
+"leading Linux compiler <b>GCC</b>, you will be able to create applications "
+"in <b>many different languages</b> (C, C++, Java™, Perl, Python, etc.)."
 msgstr ""
-"Quan entreu per primer cop a Mandrakelinux, podeu escollir entre els "
-"populars entorns gràfics d'escriptori, incloent: KDE, GNOME, WindowMaker, "
-"IceWM, i altres."
 
-#: share/advertising/ppp-04.pl:13
+#: share/advertising/23.pl:13
+#, c-format
+msgid "<b>Groupware Server</b>"
+msgstr "<b>Servidor Groupware</b>"
+
+#: share/advertising/23.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all "
-"tasks:"
+"PowerPack+ will give you access to <b>Kolab</b>, a full-featured "
+"<b>groupware server</b> which will, thanks to the client <b>Kontact</b>, "
+"allow you to:"
 msgstr ""
-"Al menú de Mandrakelinux trobareu aplicacions fàcils d'usar per totes les "
-"tasques:"
 
-#: share/advertising/ppp-04.pl:15 share/advertising/pwp-04.pl:15
+#: share/advertising/23.pl:16
+#, c-format
+msgid "\t* Send and receive your <b>e-mails</b>."
+msgstr "\t* Enviar i rebre <b>correus electrònics</b>."
+
+#: share/advertising/23.pl:17
 #, c-format
-msgid "\t- Create, edit and share office documents with <b>OpenOffice.org</b>"
+msgid "\t* Share your <b>agendas</b> and your <b>address books</b>."
 msgstr ""
-"\t- Crear, editar i compartir documents d'oficina amb <b>OpenOffice.org</b>"
 
-#: share/advertising/ppp-04.pl:16
+#: share/advertising/23.pl:18
+#, c-format
+msgid "\t* Manage your <b>memos</b> and <b>task lists</b>."
+msgstr ""
+
+#: share/advertising/24.pl:13
+#, c-format
+msgid "<b>Servers</b>"
+msgstr "<b>Servidors</b>"
+
+#: share/advertising/24.pl:15
 #, c-format
 msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites: <b>Kontact</b> and <b>Evolution</b>"
+"Empower your business network with <b>premier server solutions</b> including:"
 msgstr ""
 
-#: share/advertising/ppp-04.pl:17
+#: share/advertising/24.pl:16
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla and Konqueror</b>"
-msgstr "\t- Navegar per la xarxa amb <b>Mozilla i Konqueror</b>"
+msgid ""
+"\t* <b>Samba</b>: File and print services for Microsoft® Windows® clients."
+msgstr ""
+"\t* <b>Samba</b>: Serveis de fitxers i impressió per a clients MS-Windows"
 
-#: share/advertising/ppp-04.pl:18 share/advertising/pwp-04.pl:18
+#: share/advertising/24.pl:17
 #, c-format
-msgid "\t- Participate in online chat with <b>Kopete</b>"
-msgstr "\t- Participar en xats en línia amb <b>Kopete</b>"
+msgid "\t* <b>Apache</b>: The most widely used web server."
+msgstr "\t* <b>Apache</b>: El servidor Web més usat"
 
-#: share/advertising/ppp-04.pl:19
+#: share/advertising/24.pl:18
 #, c-format
 msgid ""
-"\t- Listen to audio CDs and music files with <b>KsCD</b> and <b>Totem</b>"
+"\t* <b>MySQL</b> and <b>PostgreSQL</b>: The world's most popular open source "
+"databases."
 msgstr ""
-"\t- Escolteu CD d'àudio i fitxers de música amb <b>KsCD</b> i <b>Totem</b>"
+"\t* <b>MySQL</b> i <b>PostgreSQL</b>: Les bases de dades de Codi Font Obert "
+"més populars del món"
 
-#: share/advertising/ppp-04.pl:20 share/advertising/pwp-04.pl:20
+#: share/advertising/24.pl:19
 #, c-format
-msgid "\t- Edit images and photos with <b>The Gimp</b>"
-msgstr "\t- Editar imatges i fotos amb <b>El Gimp</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, el sistema de control de "
+"versions dominant i transparent a la xarxa de codi font obert"
 
-#: share/advertising/ppp-05.pl:13
+#: share/advertising/24.pl:20
 #, c-format
 msgid ""
-"PowerPack+ includes everything needed for developing and creating your own "
-"software, including:"
+"\t* <b>ProFTPD</b>: The highly configurable GPL-licensed FTP server software."
 msgstr ""
-"PowerPack+ inclou tot el que necessiteu per desenvolupar i crear els vostres "
-"programes, incloent:"
+"\t* <b>ProFTPD</b>: el servidor FTP amb llicència GPL altament configurable"
 
-#: share/advertising/ppp-05.pl:15 share/advertising/pwp-05.pl:16
+#: share/advertising/24.pl:21
 #, c-format
 msgid ""
-"\t- <b>Kdevelop</b>: a full featured, easy to use Integrated Development "
-"Environment for C++ programming"
+"\t* <b>Postfix</b> and <b>Sendmail</b>: The popular and powerful mail "
+"servers."
 msgstr ""
-"\t- <b>Kdevelop</b>: Un entorn integrat de desenvolupament per programar amb "
-"C++ amb moltes opcions i fàcil d'usar,"
+"\t* <b>Postfix</b> i <b>Sendmail</b>: Els servidors de correu populars i "
+"potents."
 
-#: share/advertising/ppp-05.pl:16 share/advertising/pwp-05.pl:17
+#: share/advertising/25.pl:13
 #, c-format
-msgid "\t- <b>GCC</b>: the GNU Compiler Collection"
-msgstr "\t- <b>GCC</b>: la Colecció de Compiladors GNU"
+msgid "<b>Mandrakelinux Control Center</b>"
+msgstr "<b>Centre de Control Mandrakelinux</b>"
 
-#: share/advertising/ppp-05.pl:17 share/advertising/pwp-05.pl:18
+#: share/advertising/25.pl:15
 #, c-format
-msgid "\t- <b>GDB</b>: the GNU Project debugger"
-msgstr "\t- <b>GDB</b>: el debugger del projecte GNU"
+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>Centre de Control Mandrakelinux</b> és una col·lecció essencial de "
+"utilitats específiques de Mandrakelinux per simplificar la configuració del "
+"vostre ordinador."
 
-#: share/advertising/ppp-05.pl:18 share/advertising/pwp-06.pl:16
+#: share/advertising/25.pl:17
 #, c-format
-msgid "\t- <b>Emacs</b>: a customizable and real time display editor"
+msgid ""
+"You will immediately appreciate this collection of <b>more than 60</b> handy "
+"utilities for <b>easily configuring your system</b>: hardware devices, mount "
+"points, network and Internet, security level of your computer, etc."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:19
+#: share/advertising/26.pl:13
+#, c-format
+msgid "<b>The Open Source Model</b>"
+msgstr "<b>El model del codi font obert</b>"
+
+#: share/advertising/26.pl:15
 #, c-format
 msgid ""
-"\t- <b>Xemacs</b>: open source text editor and application development system"
+"Like all computer programming, open source software <b>requires time and "
+"people</b> for development. In order to respect the open source philosophy, "
+"Mandrakesoft sells added value products and services to <b>keep improving "
+"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"our products or services!"
 msgstr ""
 
-#: share/advertising/ppp-05.pl:20
+#: share/advertising/27.pl:13
 #, c-format
+msgid "<b>Online Store</b>"
+msgstr "<b>Tenda en línia</b>"
+
+#: share/advertising/27.pl:15
+#, fuzzy, c-format
 msgid ""
-"\t- <b>Vim</b>: advanced text editor with more features than standard Vi"
+"To learn more about Mandrakesoft products and services, you can visit our "
+"<b>e-commerce platform</b>."
 msgstr ""
-"\t- <b>Vim</b>: editor de text avançat amb més característiques que el vi "
-"estàndard"
+"Conegui tots els productes i serveis de Mandrakesoft a <b>Mandrakestore</b> "
+"-- la nostra plataforma de serveis de comerç electrònic."
 
-#: share/advertising/ppp-06.pl:13
+#: share/advertising/27.pl:17
 #, c-format
-msgid "<b>Discover the full-featured groupware solution!</b>"
+msgid "There you can find all our products, services and third-party products."
 msgstr ""
 
-#: share/advertising/ppp-06.pl:15
+#: share/advertising/27.pl:19
 #, c-format
-msgid "It includes both server and client features for:"
+msgid ""
+"This platform has just been <b>redesigned</b> to improve its efficiency and "
+"usability."
 msgstr ""
 
-#: share/advertising/ppp-06.pl:16
+#: share/advertising/27.pl:21
 #, c-format
-msgid "\t- Sending and receiving emails"
-msgstr "\t- Enviar i rebre correus electrònics"
+msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
+msgstr "Passeu-vos avui per <b>store.mandrakesoft.com</b>"
 
-#: share/advertising/ppp-06.pl:17
+#: share/advertising/28.pl:13
+#, c-format
+msgid "<b>Mandrakeclub</b>"
+msgstr "<b>Mandrakeclub</b>"
+
+#: share/advertising/28.pl:15
 #, c-format
 msgid ""
-"\t- Calendar, Task List, Memos, Contacts, Meeting Request (sending and "
-"receiving), Task Requests (sending and receiving)"
+"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"product.."
 msgstr ""
+"<b>Mandrakeclub</b> és el <b>company perfecte</b> pel vostre producte "
+"Mandrakelinux."
 
-#: share/advertising/ppp-06.pl:18
+#: share/advertising/28.pl:17
 #, c-format
-msgid "\t- Address Book (server and client)"
-msgstr "\t- Llibreta d'adreces (servidor i client)"
+msgid ""
+"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+msgstr ""
+
+#: share/advertising/28.pl:18
+#, fuzzy, c-format
+msgid ""
+"\t* <b>Special discounts</b> on products and services of our online store "
+"<b>store.mandrakesoft.com</b>."
+msgstr "\t* Descomptes especials en productes i serveis de Mandrakestore"
 
-#: share/advertising/ppp-07.pl:13
+#: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Empower your business network with <b>premier server solutions</b> including:"
+"\t* Access to <b>commercial applications</b> (for example to NVIDIA® or ATI™ "
+"drivers)."
 msgstr ""
+"\t* Accés a <b>aplicacions comercials</b> (per exemple controladors NVIDIA® "
+"o ATI™)."
+
+#: share/advertising/28.pl:20
+#, c-format
+msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgstr "\t* Participació en els <b>fòrums d'usuaris</b> de Mandrakelinux"
 
-#: share/advertising/ppp-07.pl:15
+#: share/advertising/28.pl:21
 #, c-format
-msgid "\t- <b>Samba</b>: File and print services for MS-Windows clients"
+msgid ""
+"\t* <b>Early and privileged access</b>, before public release, to "
+"Mandrakelinux <b>ISO images</b>."
 msgstr ""
-"\t- <b>Samba</b>: Serveis de fitxers i impressió per a clients MS-Windows"
 
-#: share/advertising/ppp-07.pl:16
+#: share/advertising/29.pl:13
 #, c-format
-msgid "\t- <b>Apache</b>: The most widely used Web server"
-msgstr "\t- <b>Apache</b>: El servidor Web més usat"
+msgid "<b>Mandrakeonline</b>"
+msgstr "<b>Mandrakeonline</b>"
 
-#: share/advertising/ppp-07.pl:17
+#: share/advertising/29.pl:15
 #, c-format
-msgid "\t- <b>MySQL</b>: The world's most popular Open Source database"
+msgid ""
+"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"offer its customers!"
 msgstr ""
-"\t- <b>MySQL</b>: La base de dades de Codi Font Obert més popular del món"
 
-#: share/advertising/ppp-07.pl:18
+#: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"\t- <b>CVS</b>: Concurrent Versions System, the dominant open-source network-"
-"transparent version control system"
+"Mandrakeonline provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrakelinux systems:"
 msgstr ""
-"\t- <b>CVS</b>: Concurrent Versions System, el sistema de control de "
-"versions dominant i transparent a la xarxa de codi font obert"
 
-#: share/advertising/ppp-07.pl:19
+#: share/advertising/29.pl:18
+#, c-format
+msgid "\t* <b>Perfect</b> system security (automated software updates)."
+msgstr ""
+
+#: share/advertising/29.pl:19
 #, c-format
 msgid ""
-"\t- <b>ProFTPD</b>: the highly configurable GPL-licensed FTP server software"
+"\t* <b>Notification</b> of updates (by e-mail or by an applet on the "
+"desktop)."
 msgstr ""
-"\t- <b>ProFTPD</b>: el servidor FTP amb llicència GPL altament configurable"
+"\t* <b>Notificació</b> d'actualitzacions (per correu electrònic o per un "
+"applet a l'escriptori)."
 
-#: share/advertising/ppp-07.pl:20
+#: share/advertising/29.pl:20
 #, c-format
-msgid "\t- And others"
-msgstr "\t- i altres"
+msgid "\t* Flexible <b>scheduled</b> updates."
+msgstr ""
 
-#: share/advertising/pwp-01.pl:17
+#: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"Your new Mandrakelinux distribution is the result of collaborative efforts "
-"between MandrakeSoft developers and Mandrakelinux contributors throughout "
-"the world."
+"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
 msgstr ""
-"La vostra nova distribució Mandrakelinux és el resultat de l'esforç "
-"col·laboratiu dels desenvolupadors de MandrakeSoft i els contribuïdors de "
-"Mandrakelinux al voltant del món."
 
-#: share/advertising/pwp-01.pl:19
+#: share/advertising/30.pl:13
+#, c-format
+msgid "<b>Mandrakeexpert</b>"
+msgstr "<b>Mandrakeexpert</b>"
+
+#: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of our "
-"latest release."
+"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
-"Voldríem donar les gracies a tothom que hagi participat en el "
-"desenvolupament d'aquesta versió."
 
-#: share/advertising/pwp-02.pl:13
+#: share/advertising/30.pl:17
 #, c-format
-msgid "<b>PowerPack</b>"
-msgstr "<b>PowerPack</b>"
+msgid ""
+"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"a lot of time."
+msgstr ""
 
-#: share/advertising/pwp-02.pl:15
+#: share/advertising/30.pl:19
 #, 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."
+"For any question related to Mandrakelinux, you have the possibility to "
+"purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
-#: share/advertising/pwp-04.pl:13
+#: share/compssUsers.pl:25
 #, c-format
+msgid "Office Workstation"
+msgstr "Estació de treball d'oficina"
+
+#: share/compssUsers.pl:27
+#, fuzzy, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all of "
-"your tasks:"
+"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
+"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
 msgstr ""
+"Programes d'ofimàtica: processadors de textos (kword, abiword), fulls de "
+"càlcul (kspread, gnumeric), visualitzadors pdf, etc."
 
-#: share/advertising/pwp-04.pl:16
+#: share/compssUsers.pl:28
 #, c-format
 msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites <b>Kontact</b> and <b>Evolution</b>"
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
+"Programes d'ofimàtica: processadors de textos (kword, abiword), fulls de "
+"càlcul (kspread, gnumeric), visualitzadors pdf, etc."
+
+#: share/compssUsers.pl:33
+#, c-format
+msgid "Game station"
+msgstr "Estació de jocs"
 
-#: share/advertising/pwp-04.pl:17
+#: share/compssUsers.pl:34
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla</b> and <b>Konqueror</b>"
-msgstr "\t- Navegar per la xarxa amb <b>Mozilla</b> i <b>Konqueror</b>"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Programes d'entreteniment: acció, jocs de taula, estratègia, etc."
 
-#: share/advertising/pwp-04.pl:19
+#: share/compssUsers.pl:37
 #, c-format
-msgid "\t- Listen to audio CDs and music files with KsCD and <b>Totem</b>"
-msgstr "\t- Escolteu CD d'àudio i fitxers de música amb KsCD i <b>Totem</b>"
+msgid "Multimedia station"
+msgstr "Estació multimèdia"
 
-#: share/advertising/pwp-05.pl:13 share/advertising/pwp-06.pl:13
+#: share/compssUsers.pl:38
 #, c-format
-msgid "<b>Development tools</b>"
-msgstr "<b>Eines de desenvolupament</b>"
+msgid "Sound and video playing/editing programs"
+msgstr "Programes de reproducció/edició de so i vídeo"
 
-#: share/advertising/pwp-05.pl:15
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Internet station"
+msgstr "Estació d'Internet"
+
+#: 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 ""
+"Conjunt d'eines per llegir i enviar correu i notícies (mutt, tin...) i per "
+"navegar pel Web"
+
+#: share/compssUsers.pl:49
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Ordinador de xarxa (client)"
+
+#: share/compssUsers.pl:50
+#, c-format
+msgid "Clients for different protocols including ssh"
+msgstr "Clients per a diferents protocols, incloent l'ssh"
+
+#
+#: share/compssUsers.pl:54
+#, c-format
+msgid "Configuration"
+msgstr "Configuració"
+
+#: share/compssUsers.pl:55
+#, c-format
+msgid "Tools to ease the configuration of your computer"
+msgstr "Eines per facilitar la configuració de l'ordinador"
+
+#: share/compssUsers.pl:59
+#, c-format
+msgid "Console Tools"
+msgstr "Eines de consola"
+
+#: share/compssUsers.pl:60
+#, c-format
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editors, intèrprets d'ordres, eines de fitxer, terminals"
+
+#: share/compssUsers.pl:65 share/compssUsers.pl:165
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Biblioteques de desenvolupament C i C++, programes i fitxers include"
+
+#: share/compssUsers.pl:69 share/compssUsers.pl:169
+#, c-format
+msgid "Documentation"
+msgstr "Documentació"
+
+#: share/compssUsers.pl:70 share/compssUsers.pl:170
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Llibres i Com es fa... sobre el Linux i el programari lliure"
+
+#: 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 "Base Estàndard de Linux (LSB). Suport a aplicacions de tercers"
+
+#: share/compssUsers.pl:85
+#, c-format
+msgid "Apache"
 msgstr ""
-"PowerPack inclou tot el que necessiteu per desenvolupar i crear els vostres "
-"programes, incloent:"
 
-#: share/advertising/pwp-06.pl:15
+#: share/compssUsers.pl:88
+#, fuzzy, c-format
+msgid "Groupware"
+msgstr "Grup"
+
+#: share/compssUsers.pl:89
+#, fuzzy, c-format
+msgid "Kolab Server"
+msgstr "Servidor Samba"
+
+#: share/compssUsers.pl:92 share/compssUsers.pl:133
 #, c-format
-msgid "And of course the editors!"
-msgstr "I per suposat els editors!"
+msgid "Firewall/Router"
+msgstr "Tallafoc/Encaminador"
 
-#: share/advertising/pwp-06.pl:17
+#
+#: share/compssUsers.pl:93 share/compssUsers.pl:134
+#, c-format
+msgid "Internet gateway"
+msgstr "Passarel·la a Internet"
+
+#: share/compssUsers.pl:96
+#, fuzzy, c-format
+msgid "Mail/News"
+msgstr "/Fitxer/_Nou"
+
+#: share/compssUsers.pl:97
+#, fuzzy, c-format
+msgid "Postfix mail server, Inn news server"
+msgstr "Servidor de correu Postfix"
+
+#
+#: share/compssUsers.pl:100
+#, fuzzy, c-format
+msgid "Directory Server"
+msgstr "Directori del qual restaurar"
+
+#
+#: share/compssUsers.pl:104
+#, fuzzy, c-format
+msgid "FTP Server"
+msgstr "Servidor NTP"
+
+#: share/compssUsers.pl:105
+#, c-format
+msgid "ProFTPd"
+msgstr ""
+
+#: share/compssUsers.pl:108
+#, fuzzy, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS "
+
+#: share/compssUsers.pl:109
+#, c-format
+msgid "Domain Name and Network Information Server"
+msgstr "Servidor de Noms de Domini i d'Informació de la Xarxa (DNS/NIS)"
+
+#: share/compssUsers.pl:112
+#, fuzzy, c-format
+msgid "File and Printer Sharing Server"
+msgstr "Servidor de la impressora"
+
+#: share/compssUsers.pl:113
+#, fuzzy, c-format
+msgid "NFS Server, Samba server"
+msgstr "Servidor Samba"
+
+#: share/compssUsers.pl:116 share/compssUsers.pl:129
+#, c-format
+msgid "Database"
+msgstr "Base de dades"
+
+#: share/compssUsers.pl:117
+#, fuzzy, c-format
+msgid "PostgreSQL and MySQL Database Server"
+msgstr "Servidor de bases de dades PostgreSQL o MySQL"
+
+#: share/compssUsers.pl:121
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+#: share/compssUsers.pl:122
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache i Pro-ftpd"
+
+#: share/compssUsers.pl:125
+#, c-format
+msgid "Mail"
+msgstr "Correu"
+
+#: share/compssUsers.pl:126
+#, c-format
+msgid "Postfix mail server"
+msgstr "Servidor de correu Postfix"
+
+#: share/compssUsers.pl:130
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "Servidor de bases de dades PostgreSQL o MySQL"
+
+#: share/compssUsers.pl:137
+#, c-format
+msgid "Network Computer server"
+msgstr "Servidor d'ordinador de xarxa"
+
+#: 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ó de treball KDE"
+
+#: 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>: un altre editor de text i sistema de desenvolupament "
-"d'aplicacions de codi font obert"
+"L'entorn d'escriptori K (KDE), l'entorn gràfic bàsic que inclou diverses "
+"eines"
+
+#: share/compssUsers.pl:151
+#, c-format
+msgid "GNOME Workstation"
+msgstr "Estació de treball GNOME"
 
-#: 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>: editor de text avançat amb més característiques que el vi "
-"estàndard"
+"Entorn gràfic amb un conjunt d'aplicacions i eines d'escriptori fàcil "
+"d'utilitzar"
+
+#: share/compssUsers.pl:155
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Altres escriptoris gràfics"
+
+#: share/compssUsers.pl:156
+#, c-format
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+
+#: share/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "Utilities"
+msgstr "Filipines"
+
+#: share/compssUsers.pl:181 share/compssUsers.pl:182 standalone/logdrake:381
+#, c-format
+msgid "SSH Server"
+msgstr "Servidor SSH"
+
+#: share/compssUsers.pl:186
+#, fuzzy, c-format
+msgid "Webmin"
+msgstr "Webcam"
+
+#
+#: share/compssUsers.pl:187
+#, fuzzy, c-format
+msgid "Webmin Remote Configuration Server"
+msgstr "Configuració del Servidor de Terminal"
+
+#: share/compssUsers.pl:191
+#, fuzzy, c-format
+msgid "Network Utilities/Monitoring"
+msgstr "Monitorització de la xarxa"
+
+#: share/compssUsers.pl:192
+#, c-format
+msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
+msgstr ""
+
+#: share/compssUsers.pl:196
+#, fuzzy, c-format
+msgid "MandrakeSoft Wizards"
+msgstr "<b>Productes de Mandrakesoft</b>"
+
+#: share/compssUsers.pl:197
+#, fuzzy, c-format
+msgid "Wizards to configure server"
+msgstr "No s'ha pogut configurar la impressora \"%s\"!"
 
 #: standalone.pm:21
 #, c-format
@@ -16151,15 +16878,16 @@ 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 ""
 "[OPCIONS] [NOM_DEL_PROGRAMA]\n"
 "\n"
 "OPCIONS:\n"
 "  --help            - imprimeix aquest missatge d'ajuda.\n"
-"  --report          - el programa ha de ser una de les eines de Mandrake\n"
-"  --incident        - el programa ha de ser una de les eines de Mandrake"
+"  --report          - el programa ha de ser una de les eines de "
+"Mandrakelinux\n"
+"  --incident        - el programa ha de ser una de les eines de Mandrakelinux"
 
 #: standalone.pm:63
 #, c-format
@@ -16181,7 +16909,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"
@@ -16207,10 +16935,10 @@ msgstr ""
 "                 : i gs per al ghostscript per utilitzar només aquesta."
 
 #: standalone.pm:84
-#, c-format
+#, fuzzy, 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"
@@ -16224,7 +16952,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPCIONS]...\n"
-"Configurador del servidor de terminal de Mandrake (MTS)\n"
+"Configurador del servidor de terminal de Mandrakelinux (MTS)\n"
 "--enable         : habilita l'MTS\n"
 "--disable        : inhabilita l'MTS\n"
 "--start          : inicia l'MTS\n"
@@ -16316,7 +17044,7 @@ msgstr ""
 "       XFdrake [--noauto] monitor\n"
 "       XFdrake resolució"
 
-#: standalone.pm:128
+#: standalone.pm:133
 #, c-format
 msgid ""
 "\n"
@@ -16327,27 +17055,27 @@ msgstr ""
 "Sintaxi: %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 "Si us plau, sortiu i utilitzeu Ctrl-Alt-tecla de retrocés"
 
-#: standalone/XFdrake:91
+#: standalone/XFdrake:89
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
 msgstr "Heu de sortir i tornar a entrar per tal que els canvis tinguin efecte"
 
-#: standalone/drakTermServ:79
+#: standalone/drakTermServ:76
 #, c-format
 msgid "Useless without Terminal Server"
 msgstr "Inútil sense el servidor de terminal"
 
-#: standalone/drakTermServ:116 standalone/drakTermServ:123
+#: standalone/drakTermServ:108 standalone/drakTermServ:114
 #, c-format
 msgid "%s: %s requires a username...\n"
 msgstr "%s: %s requereix un nom d'usuari...\n"
 
-#: standalone/drakTermServ:136
+#: standalone/drakTermServ:125
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
@@ -16356,83 +17084,77 @@ msgstr ""
 "%s: %s necessita: el nom de l'ordinador, adreça MAC, IP, image-nbi, 0/1 per "
 "a THIN_CLIENT, 0/1 per a la configuració local...\n"
 
-#: standalone/drakTermServ:143
+#: standalone/drakTermServ:131
 #, c-format
 msgid "%s: %s requires hostname...\n"
 msgstr "%s: %s necessita un nom d'ordinador...\n"
 
-#: standalone/drakTermServ:226 standalone/drakTermServ:500
-#: standalone/drakfont:575
-#, c-format
-msgid "OK"
-msgstr "D'acord"
-
 #
-#: standalone/drakTermServ:237 standalone/drakTermServ:240
+#: standalone/drakTermServ:213 standalone/drakTermServ:216
 #, c-format
 msgid "Terminal Server Configuration"
 msgstr "Configuració del Servidor de Terminal"
 
 #
 #
-#: standalone/drakTermServ:255
+#: standalone/drakTermServ:231
 #, c-format
 msgid "Enable Server"
 msgstr "Habilita el servidor"
 
 #
-#: standalone/drakTermServ:261
+#: standalone/drakTermServ:237
 #, c-format
 msgid "Disable Server"
 msgstr "Inhabilita el servidor"
 
-#: standalone/drakTermServ:269
+#: standalone/drakTermServ:245
 #, c-format
 msgid "Start Server"
 msgstr "Inicia el servidor"
 
-#: standalone/drakTermServ:275
+#: standalone/drakTermServ:251
 #, c-format
 msgid "Stop Server"
 msgstr "Atura el servidor"
 
-#: standalone/drakTermServ:283
+#: standalone/drakTermServ:259
 #, c-format
 msgid "Etherboot Floppy/ISO"
 msgstr "Disquet/ISO per a Etherboot"
 
-#: standalone/drakTermServ:287
+#: standalone/drakTermServ:263
 #, c-format
 msgid "Net Boot Images"
 msgstr "Imatges d'arrencada de la xarxa"
 
-#: standalone/drakTermServ:293
+#: standalone/drakTermServ:269
 #, c-format
 msgid "Add/Del Users"
 msgstr "Afegeix/Suprimeix usuaris"
 
-#: standalone/drakTermServ:297
+#: standalone/drakTermServ:273
 #, c-format
 msgid "Add/Del Clients"
 msgstr "Afegeix/Suprimeix clients"
 
-#: standalone/drakTermServ:308 standalone/drakbug:54
+#: standalone/drakTermServ:284 standalone/drakbug:47
 #, c-format
 msgid "First Time Wizard"
 msgstr "Auxiliar per a la primera vegada"
 
-#: standalone/drakTermServ:340 standalone/drakTermServ:341
+#: standalone/drakTermServ:315 standalone/drakTermServ:316
 #, c-format
 msgid "%s defined as dm, adding gdm user to /etc/passwd$$CLIENT$$"
 msgstr ""
 
-#: standalone/drakTermServ:347
+#: standalone/drakTermServ:322
 #, c-format
 msgid ""
 "\n"
 " This wizard routine will:\n"
 " \t1) Ask you to select either 'thin' or 'fat' clients.\n"
-"\t2) Setup dhcp.\n"
+"\t2) Setup DHCP.\n"
 "\t\n"
 "After doing these steps, the wizard will:\n"
 "\t\n"
@@ -16449,22 +17171,22 @@ msgid ""
 "    f) If it's thin clients, ask if you want to restart KDM.\n"
 msgstr ""
 
-#: standalone/drakTermServ:392
+#: standalone/drakTermServ:367
 #, c-format
 msgid "Cancel Wizard"
 msgstr "Cancel·la l'auxiliar"
 
-#: standalone/drakTermServ:404
+#: standalone/drakTermServ:379
 #, c-format
 msgid "Please save dhcpd config!"
 msgstr ""
 
-#: standalone/drakTermServ:432
+#: standalone/drakTermServ:407
 #, c-format
 msgid "Use thin clients."
 msgstr "Usa clients prims."
 
-#: standalone/drakTermServ:434
+#: standalone/drakTermServ:409
 #, c-format
 msgid ""
 "Please select default client type.\n"
@@ -16478,47 +17200,47 @@ msgstr ""
 "    Els clients grassos usen la seva CPU/RAM però el sistema de fitxers 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 ""
 
-#: standalone/drakTermServ:453
+#: standalone/drakTermServ:428
 #, c-format
 msgid "Creating net boot images for all kernels"
 msgstr "S'estan creant les imatges d'arrencada per tots els nuclis"
 
-#: 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 "Això trigarà uns minuts."
 
-#: standalone/drakTermServ:458 standalone/drakTermServ:478
+#: standalone/drakTermServ:433 standalone/drakTermServ:452
 #, c-format
 msgid "Done!"
 msgstr "Fet!"
 
-#: standalone/drakTermServ:464
+#: standalone/drakTermServ:438
 #, c-format
 msgid "Syncing server user list with client list, including root."
 msgstr ""
 "S'està sincronitzant la llista d'usuaris del servidor amb la del client, "
 "incloent root."
 
-#: standalone/drakTermServ:484
+#: standalone/drakTermServ:458
 #, c-format
 msgid ""
 "In order to enable changes made for thin clients, the display manager must "
 "be restarted. Restart now?"
 msgstr ""
 
-#: standalone/drakTermServ:519
+#: standalone/drakTermServ:493
 #, c-format
 msgid "Terminal Server Overview"
 msgstr "Visió general del Terminal Server"
 
-#: standalone/drakTermServ:520
+#: standalone/drakTermServ:494
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -16545,7 +17267,7 @@ msgstr ""
 "        \tdhcpd.conf, heu de crear les imatges Etherboot per a un nucli "
 "complet com a mínim."
 
-#: standalone/drakTermServ:526
+#: standalone/drakTermServ:500
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -16579,7 +17301,7 @@ msgstr ""
 "        \t\tUna secció dhcpd.conf  típica que permeti l'ús d'un client sense "
 "disc té aquest aspecte:"
 
-#: standalone/drakTermServ:544
+#: standalone/drakTermServ:518
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -16590,14 +17312,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"
@@ -16653,7 +17375,7 @@ msgstr ""
 "\t\t\tNota: heu d'aturar/iniciar el servidor després d'afegir o canviar "
 "clients."
 
-#: standalone/drakTermServ:564
+#: standalone/drakTermServ:538
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -16684,7 +17406,7 @@ msgstr ""
 "\t\t\t\n"
 "\t\t\tsent SUBNET/MASK definida per la vostra xarxa."
 
-#: standalone/drakTermServ:576
+#: standalone/drakTermServ:550
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -16701,7 +17423,7 @@ msgstr ""
 "afegint\n"
 "        \t\to eliminant, d'aquest fitxer, usuaris del sistema."
 
-#: standalone/drakTermServ:580
+#: standalone/drakTermServ:554
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -16718,7 +17440,7 @@ msgstr ""
 "configuració de maquinari de client local, \n"
 "        \t\tel drakTermServ ajudarà a crear aquests fitxers."
 
-#: standalone/drakTermServ:585
+#: standalone/drakTermServ:559
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -16753,7 +17475,7 @@ msgstr ""
 "        a desactivar, mantenint els fitxers de configuració, quan la màquina "
 "client estigui configurada."
 
-#: standalone/drakTermServ:594
+#: standalone/drakTermServ:568
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -16763,7 +17485,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"
@@ -16789,7 +17511,7 @@ msgstr ""
 "imatge d'arrencada a cada client sense \n"
 "        \t\tdisc.\n"
 "\n"
-"        \t\tUn fitxer de configuració tftp típic té aquest aspecte:\n"
+"        \t\tUn fitxer de configuració TFTP típic té aquest aspecte:\n"
 "        \t\t\n"
 "        \tservice tftp\n"
 "\t\t\t{\n"
@@ -16808,13 +17530,13 @@ msgstr ""
 "tftpboot, on mkinitrd-net\n"
 "        \t\tposa les seves imatges."
 
-#: 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"
@@ -16840,63 +17562,63 @@ 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 "Disquet d'arrencada"
 
-#: standalone/drakTermServ:652
+#: standalone/drakTermServ:626
 #, c-format
 msgid "Boot ISO"
 msgstr "ISO d'arrencada"
 
-#: standalone/drakTermServ:654
+#: standalone/drakTermServ:628
 #, c-format
 msgid "PXE Image"
 msgstr "Imatge PXE"
 
-#: standalone/drakTermServ:723
+#: standalone/drakTermServ:696
 #, c-format
 msgid "Default kernel version"
 msgstr "Versió del nucli per defecte"
 
-#: standalone/drakTermServ:751
+#: standalone/drakTermServ:724
 #, c-format
 msgid "Build Whole Kernel -->"
 msgstr "Munta tot el nucli -->"
 
-#: standalone/drakTermServ:758
+#: standalone/drakTermServ:731
 #, c-format
 msgid "No kernel selected!"
 msgstr "No heu seleccionat cap nucli!"
 
-#: standalone/drakTermServ:761
+#: standalone/drakTermServ:734
 #, c-format
 msgid "Build Single NIC -->"
 msgstr "Munta un NIC senzill -->"
 
-#: standalone/drakTermServ:765
+#: standalone/drakTermServ:738
 #, c-format
 msgid "No NIC selected!"
 msgstr "No s'ha seleccionat cap NIC!"
 
-#: standalone/drakTermServ:768
+#: standalone/drakTermServ:741
 #, c-format
 msgid "Build All Kernels -->"
 msgstr "Munta tots els nuclis -->"
 
-#: standalone/drakTermServ:776
+#: standalone/drakTermServ:749
 #, c-format
 msgid "<-- Delete"
 msgstr "<-- Suprimeix"
 
 #
-#: standalone/drakTermServ:783
+#: standalone/drakTermServ:756
 #, c-format
 msgid "Delete All NBIs"
 msgstr "Suprimeix tots els NBI"
 
-#: standalone/drakTermServ:870
+#: standalone/drakTermServ:843
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -16908,28 +17630,28 @@ msgstr ""
 "Suprimiu o torneu a afegir l'usuari al servidor de terminal per habilitar "
 "l'entrada."
 
-#: standalone/drakTermServ:875
+#: standalone/drakTermServ:848
 #, c-format
 msgid "Add User -->"
 msgstr "Afegeix un usuari -->"
 
-#: standalone/drakTermServ:881
+#: standalone/drakTermServ:854
 #, c-format
 msgid "<-- Del User"
 msgstr "<-- Suprimeix un usuari"
 
-#: standalone/drakTermServ:917
+#: standalone/drakTermServ:890
 #, c-format
 msgid "type: %s"
 msgstr "tipus: %s "
 
-#: standalone/drakTermServ:921
+#: standalone/drakTermServ:894
 #, c-format
 msgid "local config: %s"
 msgstr "configuració local:: %s"
 
 #
-#: standalone/drakTermServ:951
+#: standalone/drakTermServ:924
 #, c-format
 msgid ""
 "Allow local hardware\n"
@@ -16938,68 +17660,68 @@ msgstr ""
 "Permet la configuració del\n"
 "maquinari local."
 
-#: standalone/drakTermServ:960
+#: standalone/drakTermServ:933
 #, c-format
 msgid "No net boot images created!"
 msgstr "No s'ha creat cap imatge d'arrencada des de xarxa"
 
-#: standalone/drakTermServ:978
+#: standalone/drakTermServ:951
 #, c-format
 msgid "Thin Client"
 msgstr "Client prim"
 
-#: standalone/drakTermServ:982
+#: standalone/drakTermServ:955
 #, c-format
 msgid "Allow Thin Clients"
 msgstr "Permet clients prims"
 
-#: standalone/drakTermServ:983
+#: standalone/drakTermServ:956
 #, c-format
 msgid "Add Client -->"
 msgstr "Afegeix un client -->"
 
-#: standalone/drakTermServ:997
+#: standalone/drakTermServ:970
 #, c-format
 msgid "type: fat"
 msgstr "tipus: gras"
 
-#: standalone/drakTermServ:998
+#: standalone/drakTermServ:971
 #, c-format
 msgid "type: thin"
 msgstr "tipus: prim"
 
 #
-#: standalone/drakTermServ:1005
+#: standalone/drakTermServ:978
 #, c-format
 msgid "local config: false"
 msgstr "configuració local: fals"
 
-#: standalone/drakTermServ:1006
+#: standalone/drakTermServ:979
 #, c-format
 msgid "local config: true"
 msgstr "configuració local: cert"
 
-#: standalone/drakTermServ:1014
+#: standalone/drakTermServ:987
 #, c-format
 msgid "<-- Edit Client"
 msgstr "<-- Edita un client"
 
-#: standalone/drakTermServ:1040
+#: standalone/drakTermServ:1013
 #, c-format
 msgid "Disable Local Config"
 msgstr "Inhabilita la configuració local"
 
-#: standalone/drakTermServ:1047
+#: standalone/drakTermServ:1020
 #, c-format
 msgid "Delete Client"
 msgstr "Suprimeix el client"
 
-#: standalone/drakTermServ:1056
+#: standalone/drakTermServ:1029
 #, c-format
 msgid "dhcpd Config..."
 msgstr "Configuració del dhcpd..."
 
-#: standalone/drakTermServ:1072
+#: standalone/drakTermServ:1045
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
@@ -17009,78 +17731,78 @@ msgstr ""
 "efecte. \n"
 "(\"service dm restart\" a la consola)"
 
-#: standalone/drakTermServ:1112
+#: standalone/drakTermServ:1085
 #, c-format
 msgid "Thin clients won't work with autologin. Disable autologin?"
 msgstr ""
 
-#: standalone/drakTermServ:1128
+#: standalone/drakTermServ:1101
 #, c-format
 msgid "All clients will use %s"
 msgstr "Tots els clients usaran %s"
 
-#: standalone/drakTermServ:1160
+#: standalone/drakTermServ:1133
 #, c-format
 msgid "Subnet:"
 msgstr "Subxarxa:"
 
-#: standalone/drakTermServ:1167
+#: standalone/drakTermServ:1140
 #, c-format
 msgid "Netmask:"
 msgstr "Màscara de xarxa:"
 
-#: standalone/drakTermServ:1174
+#: standalone/drakTermServ:1147
 #, c-format
 msgid "Routers:"
 msgstr "Encaminadors:"
 
-#: standalone/drakTermServ:1181
+#: standalone/drakTermServ:1154
 #, c-format
 msgid "Subnet Mask:"
 msgstr "Màscara de la subxarxa:"
 
-#: standalone/drakTermServ:1188
+#: standalone/drakTermServ:1161
 #, c-format
 msgid "Broadcast Address:"
 msgstr "Adreça de difusió:"
 
-#: standalone/drakTermServ:1195
+#: standalone/drakTermServ:1168
 #, c-format
 msgid "Domain Name:"
 msgstr "Nom de domini:"
 
-#: standalone/drakTermServ:1203
+#: standalone/drakTermServ:1176
 #, c-format
 msgid "Name Servers:"
 msgstr "Servidors de noms:"
 
-#: standalone/drakTermServ:1214
+#: standalone/drakTermServ:1187
 #, c-format
 msgid "IP Range Start:"
 msgstr "Inici de l'abast de la IP:"
 
-#: standalone/drakTermServ:1215
+#: standalone/drakTermServ:1188
 #, c-format
 msgid "IP Range End:"
 msgstr "Final de l'abast de la IP:"
 
-#: standalone/drakTermServ:1257
+#: standalone/drakTermServ:1230
 #, c-format
 msgid "Append TS Includes To Existing Config"
 msgstr ""
 
-#: standalone/drakTermServ:1259
+#: standalone/drakTermServ:1232
 #, c-format
 msgid "Write Config"
 msgstr "Escriu la configuració"
 
 #
-#: standalone/drakTermServ:1275
+#: standalone/drakTermServ:1248
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr "Configuració del servidor dhcpd"
 
-#: standalone/drakTermServ:1276
+#: standalone/drakTermServ:1249
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -17091,103 +17813,97 @@ msgstr ""
 "del vostre sistema actual.\n"
 "Podeu modificar-los si cal."
 
-#: standalone/drakTermServ:1279
+#: standalone/drakTermServ:1252
 #, c-format
 msgid "Dynamic IP Address Pool:"
 msgstr "Conjunt d'adreces IP dinàmiques:"
 
-#: standalone/drakTermServ:1426
+#: standalone/drakTermServ:1399
 #, c-format
 msgid "Please insert floppy disk:"
 msgstr "Si us plau, inseriu un disquet:"
 
-#: standalone/drakTermServ:1430
+#: standalone/drakTermServ:1403
 #, c-format
 msgid "Couldn't access the floppy!"
 msgstr "No s'ha pogut accedir al disquet!"
 
-#: standalone/drakTermServ:1432
+#: standalone/drakTermServ:1405
 #, c-format
 msgid "Floppy can be removed now"
 msgstr "Ja podeu extreure el disquet"
 
-#: standalone/drakTermServ:1435
+#: standalone/drakTermServ:1408
 #, c-format
 msgid "No floppy drive available!"
 msgstr "No s'ha trobat cap unitat de disquet!"
 
-#: standalone/drakTermServ:1440
+#: standalone/drakTermServ:1413
 #, c-format
 msgid "PXE image is %s/%s"
 msgstr "La imatge PXE és %s/%s"
 
-#: standalone/drakTermServ:1442
+#: standalone/drakTermServ:1415
 #, c-format
 msgid "Error writing %s/%s"
 msgstr "Error al escriure %s/%s"
 
-#: standalone/drakTermServ:1451
+#: standalone/drakTermServ:1424
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr "La imatge ISO per a Etherboot és %s"
 
-#: standalone/drakTermServ:1453
+#: standalone/drakTermServ:1426
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr "Alguna cosa ha anat malament! Teniu instal·lat l'mkisofs?"
 
-#: standalone/drakTermServ:1475
+#: standalone/drakTermServ:1447
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr "Abans cal crear /etc/dhcpd.conf!"
 
-#: standalone/drakTermServ:1634
+#: standalone/drakTermServ:1602
 #, c-format
 msgid "%s passwd bad in Terminal Server - rewriting...\n"
 msgstr ""
 
-#: standalone/drakTermServ:1647
+#: standalone/drakTermServ:1615
 #, c-format
 msgid "%s is not a user..\n"
 msgstr "%s no és un usuari..\n"
 
-#: standalone/drakTermServ:1648
+#: standalone/drakTermServ:1616
 #, c-format
 msgid "%s is already a Terminal Server user\n"
 msgstr "%s ja és un usuari del servidor del terminal\n"
 
-#: standalone/drakTermServ:1650
+#: standalone/drakTermServ:1618
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
 msgstr "L'addicció del Terminal Server %s ha fallat!\n"
 
-#: standalone/drakTermServ:1652
+#: standalone/drakTermServ:1620
 #, c-format
 msgid "%s added to Terminal Server\n"
 msgstr "%s afegit al servidor de terminal\n"
 
-#: standalone/drakTermServ:1698
+#: standalone/drakTermServ:1666
 #, c-format
 msgid "Deleted %s...\n"
 msgstr "S'ha eliminat %s...\n"
 
-#: standalone/drakTermServ:1700 standalone/drakTermServ:1773
+#: standalone/drakTermServ:1668 standalone/drakTermServ:1741
 #, c-format
 msgid "%s not found...\n"
 msgstr "No s'ha trobat %s...\n"
 
-#: standalone/drakTermServ:1722 standalone/drakTermServ:1723
-#: standalone/drakTermServ:1724
-#, c-format
-msgid "%s already in use\n"
-msgstr "%s ja és en ús\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 i /etc/hosts.deny ja estan configurats - no canviats"
 
-#: standalone/drakTermServ:1953
+#: standalone/drakTermServ:1921
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr "La configuració ha canviat; voleu reiniciar el clúster nfs/dhcpd?"
@@ -17296,8 +18012,8 @@ msgstr ""
 "Els paràmetres de la instal·lació automàtica estan disponibles en les "
 "seccions de l'esquerra"
 
-#: 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 "Felicitats!"
@@ -17339,47 +18055,41 @@ msgstr "hd"
 msgid "tape"
 msgstr "cinta"
 
-#
-#: standalone/drakbackup:112
-#, c-format
-msgid "No devices found"
-msgstr "No s'ha trobat cap dispositiu"
-
-#: 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 ""
 
-#: standalone/drakbackup:153
+#: standalone/drakbackup:154
 #, c-format
 msgid "Store the password for this system in drakbackup configuration."
 msgstr ""
 "Desa la contrasenya per aquest sistema a la configuració de drakbackup."
 
-#: standalone/drakbackup:154
+#: standalone/drakbackup:155
 #, c-format
 msgid ""
 "For a multisession CD, only the first session will erase the cdrw. Otherwise "
 "the cdrw is erased before each backup."
 msgstr ""
 
-#: standalone/drakbackup:155
+#: standalone/drakbackup:156
 #, c-format
 msgid ""
 "This option will save files that have changed.  Exact behavior depends on "
 "whether incremental or differential mode is used."
 msgstr ""
 
-#: standalone/drakbackup:156
+#: standalone/drakbackup:157
 #, c-format
 msgid ""
 "Incremental backups only save files that have changed or are new since the "
 "last backup."
 msgstr ""
 
-#: standalone/drakbackup:157
+#: standalone/drakbackup:158
 #, c-format
 msgid ""
 "Differential backups only save files that have changed or are new since the "
@@ -17388,21 +18098,21 @@ msgstr ""
 "Les copies de seguretat diferencials només guarden els fitxers que han "
 "canviat o que són nous a partir de la còpia de seguretat 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 ""
 
-#: standalone/drakbackup:159
+#: standalone/drakbackup:160
 #, c-format
 msgid ""
 "Files or wildcards listed in a .backupignore file at the top of a directory "
 "tree will not be backed up."
 msgstr ""
 
-#: standalone/drakbackup:160
+#: standalone/drakbackup:161
 #, c-format
 msgid ""
 "For backups to other media, files are still created on the hard drive, then "
@@ -17410,7 +18120,7 @@ msgid ""
 "tar files after the backup."
 msgstr ""
 
-#: standalone/drakbackup:161
+#: standalone/drakbackup:162
 #, c-format
 msgid ""
 "Some protocols, like rsync, may be configured at the server end.  Rather "
@@ -17418,59 +18128,59 @@ msgid ""
 "path."
 msgstr ""
 
-#: standalone/drakbackup:162
+#: standalone/drakbackup:163
 #, c-format
 msgid ""
 "Custom allows you to specify your own day and time.  The other options use "
 "run-parts in /etc/crontab."
 msgstr ""
 
-#: standalone/drakbackup:326
+#: standalone/drakbackup:327
 #, c-format
 msgid "No media selected for cron operation."
 msgstr ""
 
-#: standalone/drakbackup:330
+#: standalone/drakbackup:331
 #, c-format
 msgid "No interval selected for cron operation."
 msgstr ""
 
-#: standalone/drakbackup:377
+#: standalone/drakbackup:378
 #, c-format
 msgid "Interval cron not available as non-root"
 msgstr "Internal cron no està disponible per a usuaris que no siguin 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 és ni una adreça de correu vàlida ni un usuari local existent!"
 
-#: 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 "
 "a complete email address!"
 msgstr ""
-"\"%s\" és un usuari local, però no heu escollit un smtp local, per tant heu "
+"\"%s\" és un usuari local, però no heu escollit un SMTP local, per tant heu "
 "d'usar una adreça de correu electrònic completa!"
 
-#: standalone/drakbackup:475
+#: standalone/drakbackup:476
 #, c-format
 msgid "Valid user list changed, rewriting config file."
 msgstr ""
 
-#: standalone/drakbackup:477
+#: standalone/drakbackup:478
 #, c-format
 msgid "Old user list:\n"
 msgstr "Llista d'usuaris antics:\n"
 
-#: standalone/drakbackup:479
+#: standalone/drakbackup:480
 #, c-format
 msgid "New user list:\n"
 msgstr "Llista d'usuaris nous:\n"
 
-#: standalone/drakbackup:524
+#: standalone/drakbackup:525
 #, c-format
 msgid ""
 "\n"
@@ -17479,7 +18189,7 @@ msgstr ""
 "\n"
 "                      Informe del DrakBackup \n"
 
-#: standalone/drakbackup:525
+#: standalone/drakbackup:526
 #, c-format
 msgid ""
 "\n"
@@ -17488,7 +18198,7 @@ msgstr ""
 "\n"
 "                      Informe del Dimoni DrakBackup\n"
 
-#: standalone/drakbackup:531
+#: standalone/drakbackup:532
 #, c-format
 msgid ""
 "\n"
@@ -17501,13 +18211,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 "Progrés total"
 
-#: standalone/drakbackup:609
+#: standalone/drakbackup:610
 #, c-format
 msgid ""
 "%s exists, delete?\n"
@@ -17520,42 +18230,42 @@ msgstr ""
 "Si ja heu seguit aquest procés, probablement us calgui\n"
 "purgar l'entrada del paràmetre '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ó de les claus pot trigar una estona."
 
-#: standalone/drakbackup:625
+#: standalone/drakbackup:626
 #, c-format
 msgid "Cannot spawn %s."
 msgstr "No s'ha pogut engendrar %s."
 
-#: standalone/drakbackup:642
+#: standalone/drakbackup:643
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr "No es demana cap contrasenya a %s en el port %s"
 
-#: standalone/drakbackup:643
+#: standalone/drakbackup:644
 #, c-format
 msgid "Bad password on %s"
 msgstr "Contrasenya incorrecta a %s"
 
-#: standalone/drakbackup:644
+#: standalone/drakbackup:645
 #, c-format
 msgid "Permission denied transferring %s to %s"
 msgstr "S'ha denegat el permís per transferir %s a %s"
 
-#: standalone/drakbackup:645
+#: standalone/drakbackup:646
 #, c-format
 msgid "Can't find %s on %s"
 msgstr "No s'ha trobat %s a %s"
 
-#: standalone/drakbackup:649
+#: standalone/drakbackup:650
 #, c-format
 msgid "%s not responding"
 msgstr "%s no respon"
 
-#: standalone/drakbackup:653
+#: standalone/drakbackup:654
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -17572,88 +18282,88 @@ msgstr ""
 "\n"
 "sense que se us demani una contrasenya."
 
-#: standalone/drakbackup:697
+#: standalone/drakbackup:698
 #, c-format
 msgid "WebDAV remote site already in sync!"
 msgstr "El lloc remot WebDAV ja està sincronitzat!"
 
-#: standalone/drakbackup:701
+#: standalone/drakbackup:702
 #, c-format
 msgid "WebDAV transfer failed!"
 msgstr "La transferència WebDAV ha fallat!"
 
-#: standalone/drakbackup:722
+#: standalone/drakbackup:723
 #, c-format
 msgid "No CD-R/DVD-R in drive!"
 msgstr "No s'ha trobat cap unitat de CDR/DVDR!"
 
-#: standalone/drakbackup:726
+#: standalone/drakbackup:727
 #, c-format
 msgid "Does not appear to be recordable media!"
 msgstr "Sembla que el suport no és enregistrable!"
 
-#: standalone/drakbackup:730
+#: standalone/drakbackup:732
 #, c-format
 msgid "Not erasable media!"
 msgstr "Aquest suport no es pot esborrar!"
 
-#: standalone/drakbackup:771
+#: standalone/drakbackup:774
 #, c-format
 msgid "This may take a moment to erase the media."
 msgstr "Esborrar el suport pot trigar una estona."
 
-#: standalone/drakbackup:829
+#: standalone/drakbackup:832
 #, c-format
 msgid "Permission problem accessing CD."
 msgstr "Hi ha hagut un problema de permisos en accedir al CD."
 
-#: standalone/drakbackup:856
+#: standalone/drakbackup:859
 #, c-format
 msgid "No tape in %s!"
 msgstr "No s'ha trobat cap cinta a %s"
 
-#: standalone/drakbackup:956
+#: standalone/drakbackup:966
 #, c-format
 msgid ""
 "Backup quota exceeded!\n"
 "%d MB used vs %d MB allocated."
 msgstr ""
 
-#: standalone/drakbackup:975 standalone/drakbackup:1008
+#: standalone/drakbackup:985 standalone/drakbackup:1018
 #, c-format
 msgid "Backup system files..."
 msgstr "Fes una còpia de seguretat dels fitxers del sistema..."
 
 #
-#: standalone/drakbackup:1009 standalone/drakbackup:1050
+#: standalone/drakbackup:1019 standalone/drakbackup:1060
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr "Còpies de seguretat del disc dur..."
 
 #
-#: standalone/drakbackup:1049
+#: standalone/drakbackup:1059
 #, c-format
 msgid "Backup User files..."
 msgstr "Fes una còpia de seguretat dels fitxers d'usuari..."
 
 #
-#: standalone/drakbackup:1084
+#: standalone/drakbackup:1094
 #, c-format
 msgid "Backup Other files..."
 msgstr "Fes una còpia de seguretat d'altres fitxers..."
 
-#: standalone/drakbackup:1085
+#: standalone/drakbackup:1095
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr "Progrés de la còpia de seguretat del disc dur..."
 
 #
-#: standalone/drakbackup:1090
+#: standalone/drakbackup:1100
 #, c-format
 msgid "No changes to backup!"
 msgstr "No s'ha fet cap canvi a la còpia de seguretat"
 
-#: standalone/drakbackup:1108 standalone/drakbackup:1132
+#: standalone/drakbackup:1118 standalone/drakbackup:1142
 #, c-format
 msgid ""
 "\n"
@@ -17664,7 +18374,7 @@ msgstr ""
 "Activitats del Drakbackup a través de %s:\n"
 "\n"
 
-#: standalone/drakbackup:1117
+#: standalone/drakbackup:1127
 #, c-format
 msgid ""
 "\n"
@@ -17675,7 +18385,7 @@ msgstr ""
 " Hi ha hagut un problema en la connexió FTP: No ha estat possible enviar els "
 "fitxers de la còpia de seguretat per FTP.\n"
 
-#: standalone/drakbackup:1118
+#: standalone/drakbackup:1128
 #, c-format
 msgid ""
 "Error during sending file via FTP. Please correct your FTP configuration."
@@ -17683,12 +18393,12 @@ msgstr ""
 "S'ha produït un error en enviar el fitxer a través d'FTP. Si us plau, "
 "corregiu la configuració de l'FTP."
 
-#: standalone/drakbackup:1120
+#: standalone/drakbackup:1130
 #, c-format
 msgid "file list sent by FTP: %s\n"
 msgstr "llista de fitxers enviada per FTP: %s\n"
 
-#: standalone/drakbackup:1137
+#: standalone/drakbackup:1147
 #, c-format
 msgid ""
 "\n"
@@ -17699,7 +18409,7 @@ msgstr ""
 "Activitats del Drakbackup a través del CD:\n"
 "\n"
 
-#: standalone/drakbackup:1142
+#: standalone/drakbackup:1152
 #, c-format
 msgid ""
 "\n"
@@ -17710,7 +18420,7 @@ msgstr ""
 "Activitats del Drakbackup a través de cinta:\n"
 "\n"
 
-#: standalone/drakbackup:1151
+#: standalone/drakbackup:1161
 #, c-format
 msgid "Error sending mail. Your report mail was not sent."
 msgstr ""
@@ -17718,17 +18428,17 @@ msgstr ""
 "enviat."
 
 #
-#: standalone/drakbackup:1152
+#: standalone/drakbackup:1162
 #, c-format
 msgid " Error while sending mail. \n"
 msgstr " S'ha produït un error en enviar el correu electrònic. \n"
 
-#: standalone/drakbackup:1180
+#: standalone/drakbackup:1192
 #, c-format
 msgid "Can't create catalog!"
 msgstr "No s'ha pogut crear el catàleg!"
 
-#: standalone/drakbackup:1393
+#: standalone/drakbackup:1414
 #, c-format
 msgid ""
 "\n"
@@ -17737,7 +18447,7 @@ msgstr ""
 "\n"
 "Si us plau, marqueu totes les opcions que us calguin.\n"
 
-#: standalone/drakbackup:1394
+#: standalone/drakbackup:1415
 #, c-format
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
@@ -17745,37 +18455,37 @@ msgstr ""
 "Aquestes opcions poden fer còpia de seguretat i restaurar tots els fitxers "
 "del directori /etc.\n"
 
-#: standalone/drakbackup:1395
+#: standalone/drakbackup:1416
 #, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr "Fes una còpia de seguretat dels fitxers del sistema (directori /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 ""
 "Utilitza les còpies de seguretat incrementals/diferencials (no reemplacis "
 "les còpies antigues)"
 
-#: 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 "Utilitza les còpies de seguretat incrementals"
 
-#: 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 "Utilitza còpia de seguretat diferencials"
 
-#: standalone/drakbackup:1400
+#: standalone/drakbackup:1421
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr "No incloguis fitxers crítics (passwd, group, fstab)"
 
-#: standalone/drakbackup:1401
+#: standalone/drakbackup:1422
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
@@ -17785,191 +18495,191 @@ msgstr ""
 " del directori /etc."
 
 #
-#: standalone/drakbackup:1432
+#: standalone/drakbackup:1453
 #, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr ""
 "Si us plau, escolliu tots els usuaris que voleu incloure en la còpia de "
 "seguretat."
 
-#: standalone/drakbackup:1459
+#: standalone/drakbackup:1480
 #, c-format
 msgid "Do not include the browser cache"
 msgstr "No incloguis la memòria cau del navegador"
 
-#: standalone/drakbackup:1513
+#: standalone/drakbackup:1534
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr "Seleccioneu els fitxers o directoris i feu clic a 'D'acord'"
 
 #
-#: standalone/drakbackup:1514 standalone/drakfont:656
+#: standalone/drakbackup:1535 standalone/drakfont:660
 #, c-format
 msgid "Remove Selected"
 msgstr "Elimina la selecció"
 
 #
-#: standalone/drakbackup:1577
+#: standalone/drakbackup:1598
 #, c-format
 msgid "Users"
 msgstr "Usuaris"
 
-#: standalone/drakbackup:1597
+#: standalone/drakbackup:1618
 #, c-format
 msgid "Use network connection to backup"
 msgstr "Empra la connexió de xarxa per fer la còpia de seguretat"
 
-#: standalone/drakbackup:1599
+#: standalone/drakbackup:1620
 #, c-format
 msgid "Net Method:"
 msgstr "Mètode de xarxa:"
 
-#: standalone/drakbackup:1603
+#: standalone/drakbackup:1624
 #, c-format
 msgid "Use Expect for SSH"
 msgstr "Usa Expect en l'SSH"
 
-#: standalone/drakbackup:1604
+#: standalone/drakbackup:1625
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr "Crea/Transfereix la còpia de seguretat de les claus per a SSH"
 
-#: standalone/drakbackup:1606
+#: standalone/drakbackup:1627
 #, c-format
 msgid "Transfer Now"
 msgstr "Transfereix-ho ara"
 
-#: standalone/drakbackup:1608
+#: standalone/drakbackup:1629
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr "Ja hi ha les claus d'un altre programa (diferent del Drakbackup)"
 
-#: standalone/drakbackup:1611
+#: standalone/drakbackup:1632
 #, c-format
 msgid "Host name or IP."
 msgstr "Nom de l'ordinador o IP"
 
-#: standalone/drakbackup:1616
+#: standalone/drakbackup:1637
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
 msgstr ""
 "Directori (o mòdul) d'aquest ordinador on voleu desar la còpia de seguretat."
 
-#: standalone/drakbackup:1621
-#, c-format
-msgid "Login name"
-msgstr "Nom d'accés"
-
 #
-#: standalone/drakbackup:1628
+#: standalone/drakbackup:1649
 #, c-format
 msgid "Remember this password"
 msgstr "Recorda aquesta contrasenya"
 
-#: standalone/drakbackup:1644
+#: standalone/drakbackup:1665
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr "Cal introduir el nom de l'ordinador, el nom d'usuari i la contrasenya!"
 
-#: standalone/drakbackup:1742
+#: standalone/drakbackup:1756
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr "Utilitzar CD/DVDROM per fer la còpia de seguretat"
 
 #
-#: standalone/drakbackup:1745
+#: standalone/drakbackup:1759
 #, c-format
 msgid "Choose your CD/DVD device"
 msgstr "Escolliu el vostre dispositiu CD/DVD"
 
 #
-#: standalone/drakbackup:1750
+#: standalone/drakbackup:1764
 #, c-format
 msgid "Choose your CD/DVD media size"
 msgstr "Escolliu la mida del CD/DVD"
 
-#: standalone/drakbackup:1757
+#: standalone/drakbackup:1771
 #, c-format
 msgid "Multisession CD"
 msgstr "CD de multisessió"
 
-#: standalone/drakbackup:1759
+#: standalone/drakbackup:1773
 #, c-format
 msgid "CDRW media"
 msgstr "Suports CD-RW"
 
-#: standalone/drakbackup:1765
+#: standalone/drakbackup:1779
 #, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr "Esborra el suport RW (1a sessió)"
 
-#: standalone/drakbackup:1766
+#: standalone/drakbackup:1780
 #, c-format
 msgid " Erase Now "
 msgstr " Esborra'l ara"
 
-#: standalone/drakbackup:1772
+#: standalone/drakbackup:1786
 #, c-format
 msgid "DVD+RW media"
 msgstr "disc DVD+RW"
 
-#: standalone/drakbackup:1774
+#: standalone/drakbackup:1788
 #, c-format
 msgid "DVD-R media"
 msgstr "disc DVD-R"
 
-#: standalone/drakbackup:1776
+#: standalone/drakbackup:1790
 #, c-format
 msgid "DVDRAM device"
 msgstr "Dispositiu DVDRAM"
 
-#: standalone/drakbackup:1807
+#: standalone/drakbackup:1821
 #, c-format
 msgid "No CD device defined!"
 msgstr "No s'ha definit cap dispositiu de CD!"
 
 #
-#: standalone/drakbackup:1854
+#: standalone/drakbackup:1863
 #, c-format
 msgid "Use tape to backup"
 msgstr "Utilitza una cinta per fer la còpia de seguretat"
 
-#: standalone/drakbackup:1857
+#: standalone/drakbackup:1866
 #, c-format
 msgid "Device name to use for backup"
 msgstr "Nom del dispositiu a utilitzar per fer la còpia"
 
+#: standalone/drakbackup:1872
+#, c-format
+msgid "Backup directly to tape"
+msgstr ""
+
 #
-#: standalone/drakbackup:1863
+#: standalone/drakbackup:1878
 #, c-format
 msgid "Don't rewind tape after backup"
 msgstr "No rebobinis la cinta després de la còpia de seguretat"
 
 #
-#: standalone/drakbackup:1869
+#: standalone/drakbackup:1884
 #, c-format
 msgid "Erase tape before backup"
 msgstr "Esborra la cinta abans de fer la còpia de seguretat"
 
 #
-#: standalone/drakbackup:1875
+#: standalone/drakbackup:1890
 #, c-format
 msgid "Eject tape after the backup"
 msgstr "Expulsa la cinta després de fer la còpia de seguretat"
 
 #
-#: standalone/drakbackup:1942
+#: standalone/drakbackup:1962
 #, c-format
 msgid "Enter the directory to save to:"
 msgstr "Introduïu el directori on desar::"
 
 #
-#: standalone/drakbackup:1946
+#: standalone/drakbackup:1966
 #, c-format
 msgid "Directory to save to"
 msgstr "Directori al qual desar"
 
-#: standalone/drakbackup:1951
+#: standalone/drakbackup:1971
 #, c-format
 msgid ""
 "Maximum size\n"
@@ -17978,223 +18688,223 @@ msgstr ""
 "Mida màxima\n"
 " permesa per a 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 "Disc Dur / 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 "diària"
 
-#: standalone/drakbackup:2038 standalone/drakbackup:2043
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2058
+#: standalone/drakbackup:2063
 #, c-format
 msgid "weekly"
 msgstr "setmanal"
 
-#: standalone/drakbackup:2039 standalone/drakbackup:2044
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2059
+#: standalone/drakbackup:2064
 #, c-format
 msgid "monthly"
 msgstr "mensual"
 
-#: standalone/drakbackup:2040 standalone/drakbackup:2045
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2060
+#: standalone/drakbackup:2065
 #, c-format
 msgid "custom"
 msgstr "a mida"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "January"
 msgstr "Gener"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "February"
 msgstr "Febrer"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "March"
 msgstr "Març"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "April"
 msgstr "Abril"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "May"
 msgstr "Maig"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "June"
 msgstr "Juny"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "July"
 msgstr "Juliol"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "August"
 msgstr "Agost"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "September"
 msgstr "Setembre"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "October"
 msgstr "Octubre"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "November"
 msgstr "Novembre"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "December"
 msgstr "Desembre"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Sunday"
 msgstr "Diumenge"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Monday"
 msgstr "Dilluns"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Tuesday"
 msgstr "Dimarts"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Thursday"
 msgstr "Dijous"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Friday"
 msgstr "Divendres"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Saturday"
 msgstr "Dissabte"
 
 #
-#: standalone/drakbackup:2094
+#: standalone/drakbackup:2107
 #, c-format
 msgid "Use daemon"
 msgstr "Utilitza dimoni"
 
 #
-#: standalone/drakbackup:2099
+#: standalone/drakbackup:2112
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr "Si us plau, escolliu l'interval de temps entre cada còpia de seguretat"
 
-#: standalone/drakbackup:2105
+#: standalone/drakbackup:2118
 #, c-format
 msgid "Custom setup/crontab entry:"
 msgstr ""
 
-#: standalone/drakbackup:2110
+#: standalone/drakbackup:2123
 #, c-format
 msgid "Minute"
 msgstr "Minut"
 
-#: standalone/drakbackup:2114
+#: standalone/drakbackup:2127
 #, c-format
 msgid "Hour"
 msgstr "Hora"
 
-#: standalone/drakbackup:2118
+#: standalone/drakbackup:2131
 #, c-format
 msgid "Day"
 msgstr "Dia"
 
-#: standalone/drakbackup:2122
+#: standalone/drakbackup:2135
 #, c-format
 msgid "Month"
 msgstr "Mes"
 
-#: standalone/drakbackup:2126
+#: standalone/drakbackup:2139
 #, c-format
 msgid "Weekday"
 msgstr "Dia de la setmana"
 
 #
-#: standalone/drakbackup:2132
+#: standalone/drakbackup:2145
 #, c-format
 msgid "Please choose the media for backup."
 msgstr "Si us plau, trieu el suport per a la còpia."
 
-#: standalone/drakbackup:2139
+#: standalone/drakbackup:2152
 #, c-format
 msgid "Please be sure that the cron daemon is included in your services."
 msgstr ""
 "Si us plau assegureu-vos que el dimoni cron està inclòs en els serveis."
 
-#: standalone/drakbackup:2140
+#: standalone/drakbackup:2153
 #, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
 msgstr ""
 "Noteu que ara mateix tots els suports de xarxa també fan servir el disc dur."
 
 #
-#: standalone/drakbackup:2190
+#: standalone/drakbackup:2201
 #, c-format
 msgid "Please choose the compression type"
 msgstr "Si us plau, seleccioneu el tipus de compresió"
 
-#: standalone/drakbackup:2194
+#: standalone/drakbackup:2205
 #, c-format
 msgid "Use .backupignore files"
 msgstr "Usa fitxers .backupignore"
 
-#: standalone/drakbackup:2196
+#: standalone/drakbackup:2207
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr "Envia un informe per correu electrònic després de cada còpia a:"
 
-#: standalone/drakbackup:2202
+#: standalone/drakbackup:2213
 #, c-format
 msgid "SMTP server for mail:"
 msgstr "Servidor SMTP pel correu:"
 
-#: standalone/drakbackup:2207
+#: standalone/drakbackup:2218
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr ""
@@ -18202,102 +18912,102 @@ msgstr ""
 "en un altre suport."
 
 #
-#: standalone/drakbackup:2247
+#: standalone/drakbackup:2258
 #, c-format
 msgid "What"
 msgstr "Què"
 
 #
-#: standalone/drakbackup:2252
+#: standalone/drakbackup:2263
 #, c-format
 msgid "Where"
 msgstr "On"
 
 #
-#: standalone/drakbackup:2257
+#: standalone/drakbackup:2268
 #, c-format
 msgid "When"
 msgstr "Quan"
 
 #
-#: standalone/drakbackup:2262
+#: standalone/drakbackup:2273
 #, c-format
 msgid "More Options"
 msgstr "Més opcions"
 
 #
-#: standalone/drakbackup:2275
+#: standalone/drakbackup:2286
 #, c-format
 msgid "Backup destination not configured..."
 msgstr "El destí de la còpia de seguretat no ha estat configurat..."
 
 #
-#: standalone/drakbackup:2293 standalone/drakbackup:4208
+#: standalone/drakbackup:2306 standalone/drakbackup:4229
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr "Configuració del Drakbackup"
 
 #
-#: standalone/drakbackup:2309
+#: standalone/drakbackup:2322
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr "Si us plau, escolliu on voleu fer la còpia de seguretat"
 
-#: standalone/drakbackup:2311
+#: standalone/drakbackup:2325
 #, c-format
 msgid "Hard Drive used to prepare backups for all media"
 msgstr ""
 
 #
-#: standalone/drakbackup:2319
+#: standalone/drakbackup:2325
 #, c-format
 msgid "Across Network"
 msgstr "a la xarxa"
 
-#: 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 un dispositiu de cinta"
 
-#: standalone/drakbackup:2374
+#: standalone/drakbackup:2371
 #, c-format
 msgid "Backup Users"
 msgstr "Còpia de seguretat dels usuaris"
 
 #
-#: standalone/drakbackup:2375
+#: standalone/drakbackup:2372
 #, c-format
 msgid " (Default is all users)"
 msgstr " (El valor per defecte és tots els usuaris)"
 
 #
-#: standalone/drakbackup:2387
+#: standalone/drakbackup:2384
 #, c-format
 msgid "Please choose what you want to backup"
 msgstr "Si us plau, escolliu de què voleu fer la còpia de seguretat"
 
 #
-#: standalone/drakbackup:2388
+#: standalone/drakbackup:2385
 #, c-format
 msgid "Backup System"
 msgstr "Còpia de seguretat del sistema"
 
-#: standalone/drakbackup:2390
+#: standalone/drakbackup:2387
 #, c-format
 msgid "Select user manually"
 msgstr "Seleccioneu els usuaris manualment"
 
-#: standalone/drakbackup:2419
+#: standalone/drakbackup:2416
 #, c-format
 msgid "Please select data to backup..."
 msgstr "Seleccioneu les dades de les quals voleu fer la còpia..."
 
-#: standalone/drakbackup:2491
+#: standalone/drakbackup:2488
 #, c-format
 msgid ""
 "\n"
@@ -18306,7 +19016,7 @@ msgstr ""
 "\n"
 "Fonts de la còpia: \n"
 
-#: standalone/drakbackup:2492
+#: standalone/drakbackup:2489
 #, c-format
 msgid ""
 "\n"
@@ -18315,7 +19025,7 @@ msgstr ""
 "\n"
 "- Fitxers de sistema:\n"
 
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2491
 #, c-format
 msgid ""
 "\n"
@@ -18324,7 +19034,7 @@ msgstr ""
 "\n"
 "- Fitxers d'usuari:\n"
 
-#: standalone/drakbackup:2496
+#: standalone/drakbackup:2493
 #, c-format
 msgid ""
 "\n"
@@ -18333,7 +19043,7 @@ msgstr ""
 "\n"
 "- Altres fitxers:\n"
 
-#: standalone/drakbackup:2498
+#: standalone/drakbackup:2495
 #, c-format
 msgid ""
 "\n"
@@ -18342,12 +19052,12 @@ msgstr ""
 "\n"
 "- Desa-ho en el disc dur en el camí: %s\n"
 
-#: standalone/drakbackup:2499
+#: standalone/drakbackup:2496
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr "\tLimita l'ús de disc a %s MB\n"
 
-#: standalone/drakbackup:2502
+#: standalone/drakbackup:2499
 #, c-format
 msgid ""
 "\n"
@@ -18356,17 +19066,7 @@ msgstr ""
 "\n"
 "- Suprimeix el arxius tar del disc dur en acabar.\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"
@@ -18375,22 +19075,22 @@ msgstr ""
 "\n"
 "- Crema a un 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 dispositiu: %s"
 
-#: standalone/drakbackup:2511
+#: standalone/drakbackup:2507
 #, c-format
 msgid " (multi-session)"
 msgstr " (multisessió)"
 
-#: standalone/drakbackup:2512
+#: standalone/drakbackup:2508
 #, c-format
 msgid ""
 "\n"
@@ -18399,12 +19099,17 @@ msgstr ""
 "\n"
 "- Desa-ho a una cinta en el dispositiu: %s"
 
-#: standalone/drakbackup:2513
+#: standalone/drakbackup:2509
 #, c-format
 msgid "\t\tErase=%s"
 msgstr "\t\tEsborra=%s"
 
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2511
+#, c-format
+msgid "\tBackup directly to Tape\n"
+msgstr ""
+
+#: standalone/drakbackup:2513
 #, c-format
 msgid ""
 "\n"
@@ -18413,7 +19118,7 @@ msgstr ""
 "\n"
 "- Desa-ho a través de %s en l'ordinador %s\n"
 
-#: standalone/drakbackup:2517
+#: standalone/drakbackup:2514
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -18423,7 +19128,7 @@ msgstr ""
 "\t\t en el camí: %s \n"
 
 #
-#: standalone/drakbackup:2518
+#: standalone/drakbackup:2515
 #, c-format
 msgid ""
 "\n"
@@ -18432,43 +19137,43 @@ msgstr ""
 "\n"
 "- Opcions:\n"
 
-#: standalone/drakbackup:2519
+#: standalone/drakbackup:2516
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr "\tNo incloguis els fitxers de sistema\n"
 
-#: standalone/drakbackup:2521
+#: standalone/drakbackup:2518
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
 msgstr "\tLes còpies de seguretat utilitzen tar i bzip2\n"
 
-#: standalone/drakbackup:2522
+#: standalone/drakbackup:2519
 #, c-format
 msgid "\tBackups use tar and gzip\n"
 msgstr "\tLes còpies de seguretat utilitzen tar i gzip\n"
 
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2520
 #, c-format
 msgid "\tBackups use tar only\n"
 msgstr "\tLes còpies de seguretat utilitzen només tar\n"
 
 #
-#: standalone/drakbackup:2525
+#: standalone/drakbackup:2522
 #, c-format
 msgid "\tUse .backupignore files\n"
 msgstr "\tUsa els fitxers .backupignore\n"
 
-#: standalone/drakbackup:2526
+#: standalone/drakbackup:2523
 #, c-format
 msgid "\tSend mail to %s\n"
 msgstr "\tEnvia correu a %s\n"
 
-#: standalone/drakbackup:2527
+#: standalone/drakbackup:2524
 #, c-format
 msgid "\tUsing SMTP server %s\n"
 msgstr "\tS'està usant el servidor SMTP %s\n"
 
-#: standalone/drakbackup:2529
+#: standalone/drakbackup:2526
 #, c-format
 msgid ""
 "\n"
@@ -18477,47 +19182,47 @@ msgstr ""
 "\n"
 "- Dimoni, %s via:\n"
 
-#: standalone/drakbackup:2530
+#: standalone/drakbackup:2527
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr "\t-Disc dur.\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-Cinta \n"
 
-#: standalone/drakbackup:2533
+#: standalone/drakbackup:2530
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr "\t-Xarxa per FTP.\n"
 
-#: standalone/drakbackup:2534
+#: standalone/drakbackup:2531
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr "\t-Xarxa per SSH.\n"
 
-#: standalone/drakbackup:2535
+#: standalone/drakbackup:2532
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr "\t-Xarxa per rsync.\n"
 
-#: standalone/drakbackup:2536
+#: standalone/drakbackup:2533
 #, c-format
 msgid "\t-Network by webdav.\n"
 msgstr "\t-Xarxa per webdav.\n"
 
-#: standalone/drakbackup:2538
+#: standalone/drakbackup:2535
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
 msgstr "Cap configuració, si us plau feu clic a 'Auxiliar' o a 'Avançat'.\n"
 
-#: standalone/drakbackup:2543
+#: standalone/drakbackup:2540
 #, c-format
 msgid ""
 "List of data to restore:\n"
@@ -18526,27 +19231,27 @@ msgstr ""
 "Llista de dades per restaurar:\n"
 "\n"
 
-#: standalone/drakbackup:2545
+#: standalone/drakbackup:2542
 #, c-format
 msgid "- Restore System Files.\n"
 msgstr "- Restaura fitxers de sistema.\n"
 
-#: standalone/drakbackup:2547 standalone/drakbackup:2557
+#: standalone/drakbackup:2544 standalone/drakbackup:2554
 #, c-format
 msgid "   - from date: %s %s\n"
 msgstr "   - de la data: %s %s\n"
 
-#: standalone/drakbackup:2550
+#: standalone/drakbackup:2547
 #, c-format
 msgid "- Restore User Files: \n"
 msgstr "- Restaura fitxers d'usuari: \n"
 
-#: standalone/drakbackup:2555
+#: standalone/drakbackup:2552
 #, c-format
 msgid "- Restore Other Files: \n"
 msgstr "- Restaura d'altres fitxers: \n"
 
-#: standalone/drakbackup:2736
+#: standalone/drakbackup:2731
 #, c-format
 msgid ""
 "List of data corrupted:\n"
@@ -18556,38 +19261,38 @@ msgstr ""
 "\n"
 
 #
-#: standalone/drakbackup:2738
+#: standalone/drakbackup:2733
 #, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr "Si us plau, desseleccioneu-ho o esborreu-ho la pròxima vegada."
 
-#: standalone/drakbackup:2748
+#: standalone/drakbackup:2743
 #, c-format
 msgid "Backup files are corrupted"
 msgstr "Els fitxers de la còpia de seguretat estan corromputs"
 
-#: standalone/drakbackup:2769
+#: standalone/drakbackup:2764
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr "          Totes les dades seleccionades han estat          "
 
-#: standalone/drakbackup:2770
+#: standalone/drakbackup:2765
 #, c-format
-msgid "          Successfuly Restored on %s       "
+msgid "          Successfully Restored on %s       "
 msgstr "          restaurades amb èxit en %s       "
 
 #
-#: standalone/drakbackup:2889
+#: standalone/drakbackup:2885
 #, c-format
 msgid "         Restore Configuration       "
 msgstr "         Configuració de restauració       "
 
-#: standalone/drakbackup:2917
+#: standalone/drakbackup:2913
 #, c-format
 msgid "OK to restore the other files."
 msgstr "'D'acord' per restaurar els altres fitxers."
 
-#: standalone/drakbackup:2933
+#: standalone/drakbackup:2929
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr ""
@@ -18595,109 +19300,109 @@ msgstr ""
 "usuari)"
 
 #
-#: standalone/drakbackup:3000
+#: standalone/drakbackup:2994
 #, c-format
 msgid "Please choose the date to restore:"
 msgstr "Si us plau, seleccioneu la data a restaurar:"
 
 #
-#: standalone/drakbackup:3037
+#: standalone/drakbackup:3031
 #, c-format
 msgid "Restore from Hard Disk."
 msgstr "Restaura des del disc dur."
 
-#: standalone/drakbackup:3039
+#: standalone/drakbackup:3033
 #, c-format
 msgid "Enter the directory where backups are stored"
 msgstr "Entreu el directori on es guarden les còpies de seguretat"
 
-#: standalone/drakbackup:3043
+#: standalone/drakbackup:3037
 #, c-format
 msgid "Directory with backups"
 msgstr "Directori amb còpies de seguretat"
 
 #
-#: standalone/drakbackup:3097
+#: standalone/drakbackup:3091
 #, c-format
 msgid "Select another media to restore from"
 msgstr "Seleccioneu un altre suport des del qual restaurar"
 
 #
-#: standalone/drakbackup:3099
+#: standalone/drakbackup:3093
 #, c-format
 msgid "Other Media"
 msgstr "Altres suports"
 
 #
-#: standalone/drakbackup:3104
+#: standalone/drakbackup:3098
 #, c-format
 msgid "Restore system"
 msgstr "Restaura el sistema"
 
 #
-#: standalone/drakbackup:3105
+#: standalone/drakbackup:3099
 #, c-format
 msgid "Restore Users"
 msgstr "Restaura els usuaris"
 
-#: standalone/drakbackup:3106
+#: standalone/drakbackup:3100
 #, c-format
 msgid "Restore Other"
 msgstr "Restaura altres"
 
-#: standalone/drakbackup:3108
+#: standalone/drakbackup:3102
 #, c-format
 msgid "Select path to restore (instead of /)"
 msgstr "seleccioneu el camí al qual restaurar (en comptes de /)"
 
 #
-#: standalone/drakbackup:3112 standalone/drakbackup:3394
+#: standalone/drakbackup:3106 standalone/drakbackup:3388
 #, c-format
 msgid "Path To Restore To"
 msgstr "Ruta a la qual restaurar"
 
-#: standalone/drakbackup:3115
+#: standalone/drakbackup:3109
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr ""
 "Fes una nova còpia de seguretat abans de restaurar (només per les còpies "
 "incrementals.)"
 
-#: standalone/drakbackup:3117
+#: standalone/drakbackup:3111
 #, c-format
 msgid "Remove user directories before restore."
 msgstr "Esborra els directoris d'usuari abans de restaurar."
 
-#: standalone/drakbackup:3201
+#: standalone/drakbackup:3196
 #, c-format
 msgid "Filename text substring to search for (empty string matches all):"
 msgstr ""
 
-#: standalone/drakbackup:3204
+#: standalone/drakbackup:3199
 #, c-format
 msgid "Search Backups"
 msgstr ""
 
 #
-#: standalone/drakbackup:3223
+#: standalone/drakbackup:3217
 #, c-format
 msgid "No matches found..."
 msgstr "No s'ha trobat cap coincidència..."
 
 #
-#: standalone/drakbackup:3227
+#: standalone/drakbackup:3221
 #, c-format
 msgid "Restore Selected"
 msgstr "Restaura els seleccionats"
 
-#: standalone/drakbackup:3362
+#: standalone/drakbackup:3356
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
 "Ctrl-Click files to select multiple files."
 msgstr ""
 
-#: standalone/drakbackup:3368
+#: standalone/drakbackup:3362
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -18707,7 +19412,7 @@ msgstr ""
 "del catàleg seleccionada"
 
 #
-#: standalone/drakbackup:3377
+#: standalone/drakbackup:3371
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -18716,18 +19421,18 @@ msgstr ""
 "Restaura els fitxers\n"
 "seleccionats"
 
-#: standalone/drakbackup:3454
+#: standalone/drakbackup:3448
 #, c-format
 msgid "Backup files not found at %s."
 msgstr "No s'han trobat els fitxers de còpia de seguretat a %s"
 
 #
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid "Restore From CD"
 msgstr "Restaura des de CD"
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
@@ -18736,18 +19441,18 @@ msgstr ""
 "Inseriu el CD amb l'etiqueta de volum %s\n"
 " a la unitat de CD sota el punt de muntatge /mnt/cdrom"
 
-#: standalone/drakbackup:3469
+#: standalone/drakbackup:3463
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr "L'etiqueta del CD no és correcta. L'etiqueta d'aquest disc és %s."
 
 #
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid "Restore From Tape"
 msgstr "Restaura des de cinta"
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
@@ -18756,239 +19461,239 @@ msgstr ""
 "Inseriu la cinta amb l'etiqueta de volum %s\n"
 " al dispositiu de cinta %s"
 
-#: standalone/drakbackup:3481
+#: standalone/drakbackup:3475
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr ""
 "L'etiqueta de la cinta no és correcta. L'etiqueta d'aquesta cinta és %s."
 
 #
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore Via Network"
 msgstr "Restaura a través de la xarxa"
 
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr "Restaura mitjançant el protocol de xarxa: %s"
 
-#: standalone/drakbackup:3493
+#: standalone/drakbackup:3487
 #, c-format
 msgid "Host Name"
 msgstr "Nom de l'ordinador"
 
-#: standalone/drakbackup:3494
+#: standalone/drakbackup:3488
 #, c-format
 msgid "Host Path or Module"
 msgstr "Camí de l'ordinador central o mòdul"
 
-#: standalone/drakbackup:3501
+#: standalone/drakbackup:3495
 #, c-format
 msgid "Password required"
 msgstr "La contrasenya és necessària"
 
-#: standalone/drakbackup:3507
+#: standalone/drakbackup:3501
 #, c-format
 msgid "Username required"
 msgstr "El nom d'usuari és necessari"
 
-#: standalone/drakbackup:3510
+#: standalone/drakbackup:3504
 #, c-format
 msgid "Hostname required"
 msgstr "El nom de l'ordinador és necessari"
 
-#: standalone/drakbackup:3515
+#: standalone/drakbackup:3509
 #, c-format
 msgid "Path or Module required"
 msgstr "El camí o el mòdul són necessaris"
 
-#: standalone/drakbackup:3528
+#: standalone/drakbackup:3522
 #, c-format
 msgid "Files Restored..."
 msgstr "S'han restaurat els fitxers..."
 
-#: standalone/drakbackup:3531
+#: standalone/drakbackup:3525
 #, c-format
 msgid "Restore Failed..."
 msgstr "La restauració ha fallat..."
 
-#: standalone/drakbackup:3549
+#: standalone/drakbackup:3543
 #, c-format
 msgid "%s not retrieved..."
 msgstr ""
 
 #
-#: standalone/drakbackup:3748 standalone/drakbackup:3817
+#: standalone/drakbackup:3765 standalone/drakbackup:3834
 #, c-format
 msgid "Search for files to restore"
 msgstr "Busca fitxers a restaurar"
 
-#: standalone/drakbackup:3752
+#: standalone/drakbackup:3769
 #, c-format
 msgid "Restore all backups"
 msgstr "Restaura totes les còpies de seguretat"
 
 #
-#: standalone/drakbackup:3760
+#: standalone/drakbackup:3777
 #, c-format
 msgid "Custom Restore"
 msgstr "Restauració personalitzada"
 
 #
-#: standalone/drakbackup:3764 standalone/drakbackup:3813
+#: standalone/drakbackup:3781 standalone/drakbackup:3830
 #, c-format
 msgid "Restore From Catalog"
 msgstr "Restaura des de catàleg"
 
-#: standalone/drakbackup:3785
+#: standalone/drakbackup:3802
 #, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr "No s'han pogut trobar les dades per restaurar...\n"
 
-#: standalone/drakbackup:3786
+#: standalone/drakbackup:3803
 #, c-format
 msgid "Verify that %s is the correct path"
 msgstr "Comproveu que %s és la ruta correcte"
 
-#: standalone/drakbackup:3787
+#: standalone/drakbackup:3804
 #, c-format
 msgid " and the CD is in the drive"
 msgstr " i el CD és a la unitat"
 
-#: standalone/drakbackup:3789
+#: standalone/drakbackup:3806
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr ""
 
-#: standalone/drakbackup:3805
+#: standalone/drakbackup:3822
 #, c-format
 msgid "CD in place - continue."
 msgstr "El CD és a lloc - continua."
 
-#: standalone/drakbackup:3810
+#: standalone/drakbackup:3827
 #, c-format
 msgid "Browse to new restore repository."
 msgstr "Navega per trobar un nou dipòsit de restauració"
 
 #
-#: standalone/drakbackup:3811
+#: standalone/drakbackup:3828
 #, c-format
 msgid "Directory To Restore From"
 msgstr "Directori del qual restaurar"
 
 #
-#: standalone/drakbackup:3847
+#: standalone/drakbackup:3864
 #, c-format
 msgid "Restore Progress"
 msgstr "Progrés de la restauració"
 
 #
-#: standalone/drakbackup:3898 standalone/drakbackup:3971
-#: standalone/logdrake:174
+#: standalone/drakbackup:3919 standalone/drakbackup:3992
+#: standalone/logdrake:173
 #, c-format
 msgid "Save"
 msgstr "Desa"
 
 #
-#: standalone/drakbackup:3954
+#: standalone/drakbackup:3975
 #, c-format
 msgid "Build Backup"
 msgstr "Construeix la còpia de seguretat"
 
 #
-#: standalone/drakbackup:3987 standalone/drakbackup:4307
+#: standalone/drakbackup:4008 standalone/drakbackup:4328
 #, c-format
 msgid "Restore"
 msgstr "Restaura"
 
-#: standalone/drakbackup:4075
+#: standalone/drakbackup:4096
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "Cal instal·lar els paquets següents:\n"
 
-#: standalone/drakbackup:4102
+#: standalone/drakbackup:4123
 #, c-format
 msgid "Please select data to restore..."
 msgstr "Si us plau, seleccioneu les dades per restaurar..."
 
 #
-#: standalone/drakbackup:4142
+#: standalone/drakbackup:4163
 #, c-format
 msgid "Backup system files"
 msgstr "Còpia de seguretat dels fitxers de sistema"
 
 #
-#: standalone/drakbackup:4145
+#: standalone/drakbackup:4166
 #, c-format
 msgid "Backup user files"
 msgstr "Còpia de seguretat dels fitxers d'usuari"
 
 #
-#: standalone/drakbackup:4148
+#: standalone/drakbackup:4169
 #, c-format
 msgid "Backup other files"
 msgstr "Còpia de seguretat d'altres fitxers"
 
-#: standalone/drakbackup:4151 standalone/drakbackup:4185
+#: standalone/drakbackup:4172 standalone/drakbackup:4206
 #, c-format
 msgid "Total Progress"
 msgstr "Progrés total"
 
 #
-#: standalone/drakbackup:4177
+#: standalone/drakbackup:4198
 #, c-format
 msgid "Sending files by FTP"
 msgstr "S'estan enviant els fitxers per FTP"
 
 #
-#: standalone/drakbackup:4180
+#: standalone/drakbackup:4201
 #, c-format
 msgid "Sending files..."
 msgstr "S'estan enviant els fitxers..."
 
 #
-#: standalone/drakbackup:4250
+#: standalone/drakbackup:4271
 #, c-format
 msgid "Backup Now from configuration file"
 msgstr "Fes la còpia de seguretat des del fitxer de configuració"
 
 #
-#: standalone/drakbackup:4255
+#: standalone/drakbackup:4276
 #, c-format
 msgid "View Backup Configuration."
 msgstr "Visualitza la configuració de la còpia de seguretat"
 
 #
-#: standalone/drakbackup:4281
+#: standalone/drakbackup:4302
 #, c-format
 msgid "Wizard Configuration"
 msgstr "Auxiliar de configuració"
 
 #
-#: standalone/drakbackup:4286
+#: standalone/drakbackup:4307
 #, c-format
 msgid "Advanced Configuration"
 msgstr "Configuració avançada"
 
 #
-#: standalone/drakbackup:4291
+#: standalone/drakbackup:4312
 #, c-format
 msgid "View Configuration"
 msgstr "Consulta la configuració"
 
-#: standalone/drakbackup:4295
+#: standalone/drakbackup:4316
 #, c-format
 msgid "View Last Log"
 msgstr ""
 
 #
-#: standalone/drakbackup:4300
+#: standalone/drakbackup:4321
 #, c-format
 msgid "Backup Now"
 msgstr "Fes la còpia de seguretat"
 
-#: standalone/drakbackup:4304
+#: standalone/drakbackup:4325
 #, c-format
 msgid ""
 "No configuration file found \n"
@@ -18997,57 +19702,57 @@ msgstr ""
 "No s'ha trobat el fitxer de configuració \n"
 "si us plau, feu clic a 'Auxiliar' o a 'Avançat'."
 
-#: 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ó del tema gràfic d'arrencada"
 
-#: standalone/drakboot:58
+#: standalone/drakboot:64
 #, c-format
 msgid "System mode"
 msgstr "Mode de 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 "/_Fitxer"
 
-#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/logdrake:77
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/logdrake:76
 #, c-format
 msgid "/File/_Quit"
 msgstr "/Fitxer/_Surt"
 
-#: 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 "Instal·la els temes"
 
-#: standalone/drakboot:140
+#: standalone/drakboot:149
 #, c-format
 msgid "Create new theme"
 msgstr "Crea un nou tema"
 
-#: standalone/drakboot:152
+#: standalone/drakboot:161
 #, c-format
 msgid "Use graphical boot"
 msgstr "Usa l'arrencada gràfica"
 
-#: standalone/drakboot:157
+#: standalone/drakboot:166
 #, c-format
 msgid ""
 "Your system bootloader is not in framebuffer mode. To activate graphical "
@@ -19057,12 +19762,17 @@ msgstr ""
 "Per activar l'arrencada gràfica, escolliu un mode de vídeo gràfic a l'eina "
 "de configuració del carregador d'arrencada."
 
-#: standalone/drakboot:164
+#: standalone/drakboot:167
+#, c-format
+msgid "Do you want to configure it now?"
+msgstr "Voleu configurar-ho ara?"
+
+#: standalone/drakboot:177
 #, c-format
 msgid "Theme"
 msgstr "Tema"
 
-#: standalone/drakboot:167
+#: standalone/drakboot:180
 #, c-format
 msgid ""
 "Display theme\n"
@@ -19071,154 +19781,135 @@ msgstr ""
 "Mostra el tema\n"
 "sota la consola"
 
-#: standalone/drakboot:176
+#: standalone/drakboot:189
 #, c-format
 msgid "Launch the graphical environment when your system starts"
 msgstr "Executa la interfície gràfica en iniciar el sistema"
 
-#: standalone/drakboot:184
+#: standalone/drakboot:197
 #, c-format
 msgid "No, I don't want autologin"
 msgstr "No, no vull l'entrada automàtica"
 
-#: standalone/drakboot:185
+#: standalone/drakboot:198
 #, c-format
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "Sí, vull l'entrada automàtica amb aquest (usuari, escriptori)"
 
 #
-#: standalone/drakboot:191
+#: standalone/drakboot:201
 #, c-format
 msgid "Default user"
 msgstr "Usuari predeterminat"
 
-#: standalone/drakboot:192
+#: standalone/drakboot:202
 #, c-format
 msgid "Default desktop"
 msgstr "Escriptori predeterminat"
 
-#: standalone/drakboot:256
-#, c-format
-msgid "Installation of %s failed. The following error occured:"
-msgstr "Ha fallat la instal·lació de %s. S'ha produït l'error següent:"
-
-#: 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 ""
-"Per trametre un informe d'error de programació, feu clic al botó 'Informa'.\n"
-"S'obrirà una finestra del navegador web amb la pàgina %s\n"
-"on trobareu un formulari per omplir. La informació que es mostra més amunt "
-"s'enviarà al servidor."
 
-#: standalone/drakbug:48
+#: standalone/drakbug:41
 #, c-format
-msgid "Mandrake Bug Report Tool"
-msgstr "Eina per a la comunicació d'errors de programació (bugs) de Mandrake"
+msgid "Mandrakelinux Bug Report Tool"
+msgstr ""
+"Eina per a la comunicació d'errors de programació (bugs) de Mandrakelinux"
 
-#: standalone/drakbug:53
+#: standalone/drakbug:46
 #, c-format
-msgid "Mandrake Control Center"
-msgstr "Centre de Control Mandrake"
+msgid "Mandrakelinux Control Center"
+msgstr "Centre de Control Mandrakelinux"
 
-#: standalone/drakbug:55
+#: standalone/drakbug:48
 #, c-format
 msgid "Synchronization tool"
 msgstr "Eina de sincronització"
 
-#: 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 "Eines autònomes"
 
-#: 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 Remot"
 
-#: standalone/drakbug:62
+#: standalone/drakbug:55
 #, c-format
 msgid "Software Manager"
 msgstr "Gestor de programari"
 
-#: 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 "Eina de migració des de 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 "Auxiliars de configuració"
 
-#: standalone/drakbug:84
-#, c-format
-msgid ""
-"To submit a bug report, click the report button, which will open your "
-"default browser\n"
-"to Anthill where you will be able to upload the above information as a bug "
-"report."
-msgstr ""
-
-#: standalone/drakbug:102
+#: standalone/drakbug:83
 #, c-format
 msgid "Application:"
 msgstr "Aplicació:"
 
 #
-#: standalone/drakbug:103 standalone/drakbug:115
+#: standalone/drakbug:84 standalone/drakbug:96
 #, c-format
 msgid "Package: "
 msgstr "Paquet: "
 
-#: standalone/drakbug:104
+#: standalone/drakbug:85
 #, c-format
 msgid "Kernel:"
 msgstr "Nucli:"
 
-#: standalone/drakbug:105 standalone/drakbug:116
+#: standalone/drakbug:86 standalone/drakbug:97
 #, c-format
 msgid "Release: "
 msgstr "Llançament: "
 
-#: standalone/drakbug:110
+#: standalone/drakbug:91
 #, c-format
 msgid ""
 "Application Name\n"
@@ -19227,122 +19918,136 @@ msgstr ""
 "Nom de l'aplicació\n"
 "o ruta completa:"
 
-#: standalone/drakbug:113
+#: standalone/drakbug:94
 #, c-format
 msgid "Find Package"
 msgstr "Cerca el paquet"
 
-#: standalone/drakbug:117
+#: standalone/drakbug:98
 #, c-format
 msgid "Summary: "
 msgstr "Resum: "
 
-#: standalone/drakbug:129
-#, c-format
-msgid "YOUR TEXT HERE"
-msgstr "EL TEU TEXT AQUÍ"
-
-#: standalone/drakbug:132
+#: standalone/drakbug:104
 #, c-format
 msgid "Bug Description/System Information"
 msgstr "Descripció de l'error/Informació del sistema"
 
-#: standalone/drakbug:136
+#: standalone/drakbug:105
+#, c-format
+msgid "YOUR TEXT HERE"
+msgstr "EL TEU TEXT AQUÍ"
+
+#: standalone/drakbug:108
 #, c-format
 msgid "Submit kernel version"
 msgstr "Envia la versió del nucli"
 
-#: standalone/drakbug:137
+#: standalone/drakbug:109
 #, c-format
 msgid "Submit cpuinfo"
 msgstr "Envia cpuinfo"
 
-#: standalone/drakbug:138
+#: standalone/drakbug:110
 #, c-format
 msgid "Submit lspci"
 msgstr "Envia lspci"
 
+#: 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 ""
+"Per trametre un informe d'error de programació, feu clic al botó 'Informa'.\n"
+"S'obrirà una finestra del navegador web amb la pàgina %s\n"
+"on trobareu un formulari per omplir. La informació que es mostra més amunt "
+"s'enviarà al servidor."
+
 #
-#: standalone/drakbug:159
+#: standalone/drakbug:130
 #, c-format
 msgid "Report"
 msgstr "Informa"
 
 #
-#: standalone/drakbug:219
+#: standalone/drakbug:191
 #, c-format
 msgid "Not installed"
 msgstr "No instal·lat"
 
 #
-#: standalone/drakbug:231
+#: standalone/drakbug:203
 #, c-format
 msgid "Package not installed"
 msgstr "El paquet no està instal·lat"
 
-#: standalone/drakbug:248
+#: standalone/drakbug:220
 #, c-format
 msgid "NOT FOUND"
 msgstr "NO S'HA TROBAT"
 
-#: standalone/drakbug:259
+#: standalone/drakbug:227
 #, c-format
-msgid "connecting to %s ..."
+msgid "connecting to %s..."
 msgstr "s'està connectant a %s ..."
 
-#: standalone/drakbug:267
+#: standalone/drakbug:235
 #, c-format
 msgid "No browser available! Please install one"
 msgstr "No hi ha cap navegador disponible! Si us plau, instal·leu-ne un"
 
-#: standalone/drakbug:286
+#: standalone/drakbug:254
 #, c-format
 msgid "Please enter a package name."
 msgstr "Si us plau, introduïu un nom de paquet"
 
 #
-#: standalone/drakbug:292
+#: standalone/drakbug:260
 #, c-format
 msgid "Please enter summary text."
 msgstr "Si us plau, introduïu el resum."
 
-#: 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 definit"
 
-#: standalone/drakclock:41
+#: standalone/drakclock:42
 #, c-format
 msgid "Change Time Zone"
 msgstr "Canvia el fus horari"
 
-#: standalone/drakclock:45
+#: standalone/drakclock:46
 #, c-format
 msgid "Timezone - DrakClock"
 msgstr "Fus horari - 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 "Està el rellotge del vostre ordinador establert en GTM?"
 
-#: 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"
@@ -19351,50 +20056,55 @@ msgstr ""
 "El teu ordinador por sincronitzar el seu rellotge\n"
 " amb un servidor de temps remot usant NTP"
 
-#: standalone/drakclock:82
+#: standalone/drakclock:79
 #, c-format
 msgid "Enable Network Time Protocol"
 msgstr "Habilita el Network Time Protocol"
 
-#: 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 ""
+
+#: standalone/drakclock:147 standalone/drakclock:157
 #, c-format
 msgid "Reset"
 msgstr "Reinicialitza"
 
-#: 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 ""
 "Es necessari instal·lar el paquet ntp\n"
 " per habilitar el Network Time Protocol\n"
 "\n"
 "Vols instal·lar ntp?"
 
-#: standalone/drakconnect:81
+#: standalone/drakconnect:85
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Configuració de xarxa (%d adaptadors)"
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Gateway:"
 msgstr "Passarel·la:"
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Interface:"
 msgstr "Intefície:"
 
-#: standalone/drakconnect:96 standalone/net_monitor:106
+#: standalone/drakconnect:100 standalone/net_monitor:122
 #, c-format
 msgid "Wait please"
 msgstr "Espereu si us plau"
@@ -19404,13 +20114,9 @@ msgstr "Espereu si us plau"
 msgid "Interface"
 msgstr "Interfície"
 
-#: 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 "Estat"
@@ -19425,7 +20131,7 @@ msgstr "Nom de l'ordinador: "
 msgid "Configure hostname..."
 msgstr "Configura el nom de l'ordinador..."
 
-#: standalone/drakconnect:149 standalone/drakconnect:792
+#: standalone/drakconnect:149 standalone/drakconnect:843
 #, c-format
 msgid "LAN configuration"
 msgstr "Configuració de la LAN"
@@ -19435,8 +20141,8 @@ msgstr "Configuració de la LAN"
 msgid "Configure Local Area Network..."
 msgstr "Configura la xarxa d'à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 "Aplica"
@@ -19447,108 +20153,114 @@ msgid "Manage connections"
 msgstr "Gestiona connexions"
 
 #
-#: standalone/drakconnect:218
-#, fuzzy, c-format
+#: standalone/drakconnect:224
+#, c-format
 msgid "Device selected"
-msgstr "Elimina la selecció"
+msgstr ""
 
 #
-#: standalone/drakconnect:314
-#, fuzzy, c-format
+#: standalone/drakconnect:305
+#, c-format
 msgid "IP configuration"
-msgstr "Configuració de CUPS"
+msgstr "Configuració IP"
 
-#: standalone/drakconnect:351
+#: standalone/drakconnect:342
 #, c-format
 msgid "DNS servers"
 msgstr "Servidors DNS"
 
-#: standalone/drakconnect:359
+#: standalone/drakconnect:350
 #, c-format
 msgid "Search Domain"
 msgstr "Domini de cerca"
 
-#: 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 ""
+
+#: standalone/drakconnect:491
 #, c-format
 msgid "Flow control"
 msgstr "Control de fluxe"
 
-#: standalone/drakconnect:494
+#: standalone/drakconnect:492
 #, c-format
 msgid "Line termination"
 msgstr "Terminació de línia"
 
-#: standalone/drakconnect:505
+#: standalone/drakconnect:503
 #, c-format
 msgid "Modem timeout"
 msgstr "Temps màxim d'espera per al mòdem"
 
-#: standalone/drakconnect:509
+#: standalone/drakconnect:507
 #, c-format
 msgid "Use lock file"
 msgstr "Usa fitxer de bloqueig"
 
-#: standalone/drakconnect:511
+#: standalone/drakconnect:509
 #, c-format
 msgid "Wait for dialup tone before dialing"
 msgstr "Espera el to abans de marcar"
 
-#: standalone/drakconnect:514
+#: standalone/drakconnect:512
 #, c-format
 msgid "Busy wait"
-msgstr ""
+msgstr "Espera activa"
 
-#: standalone/drakconnect:519
+#: standalone/drakconnect:517
 #, c-format
 msgid "Modem sound"
 msgstr "So del mòdem"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
 #, c-format
 msgid "Enable"
 msgstr "Habilita"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
 #, c-format
 msgid "Disable"
 msgstr "Inhabilita"
 
-#: standalone/drakconnect:571 standalone/harddrake2:62
+#: standalone/drakconnect:569 standalone/harddrake2:45
 #, c-format
 msgid "Media class"
 msgstr "Tipus de mitjà"
 
-#: standalone/drakconnect:572 standalone/drakfloppy:141
+#: standalone/drakconnect:570 standalone/drakfloppy:136
 #, c-format
 msgid "Module name"
 msgstr "Nom del mòdul"
 
-#: standalone/drakconnect:573
+#: standalone/drakconnect:571
 #, c-format
 msgid "Mac Address"
 msgstr "Adreça 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ó 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 "
@@ -19557,20 +20269,20 @@ msgstr ""
 "No s'ha detectat cap adaptador de xarxa ethernet al sistema. Si us plau, "
 "executeu l'eina de configuració de maquinari."
 
-#: standalone/drakconnect:651
+#: standalone/drakconnect:678
 #, c-format
 msgid "Remove a network interface"
 msgstr "Esborra una interfície de xarxa"
 
-#: standalone/drakconnect:655
+#: standalone/drakconnect:682
 #, c-format
 msgid "Select the network interface to remove:"
 msgstr "Escolliu la interfície de xarxa a esborrar:"
 
-#: 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 ""
@@ -19578,53 +20290,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 "Felicitats, la interfície de xarxa \"%s\" s'ha esborrat amb èxit"
 
-#: standalone/drakconnect:698
+#: standalone/drakconnect:732
 #, c-format
-msgid "No Ip"
+msgid "No IP"
 msgstr "Sense IP"
 
-#: standalone/drakconnect:699
+#: standalone/drakconnect:733
 #, c-format
 msgid "No Mask"
 msgstr "Sense màscara"
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
 #, c-format
 msgid "up"
 msgstr "amunt"
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
 #, c-format
 msgid "down"
 msgstr "avall"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Connected"
 msgstr "Connectat"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Not connected"
 msgstr "Sense connexió"
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Disconnect..."
 msgstr "Desconnecta..."
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Connect..."
 msgstr "Connecta..."
 
-#: standalone/drakconnect:772
+#: standalone/drakconnect:808
 #, c-format
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
@@ -19634,18 +20346,18 @@ msgstr ""
 "la vostra xarxa"
 
 #
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, c-format
 msgid "Deactivate now"
 msgstr "Desactiva'l ara"
 
 #
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, c-format
 msgid "Activate now"
 msgstr "Activa'l ara"
 
-#: standalone/drakconnect:796
+#: standalone/drakconnect:847
 #, c-format
 msgid ""
 "You don't have any configured interface.\n"
@@ -19654,82 +20366,103 @@ msgstr ""
 "No teniu cap interfície configurada.\n"
 "Configureu-la primer fent clic a 'Configura'"
 
-#: standalone/drakconnect:810
+#: standalone/drakconnect:861
 #, c-format
 msgid "LAN Configuration"
 msgstr "Configuració de la 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 "Protocol d'arrencada"
 
-#: standalone/drakconnect:832
+#: standalone/drakconnect:883
 #, c-format
 msgid "Started on boot"
 msgstr "Iniciat en l'arrencada"
 
-#: 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 ""
 "Aquesta interfície encara no s'ha configurat.\n"
 "Executeu l'auxiliar \"Afegeix una interfície\" del Centre 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 teniu cap connexió a Internet configurada.\n"
-"Si us plau executeu \"Accés a internet\" al centre de control"
+"Aquesta interfície encara no s'ha configurat.\n"
+"Executeu l'auxiliar \"Afegeix una connexió\" del Centre de Control de "
+"Mandrakelinux"
 
-#: standalone/drakconnect:931
+#: standalone/drakconnect:982
 #, c-format
 msgid "Internet connection configuration"
 msgstr "Configuració de la connexió 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ó de la connexió a Internet"
 
-#: standalone/drakconnect:972
+#: standalone/drakconnect:1023
 #, c-format
 msgid "Internet access"
 msgstr "Accés a Internet"
 
-#: standalone/drakconnect:974 standalone/net_monitor:88
+#: standalone/drakconnect:1025 standalone/net_monitor:101
 #, c-format
 msgid "Connection type: "
 msgstr "Tipus de connexió: "
 
-#: standalone/drakconnect:977
+#: standalone/drakconnect:1028
 #, c-format
 msgid "Status:"
 msgstr "Estat:"
 
-#: standalone/drakedm:53
+#: standalone/drakedm:34
+#, c-format
+msgid "GDM (GNOME Display Manager)"
+msgstr ""
+
+#: standalone/drakedm:35
+#, c-format
+msgid "KDM (KDE Display Manager)"
+msgstr ""
+
+#: standalone/drakedm:36
+#, c-format
+msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgstr ""
+
+#: standalone/drakedm:37
+#, c-format
+msgid "XDM (X Display Manager)"
+msgstr ""
+
+#: standalone/drakedm:55
 #, c-format
 msgid "Choosing a display manager"
 msgstr "Elecció d'un gestor de pantalla"
 
-#: standalone/drakedm:54
+#: standalone/drakedm:56
 #, c-format
 msgid ""
 "X11 Display Manager allows you to graphically log\n"
@@ -19740,92 +20473,99 @@ msgstr ""
 "gràfica amb el sistema X Window executant-se, i permet l'execució\n"
 "simultània de diverses sessions X a la màquina local."
 
-#: 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 "S'ha fet el canvi, voleu reiniciar el servei 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 ""
+
+#: standalone/drakfloppy:41
 #, c-format
 msgid "drakfloppy"
 msgstr "drakfloppy"
 
-#: standalone/drakfloppy:83
+#: standalone/drakfloppy:78
 #, c-format
 msgid "Boot disk creation"
 msgstr "Creació del disc d'arrencada"
 
-#: 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 "Dispositiu"
 
-#: standalone/drakfloppy:93
+#: standalone/drakfloppy:88
 #, c-format
 msgid "Kernel version"
 msgstr "Versió del nucli"
 
-#: standalone/drakfloppy:108
+#: standalone/drakfloppy:103
 #, c-format
 msgid "Preferences"
 msgstr "Preferències"
 
-#: standalone/drakfloppy:122
+#: standalone/drakfloppy:117
 #, c-format
 msgid "Advanced preferences"
 msgstr "Opcions avançades"
 
-#: standalone/drakfloppy:141
+#: standalone/drakfloppy:136
 #, c-format
 msgid "Size"
 msgstr "Mida"
 
-#: standalone/drakfloppy:144
+#: standalone/drakfloppy:139
 #, c-format
 msgid "Mkinitrd optional arguments"
 msgstr "Arguments opcionals de l'mkinitrd"
 
-#: standalone/drakfloppy:146
+#: standalone/drakfloppy:141
 #, c-format
 msgid "force"
 msgstr "imposa"
 
-#: standalone/drakfloppy:147
+#: standalone/drakfloppy:142
 #, c-format
 msgid "omit raid modules"
 msgstr "omet els mòduls RAID"
 
-#: standalone/drakfloppy:148
+#: standalone/drakfloppy:143
 #, c-format
 msgid "if needed"
 msgstr "si cal"
 
-#: standalone/drakfloppy:149
+#: standalone/drakfloppy:144
 #, c-format
 msgid "omit scsi modules"
 msgstr "omet els mòduls SCSI"
 
-#: standalone/drakfloppy:152
+#: standalone/drakfloppy:147
 #, c-format
 msgid "Add a module"
 msgstr "Afegeix un mòdul"
 
-#: standalone/drakfloppy:161
+#: standalone/drakfloppy:156
 #, c-format
 msgid "Remove a module"
 msgstr "Elimina un mòdul"
 
-#: standalone/drakfloppy:296
+#: standalone/drakfloppy:291
 #, c-format
 msgid "Be sure a media is present for the device %s"
 msgstr "Assegureu-vos que hi ha un suport al dispositiu %s"
 
-#: standalone/drakfloppy:302
+#: standalone/drakfloppy:297
 #, c-format
 msgid ""
 "There is no medium or it is write-protected for device %s.\n"
@@ -19834,23 +20574,24 @@ msgstr ""
 "No hi ha cap suport al dispositiu %s o està protegit contra escriptura.\n"
 "Si us plau, inseriu-ne un."
 
-#: standalone/drakfloppy:306
+#: standalone/drakfloppy:301
 #, c-format
 msgid "Unable to fork: %s"
 msgstr "No es pot bifurcar: %s"
 
 #
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, c-format
 msgid "Floppy creation completed"
 msgstr "Creació del disquet completa"
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, c-format
 msgid "The creation of the boot floppy has been successfully completed \n"
 msgstr "La creació del disc d'arrencada s'ha completat amb èxit \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"
@@ -20001,7 +20742,7 @@ msgid "About"
 msgstr "Quant a"
 
 #
-#: standalone/drakfont:495 standalone/drakfont:687 standalone/drakfont:725
+#: standalone/drakfont:495 standalone/drakfont:691 standalone/drakfont:729
 #, c-format
 msgid "Uninstall"
 msgstr "Desinstal·la"
@@ -20012,10 +20753,11 @@ msgstr "Desinstal·la"
 msgid "Import"
 msgstr "Importa"
 
-#: 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"
@@ -20024,7 +20766,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright (C) 2001-2002 per MandrakeSoft \n"
+"Copyright (C) 2001-2002 per Mandrakesoft \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (versió original)\n"
@@ -20033,7 +20775,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"
@@ -20068,7 +20810,7 @@ msgstr ""
 "amb aquest programa; si no és així, escriviu a la Free Software\n"
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, EUA."
 
-#: standalone/drakfont:537
+#: standalone/drakfont:539
 #, c-format
 msgid ""
 "Thanks:\n"
@@ -20100,12 +20842,12 @@ msgstr ""
 "             Converteix fonts ttf a fonts afm i pfb\n"
 
 #
-#: standalone/drakfont:556
+#: standalone/drakfont:558
 #, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr "Escolliu les aplicacions que suportaran les fonts:"
 
-#: standalone/drakfont:557
+#: standalone/drakfont:559
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -20120,136 +20862,141 @@ msgstr ""
 "Podeu instal·lar les fonts de la manera habitual. En casos estranys, fonts "
 "amb errors poden penjar el vostre 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 "Impressores genèriques"
 
-#: standalone/drakfont:586
+#: standalone/drakfont:588
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
 msgstr "Seleccioneu el fitxer o directori de fonts i feu clic a 'Afegeix'"
 
 #
-#: standalone/drakfont:587
+#: standalone/drakfont:589
 #, c-format
 msgid "File Selection"
 msgstr "Selecció de fitxers"
 
-#: standalone/drakfont:600
+#: standalone/drakfont:604
 #, c-format
 msgid "You've not selected any font"
 msgstr "No heu seleccionat cap tipus de lletra"
 
 #
-#: standalone/drakfont:652
+#: standalone/drakfont:656
 #, c-format
 msgid "Import fonts"
 msgstr "Importa fonts"
 
 #
-#: standalone/drakfont:657
+#: standalone/drakfont:661
 #, c-format
 msgid "Install fonts"
 msgstr "Instal·la fonts"
 
-#: standalone/drakfont:692
+#: standalone/drakfont:696
 #, c-format
 msgid "click here if you are sure."
 msgstr "feu clic aquí si ho teniu clar."
 
-#: standalone/drakfont:694
+#: standalone/drakfont:698
 #, c-format
 msgid "here if no."
 msgstr "aquí si no."
 
-#: standalone/drakfont:733
+#: standalone/drakfont:737
 #, c-format
 msgid "Unselected All"
 msgstr "Desselecciona-ho tot"
 
 #
-#: standalone/drakfont:736
+#: standalone/drakfont:740
 #, c-format
 msgid "Selected All"
 msgstr "Selecciona-ho tot"
 
 #
-#: standalone/drakfont:739
+#: standalone/drakfont:743
 #, c-format
 msgid "Remove List"
 msgstr "Esborra la llista"
 
 #
-#: standalone/drakfont:750 standalone/drakfont:769
+#: standalone/drakfont:754 standalone/drakfont:773
 #, c-format
 msgid "Importing fonts"
 msgstr "S'estan important les fonts"
 
 #
-#: standalone/drakfont:754 standalone/drakfont:774
+#: standalone/drakfont:758 standalone/drakfont:778
 #, c-format
 msgid "Initial tests"
 msgstr "Comprovacions inicials"
 
 #
-#: standalone/drakfont:755
+#: standalone/drakfont:759
 #, c-format
 msgid "Copy fonts on your system"
 msgstr "Copiar les fonts en el vostre sistema"
 
-#: standalone/drakfont:756
+#: standalone/drakfont:760
 #, c-format
 msgid "Install & convert Fonts"
 msgstr "Instal·la i converteix les Fonts"
 
 #
-#: standalone/drakfont:757
+#: standalone/drakfont:761
 #, c-format
 msgid "Post Install"
 msgstr "Post-instal·lació"
 
 #
-#: standalone/drakfont:775
+#: standalone/drakfont:779
 #, c-format
 msgid "Remove fonts on your system"
 msgstr "Esborra fonts del sistema"
 
 #
-#: standalone/drakfont:776
+#: standalone/drakfont:780
 #, c-format
 msgid "Post Uninstall"
 msgstr "Post-desinstal·lació"
 
-#: standalone/drakgw:58 standalone/drakgw:193
+#: standalone/drakgw:58 standalone/drakgw:194
 #, c-format
 msgid "Internet Connection Sharing"
 msgstr "Connexió a Internet compartida"
 
-#: standalone/drakgw:124
+#: standalone/drakgw:114 standalone/drakvpn:51
+#, c-format
+msgid "Sorry, we support only 2.4 and above kernels."
+msgstr "Només s'accepten nuclis de la sèrie 2.4 o superior."
+
+#: standalone/drakgw:125
 #, c-format
 msgid "Internet Connection Sharing currently disabled"
 msgstr "La connexió a Internet compartida està inhabilitada"
 
-#: standalone/drakgw:125
+#: standalone/drakgw:126
 #, c-format
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
@@ -20262,39 +21009,39 @@ msgstr ""
 "\n"
 "Què voleu fer?"
 
-#: standalone/drakgw:129 standalone/drakvpn:127
+#: standalone/drakgw:130 standalone/drakvpn:127
 #, c-format
 msgid "enable"
 msgstr "habilita"
 
-#: 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 "torna a configurar"
 
-#: 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 "deixa-ho córrer"
 
-#: standalone/drakgw:136
+#: standalone/drakgw:137
 #, c-format
 msgid "Enabling servers..."
 msgstr "S'estan habilitant els servidors..."
 
-#: standalone/drakgw:148
+#: standalone/drakgw:149
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr "Ara, la connexió compartida a Internet està habilitada."
 
-#: standalone/drakgw:151
+#: standalone/drakgw:152
 #, c-format
 msgid "Internet Connection Sharing currently enabled"
 msgstr "La connexió a Internet compartida està habilitada"
 
-#: standalone/drakgw:152
+#: standalone/drakgw:153
 #, c-format
 msgid ""
 "The setup of Internet Connection Sharing has already been done.\n"
@@ -20307,22 +21054,22 @@ msgstr ""
 "\n"
 "Què voleu fer?"
 
-#: standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:157 standalone/drakvpn:101
 #, c-format
 msgid "disable"
 msgstr "inhabilita"
 
-#: standalone/drakgw:159
+#: standalone/drakgw:160
 #, c-format
 msgid "Disabling servers..."
 msgstr "S'estan inhabilitant els servidors..."
 
-#: standalone/drakgw:174
+#: standalone/drakgw:175
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr "Ara, la compartició de la connexió a Internet està inhabilitada."
 
-#: standalone/drakgw:194
+#: standalone/drakgw:195
 #, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -20345,27 +21092,27 @@ msgstr ""
 "Nota: per configurar una xarxa d'àrea local (LAN), us cal un adaptador de "
 "xarxa dedicat."
 
-#: standalone/drakgw:237
+#: standalone/drakgw:239
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Interfície %s (utilitzant el mòdul %s)"
 
-#: standalone/drakgw:238
+#: standalone/drakgw:240
 #, c-format
 msgid "Interface %s"
 msgstr "Interfície %s"
 
-#: standalone/drakgw:247 standalone/drakpxe:137
+#: standalone/drakgw:249 standalone/drakpxe:137
 #, c-format
 msgid "No network adapter on your system!"
 msgstr "No teniu cap adaptador de xarxa al sistema!"
 
-#: standalone/drakgw:254
+#: standalone/drakgw:256
 #, c-format
 msgid "Network interface"
 msgstr "Interfície de la xarxa"
 
-#: standalone/drakgw:255
+#: standalone/drakgw:257
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -20380,7 +21127,12 @@ msgstr ""
 "\n"
 "Ara es configurarà la vostra xarxa d'àrea local amb aquest adaptador."
 
-#: standalone/drakgw:262
+#: standalone/drakgw:263 standalone/drakpxe:142
+#, c-format
+msgid "Choose the network interface"
+msgstr "Escolliu la interfície de xarxa"
+
+#: standalone/drakgw:264
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
@@ -20390,12 +21142,12 @@ msgstr ""
 "xarxa d'àrea local."
 
 #
-#: standalone/drakgw:291
+#: standalone/drakgw:293
 #, c-format
 msgid "Network interface already configured"
 msgstr "La intefície de xarxa ja està configurada"
 
-#: standalone/drakgw:292
+#: standalone/drakgw:294
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -20411,29 +21163,29 @@ msgstr ""
 "Ho podeu fer manualment però heu de saber què feu."
 
 #
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "Automatic reconfiguration"
 msgstr "Reconfiguració automàtica"
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "No (experts only)"
 msgstr "No (només experts)"
 
 #
-#: standalone/drakgw:298
+#: standalone/drakgw:300
 #, c-format
 msgid "Show current interface configuration"
 msgstr "Mostra la configuració actual de la interfície"
 
 #
-#: standalone/drakgw:299
+#: standalone/drakgw:301
 #, c-format
 msgid "Current interface configuration"
 msgstr "Configuració actual de la interfície"
 
-#: standalone/drakgw:300
+#: standalone/drakgw:302
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -20450,7 +21202,7 @@ msgstr ""
 "Atribució 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 "
@@ -20478,12 +21230,12 @@ msgstr ""
 "per al vostre ús.\n"
 "\n"
 
-#: standalone/drakgw:320
+#: standalone/drakgw:322
 #, c-format
 msgid "Local Network adress"
 msgstr "Adreça de la xarxa local"
 
-#: standalone/drakgw:324
+#: standalone/drakgw:326
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -20498,78 +21250,78 @@ msgstr ""
 "Si no sabeu el significat d'una opció, deixeu-la com està."
 
 #
-#: standalone/drakgw:328
+#: standalone/drakgw:330
 #, c-format
 msgid "(This) DHCP Server IP"
 msgstr "IP d'aquest servidor DHCP"
 
 #
-#: standalone/drakgw:329
+#: standalone/drakgw:331
 #, c-format
 msgid "The DNS Server IP"
 msgstr "IP del Servidor DNS"
 
 #
-#: standalone/drakgw:330
+#: standalone/drakgw:332
 #, c-format
 msgid "The internal domain name"
 msgstr "Nom intern de domini"
 
-#: standalone/drakgw:331
+#: standalone/drakgw:333
 #, c-format
 msgid "The DHCP start range"
 msgstr "L'adreça inicial del rang del DHCP"
 
-#: standalone/drakgw:332
+#: standalone/drakgw:334
 #, c-format
 msgid "The DHCP end range"
 msgstr "L'adreça final del rang del DHCP"
 
-#: standalone/drakgw:333
+#: standalone/drakgw:335
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr "Lísing per defecte (en segons)"
 
-#: standalone/drakgw:334
+#: standalone/drakgw:336
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr "Lísing màxim (en segons)"
 
-#: standalone/drakgw:335
+#: standalone/drakgw:337
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr "Torna a configurar la interfície i el servidor DHCP"
 
-#: standalone/drakgw:342
+#: standalone/drakgw:344
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr "La xarxa local no finalitza amb '.0', ho deixem córrer."
 
-#: standalone/drakgw:352
+#: standalone/drakgw:354
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr ""
 "S'ha trobat un conflicte potencial d'adreça LAN en la configuració actual de "
 "%s!\n"
 
-#: standalone/drakgw:362
+#: standalone/drakgw:364
 #, c-format
 msgid "Configuring..."
 msgstr "S'està configurant..."
 
-#: standalone/drakgw:363
+#: standalone/drakgw:365
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr ""
 "S'estan configurant les seqüències, instal·lant el programari, iniciant els "
 "servidors..."
 
-#: 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 "Hi ha hagut problemes en instal·lar el paquet %s"
 
-#: standalone/drakgw:599
+#: standalone/drakgw:601
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -20587,14 +21339,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"
 "Aquest programa és programari lliure i pot ser redistribuït sota els termes "
 "de la GNU GPL.\n"
 "\n"
@@ -20618,14 +21370,19 @@ msgid ""
 "frontend)\n"
 msgstr ""
 
-#: standalone/drakhelp:35
+#: standalone/drakhelp:36
+#, c-format
+msgid "Mandrakelinux Help Center"
+msgstr "Centre d'ajuda de Mandrakelinux"
+
+#: standalone/drakhelp:36
 #, c-format
 msgid ""
 "%s cannot be displayed \n"
 ". No Help entry of this type\n"
 msgstr ""
 
-#: standalone/drakhelp:41
+#: standalone/drakhelp:42
 #, c-format
 msgid ""
 "No browser is installed on your system, Please install one if you want to "
@@ -20634,43 +21391,43 @@ msgstr ""
 "No teniu cap navegador instal·lat al sistema. Si us plau, instal·leu-ne un "
 "si voleu navegar pel sistema d'ajuda"
 
-#: standalone/drakperm:21
+#: standalone/drakperm:22
 #, c-format
 msgid "System settings"
 msgstr "Configuració del sistema"
 
-#: standalone/drakperm:22
+#: standalone/drakperm:23
 #, c-format
 msgid "Custom settings"
 msgstr "Arranjament personalitzat"
 
-#: standalone/drakperm:23
+#: standalone/drakperm:24
 #, c-format
 msgid "Custom & system settings"
 msgstr "Arranjament personalitzat 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 "Camí"
 
 #
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, c-format
 msgid "User"
 msgstr "Usuari"
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, c-format
 msgid "Group"
 msgstr "Grup"
 
-#: standalone/drakperm:48 standalone/drakperm:330
+#: standalone/drakperm:49 standalone/drakperm:333
 #, c-format
 msgid "Permissions"
 msgstr "Permisos"
@@ -20735,9 +21492,9 @@ msgstr "Elimina 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 "Edita"
@@ -20747,47 +21504,66 @@ msgstr "Edita"
 msgid "Edit current rule"
 msgstr "Edita la regla actual"
 
-#: standalone/drakperm:246
+#: standalone/drakperm:242
 #, c-format
 msgid "browse"
 msgstr "navega"
 
-#: standalone/drakperm:256
+#
+#: standalone/drakperm:247
+#, c-format
+msgid "user"
+msgstr "usuari"
+
+#: standalone/drakperm:247
+#, c-format
+msgid "group"
+msgstr "grup"
+
+#: standalone/drakperm:247
+#, c-format
+msgid "other"
+msgstr "altres"
+
+#: 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 ""
+msgstr "Permet que \"%s\" llegeixi el fitxer"
 
-#: standalone/drakperm:260
+#: standalone/drakperm:259
 #, c-format
 msgid "Write"
 msgstr "Escriptura"
 
-#: 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 ""
+msgstr "Permet que \"%s\" escrigui el fitxer"
 
-#: standalone/drakperm:264
+#: standalone/drakperm:266
 #, c-format
 msgid "Execute"
 msgstr "Executa"
 
-#: 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 ""
+msgstr "Permet que \"%s\" executi el fitxer"
 
-#: 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"
@@ -20797,53 +21573,53 @@ msgstr ""
 " només el propietari del directori o del fitxer en aquest directori poden "
 "suprimir-lo"
 
-#: 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 "Usa l'identificador del propietari (UID) per a l'execució"
 
-#: 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 "Usa l'identificador del grup (GID) per a l'execució"
 
 #
-#: standalone/drakperm:287 standalone/drakxtv:87
+#: standalone/drakperm:290 standalone/drakxtv:89
 #, c-format
-msgid "User :"
+msgid "User:"
 msgstr "Usuari :"
 
-#: standalone/drakperm:289
+#: standalone/drakperm:292
 #, c-format
-msgid "Group :"
+msgid "Group:"
 msgstr "Grup :"
 
-#: standalone/drakperm:293
+#: standalone/drakperm:296
 #, c-format
 msgid "Current user"
 msgstr "Usuari actual"
 
-#: standalone/drakperm:294
+#: standalone/drakperm:297
 #, c-format
 msgid "When checked, owner and group won't be changed"
 msgstr "Si ho marqueu, no es canviaran ni el propietari ni el grup"
 
-#: standalone/drakperm:304
+#: standalone/drakperm:307
 #, c-format
 msgid "Path selection"
 msgstr "Selecció del camí"
 
-#: standalone/drakperm:324
+#: standalone/drakperm:327
 #, c-format
 msgid "Property"
 msgstr "Propietat"
@@ -20978,54 +21754,42 @@ msgstr ""
 msgid "Location of auto_install.cfg file"
 msgstr "Ubicació del fitxer auto_install.cfg"
 
-#: standalone/draksec:44
+#: standalone/draksec:49
 #, c-format
 msgid "ALL"
 msgstr "TOT"
 
-#: standalone/draksec:44
+#: standalone/draksec:50
 #, c-format
 msgid "LOCAL"
 msgstr "LOCAL"
 
-#: standalone/draksec:44 standalone/drakvpn:1146
-#, c-format
-msgid "default"
-msgstr "predeterminat"
-
-#: standalone/draksec:44
+#: standalone/draksec:53
 #, c-format
-msgid "ignore"
-msgstr "ignora"
+msgid "Ignore"
+msgstr "Ignora"
 
-#: 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 "
@@ -21060,65 +21824,59 @@ msgid ""
 "maximum"
 msgstr ""
 
-#: standalone/draksec:129
+#: standalone/draksec:154 standalone/harddrake2:184
+#, c-format
+msgid ""
+"Description of the fields:\n"
+"\n"
+msgstr ""
+"Descripció dels camps:\n"
+"\n"
+
+#: standalone/draksec:168
 #, c-format
 msgid "(default value: %s)"
 msgstr " (valor per defecte: %s)"
 
 #
-#: standalone/draksec:170
+#: standalone/draksec:210
 #, c-format
 msgid "Security Level:"
 msgstr "Nivell de seguretat:"
 
-#
-#: standalone/draksec:173
-#, c-format
-msgid "Security Alerts:"
-msgstr "Alarmes de seguretat:"
-
-#: standalone/draksec:177
+#: standalone/draksec:217
 #, c-format
 msgid "Security Administrator:"
 msgstr "Administrador de seguretat:"
 
-#: standalone/draksec:179
+#: standalone/draksec:219
 #, c-format
 msgid "Basic options"
 msgstr "Opcions bàsiques"
 
-#: 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 ""
-"Les opcions següents es poden establir per personalitzar la seguretat\n"
-"del vostre sistema. Si necessiteu una explicació, mireu el rètol d'ajuda.\n"
-
 #
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "Network Options"
 msgstr "Opcions de xarxa"
 
 #
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "System Options"
 msgstr "Opcions de sistema"
 
-#: standalone/draksec:240
+#: standalone/draksec:268
 #, c-format
 msgid "Periodic Checks"
 msgstr "Comprovacions periòdiques"
 
-#: standalone/draksec:258
+#: standalone/draksec:299
 #, c-format
 msgid "Please wait, setting security level..."
 msgstr "Espereu si us plau, s'està configurant el nivell de seguretat..."
 
-#: standalone/draksec:264
+#: standalone/draksec:305
 #, c-format
 msgid "Please wait, setting security options..."
 msgstr "Espereu si us plau, s'estan configurant les opcions de seguretat..."
@@ -21128,7 +21886,8 @@ msgstr "Espereu si us plau, s'estan configurant les opcions de seguretat..."
 msgid "No Sound Card detected!"
 msgstr "No s'ha detectat cap targeta de so!"
 
-#: 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-"
@@ -21150,7 +21909,7 @@ msgstr ""
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 
-#: standalone/draksound:55
+#: standalone/draksound:57
 #, c-format
 msgid ""
 "\n"
@@ -21292,15 +22051,15 @@ msgstr "Mostra el logotip a la consola"
 msgid "Make kernel message quiet by default"
 msgstr "Fes que, per defecte, no apareguin els missatges del nucli"
 
-#: standalone/draksplash:161 standalone/draksplash:319
-#: standalone/draksplash:464
+#: standalone/draksplash:161 standalone/draksplash:309
+#: standalone/draksplash:454
 #, c-format
 msgid "Notice"
 msgstr "Avís"
 
-#: 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 ""
 "Aquest tema encara no té cap pantalla de presentació de l'arrencada en %s!"
 
@@ -21316,107 +22075,116 @@ msgid "saving Bootsplash theme..."
 msgstr "s'està desant el tema Bootsplash..."
 
 #
-#: standalone/draksplash:445
+#: standalone/draksplash:435
 #, c-format
 msgid "ProgressBar color selection"
 msgstr "Selecció del color de la barra de progrés"
 
 #
-#: standalone/draksplash:464
+#: standalone/draksplash:454
 #, c-format
 msgid "You must choose an image file first!"
 msgstr "Abans heu de triar un fitxer d'imatge!"
 
 #
-#: standalone/draksplash:469
+#: standalone/draksplash:459
 #, c-format
-msgid "Generating preview ..."
+msgid "Generating preview..."
 msgstr "S'està generant la vista prèvia..."
 
 #. -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 "Vista prèvia del BootSplash %s (%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 ""
+
+#: standalone/drakups:74
 #, c-format
 msgid "Connected through a serial port or an usb cable"
 msgstr "Connectat a través d'un port sèrie o un cable usb"
 
 #
-#: standalone/drakups:69
+#: standalone/drakups:80
 #, c-format
 msgid "Add an UPS device"
 msgstr "Afegeix un dispositiu SAI"
 
-#: 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 ""
 "Benvingut a la utilitat de configuració de SAI.\n"
 "\n"
 "Aquí podreu afegir un nou SAI al vostre 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 ""
 "Ara s'afegirà un dispositiu SAI.\n"
 "\n"
-"Preferiu autodetectar els dispositius SAI connectats a aquest ordinador o  ?"
+"Preferiu autodetectar els dispositius SAI connectats a aquest ordinador o ?"
 
-#
-#: standalone/drakups:82
+#: standalone/drakups:93
 #, c-format
 msgid "Autodetection"
 msgstr "Detecció automàtica"
 
-#: standalone/drakups:90 standalone/harddrake2:140
+#: standalone/drakups:101 standalone/harddrake2:211
 #, c-format
 msgid "Detection in progress"
 msgstr "Detecció en procés"
 
-#: 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 "Felicitats"
 
-#: standalone/drakups:109
+#: standalone/drakups:121
 #, c-format
 msgid "The wizard successfully added the following UPS devices:"
 msgstr "L'auxiliar ha afegit els següents dispositius SAI amb èxit:"
 
 #
-#: standalone/drakups:111
+#: standalone/drakups:123
 #, c-format
 msgid "No new UPS devices was found"
 msgstr "No s'ha trobat cap dispositiu SAI nou"
 
 #
-#: standalone/drakups:116 standalone/drakups:128
+#: standalone/drakups:128 standalone/drakups:140
 #, c-format
 msgid "UPS driver configuration"
 msgstr "Configuració del controlador del SAI"
 
-#: standalone/drakups:116
+#: standalone/drakups:128
 #, c-format
 msgid "Please select your UPS model."
 msgstr "Si us plau, escolliu el model del vostre SAI."
 
-#: standalone/drakups:117
+#: standalone/drakups:129
 #, c-format
 msgid "Manufacturer / Model:"
 msgstr "Fabricant / Model:"
 
-#: standalone/drakups:128
+#: standalone/drakups:140
 #, c-format
 msgid ""
 "We are configuring the \"%s\" UPS from \"%s\".\n"
@@ -21425,90 +22193,90 @@ msgstr ""
 "S'està configurant el SAI \"%s\" de \"%s\".\n"
 "Si us plau introdueix el nom, controlador i port."
 
-#: standalone/drakups:133
+#: standalone/drakups:145
 #, c-format
 msgid "Name:"
 msgstr "Nom:"
 
-#: standalone/drakups:133
+#: standalone/drakups:145
 #, c-format
 msgid "The name of your ups"
 msgstr "El nom del vostre SAI"
 
-#: 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 gestiona el teu SAI"
 
-#: 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 "El port al qual està connectat el vostre SAI"
 
-#: standalone/drakups:144
+#: standalone/drakups:156
 #, c-format
 msgid "The wizard successfully configured the new \"%s\" UPS device."
 msgstr "L'auxiliar ha configurat el nou dispositiu SAI \"%s\" amb èxit."
 
 #
-#: standalone/drakups:232
+#: standalone/drakups:246
 #, c-format
 msgid "UPS devices"
 msgstr "Dispositius SAI"
 
-#: 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 "Nom"
 
 #
-#: standalone/drakups:250
+#: standalone/drakups:265
 #, c-format
 msgid "UPS users"
 msgstr "Usuaris SAI"
 
-#: standalone/drakups:265
+#: standalone/drakups:281
 #, c-format
 msgid "Access Control Lists"
 msgstr "Llistes de control d'accés"
 
-#: 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 "Regles"
 
-#: standalone/drakups:278
+#: standalone/drakups:295
 #, c-format
 msgid "Action"
 msgstr "Acció"
 
-#: standalone/drakups:278 standalone/drakvpn:1146 standalone/harddrake2:61
+#: standalone/drakups:295 standalone/drakvpn:1146 standalone/harddrake2:77
 #, c-format
 msgid "Level"
 msgstr "Nivell"
 
-#: standalone/drakups:278
+#: standalone/drakups:295
 #, c-format
 msgid "ACL name"
 msgstr "Nom 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 "Benvingut a les eines de configuració SAI"
@@ -21530,7 +22298,7 @@ msgid ""
 "\n"
 "It's currently enabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 "La configuració de l'una connexió VPN ja s'ha dut a terme.\n"
 "\n"
@@ -21560,7 +22328,7 @@ msgid ""
 "\n"
 "It's currently disabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 "La configuració de l'una connexió VPN ja s'ha dut a terme.\n"
 "\n"
@@ -21623,7 +22391,7 @@ msgstr "Mòdul del kernel."
 #: 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"
@@ -21650,13 +22418,13 @@ msgstr "Fitxer de configuració"
 #: standalone/drakvpn:296
 #, c-format
 msgid ""
-"Configuration step !\n"
+"Configuration step!\n"
 "\n"
 "You need to define the Security Policies and then to \n"
 "configure the automatic key exchange (IKE) daemon. \n"
 "The KAME IKE daemon we're using is called 'racoon'.\n"
 "\n"
-"What would you like to configure ?\n"
+"What would you like to configure?\n"
 msgstr ""
 
 #: standalone/drakvpn:307
@@ -21679,12 +22447,12 @@ msgid ""
 "The %s file contents\n"
 "is divided into sections.\n"
 "\n"
-"You can now :\n"
+"You can now:\n"
 "\n"
 "  - display, add, edit, or remove sections, then\n"
 "  - commit the changes\n"
 "\n"
-"What would you like to do ?\n"
+"What would you like to do?\n"
 msgstr ""
 
 #: standalone/drakvpn:333 standalone/drakvpn:694
@@ -21727,7 +22495,7 @@ msgstr ""
 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"
@@ -21755,7 +22523,7 @@ msgstr ""
 #
 #: standalone/drakvpn:382 standalone/drakvpn:423 standalone/drakvpn:510
 #, c-format
-msgid "Exists !"
+msgid "Exists!"
 msgstr "Existeix!"
 
 #: standalone/drakvpn:383 standalone/drakvpn:424
@@ -21960,7 +22728,7 @@ msgstr "Noms de secció"
 
 #: standalone/drakvpn:590
 #, c-format
-msgid "Can't edit !"
+msgid "Can't edit!"
 msgstr "No es pot editar!"
 
 #: standalone/drakvpn:591
@@ -21968,10 +22736,10 @@ msgstr "No es pot 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 ""
 
 #: standalone/drakvpn:600
@@ -22007,7 +22775,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 ""
@@ -22033,7 +22801,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"
@@ -22061,7 +22829,7 @@ msgstr ""
 msgid ""
 "The 'add' sections step.\n"
 "\n"
-"Here below is the racoon.conf file skeleton :\n"
+"Here below is the racoon.conf file skeleton:\n"
 "\t'path'\n"
 "\t'remote'\n"
 "\t'sainfo' \n"
@@ -22103,23 +22871,23 @@ msgstr ""
 #: 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 ""
@@ -22226,7 +22994,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"
@@ -22255,7 +23023,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"
@@ -22280,7 +23048,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"
@@ -22308,7 +23076,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"
@@ -22328,7 +23096,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 ""
 
@@ -22342,11 +23110,11 @@ msgstr ""
 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"
@@ -22368,18 +23136,18 @@ msgstr ""
 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"
@@ -22419,7 +23187,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]"
@@ -22478,7 +23246,7 @@ msgstr ""
 #: standalone/drakvpn:1076
 #, c-format
 msgid "Passive"
-msgstr ""
+msgstr "Passiu"
 
 #: standalone/drakvpn:1078
 #, c-format
@@ -22544,7 +23312,7 @@ msgstr ""
 #, 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"
@@ -22553,7 +23321,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"
@@ -22562,7 +23330,7 @@ msgid ""
 "\t\tstring is omitted, racoon(8) will get DN from\n"
 "\t\tSubject field in the certificate.\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "my_identifier user_fqdn \"myemail@mydomain.com\""
 msgstr ""
@@ -22582,9 +23350,9 @@ msgstr ""
 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 ""
@@ -22633,7 +23401,7 @@ msgstr ""
 #: standalone/drakvpn:1138
 #, c-format
 msgid "Flag"
-msgstr ""
+msgstr "Bandera"
 
 #: standalone/drakvpn:1139
 #, c-format
@@ -22682,6 +23450,11 @@ msgstr ""
 
 #: standalone/drakvpn:1146
 #, c-format
+msgid "default"
+msgstr "predeterminat"
+
+#: standalone/drakvpn:1146
+#, c-format
 msgid "use"
 msgstr ""
 
@@ -22690,69 +23463,69 @@ msgstr ""
 msgid "unique"
 msgstr ""
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (broadcast)"
 msgstr "EUA (difusió)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable)"
 msgstr "EUA (cable)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable-hrc)"
 msgstr "EUA (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ó (difusió)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (cable)"
 msgstr "Japó (cable)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "China (broadcast)"
 msgstr "Xina (difusió)"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "West Europe"
 msgstr "Europa de l'Oest"
 
 #
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "East Europe"
 msgstr "Europa de l'Est"
 
 #
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "France [SECAM]"
 msgstr "França [SECAM]"
 
-#: standalone/drakxtv:46
+#: standalone/drakxtv:48
 #, c-format
 msgid "Newzealand"
 msgstr "Nova Zelanda"
 
-#: standalone/drakxtv:49
+#: standalone/drakxtv:51
 #, c-format
 msgid "Australian Optus cable TV"
 msgstr "TV per cable australiana Optus"
 
-#: standalone/drakxtv:83
+#: standalone/drakxtv:85
 #, c-format
 msgid ""
 "Please,\n"
@@ -22761,48 +23534,49 @@ msgstr ""
 "Si us plau,\n"
 "entreu la vostra normativa de tv i el país"
 
-#: standalone/drakxtv:85
+#: standalone/drakxtv:87
 #, c-format
 msgid "TV norm:"
 msgstr "Normativa 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 "La cerca de canals de TV està en progrés..."
 
-#: standalone/drakxtv:101
+#: standalone/drakxtv:103
 #, c-format
 msgid "Scanning for TV channels"
 msgstr "S'estan cercant canals de TV"
 
 #
-#: standalone/drakxtv:105
+#: standalone/drakxtv:107
 #, c-format
 msgid "There was an error while scanning for TV channels"
 msgstr "S'ha produït un error en cercar els canals de TV"
 
-#: standalone/drakxtv:108
+#: standalone/drakxtv:110
 #, c-format
 msgid "Have a nice day!"
 msgstr "Tingueu un bon dia!"
 
-#: standalone/drakxtv:109
+#: standalone/drakxtv:111
 #, c-format
 msgid "Now, you can run xawtv (under X Window!) !\n"
 msgstr "Ara, podeu executar xawtv (sota X Window!) !\n"
 
-#: standalone/drakxtv:132
+#: standalone/drakxtv:134
 #, c-format
 msgid "No TV Card detected!"
 msgstr "No s'ha detectat cap targeta 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-"
@@ -22825,17 +23599,17 @@ msgstr ""
 "http://www.linux-mandrake.com/en/hardware.php3"
 
 #
-#: standalone/harddrake2:18
+#: standalone/harddrake2:20
 #, c-format
 msgid "Alternative drivers"
 msgstr "Controladors alternatius"
 
-#: standalone/harddrake2:19
+#: standalone/harddrake2:21
 #, c-format
 msgid "the list of alternative drivers for this sound card"
 msgstr "la llista de controladors alternatius per a aquesta targeta de so"
 
-#: standalone/harddrake2:22
+#: standalone/harddrake2:24
 #, c-format
 msgid ""
 "this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
@@ -22843,33 +23617,7 @@ msgstr ""
 "aquest és el bus físic al qual el dispositiu està connectat (p.ex.: 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."
-msgstr ""
-"el nucli GNU/Linux necessita executar un bucle de càlcul durant l'arrencada "
-"per iniciar un comptador de temps. El seu resultat s'emmagatzema com a "
-"bogomips com a manera d'\"avaluar\" la CPU."
-
-#: standalone/harddrake2:26
+#: standalone/harddrake2:26 standalone/harddrake2:130
 #, c-format
 msgid "Bus identification"
 msgstr "Identificació del bus"
@@ -22898,64 +23646,265 @@ msgstr ""
 
 #: standalone/harddrake2:33
 #, c-format
-msgid "Cache size"
-msgstr "Mida de la memòria cau"
+msgid "Drive capacity"
+msgstr "Capacitat de la unitat"
 
 #: standalone/harddrake2:33
 #, c-format
-msgid "size of the (second level) cpu cache"
-msgstr "mida de la memòria cau de la CPU (segon nivell)"
+msgid "special capacities of the driver (burning ability and or DVD support)"
+msgstr ""
+"funcions especials del programa de control (capacitat per enregistrar CD o  "
+"preparat per a DVD)"
 
 #: standalone/harddrake2:34
 #, c-format
-msgid "Drive capacity"
-msgstr "Capacitat de la unitat"
+msgid "this field describes the device"
+msgstr "aquest camp descriu el dispositiu"
 
-#: standalone/harddrake2:34
+#: standalone/harddrake2:35
 #, c-format
-msgid "special capacities of the driver (burning ability and or DVD support)"
+msgid "Old device file"
+msgstr "Fitxer de dispositiu antic"
+
+#: standalone/harddrake2:36
+#, c-format
+msgid "old static device name used in dev package"
+msgstr "nom antic de dispositiu estàtic, usat en el paquet de desenvolupament"
+
+#: standalone/harddrake2:37
+#, c-format
+msgid "New devfs device"
+msgstr "Nou dispositiu devfs"
+
+#: standalone/harddrake2:38
+#, c-format
+msgid "new dynamic device name generated by core kernel devfs"
+msgstr "nou nom de dispositiu dinàmic generat pel devfs intern del nucli"
+
+#. -PO: here "module" is the "jargon term" for a kernel driver
+#: standalone/harddrake2:41
+#, c-format
+msgid "Module"
+msgstr "Mòdul"
+
+#: standalone/harddrake2:41
+#, c-format
+msgid "the module of the GNU/Linux kernel that handles the device"
+msgstr "el mòdul del nucli GNU/Linux que gestiona aquest dispositiu"
+
+#: standalone/harddrake2:42
+#, c-format
+msgid "Extended partitions"
 msgstr ""
-"funcions especials del programa de control (capacitat per enregistrar CD o  "
-"preparat per a DVD)"
+
+#: standalone/harddrake2:42
+#, c-format
+msgid "the number of extended partitions"
+msgstr ""
+
+#
+#: standalone/harddrake2:43
+#, c-format
+msgid "Geometry"
+msgstr "Geometria"
+
+#: standalone/harddrake2:43
+#, c-format
+msgid "Cylinder/head/sectors geometry of the disk"
+msgstr ""
+
+#: standalone/harddrake2:44
+#, c-format
+msgid "Disk controller"
+msgstr "Controlador de disc"
+
+#: standalone/harddrake2:44
+#, c-format
+msgid "the disk controller on the host side"
+msgstr ""
+
+#: standalone/harddrake2:45
+#, c-format
+msgid "class of hardware device"
+msgstr "tipus de dispositiu de maquinari"
+
+#: standalone/harddrake2:46 standalone/harddrake2:78
+#: standalone/printerdrake:218
+#, c-format
+msgid "Model"
+msgstr "Model"
+
+#: standalone/harddrake2:46
+#, c-format
+msgid "hard disk model"
+msgstr "model de disc dur"
+
+#: standalone/harddrake2:47
+#, c-format
+msgid "network printer port"
+msgstr "port d'impressora de la xarxa"
+
+#: standalone/harddrake2:48
+#, c-format
+msgid "Primary partitions"
+msgstr "Particions primàries"
+
+#: standalone/harddrake2:48
+#, c-format
+msgid "the number of the primary partitions"
+msgstr "el número de particions primàries"
+
+#: standalone/harddrake2:49
+#, c-format
+msgid "the vendor name of the device"
+msgstr "el nom del venedor del dispositiu"
+
+#: 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 "el bus PCI al qual el dispositiu està connectat"
+
+#
+#: standalone/harddrake2:51
+#, c-format
+msgid "PCI device #"
+msgstr "# dispositiu PCI"
+
+#: standalone/harddrake2:51
+#, c-format
+msgid "PCI device number"
+msgstr "Número del dispositiu PCI"
+
+#: standalone/harddrake2:52
+#, c-format
+msgid "PCI function #"
+msgstr "Funció PCI #"
+
+#: standalone/harddrake2:52
+#, c-format
+msgid "PCI function number"
+msgstr ""
+
+#: standalone/harddrake2:53
+#, c-format
+msgid "Vendor ID"
+msgstr "ID del venedor"
+
+#: standalone/harddrake2:53
+#, c-format
+msgid "this is the standard numerical identifier of the vendor"
+msgstr ""
+
+#: standalone/harddrake2:54
+#, c-format
+msgid "Device ID"
+msgstr "ID del dispositiu"
+
+#: standalone/harddrake2:54
+#, c-format
+msgid "this is the numerical identifier of the device"
+msgstr ""
+
+#: standalone/harddrake2:55
+#, c-format
+msgid "Sub vendor ID"
+msgstr ""
+
+#: standalone/harddrake2:55
+#, c-format
+msgid "this is the minor numerical identifier of the vendor"
+msgstr ""
+
+#
+#: standalone/harddrake2:56
+#, c-format
+msgid "Sub device ID"
+msgstr ""
+
+#: standalone/harddrake2:56
+#, c-format
+msgid "this is the minor numerical identifier of the device"
+msgstr ""
+
+#: standalone/harddrake2:57
+#, c-format
+msgid "Device USB ID"
+msgstr "ID dispositiu USB"
+
+#: 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 nucli GNU/Linux necessita executar un bucle de càlcul durant l'arrencada "
+"per iniciar un comptador de temps. El seu resultat s'emmagatzema com a "
+"bogomips com a manera d'\"avaluar\" la CPU."
+
+#: standalone/harddrake2:62
+#, c-format
+msgid "Cache size"
+msgstr "Mida de la memòria cau"
+
+#: standalone/harddrake2:62
+#, c-format
+msgid "size of the (second level) cpu cache"
+msgstr "mida de la memòria cau de la CPU (segon nivell)"
 
 #. -PO: here "comas" is the medical coma, not the lexical coma!!
-#: standalone/harddrake2:37
+#: standalone/harddrake2:65
 #, c-format
 msgid "Coma bug"
 msgstr "Error Coma"
 
-#: standalone/harddrake2:37
+#: standalone/harddrake2:65
 #, c-format
 msgid "whether this cpu has the Cyrix 6x86 Coma bug"
 msgstr "si aquesta CPU té o no l'error Coma Cyrix 6x86"
 
-#: standalone/harddrake2:38
+#: standalone/harddrake2:66
 #, c-format
 msgid "Cpuid family"
 msgstr "Família cpuid"
 
-#: standalone/harddrake2:38
+#: standalone/harddrake2:66
 #, c-format
 msgid "family of the cpu (eg: 6 for i686 class)"
 msgstr "família de la CPU (p.ex. 6 per a la classe i686)"
 
 #
-#: standalone/harddrake2:39
+#: standalone/harddrake2:67
 #, c-format
 msgid "Cpuid level"
 msgstr "Nivell cpuid"
 
-#: standalone/harddrake2:39
+#: standalone/harddrake2:67
 #, c-format
 msgid "information level that can be obtained through the cpuid instruction"
 msgstr "nivell d'informació que es pot obtenir mitjançant la instrucció cpuid"
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:68
 #, c-format
 msgid "Frequency (MHz)"
 msgstr "Freqüència (MHz)"
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:68
 #, c-format
 msgid ""
 "the CPU frequency in MHz (Megahertz which in first approximation may be "
@@ -22966,68 +23915,22 @@ msgstr ""
 "grollera, es pot considerar com el nombre d'instruccions per segon que la "
 "CPU pot executar)"
 
-#: standalone/harddrake2:41
-#, c-format
-msgid "this field describes the device"
-msgstr "aquest camp descriu el dispositiu"
-
-#: standalone/harddrake2:42
-#, c-format
-msgid "Old device file"
-msgstr "Fitxer de dispositiu antic"
-
-#: standalone/harddrake2:43
-#, c-format
-msgid "old static device name used in dev package"
-msgstr "nom antic de dispositiu estàtic, usat en el paquet de desenvolupament"
-
-#: standalone/harddrake2:44
-#, c-format
-msgid "New devfs device"
-msgstr "Nou dispositiu devfs"
-
-#: standalone/harddrake2:45
-#, c-format
-msgid "new dynamic device name generated by core kernel devfs"
-msgstr "nou nom de dispositiu dinàmic generat pel devfs intern del nucli"
-
-#. -PO: here "module" is the "jargon term" for a kernel driver
-#: standalone/harddrake2:48
-#, c-format
-msgid "Module"
-msgstr "Mòdul"
-
-#: standalone/harddrake2:48
-#, c-format
-msgid "the module of the GNU/Linux kernel that handles the device"
-msgstr "el mòdul del nucli GNU/Linux que gestiona aquest dispositiu"
-
-#: standalone/harddrake2:49
-#, fuzzy, c-format
-msgid "Extended partitions"
-msgstr "Crea una nova partició"
-
-#: standalone/harddrake2:49
-#, fuzzy, c-format
-msgid "the number of extended partitions"
-msgstr "número del processador"
-
-#: standalone/harddrake2:50
+#: standalone/harddrake2:69
 #, c-format
 msgid "Flags"
 msgstr "Senyaladors"
 
-#: standalone/harddrake2:50
+#: standalone/harddrake2:69
 #, c-format
 msgid "CPU flags reported by the kernel"
 msgstr "Senyaladors de la CPU informats pel nucli."
 
-#: standalone/harddrake2:51
+#: standalone/harddrake2:70
 #, c-format
 msgid "Fdiv bug"
 msgstr "Error Fdiv"
 
-#: standalone/harddrake2:52
+#: standalone/harddrake2:71
 #, c-format
 msgid ""
 "Early Intel Pentium chips manufactured have a bug in their floating point "
@@ -23038,57 +23941,46 @@ msgstr ""
 "processador de punt flotant que no els permet aconseguir la precisió "
 "necessària en realitzar una divisió de punt flotant (FDIV)"
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
 #, c-format
 msgid "Is FPU present"
 msgstr "FPU és present"
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
 #, c-format
 msgid "yes means the processor has an arithmetic coprocessor"
 msgstr "\"sí\" indica que el processador té un coprocessador aritmètic"
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
 #, c-format
 msgid "Whether the FPU has an irq vector"
 msgstr "Si l'FPU té o no un vector irq"
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
 #, c-format
 msgid "yes means the arithmetic coprocessor has an exception vector attached"
 msgstr ""
 "\"sí\" significa que el coprocessador matemàtic te un vector d'excepció "
 "adjunt"
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
 #, c-format
 msgid "F00f bug"
 msgstr "Error F00f"
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
 #, c-format
 msgid "early pentiums were buggy and freezed when decoding the F00F bytecode"
 msgstr ""
 "els primers pentiums eren plens d'errors i es penjaven en decodificar el "
 "codi de byte F00F "
 
-#
-#: standalone/harddrake2:56
-#, fuzzy, c-format
-msgid "Geometry"
-msgstr "Reintenta"
-
-#: 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 "Error d'aturada"
 
-#: standalone/harddrake2:58
+#: standalone/harddrake2:76
 #, c-format
 msgid ""
 "Some of the early i486DX-100 chips cannot reliably return to operating mode "
@@ -23097,128 +23989,67 @@ msgstr ""
 "Alguns del primers xips i486DX-100 no poden tornar amb fiabilitat al mode "
 "d'operació després que s'hagi utilitzat la instrucció \"halt\""
 
-#: standalone/harddrake2:60
-#, c-format
-msgid "Floppy format"
-msgstr "Format del disquet"
-
-#: standalone/harddrake2:60
-#, c-format
-msgid "format of floppies supported by the drive"
-msgstr "format dels disquets que es poden utilitzar en la unitat"
-
-#: standalone/harddrake2:61
+#: standalone/harddrake2:77
 #, c-format
 msgid "sub generation of the cpu"
 msgstr "subgeneració de la CPU"
 
-#: standalone/harddrake2:62
-#, c-format
-msgid "class of hardware device"
-msgstr "tipus de dispositiu de maquinari"
-
-#: standalone/harddrake2:63 standalone/harddrake2:64
-#: standalone/printerdrake:212
-#, c-format
-msgid "Model"
-msgstr "Model"
-
-#: standalone/harddrake2:63
-#, c-format
-msgid "hard disk model"
-msgstr "model de disc dur"
-
-#: standalone/harddrake2:64
+#: standalone/harddrake2:78
 #, c-format
-msgid "generation of the cpu (eg: 8 for PentiumIII, ...)"
+msgid "generation of the cpu (eg: 8 for Pentium III, ...)"
 msgstr "generació de la CPU (p.ex., 8 per al Pentium III, etc.)"
 
-#: standalone/harddrake2:65
+#: standalone/harddrake2:79
 #, c-format
 msgid "Model name"
 msgstr "Nom del model"
 
-#: standalone/harddrake2:65
+#: standalone/harddrake2:79
 #, c-format
 msgid "official vendor name of the cpu"
 msgstr "nom oficial del distribuïdor de la cpu"
 
-#: standalone/harddrake2:66
-#, c-format
-msgid "Number of buttons"
-msgstr "Nombre de botons"
-
-#: standalone/harddrake2:66
-#, c-format
-msgid "the number of buttons the mouse has"
-msgstr "el nombre de botons que té el ratolí"
-
-#: standalone/harddrake2:67
+#: standalone/harddrake2:80
 #, c-format
 msgid "the name of the CPU"
 msgstr "nom de la CPU"
 
-#: standalone/harddrake2:68
-#, c-format
-msgid "network printer port"
-msgstr "port d'impressora de la xarxa"
-
-#: standalone/harddrake2:69
+#: standalone/harddrake2:81
 #, c-format
 msgid "Processor ID"
 msgstr "ID del processador"
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:81
 #, c-format
 msgid "the number of the processor"
 msgstr "número del processador"
 
-#: standalone/harddrake2:70
-#, fuzzy, c-format
-msgid "Primary partitions"
-msgstr "Formata les particions"
-
-#: standalone/harddrake2:70
-#, fuzzy, c-format
-msgid "the number of the primary partitions"
-msgstr "número del processador"
-
 #
-#: standalone/harddrake2:71
+#: standalone/harddrake2:82
 #, c-format
 msgid "Model stepping"
 msgstr "Pas a pas del model"
 
-#: standalone/harddrake2:71
+#: standalone/harddrake2:82
 #, c-format
 msgid "stepping of the cpu (sub model (generation) number)"
 msgstr "stepping de la CPU (número de submodel (generació))"
 
-#: standalone/harddrake2:72
-#, c-format
-msgid "the type of bus on which the mouse is connected"
-msgstr "tipus de bus a què està connectat el ratolí."
-
-#: standalone/harddrake2:73
-#, c-format
-msgid "the vendor name of the device"
-msgstr "el nom del venedor del dispositiu"
-
-#: standalone/harddrake2:74
+#: standalone/harddrake2:83
 #, c-format
 msgid "the vendor name of the processor"
 msgstr "el nom del distribuïdor del processador"
 
 #
-#: standalone/harddrake2:75
+#: standalone/harddrake2:84
 #, c-format
 msgid "Write protection"
 msgstr "Protecció contra escriptura"
 
-#: 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 ""
@@ -23227,63 +24058,191 @@ msgstr ""
 "eviti accessos del nucli no comprovats a la memòria de l'usuari (és a dir, "
 "que és un control contra errors)"
 
-#. -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 "Format del disquet"
+
+#: standalone/harddrake2:88
+#, c-format
+msgid "format of floppies supported by the drive"
+msgstr "format dels disquets que es poden utilitzar en la unitat"
+
+#: standalone/harddrake2:92
+#, c-format
+msgid "Channel"
+msgstr "Canal"
+
+#: standalone/harddrake2:92
+#, c-format
+msgid "EIDE/SCSI channel"
+msgstr "Canal EIDE/SCSI"
+
+#: standalone/harddrake2:93
+#, c-format
+msgid "Disk identifier"
+msgstr "Identificador de disc"
+
+#: standalone/harddrake2:93
+#, c-format
+msgid "usually the disk serial number"
+msgstr "normalment el número de sèrie del disc"
+
+#
+#: standalone/harddrake2:94
+#, c-format
+msgid "Logical unit number"
+msgstr ""
+
+#: standalone/harddrake2:94
+#, c-format
+msgid ""
+"the SCSI target number (LUN). SCSI devices connected to a host are uniquely "
+"identified by a\n"
+"channel number, a target id and a logical unit number"
+msgstr ""
+
+#: standalone/harddrake2:99
+#, c-format
+msgid "Device file"
+msgstr "Fitxer de dispositiu"
+
+#: standalone/harddrake2:99
+#, c-format
+msgid ""
+"the device file used to communicate with the kernel driver for the mouse"
+msgstr ""
+
+#: standalone/harddrake2:100
+#, c-format
+msgid "Emulated wheel"
+msgstr ""
+
+#: standalone/harddrake2:100
+#, c-format
+msgid "whether the wheel is emulated or not"
+msgstr "si la rodeta s'emula o no"
+
+#: standalone/harddrake2:101
+#, c-format
+msgid "the type of the mouse"
+msgstr "el tipus de ratolí"
+
+#: standalone/harddrake2:102
+#, c-format
+msgid "the name of the mouse"
+msgstr "el nom del ratolí"
+
+#: standalone/harddrake2:103
+#, c-format
+msgid "Number of buttons"
+msgstr "Nombre de botons"
+
+#: standalone/harddrake2:103
+#, c-format
+msgid "the number of buttons the mouse has"
+msgstr "el nombre de botons que té el ratolí"
+
+#: standalone/harddrake2:104
+#, c-format
+msgid "the type of bus on which the mouse is connected"
+msgstr "tipus de bus a què està connectat el ratolí."
+
+#: standalone/harddrake2:105
+#, c-format
+msgid "Mouse protocol used by X11"
+msgstr ""
+
+#: standalone/harddrake2:105
+#, c-format
+msgid "the protocol that the graphical desktop use with the mouse"
+msgstr ""
+
+#: standalone/harddrake2:112 standalone/harddrake2:121
+#: standalone/harddrake2:128 standalone/harddrake2:136
+#: standalone/harddrake2:309
+#, c-format
+msgid "Identification"
+msgstr "Identificació"
+
+#: standalone/harddrake2:113 standalone/harddrake2:129
+#, c-format
+msgid "Connection"
+msgstr "Connexió"
+
+#: standalone/harddrake2:122
+#, c-format
+msgid "Performances"
+msgstr ""
+
+#: standalone/harddrake2:123
+#, c-format
+msgid "Bugs"
+msgstr "Errors"
+
+#: standalone/harddrake2:124
+#, c-format
+msgid "FPU"
+msgstr "FPU"
+
+#: standalone/harddrake2:132
+#, c-format
+msgid "Partitions"
+msgstr "Particions"
+
+#: standalone/harddrake2:137
+#, c-format
+msgid "Features"
+msgstr "Característiques"
+
+#. -PO: please keep all "/" characters !!!
+#: standalone/harddrake2:158 standalone/logdrake:77
+#: standalone/printerdrake:152 standalone/printerdrake:165
 #, c-format
 msgid "/_Options"
 msgstr "/_Opcions"
 
-#: 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 "/_Ajuda"
 
 #
-#: standalone/harddrake2:95
+#: standalone/harddrake2:163
 #, c-format
 msgid "/Autodetect _printers"
 msgstr "/Detecta les im_pressores automàticament"
 
 #
-#: standalone/harddrake2:96
+#: standalone/harddrake2:164
 #, c-format
 msgid "/Autodetect _modems"
 msgstr "/Detecta els _mòdems automàticament"
 
 #
-#: standalone/harddrake2:97
+#: standalone/harddrake2:165
 #, c-format
 msgid "/Autodetect _jaz drives"
 msgstr "/Detecta automàticament les unitats _jaz"
 
-#: standalone/harddrake2:104 standalone/printerdrake:152
+#: standalone/harddrake2:172 standalone/printerdrake:158
 #, c-format
 msgid "/_Quit"
 msgstr "/_Surt"
 
-#: standalone/harddrake2:113
+#: standalone/harddrake2:181
 #, c-format
 msgid "/_Fields description"
 msgstr "/Descripció de _camps"
 
-#: standalone/harddrake2:115
+#: standalone/harddrake2:183
 #, c-format
 msgid "Harddrake help"
 msgstr "Ajuda del Harddrake"
 
-#: standalone/harddrake2:116
-#, c-format
-msgid ""
-"Description of the fields:\n"
-"\n"
-msgstr ""
-"Descripció dels camps:\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 "
@@ -23292,68 +24251,76 @@ msgstr ""
 "Quan hagueu seleccionat un dispositiu podreu veure'n la informació en els "
 "camps del marc dret (\"Informació\")"
 
-#: standalone/harddrake2:126 standalone/printerdrake:173
+#: standalone/harddrake2:197 standalone/printerdrake:179
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Informeu d'un error"
 
-#: standalone/harddrake2:127 standalone/printerdrake:174
+#: standalone/harddrake2:198 standalone/printerdrake:180
 #, c-format
 msgid "/_About..."
 msgstr "/_Quant a..."
 
-#: standalone/harddrake2:128
+#: standalone/harddrake2:199
 #, c-format
 msgid "About Harddrake"
 msgstr "Quant al 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 ""
-"Aquest és el HardDrake, l'eina de configuració de maquinari de Mandrake.\n"
+"Aquest és el HardDrake, l'eina de configuració de maquinari de "
+"Mandrakelinux.\n"
 "<span foreground=\"royalblue3\">Versió:</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 "Versió del Harddrake2 %s"
+msgid "Harddrake2"
+msgstr "Harddrake2"
 
-#: standalone/harddrake2:163
+#: standalone/harddrake2:234
 #, c-format
 msgid "Detected hardware"
 msgstr "S'ha detectat el següent maquinari"
 
-#: standalone/harddrake2:168
+#: standalone/harddrake2:239
 #, c-format
 msgid "Configure module"
 msgstr "Configura el mòdul"
 
-#: standalone/harddrake2:175
+#: standalone/harddrake2:246
 #, c-format
 msgid "Run config tool"
 msgstr "Executa l'eina de configuració"
 
-#: standalone/harddrake2:222
+#: standalone/harddrake2:296 standalone/net_monitor:108
+#: standalone/net_monitor:109 standalone/net_monitor:114
 #, c-format
 msgid "unknown"
 msgstr "desconegut"
 
-#: standalone/harddrake2:223
+#: standalone/harddrake2:297 standalone/printerdrake:308
+#: standalone/printerdrake:346
 #, c-format
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: standalone/harddrake2:241
+#: standalone/harddrake2:317
+#, c-format
+msgid "Misc"
+msgstr "Varis"
+
+#: standalone/harddrake2:332
 #, c-format
 msgid ""
 "Click on a device in the left tree in order to display its information here."
@@ -23361,185 +24328,190 @@ msgstr ""
 "Feu clic a un dispositiu de l'arbre de l'esquerra per veure'n aquí la "
 "informació."
 
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
 #, c-format
 msgid "secondary"
 msgstr "secundari"
 
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
 #, c-format
 msgid "primary"
 msgstr "primari"
 
-#: standalone/harddrake2:303
+#: standalone/harddrake2:388
 #, c-format
 msgid "burner"
 msgstr "gravador"
 
-#: 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 "Si us plau, seleccioneu la disposició del vostre teclat."
 
-#: standalone/keyboarddrake:33
+#: standalone/keyboarddrake:34
 #, c-format
 msgid "Do you want the BackSpace to return Delete in console?"
 msgstr "Voleu que la tecla Enrere efectuï un Suprimeix 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 ""
 "El canvi està fet, però perquè sigui efectiu heu de sortir de la sessió "
 "actual"
 
-#: standalone/logdrake:51
+#: standalone/logdrake:50
 #, c-format
-msgid "Mandrake Tools Logs"
+msgid "Mandrakelinux Tools Logs"
 msgstr ""
 
-#: 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-ho només per al dia seleccionat"
 
-#: standalone/logdrake:72
+#: standalone/logdrake:71
 #, c-format
 msgid "/File/_New"
 msgstr "/Fitxer/_Nou"
 
-#: 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 "/Fitxer/_Obre"
 
-#: standalone/logdrake:73
+#: standalone/logdrake:72
 #, c-format
 msgid "<control>O"
 msgstr "<control>O"
 
-#: standalone/logdrake:74
+#: standalone/logdrake:73
 #, c-format
 msgid "/File/_Save"
 msgstr "/Fitxer/De_sa"
 
-#: standalone/logdrake:74
+#: standalone/logdrake:73
 #, c-format
 msgid "<control>S"
 msgstr "<control>S"
 
-#: standalone/logdrake:75
+#: standalone/logdrake:74
 #, c-format
 msgid "/File/Save _As"
 msgstr "/Fitxer/_Anomena i desa"
 
-#: standalone/logdrake:76
+#: standalone/logdrake:75
 #, c-format
 msgid "/File/-"
 msgstr "/Fitxer/-"
 
-#: standalone/logdrake:79
+#: standalone/logdrake:78
 #, c-format
 msgid "/Options/Test"
 msgstr "/Opcions/Prova"
 
-#: standalone/logdrake:81
+#: standalone/logdrake:80
 #, c-format
 msgid "/Help/_About..."
 msgstr "/Ajuda/_Quant a.."
 
-#: standalone/logdrake:110
+#: standalone/logdrake:109
 #, c-format
 msgid ""
 "_:this is the auth.log log file\n"
 "Authentication"
 msgstr "Autenticació"
 
-#: standalone/logdrake:111
+#: standalone/logdrake:110
 #, c-format
 msgid ""
 "_:this is the user.log log file\n"
 "User"
 msgstr "Usuari"
 
-#: standalone/logdrake:112
+#: standalone/logdrake:111
 #, c-format
 msgid ""
 "_:this is the /var/log/messages log file\n"
 "Messages"
 msgstr "Missatges"
 
-#: standalone/logdrake:113
+#: standalone/logdrake:112
 #, c-format
 msgid ""
 "_:this is the /var/log/syslog log file\n"
 "Syslog"
 msgstr ""
 
-#: standalone/logdrake:117
+#: standalone/logdrake:116
 #, c-format
 msgid "search"
 msgstr "cerca"
 
-#: standalone/logdrake:129
+#: standalone/logdrake:128
 #, c-format
 msgid "A tool to monitor your logs"
 msgstr "Eina per veure els registres"
 
-#: standalone/logdrake:130 standalone/net_monitor:86
+#: standalone/logdrake:129 standalone/net_monitor:99
 #, c-format
 msgid "Settings"
 msgstr "Paràmetres"
 
-#: standalone/logdrake:135
+#: standalone/logdrake:134
 #, c-format
 msgid "Matching"
 msgstr "que coincideixin amb"
 
-#: standalone/logdrake:136
+#: standalone/logdrake:135
 #, c-format
 msgid "but not matching"
 msgstr "però que no coincideixin amb"
 
-#: standalone/logdrake:140
+#: standalone/logdrake:139
 #, c-format
 msgid "Choose file"
 msgstr "Escolliu el fitxer"
 
-#: standalone/logdrake:149
+#: standalone/logdrake:148
 #, c-format
 msgid "Calendar"
 msgstr "Calendari"
 
-#: standalone/logdrake:159
+#: standalone/logdrake:158
 #, c-format
 msgid "Content of the file"
 msgstr "Contingut del fitxer"
 
-#: standalone/logdrake:163 standalone/logdrake:429
+#: standalone/logdrake:162 standalone/logdrake:399
 #, c-format
 msgid "Mail alert"
 msgstr "Alerta de correu"
 
-#: standalone/logdrake:170
-#, c-format
-msgid "The alert wizard had unexpectly failled:"
+#: standalone/logdrake:169
+#, fuzzy, c-format
+msgid "The alert wizard has failed unexpectedly:"
 msgstr "L'auxiliar d'alerta ha fallat:"
 
 #: standalone/logdrake:221
@@ -23547,65 +24519,60 @@ msgstr "L'auxiliar d'alerta ha fallat:"
 msgid "please wait, parsing file: %s"
 msgstr "espereu si us plau, s'està analitzant el fitxer: %s"
 
-#: standalone/logdrake:406
+#: standalone/logdrake:376
 #, c-format
 msgid "Apache World Wide Web Server"
 msgstr "Servidor World Wide Web Apache"
 
-#: standalone/logdrake:407
+#: standalone/logdrake:377
 #, c-format
 msgid "Domain Name Resolver"
 msgstr "Sistema de resolució de nom de domini"
 
-#: 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 correu 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 "Servei Webmin"
 
-#: standalone/logdrake:413
+#: standalone/logdrake:383
 #, c-format
 msgid "Xinetd Service"
 msgstr "Servei Xinetd"
 
 #
-#: standalone/logdrake:424
+#: standalone/logdrake:394
 #, c-format
 msgid "Configure the mail alert system"
 msgstr "Configura el sistema d'alerta per correu"
 
-#: standalone/logdrake:425
+#: standalone/logdrake:395
 #, c-format
 msgid "Stop the mail alert system"
 msgstr "Atura el sistema d'alerta per correu"
 
 #
-#: standalone/logdrake:432
+#: standalone/logdrake:402
 #, c-format
 msgid "Mail alert configuration"
 msgstr "Configuració de l'alerta de correu"
 
-#: standalone/logdrake:433
+#: standalone/logdrake:403
 #, c-format
 msgid ""
 "Welcome to the mail configuration utility.\n"
@@ -23616,18 +24583,18 @@ msgstr ""
 "\n"
 "Aquí podreu configurar el sistema d'alerta.\n"
 
-#: standalone/logdrake:436
+#: standalone/logdrake:406
 #, c-format
 msgid "What do you want to do?"
 msgstr "Que voleu fer?"
 
 #
-#: standalone/logdrake:443
+#: standalone/logdrake:413
 #, c-format
 msgid "Services settings"
 msgstr "Paràmetre dels serveis"
 
-#: standalone/logdrake:444
+#: standalone/logdrake:414
 #, c-format
 msgid ""
 "You will receive an alert if one of the selected services is no longer "
@@ -23635,17 +24602,17 @@ msgid ""
 msgstr "Rebreu un avís si algun dels serveis seleccionats ja no funciona"
 
 #
-#: standalone/logdrake:451
+#: standalone/logdrake:421
 #, c-format
 msgid "Load setting"
 msgstr ""
 
-#: standalone/logdrake:452
+#: standalone/logdrake:422
 #, c-format
 msgid "You will receive an alert if the load is higher than this value"
 msgstr "Rebreu un avís si la càrrega és més gran que aquest valor"
 
-#: standalone/logdrake:453
+#: standalone/logdrake:423
 #, c-format
 msgid ""
 "_: load here is a noun, the load of the system\n"
@@ -23653,33 +24620,33 @@ msgid ""
 msgstr "Càrrega"
 
 #
-#: standalone/logdrake:458
+#: standalone/logdrake:428
 #, c-format
 msgid "Alert configuration"
 msgstr "Configuració de l'avís"
 
 #
-#: standalone/logdrake:459
+#: standalone/logdrake:429
 #, c-format
 msgid "Please enter your email address below "
 msgstr "Si us plau, entreu la vostra adreça electrònica"
 
-#: 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 "i introduïu el nom (o l'adreça IP) del servidor SMTP que voleu usar"
 
-#: standalone/logdrake:479
+#: standalone/logdrake:449
 #, c-format
 msgid "The wizard successfully configured the mail alert."
 msgstr "L'auxiliar ha configurat l'alerta per correu amb èxit."
 
-#: standalone/logdrake:485
+#: standalone/logdrake:455
 #, c-format
 msgid "The wizard successfully disabled the mail alert."
 msgstr "L'auxiliar ha desactivat l'alerta per correu amb èxit."
 
-#: standalone/logdrake:544
+#: standalone/logdrake:514
 #, c-format
 msgid "Save as.."
 msgstr "Anomena i desa..."
@@ -23704,28 +24671,76 @@ msgstr "Prova del ratolí"
 msgid "Please test your mouse:"
 msgstr "Si us plau, comproveu el ratolí:"
 
-#: standalone/net_monitor:52 standalone/net_monitor:57
+#: standalone/net_applet:30
+#, c-format
+msgid "Network is up on interface %s"
+msgstr "La xarxa està activa a la interfície %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 ""
+
+#: standalone/net_applet:53 standalone/net_monitor:471
+#, c-format
+msgid "Connect %s"
+msgstr "Connecta %s"
+
+#: standalone/net_applet:54 standalone/net_monitor:471
+#, c-format
+msgid "Disconnect %s"
+msgstr "Desconnecta %s"
+
+#
+#: standalone/net_applet:55
+#, c-format
+msgid "Monitor Network"
+msgstr "Monitoritza la xarxa"
+
+#: standalone/net_applet:56
+#, c-format
+msgid "Configure Network"
+msgstr "Configura la xarxa"
+
+#. -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 "Refresca"
+
+#: standalone/net_applet:58
+#, c-format
+msgid "Get Online Help"
+msgstr "Obtenir ajuda en línia"
+
+#: standalone/net_applet:158
+#, c-format
+msgid "Always launch on startup"
+msgstr "Executa sempre al inici"
+
+#: standalone/net_monitor:61 standalone/net_monitor:66
 #, c-format
 msgid "Network Monitoring"
 msgstr "Monitorització de la xarxa"
 
-#: standalone/net_monitor:92
+#: standalone/net_monitor:104
 #, c-format
 msgid "Global statistics"
 msgstr "Estadístiques globals"
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Instantaneous"
 msgstr "Instantània"
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Average"
 msgstr "Mitjana"
 
 #
-#: standalone/net_monitor:96
+#: standalone/net_monitor:108
 #, c-format
 msgid ""
 "Sending\n"
@@ -23734,7 +24749,7 @@ msgstr ""
 "Velocitat\n"
 "d'enviament:"
 
-#: standalone/net_monitor:97
+#: standalone/net_monitor:109
 #, c-format
 msgid ""
 "Receiving\n"
@@ -23743,7 +24758,7 @@ msgstr ""
 "Velocitat\n"
 "de recepció:"
 
-#: standalone/net_monitor:100
+#: standalone/net_monitor:113
 #, c-format
 msgid ""
 "Connection\n"
@@ -23752,84 +24767,79 @@ msgstr ""
 "Temps de\n"
 "connexió: "
 
-#: standalone/net_monitor:122
+#: standalone/net_monitor:120
+#, c-format
+msgid "Use same scale for received and transmitted"
+msgstr "Usa la mateixa escala per enviat i rebut"
+
+#: standalone/net_monitor:139
 #, c-format
 msgid "Wait please, testing your connection..."
 msgstr "Espereu, si us plau, s'està comprovant la vostra connexió..."
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, c-format
 msgid "Disconnecting from Internet "
 msgstr "S'està desconnectant d'Internet "
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, c-format
 msgid "Connecting to Internet "
 msgstr "S'està connectant a Internet "
 
-#: standalone/net_monitor:194
+#: standalone/net_monitor:232
 #, c-format
 msgid "Disconnection from Internet failed."
 msgstr "La desconnexió d'Internet ha fallat."
 
-#: standalone/net_monitor:195
+#: standalone/net_monitor:233
 #, c-format
 msgid "Disconnection from Internet complete."
 msgstr "S'ha completat la desconnexió d'Internet."
 
 #
-#: standalone/net_monitor:197
+#: standalone/net_monitor:235
 #, c-format
 msgid "Connection complete."
 msgstr "Connexió 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 ""
 "La connexió ha fallat.\n"
-"Comproveu la vostra configuració al Centre de control de Mandrake."
+"Comproveu la vostra configuració al Centre de control de Mandrakelinux."
 
 #
-#: standalone/net_monitor:299
+#: standalone/net_monitor:341
 #, c-format
 msgid "Color configuration"
 msgstr "Configuració de color"
 
-#: standalone/net_monitor:347 standalone/net_monitor:367
+#: standalone/net_monitor:389 standalone/net_monitor:409
 #, c-format
 msgid "sent: "
 msgstr "enviats:"
 
-#: standalone/net_monitor:354 standalone/net_monitor:371
+#: standalone/net_monitor:396 standalone/net_monitor:413
 #, c-format
 msgid "received: "
 msgstr "rebut:"
 
-#: standalone/net_monitor:361
+#: standalone/net_monitor:403
 #, c-format
 msgid "average"
 msgstr "mitjana"
 
 #
-#: standalone/net_monitor:364
+#: standalone/net_monitor:406
 #, c-format
 msgid "Local measure"
 msgstr "Mesura local"
 
-#: standalone/net_monitor:396
-#, c-format
-msgid "transmitted"
-msgstr "transmitits"
-
-#: standalone/net_monitor:397
-#, c-format
-msgid "received"
-msgstr "rebuts"
-
-#: standalone/net_monitor:415
+#: standalone/net_monitor:464
 #, c-format
 msgid ""
 "Warning, another internet connection has been detected, maybe using your "
@@ -23838,179 +24848,174 @@ msgstr ""
 "Avís: s'ha detectat una altra connexió a Internet, potser utilitzant la "
 "vostra xarxa"
 
-#: standalone/net_monitor:421
-#, c-format
-msgid "Disconnect %s"
-msgstr "Desconnecta %s"
-
-#: standalone/net_monitor:421
-#, c-format
-msgid "Connect %s"
-msgstr "Connecta %s"
-
-#: standalone/net_monitor:426
+#: standalone/net_monitor:475
 #, c-format
 msgid "No internet connection configured"
 msgstr "No s'ha configurat cap connexió a Internet"
 
 #
-#: standalone/printerdrake:70
+#: standalone/printerdrake:69
 #, c-format
 msgid "Loading printer configuration... Please wait"
 msgstr ""
 "S'està carregant la configuració de la impressora... Si us plau, espereu"
 
-#: standalone/printerdrake:86
+#: standalone/printerdrake:85
 #, c-format
 msgid "Reading data of installed printers..."
 msgstr "S'estan llegint dades de les impressores instal·lades..."
 
 #
-#: standalone/printerdrake:129
+#: standalone/printerdrake:134
 #, c-format
 msgid "%s Printer Management Tool"
 msgstr "%s Eina de gestió d'impressores"
 
-#: 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 "/_Accions"
 
-#: standalone/printerdrake:143
+#: standalone/printerdrake:148 standalone/printerdrake:160
+#, c-format
+msgid "/_Add Printer"
+msgstr "/_Afegeix impressora"
+
+#: standalone/printerdrake:149
 #, c-format
 msgid "/Set as _Default"
 msgstr "/Estableix com a _predeterminada"
 
-#: standalone/printerdrake:144
+#: standalone/printerdrake:150
 #, c-format
 msgid "/_Edit"
 msgstr "/_Edita"
 
-#: standalone/printerdrake:145
+#: standalone/printerdrake:151
 #, c-format
 msgid "/_Delete"
 msgstr "/_Esborra"
 
-#: standalone/printerdrake:146
+#: standalone/printerdrake:152
 #, c-format
 msgid "/_Expert mode"
 msgstr "/Mode _expert"
 
-#: standalone/printerdrake:151
+#: standalone/printerdrake:157
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Refresca"
 
-#: standalone/printerdrake:154
-#, c-format
-msgid "/_Add Printer"
-msgstr "/_Afegeix impressora"
-
-#: standalone/printerdrake:158
+#: standalone/printerdrake:164
 #, c-format
 msgid "/_Configure CUPS"
 msgstr "/_Configura CUPS"
 
-#: standalone/printerdrake:191
+#: standalone/printerdrake:197
 #, c-format
 msgid "Search:"
 msgstr "Cerca:"
 
-#: standalone/printerdrake:194
+#: standalone/printerdrake:200
 #, c-format
 msgid "Apply filter"
 msgstr "Aplica el filtre"
 
-#: standalone/printerdrake:212 standalone/printerdrake:219
+#: standalone/printerdrake:218 standalone/printerdrake:225
 #, c-format
 msgid "Def."
 msgstr ""
 
-#: standalone/printerdrake:212 standalone/printerdrake:219
+#: standalone/printerdrake:218 standalone/printerdrake:225
 #, c-format
 msgid "Printer Name"
 msgstr "Nom de la impressora"
 
-#: standalone/printerdrake:212
+#: standalone/printerdrake:218
 #, c-format
 msgid "Connection Type"
 msgstr "Tipus de connexió"
 
-#: standalone/printerdrake:219
+#: standalone/printerdrake:225
 #, c-format
 msgid "Server Name"
 msgstr "Nom 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 "Afegeix impressora"
 
-#: standalone/printerdrake:227
+#: standalone/printerdrake:233
 #, c-format
 msgid "Add a new printer to the system"
 msgstr "Afegeix una nova impressora 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 "Estableix com a predeterminat"
 
-#: standalone/printerdrake:230
+#: standalone/printerdrake:236
 #, c-format
 msgid "Set selected printer as the default printer"
 msgstr "Estaleix la impressora seleccionada com la predeterminada"
 
-#: standalone/printerdrake:233
+#: standalone/printerdrake:239
 #, c-format
 msgid "Edit selected printer"
 msgstr "Edita la impressora seleccionada"
 
 #
-#: standalone/printerdrake:236
+#: standalone/printerdrake:242
 #, c-format
 msgid "Delete selected printer"
 msgstr "Elimina la impressora 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 "Refresca"
-
-#: standalone/printerdrake:239
+#: standalone/printerdrake:245
 #, c-format
 msgid "Refresh the list"
 msgstr "Actualitza la llista"
 
 #. -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 "Configura CUPS"
 
 #
-#: standalone/printerdrake:242
+#: standalone/printerdrake:248
 #, c-format
 msgid "Configure CUPS printing system"
 msgstr "Configura el sistema d'impressió CUPS"
 
-#: standalone/printerdrake:528
+#: standalone/printerdrake:309 standalone/printerdrake:347
+#, c-format
+msgid "Enabled"
+msgstr "Habilitat"
+
+#: standalone/printerdrake:310 standalone/printerdrake:348
+#, c-format
+msgid "Disabled"
+msgstr "Deshabilitat"
+
+#: standalone/printerdrake:572
 #, c-format
 msgid "Authors: "
 msgstr "Autors: "
 
 #
-#: standalone/printerdrake:534
+#: standalone/printerdrake:578
 #, c-format
 msgid "Printer Management \n"
 msgstr "Gestió d'impressores \n"
 
-#: standalone/scannerdrake:50
+#: standalone/scannerdrake:51
 #, c-format
 msgid ""
 "SANE packages need to be installed to use scanners.\n"
@@ -24023,12 +25028,12 @@ msgstr ""
 "Vols instal·lar els paquets SANE?"
 
 #
-#: standalone/scannerdrake:54
+#: standalone/scannerdrake:55
 #, c-format
 msgid "Aborting Scannerdrake."
 msgstr "S'està avortant Scannerdrake."
 
-#: standalone/scannerdrake:59
+#: standalone/scannerdrake:60
 #, c-format
 msgid ""
 "Could not install the packages needed to set up a scanner with Scannerdrake."
@@ -24036,80 +25041,69 @@ msgstr ""
 "No s'han pogut instal·lar els paquets necessaris per configurar l'escàner "
 "amb Scannerdrake."
 
-#: standalone/scannerdrake:60
+#: standalone/scannerdrake:61
 #, c-format
 msgid "Scannerdrake will not be started now."
 msgstr "Scannerdrake no s'iniciarà ara."
 
-#: 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'estan cercant els escàners configurats..."
 
-#: 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'estan cercant escàners nous..."
 
-#: 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 "S'està tornant a generar la llista dels escàners configurats..."
 
-#: 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à suportat per aquesta versió de %s."
 
-#: standalone/scannerdrake:103
+#: standalone/scannerdrake:104
 #, c-format
 msgid "%s found on %s, configure it automatically?"
 msgstr "S'ha trobat %s en %s, voleu configurar-lo automàticament?"
 
-#: standalone/scannerdrake:115
+#: standalone/scannerdrake:116
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
 msgstr ""
 "%s no és a la base de dades de l'escàner, voleu configurar-lo manualment?"
 
 #
-#: standalone/scannerdrake:130
+#: standalone/scannerdrake:131
 #, c-format
 msgid "Select a scanner model"
 msgstr "Seleccioneu un model d'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 "Model detectat: %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 "Aquesta versió de l'Scannerdrake no coneix el %s."
-
-#: standalone/scannerdrake:169 standalone/scannerdrake:183
+#: standalone/scannerdrake:165 standalone/scannerdrake:179
 #, c-format
 msgid "Do not install firmware file"
 msgstr "No instal·lis el fitxer 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 "
@@ -24118,41 +25112,41 @@ msgstr ""
 "És possible que el vostre %s necessiti que el firmware s'actualitzi cada cop "
 "que s'encengui."
 
-#: 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 aquest és el cas, podeu fer que es faci automàticament."
 
-#: standalone/scannerdrake:175 standalone/scannerdrake:229
+#: standalone/scannerdrake:171 standalone/scannerdrake:225
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware file for your scanner so that it "
 "can be installed."
 msgstr ""
 
-#: standalone/scannerdrake:176 standalone/scannerdrake:230
+#: standalone/scannerdrake:172 standalone/scannerdrake:226
 #, c-format
 msgid ""
 "You find the file on the CD or floppy coming with the scanner, on the "
 "manufacturer's home page, or on your Windows partition."
 msgstr ""
 
-#: standalone/scannerdrake:178 standalone/scannerdrake:237
+#: standalone/scannerdrake:174 standalone/scannerdrake:233
 #, c-format
 msgid "Install firmware file from"
 msgstr "Instal·la el fitxer de firmware des de"
 
-#: standalone/scannerdrake:198
+#: standalone/scannerdrake:194
 #, c-format
 msgid "Select firmware file"
 msgstr "Seleccioneu el fitxer 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 fitxer de firmware %s no existeix o no és pot llegir!"
 
-#: standalone/scannerdrake:224
+#: standalone/scannerdrake:220
 #, c-format
 msgid ""
 "It is possible that your scanners need their firmware to be uploaded "
@@ -24161,47 +25155,47 @@ msgstr ""
 "És possible que el vostre escànner necessiti que el firmware s'actualitzi "
 "cada cop que s'encengui."
 
-#: standalone/scannerdrake:228
+#: standalone/scannerdrake:224
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware files for your scanners so that it "
 "can be installed."
 msgstr ""
 
-#: standalone/scannerdrake:231
+#: standalone/scannerdrake:227
 #, c-format
 msgid ""
 "If you have already installed your scanner's firmware you can update the "
 "firmware here by supplying the new firmware file."
 msgstr ""
 
-#: standalone/scannerdrake:233
+#: standalone/scannerdrake:229
 #, c-format
 msgid "Install firmware for the"
 msgstr ""
 
-#: standalone/scannerdrake:256
+#: standalone/scannerdrake:252
 #, c-format
 msgid "Select firmware file for the %s"
 msgstr "Seleccioneu el fitxer de firmware per %s"
 
-#: standalone/scannerdrake:274
-#, fuzzy, c-format
+#: standalone/scannerdrake:270
+#, c-format
 msgid "Could not install the firmware file for the %s!"
-msgstr "No instal·lis el fitxer de firmware"
+msgstr "No s'ha pogut instal·lar el fitxer de firmware per %s!"
 
-#: standalone/scannerdrake:287
+#: standalone/scannerdrake:283
 #, c-format
 msgid "The firmware file for your %s was successfully installed."
 msgstr "El fitxer de firmware pel vostre %s s'ha instal·lat correctament."
 
-#: standalone/scannerdrake:297
+#: standalone/scannerdrake:293
 #, c-format
 msgid "The %s is unsupported"
 msgstr "No es permet l'ús de %s"
 
 # Com que no se sap si %s serà masc. o fem., ja que es parla del printerdrake s'assumeix que es tracta d'una impressora i per tant poso  "la".
-#: standalone/scannerdrake:302
+#: standalone/scannerdrake:298
 #, c-format
 msgid ""
 "The %s must be configured by printerdrake.\n"
@@ -24212,34 +25206,34 @@ msgstr ""
 "Maquinari."
 
 #
-#: 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 "Detecta automàticament els ports 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 "Si us plau seleccioneu el dispositiu al qual teniu connectat el %s"
 
-#: standalone/scannerdrake:309
+#: standalone/scannerdrake:305
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
 msgstr "(Nota: els ports paral·lel no es poden detectar automàticament)"
 
 #
-#: standalone/scannerdrake:311 standalone/scannerdrake:356
+#: standalone/scannerdrake:307 standalone/scannerdrake:352
 #, c-format
 msgid "choose device"
 msgstr "escolliu un dispositiu"
 
-#: standalone/scannerdrake:345
+#: standalone/scannerdrake:341
 #, c-format
-msgid "Searching for scanners ..."
+msgid "Searching for scanners..."
 msgstr "S'estan cercant els escàners..."
 
-#: standalone/scannerdrake:380
+#: standalone/scannerdrake:376
 #, c-format
 msgid ""
 "Your %s has been configured.\n"
@@ -24250,7 +25244,7 @@ msgstr ""
 "Ara podeu escanejar documents utilitzant \"XSane\" o \"Kooka\" des de "
 "Multimèdia/Gràfics en el menú d'aplicacions."
 
-#: standalone/scannerdrake:404
+#: standalone/scannerdrake:400
 #, c-format
 msgid ""
 "The following scanners\n"
@@ -24263,7 +25257,7 @@ msgstr ""
 "%s\n"
 "estan disponibles al sistema.\n"
 
-#: standalone/scannerdrake:405
+#: standalone/scannerdrake:401
 #, c-format
 msgid ""
 "The following scanner\n"
@@ -24276,43 +25270,43 @@ msgstr ""
 "%s\n"
 "està disponible al 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 s'ha trobat cap escàner que estigui disponible en el vostre sistema.\n"
 
-#: standalone/scannerdrake:425
+#: standalone/scannerdrake:421
 #, c-format
 msgid "Search for new scanners"
 msgstr "Cerca escàners nous"
 
-#: standalone/scannerdrake:431
+#: standalone/scannerdrake:427
 #, c-format
 msgid "Add a scanner manually"
 msgstr "Afegiu un escàner manualment"
 
-#: standalone/scannerdrake:438
+#: standalone/scannerdrake:434
 #, c-format
 msgid "Install/Update firmware files"
 msgstr "Instal·la/Actualitza fitxers de firmware"
 
-#: standalone/scannerdrake:444
+#: standalone/scannerdrake:440
 #, c-format
 msgid "Scanner sharing"
 msgstr "Compartició d'escàners"
 
-#: standalone/scannerdrake:503 standalone/scannerdrake:668
+#: standalone/scannerdrake:499 standalone/scannerdrake:664
 #, c-format
 msgid "All remote machines"
 msgstr "Totes les màquines remotes"
 
-#: standalone/scannerdrake:515 standalone/scannerdrake:818
+#: standalone/scannerdrake:511 standalone/scannerdrake:814
 #, c-format
 msgid "This machine"
 msgstr "Aquesta màquina"
 
-#: standalone/scannerdrake:555
+#: standalone/scannerdrake:551
 #, c-format
 msgid ""
 "Here you can choose whether the scanners connected to this machine should be "
@@ -24321,7 +25315,7 @@ msgstr ""
 "Aquí podeu decidir si màquines remotes, i quines d'elles, han de poder "
 "accedir als escàners connectats a aquesta màquina."
 
-#: standalone/scannerdrake:556
+#: standalone/scannerdrake:552
 #, c-format
 msgid ""
 "You can also decide here whether scanners on remote machines should be made "
@@ -24330,34 +25324,34 @@ msgstr ""
 "També podeu decidir aquí si aquesta màquina ha de poder accedir als escàners "
 "de màquines remotes."
 
-#: standalone/scannerdrake:559
+#: standalone/scannerdrake:555
 #, c-format
 msgid "The scanners on this machine are available to other computers"
 msgstr ""
 "Els escàners d'aquesta màquina estan disponibles per a altres ordinadors"
 
-#: standalone/scannerdrake:561
+#: standalone/scannerdrake:557
 #, c-format
 msgid "Scanner sharing to hosts: "
 msgstr "Compartició d'escàners amb els ordinadors centrals:"
 
-#: standalone/scannerdrake:575
+#: standalone/scannerdrake:571
 #, c-format
 msgid "Use scanners on remote computers"
 msgstr "Utilitza els escàners d'ordinadors remots"
 
-#: standalone/scannerdrake:578
+#: standalone/scannerdrake:574
 #, c-format
 msgid "Use the scanners on hosts: "
 msgstr "Utilitza els escàners dels ordinadors centrals:"
 
-#: 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 "Compartició d'escàners locals"
 
-#: standalone/scannerdrake:606
+#: standalone/scannerdrake:602
 #, c-format
 msgid ""
 "These are the machines on which the locally connected scanner(s) should be "
@@ -24366,57 +25360,57 @@ msgstr ""
 "Aquestes són les màquines en què l'escàner o escàners connectats localment "
 "han d'estar disponibles:"
 
-#: standalone/scannerdrake:617 standalone/scannerdrake:767
+#: standalone/scannerdrake:613 standalone/scannerdrake:763
 #, c-format
 msgid "Add host"
 msgstr "Afegeix un ordinador"
 
-#: standalone/scannerdrake:623 standalone/scannerdrake:773
+#: standalone/scannerdrake:619 standalone/scannerdrake:769
 #, c-format
 msgid "Edit selected host"
 msgstr "Edita l'ordinador seleccionat"
 
 #
-#: standalone/scannerdrake:632 standalone/scannerdrake:782
+#: standalone/scannerdrake:628 standalone/scannerdrake:778
 #, c-format
 msgid "Remove selected host"
 msgstr "Elimina l'ordinador seleccionat"
 
-#: 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 "Nom/Adreça IP de l'ordinador:"
 
-#: 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 "Escolliu l'ordinador on els escàners locals han d'estar disponibles:"
 
 #
-#: 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 "Heu d'introduir un nom d'ordinador o una adreça 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 "Aquest ordinador  ja és a la llista, no es pot tornar a afegir.\n"
 
-#: standalone/scannerdrake:755
+#: standalone/scannerdrake:751
 #, c-format
 msgid "Usage of remote scanners"
 msgstr "Utilització d'escàners remots"
 
-#: standalone/scannerdrake:756
+#: standalone/scannerdrake:752
 #, c-format
 msgid "These are the machines from which the scanners should be used:"
 msgstr "Les màquines des de les quals s'han d'utilitzar els escàners son:"
 
-#: standalone/scannerdrake:913
+#: standalone/scannerdrake:909
 #, c-format
 msgid ""
 "saned needs to be installed to share the local scanner(s).\n"
@@ -24427,32 +25421,32 @@ msgstr ""
 "\n"
 "Vols instal·lar el paquet de 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 "Els vostre(s) escànner(s) no estaran disponibles a la xarxa."
 
-#: standalone/service_harddrake:62
+#: standalone/service_harddrake:104
 #, c-format
 msgid "Some devices in the \"%s\" hardware class were removed:\n"
 msgstr "S'han suprimit alguns dispositius en la classe \"%s\" de maquinari:\n"
 
-#: standalone/service_harddrake:63
+#: standalone/service_harddrake:105
 #, c-format
 msgid "- %s was removed\n"
 msgstr ""
 
-#: standalone/service_harddrake:66
+#: standalone/service_harddrake:108
 #, c-format
 msgid "Some devices were added: %s\n"
 msgstr "S'han afegit alguns dispositius: %s\n"
 
-#: standalone/service_harddrake:67
+#: standalone/service_harddrake:109
 #, c-format
 msgid "- %s was added\n"
 msgstr "- s'ha afegit %s\n"
 
-#: standalone/service_harddrake:126
+#: standalone/service_harddrake:199
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "Comprovació de maquinari en curs"
@@ -24464,7 +25458,7 @@ msgstr ""
 
 #: standalone/service_harddrake_confirm:8
 #, c-format
-msgid "Do you want to run the appropriate config tool ?"
+msgid "Do you want to run the appropriate config tool?"
 msgstr "Voleu executar l'eina de configuració adequada?"
 
 #: steps.pm:14
@@ -24559,22 +25553,22 @@ msgstr "Instal·la les actualitzacions"
 msgid "Exit install"
 msgstr "Surt de la instal·lació"
 
-#: ugtk2.pm:1084
+#: ugtk2.pm:1122
 #, c-format
 msgid "Is this correct?"
 msgstr "Això és correcte?"
 
-#: ugtk2.pm:1212
+#: ugtk2.pm:1250
 #, c-format
 msgid "Expand Tree"
 msgstr "Expandeix l'arbre"
 
-#: ugtk2.pm:1213
+#: ugtk2.pm:1251
 #, c-format
 msgid "Collapse Tree"
 msgstr "Redueix l'arbre"
 
-#: ugtk2.pm:1214
+#: ugtk2.pm:1252
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr "Commuta entre pla i ordenat per grups"
@@ -24593,168 +25587,3030 @@ msgstr ""
 msgid "Installation failed"
 msgstr "La instal·lació ha fallat"
 
-#: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Estació de treball d'oficina"
+#, fuzzy
+#~ msgid "The "
+#~ msgstr "Tema"
 
-#: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Programes d'ofimàtica: processadors de textos (kword, abiword), fulls de "
-"càlcul (kspread, gnumeric), visualitzadors pdf, etc."
+#, fuzzy
+#~ msgid "Morrocco"
+#~ msgstr "Marroc"
 
-#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Estació de jocs"
+#, fuzzy
+#~ msgid "Server Information:"
+#~ msgstr "Informació"
 
-#: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Programes d'entreteniment: acció, jocs de taula, estratègia, etc."
+#
+#, fuzzy
+#~ msgid "Use SSL connection"
+#~ msgstr "Connexió ADSL"
 
-#: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Estació multimèdia"
+#, fuzzy
+#~ msgid "User Base:"
+#~ msgstr "Nom d'usuari"
 
-#: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programes de reproducció/edició de so i vídeo"
+#, fuzzy
+#~ msgid "Base:"
+#~ msgstr "Nom:"
 
-#: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Estació d'Internet"
+#
+#, fuzzy
+#~ msgid "Scope:"
+#~ msgstr "Atura"
 
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
-"Web"
-msgstr ""
-"Conjunt d'eines per llegir i enviar correu i notícies (mutt, tin...) i per "
-"navegar pel Web"
+#, fuzzy
+#~ msgid "Bind Server:"
+#~ msgstr "Servidor:"
 
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Ordinador de xarxa (client)"
+#, fuzzy
+#~ msgid "Users database"
+#~ msgstr "Base de dades LDAP"
 
-#: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Clients per a diferents protocols, incloent l'ssh"
+#~ msgid "OK"
+#~ msgstr "D'acord"
+
+#~ msgid "NO"
+#~ msgstr "NO"
+
+#~ msgid "YES"
+#~ msgstr "SÍ"
+
+#~ 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 ""
+#~ "Les opcions següents es poden establir per personalitzar la seguretat\n"
+#~ "del vostre sistema. Si necessiteu una explicació, mireu el rètol "
+#~ "d'ajuda.\n"
+
+#~ msgid "The %s is not known by this version of Scannerdrake."
+#~ msgstr "Aquesta versió de l'Scannerdrake no coneix el %s."
+
+#~ msgid "Czech (QWERTZ)"
+#~ msgstr "Txec (QWERTZ)"
+
+#~ msgid "German"
+#~ msgstr "Alemany"
+
+#~ msgid "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid "Spanish"
+#~ msgstr "Espanyol"
+
+#~ msgid "Finnish"
+#~ msgstr "Finès"
+
+#~ msgid "French"
+#~ msgstr "Francès"
+
+#~ msgid "Norwegian"
+#~ msgstr "Noruec"
+
+#~ msgid "Polish"
+#~ msgstr "Polonès"
+
+#~ msgid "Russian"
+#~ msgstr "Rus"
+
+#~ msgid "Swedish"
+#~ msgstr "Suec"
+
+#~ msgid "Albanian"
+#~ msgstr "Albanès"
+
+#~ msgid "Armenian (old)"
+#~ msgstr "Armeni (antic)"
+
+#~ msgid "Armenian (typewriter)"
+#~ msgstr "Armeni (màquina d'escriure)"
+
+#~ msgid "Armenian (phonetic)"
+#~ msgstr "Armeni (fonètic)"
+
+#~ msgid "Arabic"
+#~ msgstr "Àrab"
+
+#~ msgid "Azerbaidjani (latin)"
+#~ msgstr "Azerbaidjanès (llatí)"
+
+#~ msgid "Belgian"
+#~ msgstr "Belga"
+
+#~ msgid "Bengali"
+#~ msgstr "Bengalí"
+
+#~ msgid "Bulgarian (phonetic)"
+#~ msgstr "Búlgar (fonètic)"
+
+#~ msgid "Bulgarian (BDS)"
+#~ msgstr "Búlgar (BDS)"
+
+#~ msgid "Brazilian (ABNT-2)"
+#~ msgstr "Brasiler (ABNT-2)"
+
+#~ msgid "Bosnian"
+#~ msgstr "Bosnià"
+
+#~ msgid "Belarusian"
+#~ msgstr "Bielorrús"
+
+#~ msgid "Swiss (German layout)"
+#~ msgstr "Suís (disposició alemanya)"
+
+#~ msgid "Swiss (French layout)"
+#~ msgstr "Suís (disposició francesa)"
+
+#~ msgid "Czech (QWERTY)"
+#~ msgstr "Txec (QWERTY)"
+
+#~ msgid "German (no dead keys)"
+#~ msgstr "Alemany (sense tecles inoperatives)"
+
+#~ msgid "Devanagari"
+#~ msgstr "Devanagari"
+
+#~ msgid "Danish"
+#~ msgstr "Danès"
+
+#~ msgid "Dvorak (US)"
+#~ msgstr "Dvorak (Estats Units)"
+
+#~ msgid "Dvorak (Esperanto)"
+#~ msgstr "Dvorak (Esperanto)"
+
+#~ msgid "Dvorak (Norwegian)"
+#~ msgstr "Dvorak (Noruec)"
+
+#~ msgid "Dvorak (Swedish)"
+#~ msgstr "Dvorak (Suec)"
+
+#~ msgid "Estonian"
+#~ msgstr "Estonià"
+
+#~ msgid "Georgian (\"Russian\" layout)"
+#~ msgstr "Georgià (disposició \"russa\")"
+
+#~ msgid "Georgian (\"Latin\" layout)"
+#~ msgstr "Georgià (disposició \"llatina\")"
+
+#~ msgid "Greek"
+#~ msgstr "Grec"
+
+#~ msgid "Greek (polytonic)"
+#~ msgstr "Grec (politònic)"
+
+#~ msgid "Gujarati"
+#~ msgstr "Gujarati"
+
+#~ msgid "Gurmukhi"
+#~ msgstr "Gurmukhi"
+
+#~ msgid "Hungarian"
+#~ msgstr "Hongarès"
+
+#~ msgid "Croatian"
+#~ msgstr "Croata"
+
+#~ msgid "Irish"
+#~ msgstr "Irlandès"
+
+#~ msgid "Israeli"
+#~ msgstr "Israelià"
+
+#~ msgid "Israeli (Phonetic)"
+#~ msgstr "Israelià (fonètic)"
+
+#~ msgid "Iranian"
+#~ msgstr "Iranià"
+
+#~ msgid "Icelandic"
+#~ msgstr "Islandès"
+
+#~ msgid "Italian"
+#~ msgstr "Italià"
+
+#~ msgid "Inuktitut"
+#~ msgstr "Inuktitut"
+
+#~ msgid "Japanese 106 keys"
+#~ msgstr "Japonès de 106 tecles"
+
+#~ msgid "Kannada"
+#~ msgstr "Kannada"
+
+#~ msgid "Korean keyboard"
+#~ msgstr "Teclat coreà"
+
+#~ msgid "Latin American"
+#~ msgstr "Espanyol sud-americà"
+
+#~ msgid "Laotian"
+#~ msgstr "Laosià"
+
+#~ msgid "Lithuanian AZERTY (old)"
+#~ msgstr "Lituà AZERTY (antic)"
+
+#~ msgid "Lithuanian AZERTY (new)"
+#~ msgstr "Lituà AZERTY (nou)"
+
+#~ msgid "Lithuanian \"number row\" QWERTY"
+#~ msgstr "Lituà \"fila de números\" QWERTY"
+
+#~ msgid "Lithuanian \"phonetic\" QWERTY"
+#~ msgstr "Lituà \"fonètic\" QWERTY"
+
+#~ msgid "Latvian"
+#~ msgstr "Letó"
+
+#~ msgid "Malayalam"
+#~ msgstr "Malaialam"
+
+#~ msgid "Macedonian"
+#~ msgstr "Macedoni"
+
+#~ msgid "Myanmar (Burmese)"
+#~ msgstr "Myanmar (Burmese)"
+
+#~ msgid "Mongolian (cyrillic)"
+#~ msgstr "Mongol (ciríl·lic)"
+
+#~ msgid "Maltese (UK)"
+#~ msgstr "Maltès (Regne Unit)"
+
+#~ msgid "Maltese (US)"
+#~ msgstr "Maltès (Estats Units)"
+
+#~ msgid "Dutch"
+#~ msgstr "Holandès"
+
+#~ msgid "Oriya"
+#~ msgstr "Oriya"
+
+#~ msgid "Polish (qwerty layout)"
+#~ msgstr "Polonès (disposició qwerty)"
+
+#~ msgid "Polish (qwertz layout)"
+#~ msgstr "Polonès (disposició qwertz)"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portuguès"
+
+#~ msgid "Canadian (Quebec)"
+#~ msgstr "Canadenc (Quebec)"
+
+#~ msgid "Romanian (qwertz)"
+#~ msgstr "Romanès (qwertz)"
+
+#~ msgid "Romanian (qwerty)"
+#~ msgstr "Romanès (qwerty)"
+
+#~ msgid "Russian (Phonetic)"
+#~ msgstr "Rus (fonètic)"
+
+#~ msgid "Saami (norwegian)"
+#~ msgstr "Saami (Noruec)"
+
+#~ msgid "Saami (swedish/finnish)"
+#~ msgstr "Saami (suec/finès)"
+
+#~ msgid "Slovenian"
+#~ msgstr "Eslovè"
+
+#~ msgid "Slovakian (QWERTZ)"
+#~ msgstr "Eslovac (QWERTZ)"
+
+#~ msgid "Slovakian (QWERTY)"
+#~ msgstr "Eslovac (QWERTY)"
+
+#~ msgid "Serbian (cyrillic)"
+#~ msgstr "Serbi (ciríl·lic)"
+
+#~ msgid "Syriac"
+#~ msgstr "Siri"
+
+#~ msgid "Syriac (phonetic)"
+#~ msgstr "Siri (fonètic)"
+
+#~ msgid "Telugu"
+#~ msgstr "Telugu"
+
+#~ msgid "Tamil (ISCII-layout)"
+#~ msgstr "Tàmil (disposició ISCII)"
+
+#~ msgid "Tamil (Typewriter-layout)"
+#~ msgstr "Tàmil (disposició de màquina d'escriure)"
+
+#~ msgid "Thai keyboard"
+#~ msgstr "Teclat tai"
+
+#~ msgid "Tajik keyboard"
+#~ msgstr "Teclat tadjik"
+
+#~ msgid "Turkish (traditional \"F\" model)"
+#~ msgstr "Turc (tradicional, model \"F\")"
+
+#~ msgid "Turkish (modern \"Q\" model)"
+#~ msgstr "Turc (modern, model \"Q\")"
+
+#~ msgid "Ukrainian"
+#~ msgstr "Ucraïnès"
+
+#~ msgid "Uzbek (cyrillic)"
+#~ msgstr "Uzbek (ciríl·lic)"
+
+#~ msgid "Vietnamese \"numeric row\" QWERTY"
+#~ msgstr "Vietnamita \"fila numèrica\" QWERTY"
+
+#~ msgid "Yugoslavian (latin)"
+#~ msgstr "Iugoslau (llatí)"
 
 #
-#: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Configuració"
+#~ msgid "No devices found"
+#~ msgstr "No s'ha trobat cap dispositiu"
 
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Eines per facilitar la configuració de l'ordinador"
+#~ msgid "Could not install necessary packages, %s cannot be started!"
+#~ msgstr ""
+#~ "No s'han pogut instal·lar els paquets necessaris, no es pot iniciar %s!"
 
-#: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Eines de consola"
+#~ msgid ""
+#~ "You don't have any configured Internet connection.\n"
+#~ "Please run \"Internet access\" in control center."
+#~ msgstr ""
+#~ "No teniu cap connexió a Internet configurada.\n"
+#~ "Si us plau executeu \"Accés a internet\" al centre de control"
 
-#: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editors, intèrprets d'ordres, eines de fitxer, terminals"
+#~ msgid ""
+#~ "Welcome to the UPS configuration utility.\n"
+#~ "\n"
+#~ "Here, you'll be add a new UPS to your system.\n"
+#~ msgstr ""
+#~ "Benvingut a la utilitat de configuració de SAI.\n"
+#~ "\n"
+#~ "Aquí podreu afegir un nou SAI al vostre sistema.\n"
 
-#: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Estació de treball KDE"
+#~ msgid "Enable multiple profiles"
+#~ msgstr "Habilita perfils múltiples"
 
-#: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"L'entorn d'escriptori K (KDE), l'entorn gràfic bàsic que inclou diverses "
-"eines"
+#~ msgid ""
+#~ "You now have the opportunity to download updated packages. These "
+#~ "packages\n"
+#~ "have been updated after the distribution was released. They may\n"
+#~ "contain security or bug fixes.\n"
+#~ "\n"
+#~ "To download these packages, you will need to have a working Internet \n"
+#~ "connection.\n"
+#~ "\n"
+#~ "Do you want to install the updates ?"
+#~ msgstr ""
+#~ "Ara teniu l'oportunitat de baixar paquets actualitzats. Aquests paquets\n"
+#~ "han estat actualitzats després de la publicació de la distribució. Poden "
+#~ "contenir\n"
+#~ "actualitzacions de seguretat o correccions d'errors.\n"
+#~ "\n"
+#~ "Per baixar aquests paquets necessitareu tenir una connexió a Internet\n"
+#~ "operativa.\n"
+#~ "\n"
+#~ "Voleu instal·lar les actualitzacions?"
 
-#: ../../share/compssUsers:999
-msgid "GNOME Workstation"
-msgstr "Estació de treball GNOME"
+#
+#~ msgid "Installing bootloader"
+#~ msgstr "S'està instal·lant el carregador de l'arrencada"
 
-#: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Entorn gràfic amb un conjunt d'aplicacions i eines d'escriptori fàcil "
-"d'utilitzar"
+#~ msgid ""
+#~ "You may now provide options to module %s.\n"
+#~ "Options are in format ``name=value name2=value2...''.\n"
+#~ "For instance, ``io=0x300 irq=7''"
+#~ msgstr ""
+#~ "Ara podeu proporcionar les opcions per al mòdul %s.\n"
+#~ "Les opcions estan en el format \"nom=valor nom2=valor2 ...\".\n"
+#~ "Per exemple, \"io=0x300 irq=7\""
 
-#: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Altres escriptoris gràfics"
+#~ msgid "Configuring printer..."
+#~ msgstr "S'està configurant la impressora..."
 
-#: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+#
+#~ msgid "Configuring applications..."
+#~ msgstr "S'estan configurant les aplicacions..."
 
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Biblioteques de desenvolupament C i C++, programes i fitxers include"
+#~ msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
+#~ msgstr "Afegeix aquesta impressora a Star Office/OpenOffice.org/GIMP"
 
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documentació"
+#~ msgid "Remove this printer from Star Office/OpenOffice.org/GIMP"
+#~ msgstr "Suprimeix aquesta impressora de Star Office/OpenOffice.org/GIMP"
 
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Llibres i Com es fa... sobre el Linux i el programari lliure"
+#~ msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
+#~ msgstr "S'està afegint la impressora a Star Office/OpenOffice.org/GIMP"
 
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+#~ msgid ""
+#~ "The printer \"%s\" was successfully added to Star Office/OpenOffice.org/"
+#~ "GIMP."
+#~ msgstr ""
+#~ "S'ha afegit correctament la impressora \"%s\" a Star Office/OpenOffice."
+#~ "org/GIMP."
 
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Base Estàndard de Linux (LSB). Suport a aplicacions de tercers"
+#~ msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
+#~ msgstr ""
+#~ "És impossible d'afegir la impressora \"%s\" a Star Office/OpenOffice.org/"
+#~ "GIMP."
 
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
+#~ msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
+#~ msgstr "S'està suprimint la impressora d'Star Office/OpenOffice.org/GIMP"
 
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache i Pro-ftpd"
+#~ msgid ""
+#~ "The printer \"%s\" was successfully removed from Star Office/OpenOffice."
+#~ "org/GIMP."
+#~ msgstr ""
+#~ "La impressora \"%s\" ha estat suprimida d'Star Office/OpenOffice.org/GIMP "
+#~ "amb èxit."
 
-#: ../../share/compssUsers:999
-msgid "Mail"
-msgstr "Correu"
+#~ msgid ""
+#~ "Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
+#~ msgstr ""
+#~ "És impossible de suprimir la impressora \"%s\" d'Star Office/OpenOffice."
+#~ "org/GIMP."
 
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Servidor de correu Postfix"
+#~ msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
+#~ msgstr "<b>Felicitats per triar Mandrakelinux!</b>"
 
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Base de dades"
+#~ 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."
+#~ msgstr ""
+#~ "El vostre nou sistema operatiu Mandrakelinux i les seves múltiples "
+#~ "aplicacions són el resultat de l'esforç col·laboratiu dels "
+#~ "desenvolupadors de Mandrakesoft i els contribuïdors de Mandrakelinux al "
+#~ "voltant del món."
 
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Servidor de bases de dades PostgreSQL o MySQL"
+#~ msgid ""
+#~ "We would like to thank everyone who participated in the development of "
+#~ "this latest release."
+#~ msgstr ""
+#~ "Voldríem donar les gràcies a tothom que hagi participat en el "
+#~ "desenvolupament d'aquesta versió."
 
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Tallafoc/Encaminador"
+#~ msgid "<b>Discovery</b>"
+#~ msgstr "<b>Discovery</b>"
+
+#~ msgid ""
+#~ "The menu is task-oriented, with a single selected application per task."
+#~ msgstr "El menú està orientat a tasques, amb una sola aplicació per tasca."
+
+#~ msgid ""
+#~ "The powerful Open Source graphical desktop environment KDE is the desktop "
+#~ "of choice for the Discovery Pack."
+#~ msgstr ""
+#~ "El potent entorn gràfic d'escriptori de Codi Obert KDE és l'escriptori "
+#~ "triat pel Discovery Pack."
+
+#~ msgid "<b>OpenOffice.org</b>: The complete Linux office suite."
+#~ msgstr "<b>OpenOffice.org</b>: El paquet d'oficina complet per a Linux."
+
+#~ msgid ""
+#~ "<b>WRITER</b> is a powerful word processor for creating all types of text "
+#~ "documents. Documents may include images, diagrams and tables."
+#~ msgstr ""
+#~ "<b>WRITER</b> és un potent editor de text per crear tot tipus de "
+#~ "documents de text. Els documents poden incloure imatges, diagrames i "
+#~ "taules."
+
+#~ msgid ""
+#~ "<b>CALC</b> is a feature-packed spreadsheet which enables you to compute, "
+#~ "analyze and manage all of your data."
+#~ msgstr ""
+#~ "<b>CALC</b> és un full de càlcul amb moltes possibilitats que us permet "
+#~ "computar, analitzar i gestionar totes les vostres dades."
+
+#~ msgid ""
+#~ "<b>IMPRESS</b> is the fastest, most powerful way to create effective "
+#~ "multimedia presentations."
+#~ msgstr ""
+#~ "<b>IMPRESS</b> és la forma més ràpida i potent de crear presentacions "
+#~ "multimèdia."
+
+#~ msgid ""
+#~ "<b>DRAW</b> will produce everything from simple diagrams to dynamic 3D "
+#~ "illustrations."
+#~ msgstr ""
+#~ "<b>DRAW</b> por produir de tot, des de diagrames simples a il·lustracions "
+#~ "3D dinàmiques."
+
+#~ msgid "<b>Surf The Internet</b>"
+#~ msgstr "<b>Navega per Internet</b>"
+
+#~ 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!"
+#~ msgstr ""
+#~ "Més que només un complet client de correu, <b>Kontact</b> també inclou "
+#~ "una llibreta d'adreces, un calendari i un planificador, a més d'una eina "
+#~ "d'agafar notes!"
+
+#~ msgid "You can also:"
+#~ msgstr "També podeu:"
+
+#~ msgid "\t* browse the Web"
+#~ msgstr "\t navegar per la Web"
+
+#~ msgid "\t* chat"
+#~ msgstr "\t xatejar"
+
+#~ msgid "\t* organize a video-conference"
+#~ msgstr "\t* organitzar una vídeo conferència"
+
+#~ msgid "\t* create your own Web site"
+#~ msgstr "\t crear la vostra pàgina web"
+
+#~ msgid "<b>Multimedia</b>: Software for every need!"
+#~ msgstr "<b>Multimèdia</b>: Programari per totes les necessitats!"
+
+#~ msgid "Listen to audio CDs with <b>KsCD</b>."
+#~ msgstr "Escolteu CD d'àudio amb <b>KsCD</b>."
+
+#~ msgid "Listen to music files and watch videos with <b>Totem</b>."
+#~ msgstr "Escolteu fitxers musicals i mireu vídeos amb <b>Totem</b>."
+
+#~ msgid ""
+#~ "View and edit images and photos with <b>GQview</b> and <b>The Gimp!</b>"
+#~ msgstr "Veieu i editeu imatges i fotos amb <b>GQview</b>i <b>El Gimp</b>"
 
 #
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Passarel·la a Internet"
+#~ msgid "Become a <b>Mandrakeclub</b> member!"
+#~ msgstr "Esdeveniu un membre del <b>Mandrakeclub</b>!"
 
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Servidor d'ordinador de xarxa"
+#~ msgid "\t* Full access to commercial applications"
+#~ msgstr "\t* Accés complet a aplicacions comercials"
 
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Servidor NFS, Servidor SMB, Servidor Proxy, Servidor SSH"
+#~ msgid ""
+#~ "\t* Special download mirror list exclusively for Mandrakeclub Members"
+#~ msgstr "\t* Llista de rèpliques exclusiva pels membres del Mandrakeclub"
 
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Conjunt d'eines per llegir i enviar correu i notícies i per navegar pel Web"
+#~ msgid "\t* Voting for software to put in Mandrakelinux"
+#~ msgstr "\t* Votació dels programes a posar en Mandrakelinux"
+
+#~ msgid "\t* Plus much more"
+#~ msgstr "\t* i molt més"
+
+#~ msgid "For more information, please visit <b>www.mandrakeclub.com</b>"
+#~ msgstr "Per més informació visiteu <b>www.mandrakeclub.com</b>"
+
+#~ msgid "Do you require assistance?"
+#~ msgstr "Necessiteu ajuda?"
+
+#~ msgid "<b>Mandrakeexpert</b> is the primary source for technical support."
+#~ msgstr "<b>Mandrakeexpert</b> és la font primària per suport tècnic."
+
+#~ msgid ""
+#~ "If you have Linux questions, subscribe to Mandrakeexpert at <b>www."
+#~ "mandrakeexpert.com</b>"
+#~ msgstr ""
+#~ "Si teniu preguntes en quant a Linux, apunteu-vos a Mandrakeexpert <b>www."
+#~ "mandrakeexpert.com</b>"
+
+#~ msgid ""
+#~ "If you would like to get involved, please subscribe to the \"Cooker\" "
+#~ "mailing list by visiting <b>mandrake-linux.com/cooker</b>"
+#~ msgstr ""
+#~ "Si voleu involucrar-vos, apunteu-vos a la llista de correu \"Cooker\" "
+#~ "visitant <b>mandrake-linux.com/cooker</b>"
+
+#~ msgid ""
+#~ "To learn more about our dynamic community, please visit <b>www.mandrake-"
+#~ "linux.com</b>!"
+#~ msgstr ""
+#~ "Per aprendre més en quant a la nostra dinàmica comunitat visiteu <b>www."
+#~ "mandrake-linux.com</b>!"
+
+#~ msgid ""
+#~ "Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus "
+#~ "the latest versions of the most popular Open Source applications."
+#~ msgstr ""
+#~ "Mandrakelinux inclou els famosos entorns gràfics KDE i GNOME, a més de "
+#~ "les últimes versions de les aplicacions de Codi Font Obert més populars."
+
+#~ msgid ""
+#~ "Mandrakelinux is widely known as the most user-friendly and the easiest "
+#~ "to install and easy to use Linux distribution."
+#~ msgstr ""
+#~ "Mandrakelinux és ampliament coneguda com la distribució de Linux més "
+#~ "amigable, fàcil d'instal·lar i usar."
+
+#~ msgid "\t* Find out Mandrakelinux on a bootable CD with <b>Mandrakemove</b>"
+#~ msgstr ""
+#~ "\t* Conegui Mandrakelinux en un CD autoarrancable amb <b>Mandrakemove</b>"
+
+#~ msgid ""
+#~ "\t* If you use Linux mostly for Office, Internet and Multimedia tasks, "
+#~ "<b>Discovery</b> perfectly meets your needs"
+#~ msgstr ""
+#~ "\t* Si useu Linux a l'oficina, per internet o per tasques multimèdia, "
+#~ "<b>Discovery</b> és perfecte per a les vostres necessitats"
+
+#~ msgid ""
+#~ "\t* If you appreciate the largest selection of software including "
+#~ "powerful development tools, <b>PowerPack</b> is for you"
+#~ msgstr ""
+#~ "\t* Si aprecieu la selecció de programari més gran, incloent eines de "
+#~ "desenvolupament, <b>PowerPack</b> és per tu"
+
+#~ msgid ""
+#~ "\t* If you require a full-featured Linux solution customized for small to "
+#~ "medium-sized networks, choose <b>PowerPack+</b>"
+#~ msgstr ""
+#~ "\t* Si necessiteu una solució Linux per a xarxes de petites a mitjanes, "
+#~ "escolliu <b>PowerPack+</b>"
+
+#~ msgid "Find out also our <b>Business Solutions</b>!"
+#~ msgstr "Conegui també les nostres <b>Solucions per empreses</b>!"
+
+#
+#~ msgid "<b>Become a Mandrakeclub member!</b>"
+#~ msgstr "<b>Esdeveniu un membre del Mandrakeclub!</b>"
+
+#~ msgid "<b>Do you require assistance?</b>"
+#~ msgstr "<b>Necessiteu ajuda?</b>"
+
+#~ msgid "This is the Mandrakelinux <b>Download version</b>."
+#~ msgstr "Això és Mandrakelinux <b>versió de descàrrega</b>."
+
+#~ 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®)."
+#~ msgstr ""
+#~ "La versió de descarrega gratuïta no inclou programari comercial, i per "
+#~ "tant, pot no funcionar amb alguns mòdems (com ADSL i RTC) i targetes "
+#~ "gràfiques (com ATI® i NVIDIA®)."
+
+#~ msgid ""
+#~ "Your new Mandrakelinux distribution and its many applications are the "
+#~ "result of collaborative efforts between Mandrakesoft developers and "
+#~ "Mandrakelinux contributors throughout the world."
+#~ msgstr ""
+#~ "La vostra nova distribució Mandrakelinux i les seves múltiples "
+#~ "aplicacions són el resultat de l'esforç col·laboratiu dels "
+#~ "desenvolupadors de Mandrakesoft i els contribuïdors de Mandrakelinux al "
+#~ "voltant del món."
+
+#~ msgid "<b>PowerPack+</b>"
+#~ msgstr "<b>PowerPack+</b>"
+
+#~ msgid ""
+#~ "It is the only Mandrakelinux product that includes the groupware solution."
+#~ msgstr "És l'únic producte Mandrakelinux que inclou la solució groupware."
+
+#~ 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."
+#~ msgstr ""
+#~ "Quan entreu per primer cop a Mandrakelinux, podeu escollir entre els "
+#~ "populars entorns gràfics d'escriptori, incloent: KDE, GNOME, WindowMaker, "
+#~ "IceWM, i altres."
+
+#~ msgid ""
+#~ "\t* Listen to audio CDs and music files with <b>KsCD</b> and <b>Totem</b>"
+#~ msgstr ""
+#~ "\t* Escolteu CD d'àudio i fitxers de música amb <b>KsCD</b> i <b>Totem</b>"
+
+#~ msgid ""
+#~ "PowerPack+ includes everything needed for developing and creating your "
+#~ "own software, including:"
+#~ msgstr ""
+#~ "PowerPack+ inclou tot el que necessiteu per desenvolupar i crear els "
+#~ "vostres programes, incloent:"
+
+#~ msgid ""
+#~ "\t* <b>Kdevelop</b>: a full featured, easy to use Integrated Development "
+#~ "Environment for C++ programming"
+#~ msgstr ""
+#~ "\t* <b>Kdevelop</b>: Un entorn integrat de desenvolupament per programar "
+#~ "amb C++ amb moltes opcions i fàcil d'usar,"
+
+#~ msgid "\t* <b>GCC</b>: the GNU Compiler Collection"
+#~ msgstr "\t* <b>GCC</b>: la Colecció de Compiladors GNU"
+
+#~ msgid "\t* <b>GDB</b>: the GNU Project debugger"
+#~ msgstr "\t* <b>GDB</b>: el debugger del projecte GNU"
+
+#~ msgid "\t* Address Book (server and client)"
+#~ msgstr "\t* Llibreta d'adreces (servidor i client)"
+
+#~ msgid ""
+#~ "Your new Mandrakelinux distribution is the result of collaborative "
+#~ "efforts between Mandrakesoft developers and Mandrakelinux contributors "
+#~ "throughout the world."
+#~ msgstr ""
+#~ "La vostra nova distribució Mandrakelinux és el resultat de l'esforç "
+#~ "col·laboratiu dels desenvolupadors de Mandrakesoft i els contribuïdors de "
+#~ "Mandrakelinux al voltant del món."
+
+#~ msgid ""
+#~ "We would like to thank everyone who participated in the development of "
+#~ "our latest release."
+#~ msgstr ""
+#~ "Voldríem donar les gracies a tothom que hagi participat en el "
+#~ "desenvolupament d'aquesta versió."
+
+#~ msgid "<b>PowerPack</b>"
+#~ msgstr "<b>PowerPack</b>"
+
+#~ msgid ""
+#~ "PowerPack includes everything needed for developing and creating your own "
+#~ "software, including:"
+#~ msgstr ""
+#~ "PowerPack inclou tot el que necessiteu per desenvolupar i crear els "
+#~ "vostres programes, incloent:"
+
+#~ msgid "And of course the editors!"
+#~ msgstr "I per suposat els editors!"
+
+#~ msgid "Installation of %s failed. The following error occurred:"
+#~ msgstr "Ha fallat la instal·lació de %s. S'ha produït l'error següent:"
+
+#~ msgid ""
+#~ "We need to install ntp package\n"
+#~ " to enable Network Time Protocol\n"
+#~ "\n"
+#~ "Do you want to install ntp ?"
+#~ msgstr ""
+#~ "Es necessari instal·lar el paquet ntp\n"
+#~ " per habilitar el Network Time Protocol\n"
+#~ "\n"
+#~ "Vols instal·lar ntp?"
+
+#~ msgid ""
+#~ "The setup of a VPN connection has already been done.\n"
+#~ "\n"
+#~ "It's currently enabled.\n"
+#~ "\n"
+#~ "What would you like to do ?"
+#~ msgstr ""
+#~ "La configuració de l'una connexió VPN ja s'ha dut a terme.\n"
+#~ "\n"
+#~ "Ara està habilitada.\n"
+#~ "\n"
+#~ "Què voleu fer?"
+
+#~ msgid ""
+#~ "The setup of a VPN connection has already been done.\n"
+#~ "\n"
+#~ "It's currently disabled.\n"
+#~ "\n"
+#~ "What would you like to do ?"
+#~ msgstr ""
+#~ "La configuració de l'una connexió VPN ja s'ha dut a terme.\n"
+#~ "\n"
+#~ "Ara està inhabilitada.\n"
+#~ "\n"
+#~ "Què voleu fer?"
+
+#~ msgid "Set of tools to read and send mail and news and to browse the Web"
+#~ msgstr ""
+#~ "Conjunt d'eines per llegir i enviar correu i notícies i per navegar pel "
+#~ "Web"
+
+#~ 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."
+#~ msgstr ""
+#~ "Abans de continuar, llegiu atentament les clàusules de la llicència. "
+#~ "Cobreix\n"
+#~ "tota la distribució Mandrakelinux. Si esteu d'acord amb tots els termes "
+#~ "de la\n"
+#~ "llicència, feu clic al quadre \"%s\"; si no, prémer el botó \"%s\"\n"
+#~ "reiniciarà el vostre ordinador."
+
+#~ 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"
+#~ "\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"
+#~ "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"
+#~ "\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"
+#~ "\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."
+#~ msgstr ""
+#~ "El GNU/Linux és un sistema multiusuari; això vol dir que cada usuari pot\n"
+#~ "tenir les seves pròpies preferències, els seus propis fitxers, etc. Podeu "
+#~ "llegir\n"
+#~ "la ``Guia d'iniciació''\n"
+#~ " per aprendre més coses sobre els sistemes\n"
+#~ "multiusuari. Però, a diferència del \"root\", que és l'administrador del "
+#~ "sistema,\n"
+#~ "als usuaris que afegiu aquí no se'ls permetrà modificar res tret dels "
+#~ "seus propis\n"
+#~ "fitxers i configuracions, protegint així el sistema de canvis, "
+#~ "intencionats o no, \n"
+#~ " que tenen efecte sobre tot el sistema . Cal que us creeu, com a mínim, "
+#~ "un usuari\n"
+#~ "normal, i és aquest compte el que heu d'utilitzar per a l'ús quotidià. "
+#~ "Tot i que\n"
+#~ "és molt fàcil entrar com a \"root\" per a tot, també pot ser molt "
+#~ "perillós: la més\n"
+#~ "petita errada podria significar que el sistema deixés de funcionar. Si "
+#~ "cometeu\n"
+#~ "una errada greu com a usuari normal el pitjor que pot passar és que "
+#~ "perdeu\n"
+#~ "algunes daDES, però sense afectar a tot el sistema.\n"
+#~ "\n"
+#~ "Primer, heu d'introduir el vostre nom real. Per suposat, això no és "
+#~ "obligatori,\n"
+#~ "ja que podeu introduir el que vulgueu. DrakX agafarà la primera paraula\n"
+#~ "que heu introduït en aquest camp i la copiarà en el camp \"%s\", que serà "
+#~ "el\n"
+#~ "nom que utilitzarà aquest usuari per entrar al sistema (ho podeu canviar "
+#~ "si\n"
+#~ "voleu). Després cal que introduïu una contrasenya. Des del punt de vista "
+#~ "de\n"
+#~ "la seguretat, una contrasenya d'un usuari no privilegiat (habitual) no és "
+#~ "tan\n"
+#~ "important com la del \"root\" des del punt de vista de la seguretat, però "
+#~ "no hi\n"
+#~ "ha cap raó per menystenir-la, deixant-la en blanc o fent-la massa "
+#~ "senzilla: al\n"
+#~ "cap i a la fi, els vostres fitxers poden estar en joc.\n"
+#~ "\n"
+#~ "Un cop hagueu fet clic a \"%s\" podreu afegir altres usuaris. Afegiu-ne "
+#~ "un\n"
+#~ "per a tothom que hagi de fer servir l'ordinador. Feu clic a \"%s\" quan "
+#~ "hagueu\n"
+#~ "acabat d'afegir-ne.\n"
+#~ "\n"
+#~ "Feu clic al botó \"%s\" per canviar l'intèrpret d'ordres (\"shell\") per "
+#~ "defecte\n"
+#~ "(bash) de l'usuari seleccionat. \n"
+#~ "\n"
+#~ "Quan hagueu acabat d'afegir usuaris, se us proposarà decidir quin usuari\n"
+#~ "entrarà automàticament en el sistema en arrencar l'ordinador. Si us\n"
+#~ "interessa aquesta característica (i no us importa gaire la seguretat "
+#~ "local), \n"
+#~ "trieu l'usuari i el gestor de finestres desitjat i feu clic a \"%s\".\n"
+#~ "Si no hi esteu interessat, desactiveu el quadre \"%s\"."
+
+#~ 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."
+#~ msgstr ""
+#~ "La instal·lació del Mandrakelinux està repartida en diversos CD-ROM. Si\n"
+#~ "un dels paquets escollits està en un altre CD-ROM, DrakX expulsarà el CD\n"
+#~ "actual i us demanarà que n'inseriu un altre."
+
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\n"
+#~ " * \"%s\": if you plan on using your machine for programming, select the\n"
+#~ "appropriate groups from that category.\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"
+#~ "\n"
+#~ " * \"%s\": this is where you will choose your preferred graphical\n"
+#~ "environment. At least one must be selected if you want to have a "
+#~ "graphical\n"
+#~ "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"
+#~ "\n"
+#~ " * \"%s\": install the minimum number of packages possible to have a\n"
+#~ "working graphical desktop.\n"
+#~ "\n"
+#~ " * \"%s\": installs the base system plus basic utilities and their\n"
+#~ "documentation. This installation is suitable for setting up a server.\n"
+#~ "\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."
+#~ msgstr ""
+#~ "Ha arribat el moment d'indicar els programes que voleu instal·lar en el\n"
+#~ "sistema. Mandrakelinux té milers de paquets, i per facilitar-ne la\n"
+#~ "gestió s'han distribuït en grups d'aplicacions similars.\n"
+#~ "\n"
+#~ "Els paquets s'agrupen segons l'ús que vulgueu donar a l'ordinador.\n"
+#~ "Mandrakelinux agrupa els paquets en quatre categories. Podeu mesclar i "
+#~ "fer\n"
+#~ "coincidir aplicacions de grups diversos, de manera que una instal·lació\n"
+#~ "d'``Estació de treball'' pot perfectament tenir instal·lades aplicacions\n"
+#~ "de la categoria ``Desenvolupament'' \n"
+#~ " * \"%s\": si voleu utilitzar l'ordinador com a estació de treball,\n"
+#~ "seleccioneu un o més grups de la categoria estació de treball.\n"
+#~ "\n"
+#~ " * \"%s\": si penseu utilitzar la vostra màquina per programar, escolliu "
+#~ "els\n"
+#~ "grups adients d'aquesta categoria.\n"
+#~ "\n"
+#~ " * \"%s\":  si l'ordinador s'ha d'utilitzar com a servidor, seleccioneu\n"
+#~ "quins dels serveis més habituals voleu instal·lar\n"
+#~ "\n"
+#~ " * \"%s\": aquí és on escollireu quin és el vostre entorn gràfic\n"
+#~ "preferit. Heu de seleccionar-ne un com a mínim si voleu tenir una\n"
+#~ "interfície gràfica.\n"
+#~ "\n"
+#~ "Si moveu el cursor per sobre d'un nom de grup veureu una breu explicació\n"
+#~ "d'aquest grup. Si desseleccioneu tots els grups quan estigueu fent una\n"
+#~ "instal·lació normal (i no una actualització), se us presentarà un "
+#~ "diàleg \n"
+#~ "proposant-vos diferents opcions per a una instal·lació mínima:\n"
+#~ "\n"
+#~ " * \"%s\": instal·la els mínims paquets necessaris per tenir un\n"
+#~ "entorn gràfic funcional\n"
+#~ "\n"
+#~ " * \"%s\": instal·la el sistema base i les utilitats bàsiques amb la "
+#~ "seva\n"
+#~ "documentació. Aquesta instal·lació és adequada per configurar un "
+#~ "servidor;\n"
+#~ "\n"
+#~ " * \"%s\": instal·la el nombre mínim de paquets necessari per aconseguir "
+#~ "un\n"
+#~ "sistema Linux operatiu, només amb una interfície de línia d'ordres. "
+#~ "Aquesta\n"
+#~ "instal·lació ocupa uns 65 MB.\n"
+#~ "\n"
+#~ "Podeu marcar la casella \"%s\", que és útil si esteu familiaritzat amb "
+#~ "els\n"
+#~ "diversos paquets o si voleu tenir un control total sobre el que "
+#~ "s'instal·larà.\n"
+#~ "\n"
+#~ "Si heu començat la instal·lació en el mode \"%s\", podeu desseleccionar \n"
+#~ "tots els grups si voleu evitar que s'instal·li cap paquet nou. Això és "
+#~ "útil \n"
+#~ "per reparar o actualitzar un sistema existent."
+
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "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"
+#~ "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"
+#~ "\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"
+#~ "\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."
+#~ msgstr ""
+#~ "Si heu dit a l'instal·lador que volíeu seleccionar els paquets "
+#~ "individualment\n"
+#~ "se us presentarà un arbre amb tots els paquets classificats per grups i\n"
+#~ "subgrups. Mentre navegueu per l'arbre, podeu seleccionar grups complets,\n"
+#~ "subgrups o paquets individuals.\n"
+#~ "\n"
+#~ "Cada cop que seleccioneu un paquet de l'arbre, apareixerà una descripció "
+#~ "a \n"
+#~ "la dreta que us informarà de la finalitat del paquet.\n"
+#~ "\n"
+#~ "Si heu seleccionat un paquet de servidor, intencionadament o perquè\n"
+#~ "formava part d'un grup, se us demanarà que confirmeu si realment voleu\n"
+#~ "instal·lar aquests servidors. Per defecte, Mandrakelinux iniciarà i "
+#~ "instal·larà automàticament qualsevol servidor durant l'arrencada. Tot i "
+#~ "que\n"
+#~ "siguin segurs i no tinguin cap problema conegut quan es publica la\n"
+#~ "distribució, és totalment possible que es descobreixin forats de "
+#~ "seguretat\n"
+#~ "després que aquesta versió de Mandrakelinux quedi finalitzada.\n"
+#~ "Si no sabeu què se suposa que fa un servei en particular, o per què "
+#~ "s'està\n"
+#~ "instal·lant, feu clic a \"%s\". Per defecte, si feu clic a \"%s\" els "
+#~ "serveis\n"
+#~ "llistats s'instal·laran i s'iniciaran automàticament durant l'arrencada.\n"
+#~ "\n"
+#~ "L'opció \"%s\" s'utilitza per inhabilitar el diàleg d'advertència que\n"
+#~ "apareix quan l'instal·lador selecciona automàticament un paquet per "
+#~ "resoldre\n"
+#~ "un tema de dependències. Alguns paquets estan relacionats els uns amb "
+#~ "els\n"
+#~ "altres, de manera que la instal·lació d'un paquet fa que calgui "
+#~ "instal·lar\n"
+#~ "també algun altre programa. L'instal·lador pot determinar quins paquets "
+#~ "calen\n"
+#~ "per satisfer una dependència i completar la instal·lació "
+#~ "satisfactòriament.\n"
+#~ "\n"
+#~ "La diminuta icona d'un disquet al peu de la llista us permet carregar "
+#~ "una\n"
+#~ "llista de paquets creada en una instal·lació anterior. Això és útil si "
+#~ "teniu\n"
+#~ "un cert nombre d'ordinadors que voleu configurar de manera idèntica. Si "
+#~ "feu\n"
+#~ "clic a aquesta icona se us demanarà que inseriu un disquet creat "
+#~ "anteriorment\n"
+#~ "al final d'una altra instal·lació. Vegeu el segon suggeriment de l'últim "
+#~ "pas\n"
+#~ "per saber com crear aquest disquet."
+
+#~ 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 ""
+#~ "Ara configurareu la connexió a Internet/xarxa. Si voleu connectar\n"
+#~ "el vostre ordinador a Internet o a una xarxa local, feu clic a \"%s\".\n"
+#~ "Mandrakelinux intentarà detectar automàticament els dispositius\n"
+#~ "de xarxa i els mòdems. Si aquesta detecció falla, desactiveu la\n"
+#~ "casella \"%s\". També podeu decidir no configurar la xarxa, o\n"
+#~ "fer-ho més endavant; en aquest cas feu clic al botó \"%s\" per\n"
+#~ "passar al pas següent.\n"
+#~ "\n"
+#~ "En configurar la xarxa, les opcions de connexió disponibles són:\n"
+#~ "mòdem tradicional, winmodem, mòdem XDSI, connexió ADSL, mòdem de cable, "
+#~ "i\n"
+#~ "finalment una connexió LAN senzilla (Ethernet).\n"
+#~ "\n"
+#~ "No explicarem cada opció de configuració; només cal que us assegureu\n"
+#~ "que el vostre proveïdor d'Internet o administrador del sistema us ha\n"
+#~ "facilitat tots els paràmetres, com ara l'adreça IP, la passarel·la\n"
+#~ "per defecte, els servidors DNS, etc.\n"
+#~ "\n"
+#~ "En quant a les connexions amb winmodem. Els winmodems són mòdems "
+#~ "especials\n"
+#~ "integrats de gama baixa que necessiten programari addicional per "
+#~ "funcionar.\n"
+#~ "Alguns d'aquests mòdems funcionen a Mandrakelinux, i d'altres no. Podeu\n"
+#~ "consultar una llista de mòdems suportats a LinModems.\n"
+#~ "\n"
+#~ "Podeu consultar el capítol sobre connexions a Internet de la ``Guia\n"
+#~ "d'iniciació'' per conèixer els detalls de la configuració, o\n"
+#~ "simplement espereu fins que el sistema estigui instal·lat i\n"
+#~ "utilitzeu el programa que s'hi indica per configurar la connexió."
+
+#~ msgid "Use auto detection"
+#~ msgstr "Utilitza la detecció automàtica"
+
+#~ 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."
+#~ msgstr ""
+#~ "\"%s\": feu clic al botó \"%s\" per obrir l'auxiliar de configuració de "
+#~ "la\n"
+#~ "impressora. Consulteu el capítol corresponent de la ``Guia d'iniciació'' "
+#~ "per\n"
+#~ "tenir més informació en quant a la configuració de noves impressores.\n"
+#~ "La interfície que apareix és similar a la que s'utilitza durant la "
+#~ "instal·lació."
+
+#~ msgid ""
+#~ "This dialog is used to choose 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"
+#~ "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"
+#~ "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"
+#~ "!!"
+#~ msgstr ""
+#~ "En aquest diàleg escollireu els serveis que voleu que s'iniciïn durant "
+#~ "l'arrencada.\n"
+#~ "\n"
+#~ "DrakX farà una llista de tots els serveis disponibles en la instal·lació "
+#~ "actual.\n"
+#~ "Reviseu-los amb cura i desmarqueu aquells que no siguin necessaris durant "
+#~ "l'arrencada.\n"
+#~ "\n"
+#~ "Podeu obtenir una explicació breu sobre un servei si el seleccioneu. Si "
+#~ "no\n"
+#~ "esteu segur de la utilitat d'un servei, el més segur és deixar el "
+#~ "comportament\n"
+#~ "per defecte.\n"
+#~ "\n"
+#~ "AVÍS: Aneu especialment amb cura en aquest pas si penseu utilitzar "
+#~ "l'ordinador com\n"
+#~ "a servidor: segurament no voldreu iniciar serveis que no necessiteu.\n"
+#~ "Recordeu que hi ha diversos serveis que poden ser perillosos si "
+#~ "s'habiliten\n"
+#~ "en un servidor. En general, seleccioneu només els serveis que realment "
+#~ "necessiteu."
+
+#~ msgid ""
+#~ "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to\n"
+#~ "local time according to the time zone you selected. If the clock on your\n"
+#~ "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"
+#~ "\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."
+#~ msgstr ""
+#~ "GNU/Linux gestiona l'hora en GMT (Greenwich Mean Time) i el tradueix a\n"
+#~ "l'hora local d'acord amb la zona horària seleccionada. Si el rellotge de "
+#~ "la\n"
+#~ "placa base indica l'hora local, podeu desactivar-ho desseleccionant \"%s"
+#~ "\", i\n"
+#~ "això informarà a GNU/Linux que el rellotge del sistema i el rellotge del\n"
+#~ "maquinari són a la mateixa zona horària. Això és convenient quan la "
+#~ "màquina\n"
+#~ "també té instal·lat un altre sistema operatiu, com ara Windows.\n"
+#~ "\n"
+#~ "L'opció \"%s\" regularà automàticament l'hora connectant-se a un "
+#~ "servidor\n"
+#~ "horari remot d'Internet. Per tal que funcioni aquesta funció us caldrà "
+#~ "tenir\n"
+#~ "connexió a Internet. És millor triar un servidor que estigui ubicat a "
+#~ "prop\n"
+#~ "vostre. De fet, aquesta opció instal·la un servidor d'hora que altres "
+#~ "màquines\n"
+#~ "de la vostra xarxa local també podran utilitzar."
+
+#~ 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"
+#~ "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"
+#~ "best suits your needs."
+#~ msgstr ""
+#~ "Targeta gràfica\n"
+#~ "\n"
+#~ "   Normalment, l'instal·lador detectarà automàticament i configurarà la\n"
+#~ "targeta gràfica que tingueu instal·lada a l'ordinador. Si no fos així, "
+#~ "la\n"
+#~ "podeu seleccionar d'aquesta llista.\n"
+#~ "\n"
+#~ "   Cas que hi hagi diferents servidors per a la targeta, amb o sense\n"
+#~ "acceleració 3D, se us demanarà que trieu el servidor que us sigui\n"
+#~ "més convenient."
+
+#~ 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"
+#~ "\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"
+#~ "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"
+#~ "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"
+#~ "\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"
+#~ "configuration is shown in the monitor picture.\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "Test\n"
+#~ "\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"
+#~ "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"
+#~ "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."
+#~ msgstr ""
+#~ "L'X (per sistema X Window) és el cor de la interfície gràfica de GNU/"
+#~ "Linux\n"
+#~ "de què depenen tots els entorns gràfics (KDE, GNOME, AfterStep, "
+#~ "WindowMaker,\n"
+#~ "etc.) que venen amb Mandrakelinux.\n"
+#~ "\n"
+#~ "Veureu una relació de diferents paràmetres que podeu canviar per "
+#~ "aconseguir\n"
+#~ "una visualització gràfica òptima: Targeta gràfica\n"
+#~ "\n"
+#~ "   Normalment, l'instal·lador detectarà i configurarà automàticament la\n"
+#~ "targeta gràfica instal·lada a l'ordinador. Si no fos així, podeu escollir "
+#~ "de\n"
+#~ "la llista la targeta que realment tingueu instal·lada.\n"
+#~ "\n"
+#~ "   En cas que hi hagi diferents servidors disponibles per a la vostra\n"
+#~ "targeta, amb o sense acceleració 3D, se us demanarà que escolliu el que\n"
+#~ "més us convingui.\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "Monitor\n"
+#~ "\n"
+#~ "   Normalment, l'instal·lador detectarà i configurarà automàticament el\n"
+#~ "monitor que teniu connectat a l'ordinador. Si no és correcte, podreu "
+#~ "triar\n"
+#~ "d'aquesta llista el monitor que realment teniu connectat a l'ordinador.\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "Resolució\n"
+#~ "\n"
+#~ "   Aquí podeu triar les resolucions i profunditats de color disponibles "
+#~ "per\n"
+#~ "al vostre maquinari. Trieu la que us vagi més bé (tot i que podreu\n"
+#~ "canviar-la després de la instal·lació). Al monitor veureu una mostra de "
+#~ "la\n"
+#~ "configuració triada.\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "Prova\n"
+#~ "\n"
+#~ "Depenent del maquinari aquesta entrada pot no aparèixer.\n"
+#~ "\n"
+#~ "   el sistema intentarà obrir una pantalla gràfica amb la resolució\n"
+#~ "desitjada. Si podeu veure el missatge durant la prova i responeu \"%s\",\n"
+#~ "DrakX passarà al pas següent. Si no el podeu veure, vol dir que la\n"
+#~ "configuració detectada automàticament no era del tot correcta i la prova\n"
+#~ "finalitzarà automàticament al cap de 12 segons, portant-vos de nou al "
+#~ "menú.\n"
+#~ "Canvieu els paràmetres fins que obtingueu una pantalla gràfica correcta.\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "Opcions\n"
+#~ "\n"
+#~ "   Aquí podeu decidir si voleu que l'ordinador canviï automàticament a "
+#~ "una\n"
+#~ "interfície gràfica en arrencar. Òbviament, voldreu activar \"%s\" si\n"
+#~ "l'ordinador ha d'actuar com a servidor, o si no heu aconseguit\n"
+#~ "configurar la pantalla."
+
+#~ 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."
+#~ msgstr ""
+#~ "Monitor\n"
+#~ "\n"
+#~ "   Normalment, l'instal·lador detectarà i configurarà automàticament el\n"
+#~ "monitor que teniu connectat a l'ordinador. Si no és correcte, podreu "
+#~ "triar\n"
+#~ "d'aquesta llista el monitor que realment teniu connectat a l'ordinador."
+
+#~ 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"
+#~ "configuration is shown in the monitor picture."
+#~ msgstr ""
+#~ "Resolució\n"
+#~ "\n"
+#~ "   Aquí podeu triar les resolucions i profunditats de color disponibles "
+#~ "per\n"
+#~ "al vostre maquinari. Trieu la que us vagi més bé (tot i que podreu\n"
+#~ "canviar-la després de la instal·lació). Al monitor veureu una mostra de "
+#~ "la\n"
+#~ "configuració triada."
+
+#~ 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"
+#~ "suits your needs."
+#~ msgstr ""
+#~ "En cas que hi hagi diferents servidors disponibles per a la vostra\n"
+#~ "targeta, amb o sense acceleració 3D, se us demanarà que escolliu\n"
+#~ "el servidor que més us convingui."
+
+#~ 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."
+#~ msgstr ""
+#~ "Opcions\n"
+#~ "\n"
+#~ "   Aquí podeu decidir si voleu que l'ordinador canviï automàticament a "
+#~ "una\n"
+#~ "interfície gràfica en arrencar. Òbviament, activareu \"%s\" si "
+#~ "l'ordinador ha\n"
+#~ "de ser un servidor, o si no heu pogut configurar la pantalla."
+
+#~ 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"
+#~ "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"
+#~ "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"
+#~ "\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"
+#~ "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"
+#~ "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"
+#~ "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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "drive. Be careful -- it is a powerful but dangerous choice and you can "
+#~ "very\n"
+#~ "easily lose all your data. That's why this option is really only\n"
+#~ "recommended if you have done something like this before and have some\n"
+#~ "experience. For more instructions on how to use the DiskDrake utility,\n"
+#~ "refer to the ``Managing Your Partitions'' section in the ``Starter "
+#~ "Guide''."
+#~ msgstr ""
+#~ "Ara és quan heu de decidir en quin lloc del vostre disc dur voleu "
+#~ "instal·lar\n"
+#~ "el sistema operatiu Mandrakelinux. Si el disc és buit, o si un sistema\n"
+#~ "operatiu existent n'utilitza tot l'espai disponible, us caldrà \n"
+#~ "particionar-lo. Bàsicament, particionar un disc dur consisteix a dividir-"
+#~ "lo de\n"
+#~ "manera lògica per crear espai on instal·lar el nou sistema "
+#~ "Mandrakelinux.\n"
+#~ "\n"
+#~ "Atès que els efectes d'aquest procés solen ser irreversibles i poden\n"
+#~ "implicar pèrdua de dades si ja teniu un sistema operatiu instal·lat, el\n"
+#~ "particionament us pot espantar si sou un usuari sense experiència. Per "
+#~ "sort,\n"
+#~ "DrakX inclou un auxiliar que simplifica aquest procés. Abans de\n"
+#~ "continuar, però, llegiu la resta d'aquesta secció i, sobre tot, preneu-"
+#~ "vos\n"
+#~ "el temps que calgui.\n"
+#~ "\n"
+#~ "Segons la configuració del vostre disc dur, hi ha diverses opcions "
+#~ "possibles:\n"
+#~ "\n"
+#~ " * \"%s\": aquesta opció particionarà automàticament les unitats buides.\n"
+#~ "Amb aquesta opció no se us preguntarà res més.\n"
+#~ "\n"
+#~ " * \"%s\": l'auxiliar ha detectat una o més particions de Linux al "
+#~ "vostre\n"
+#~ "disc dur. Si voleu utilitzar-les, escolliu aquesta opció. Se us demanarà "
+#~ "que\n"
+#~ "trieu els punts de muntatge associats a cadascuna de les particions. Els\n"
+#~ "punts de muntatge existents se seleccionen per defecte, i en la majoria "
+#~ "dels\n"
+#~ "casos és bona idea conservar-los.\n"
+#~ "\n"
+#~ " * \"%s\" Si teniu el Microsoft Windows instal·lat al disc dur i n'ocupa "
+#~ "tot\n"
+#~ "l'espai disponible, caldrà crear-hi espai lliure per a GNU/Linux. Per fer-"
+#~ "ho,\n"
+#~ "podeu suprimir la partició i les dades del Windows (consulteu la solució\n"
+#~ "``Esborrar completament el disc\") o canviar la mida de la partició FAT "
+#~ "o\n"
+#~ "NTFS de Windows. Aquest canvi de mida es pot dur a terme sense cap pèrdua "
+#~ "de\n"
+#~ "daDES, sempre que la partició de Windows hagi estat desfragmentada\n"
+#~ "prèviament. És molt recomenable, fer una còpia de seguretat de les "
+#~ "dades.\n"
+#~ "Aquesta opció és la més recomanable si voleu utilitzar tant "
+#~ "Mandrakelinux\n"
+#~ "com Microsoft Windows al mateix ordinador.\n"
+#~ "\n"
+#~ "  Abans de decidir-vos per aquesta opció, penseu que en acabar la "
+#~ "partició\n"
+#~ "de Microsoft Windows serà més petita que anteriorment. Tindreu menys "
+#~ "espai\n"
+#~ "lliure a Microsoft Windows per emmagatzemar-hi dades o instal·lar-hi més "
+#~ "programari.\n"
+#~ "\n"
+#~ " *\"%s\": si voleu suprimir totes les dades i particions que teniu al "
+#~ "disc\n"
+#~ "dur i substituir-les pel sistema Mandrakelinux, podeu escollir aquesta\n"
+#~ "opció. Aneu amb compte, però, perquè, un cop la confirmeu, no podreu fer-"
+#~ "vos enrere.\n"
+#~ "\n"
+#~ "   ¡¡ Si trieu aquesta opció, totes les dades del disc s'esborraran !!.\n"
+#~ "\n"
+#~ " *\"%s\": aquesta opció simplement esborra tot el contingut del disc i\n"
+#~ "comença de nou, particionant des de zero. Totes les dades del disc es "
+#~ "perdran.\n"
+#~ "\n"
+#~ "   ¡¡ Si trieu aquesta opció, totes les dades del disc s'esborraran !!.\n"
+#~ "\n"
+#~ " * \"%s\": si voleu particionar el disc dur manualment, podeu triar "
+#~ "aquesta\n"
+#~ "opció. Aneu amb compte: és una opció molt potent però també perillosa, "
+#~ "ja\n"
+#~ "que podeu perdre fàcilment totes les dades. Per tant, aquesta opció només "
+#~ "és\n"
+#~ "recomenable si heu fet abans alguna cosa similar i teniu una mica\n"
+#~ "d'experiència. Trobareu més instruccions sobre la utilitat DiskDrake a "
+#~ "la\n"
+#~ "secció ``Gestió de les particions'' de la ``Guia d'iniciació''."
+
+#~ 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"
+#~ "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"
+#~ "\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"
+#~ "\n"
+#~ "   Note that two different options are available after clicking the "
+#~ "button:\n"
+#~ "\n"
+#~ "    * \"%s\". This is a partially automated installation. The "
+#~ "partitioning\n"
+#~ "step is the only interactive procedure.\n"
+#~ "\n"
+#~ "    * \"%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"
+#~ "\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\" <<."
+#~ msgstr ""
+#~ "Ja ho teniu. S'ha completat la instal·lació i el vostre sistema GNU/"
+#~ "Linux\n"
+#~ "està preparat per fer-se servir. Simplement premeu \"%s\" per reiniciar "
+#~ "el\n"
+#~ "sistema. No oblideu treure la font d'instal·lació (CD-ROM o disquet).\n"
+#~ "La primera cosa que veureu, després que l'ordinador hagi finalitzat les\n"
+#~ "comprovacions de maquinari, és el menú del carregador d'arrencada, que "
+#~ "us\n"
+#~ "deixa triar el sistema operatiu amb què voleu iniciar.\n"
+#~ "\n"
+#~ "El botó \"%s\" mostra dos botons més per:\n"
+#~ "\n"
+#~ " * \"%s\": per crear un disquet d'instal·lació que realitzarà "
+#~ "automàticament\n"
+#~ "una instal·lació completa sense l'ajuda d'un operador, semblant a la\n"
+#~ "instal·lació que acabeu de configurar.\n"
+#~ "\n"
+#~ "   Tingueu en compte que hi ha dues opcions diferents després de fer clic "
+#~ "al botó:\n"
+#~ "\n"
+#~ "    * \"%s\". Aquesta és una instal·lació parcialment automatitzada; el "
+#~ "pas\n"
+#~ "de particionament és l'únic procediment interactiu.\n"
+#~ "\n"
+#~ "    * \"%s\". Instal·lació completament automatitzada: el disc dur es\n"
+#~ "reescriu completament i totes les dades es perden.\n"
+#~ "\n"
+#~ "   Aquesta característica és força útil quan es fa una instal·lació a un\n"
+#~ "cert nombre d'ordinadors similars. En trobareu més informació a la "
+#~ "secció\n"
+#~ "d'instal·lació automàtica del nostre lloc web.\n"
+#~ "\n"
+#~ " * \"%s\": desa una llista dels paquets seleccionats en aquesta\n"
+#~ "instal·lació. Per utilitzar aquesta selecció en una altra instal·lació,\n"
+#~ "inseriu el disquet i inicieu la instal·lació. A l'indicador, premeu la "
+#~ "tecla\n"
+#~ "F1, i escriviu >>linux defcfg=\"floppy\"<<."
+
+#~ 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"
+#~ "\n"
+#~ "Please note that it is 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"
+#~ "\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"
+#~ "\n"
+#~ "Click on \"%s\" when you are 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"
+#~ "bad blocks on the disk."
+#~ msgstr ""
+#~ "Per poder utilitzar les particions que s'acaben de definir cal formatar-"
+#~ "les\n"
+#~ "(la formatació consisteix a crear-hi un sistema de fitxers).\n"
+#~ "\n"
+#~ "En aquest punt, potser voldreu tornar a formatar algunes de les "
+#~ "particions\n"
+#~ "existents per eliminar les dades que contenen. Si és així, seleccioneu\n"
+#~ "també aquestes particions.\n"
+#~ "\n"
+#~ "Tingueu en compte que no cal tornar a formatar totes les particions que "
+#~ "ja\n"
+#~ "existien; heu de tornar a formatar les particions que continguin el "
+#~ "sistema\n"
+#~ "operatiu (com ara \"/\", \"/usr\" o \"/var\"), però no les que contenen\n"
+#~ "dades que voleu conservar (habitualment, \"/home\").\n"
+#~ "\n"
+#~ "Aneu amb compte en seleccionar les particions; després de la formatació,\n"
+#~ "totes les dades s'hauran suprimit i no en podreu recuperar cap.\n"
+#~ "\n"
+#~ "Feu clic a \"%s\" quan estigueu a punt per formatar les particions.\n"
+#~ "\n"
+#~ "Feu clic a \"%s\" si voleu seleccionar una altra partició per instal·lar\n"
+#~ "el nou sistema Mandrakelinux.\n"
+#~ "\n"
+#~ "Feu clic a \"%s\" si voleu seleccionar particions on cercar-hi blocs "
+#~ "defectuosos."
+
+#~ 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"
+#~ "\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."
+#~ msgstr ""
+#~ "Ara esteu instal·lant Mandrakelinux, és probable que alguns paquets\n"
+#~ "hagin estat actualitzats desde la data de llançament. Alguns errors "
+#~ "poden\n"
+#~ "haver estat resolts, i altres problemes de seguretat poden estar ja "
+#~ "corregits.\n"
+#~ "Per beneficiar-vos d'aquestes actualitzacions, les podeu baixar "
+#~ "d'Internet.\n"
+#~ "Trieu \"%s\" si teniu una connexió a Internet operativa, o \"%s\" si "
+#~ "preferiu\n"
+#~ "instal·lar-les més tard.\n"
+#~ "\n"
+#~ "Si trieu \"%s\" apareixerà una llista de llocs des d'on podeu baixar les\n"
+#~ "actualitzacions. Escolliu la ubicació més propera. Aleshores, apareixerà\n"
+#~ "un arbre de selecció de paquets: comproveu la selecció i premeu \"%s\" "
+#~ "per\n"
+#~ "baixar i instal·lar els paquets seleccionats, o \"%s\" per abandonar."
+
+#~ 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"
+#~ "\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"
+#~ "\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."
+#~ msgstr ""
+#~ "Ara és el moment de triar el nivell de seguretat desitjat per a la "
+#~ "màquina.\n"
+#~ "Com a norma general, el nivell de seguretat ha de ser més alt si la "
+#~ "màquina\n"
+#~ "conté dades importants, o si està connectada directament a Internet.\n"
+#~ "Tanmateix, un nivell alt de seguretat sovint comporta una disminució de "
+#~ "la\n"
+#~ "facilitat d'ús.\n"
+#~ "\n"
+#~ "Si no sabeu quin escollir, deixeu l'opció per defecte.. Podreu canviar\n"
+#~ "el nivell de seguretat més tard amb l'eina draksec del\n"
+#~ "Centre de Control Mandrakelinux.\n"
+#~ "\n"
+#~ "El camp \"%s\" pot informar l'usuari del sistema qui serà el responsable\n"
+#~ "de la seguretat. Els missatges de seguretat s'enviaran a aquesta adreça."
+
+#~ 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."
+#~ msgstr ""
+#~ "\"%s\": comproveu que la selecció del país és correcta. Si no sou a\n"
+#~ "aquest país, feu clic al botó \"%s\" i seleccioneu-ne un altre.\n"
+#~ "Si el vostre país no és a la primera llista, feu clic al botó \"%s\" per\n"
+#~ "obtenir una llista de països completa."
+
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "to Mandrakelinux version \"8.1\" is not recommended."
+#~ msgstr ""
+#~ "Aquest pas només s'activa si s'ha trobat una partició GNU/Linux antiga\n"
+#~ "al vostre ordinador.\n"
+#~ "\n"
+#~ "DrakX necessita saber si voleu realitzar una instal·lació nova o\n"
+#~ "una actualització d'un sistema Mandrakelinux existent:\n"
+#~ "\n"
+#~ " * \"%s\": aquesta opció destrueix gairebé del tot el sistema antic. Si\n"
+#~ "voleu canviar les particions dels discs durs, o el sistema de fitxers,\n"
+#~ "heu d'utilitzar aquesta opció. No obstant això, i depenent de l'esquema "
+#~ "de\n"
+#~ "particionament que tingueu, podeu evitar que part de les dades existents "
+#~ "se\n"
+#~ "sobreescriguin.\n"
+#~ "\n"
+#~ " * \"%s\": aquest tipus d'instal·lació us permet actualitzar els paquets "
+#~ "que\n"
+#~ "ja estan instal·lats al sistema Mandrakelinux. L'esquema de "
+#~ "particionament\n"
+#~ "actual i les dades d'usuari no queden afectades. La majoria de les "
+#~ "altres\n"
+#~ "fases de configuració queden disponibles, de manera similar a una\n"
+#~ "instal·lació estàndard.\n"
+#~ "\n"
+#~ "L'opció “Actualitza” ha de funcionar correctament en sistemes "
+#~ "Mandrakelinux\n"
+#~ "amb la versió \"8.1\" o posteriors. No es recomana realitzar una\n"
+#~ "actualització en versions de Mandrakelinux anteriors a la \"8.1\"."
+
+#~ 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"
+#~ "\n"
+#~ "Also, you may not have a keyboard that 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"
+#~ "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"
+#~ "\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"
+#~ "keyboard between the Latin and non-Latin layouts."
+#~ msgstr ""
+#~ "DrakX seleccionarà automàticament la configuració de teclat correcta\n"
+#~ "segons l'idioma que hagueu escollit a Secció. Comproveu que la selecció\n"
+#~ "us vagi bé o escolliu una altra configuració de teclat.\n"
+#~ "\n"
+#~ "Tanmateix, pot ser que tingueu un teclat que no correspongués exactament "
+#~ "al\n"
+#~ "vostre idioma: per exemple, si sou un suís que parla anglès, potser teniu "
+#~ "un\n"
+#~ "teclat suís. O, si parleu anglès però viviu al Quebec, us podeu trobar en "
+#~ "la\n"
+#~ "mateixa situació i el vostre teclat no coincidirà amb el vostre idioma. "
+#~ "En\n"
+#~ "tots dos casos, aquesta fase de la instal·lació us permetrà triar un "
+#~ "teclat\n"
+#~ "adequat d'una llista.\n"
+#~ "\n"
+#~ "Feu clic al botó \"%s\" per veure la llista completa de teclats "
+#~ "disponibles.\n"
+#~ "\n"
+#~ "Si trieu una disposició de teclat basada en un alfabet no llatí, el "
+#~ "diàleg\n"
+#~ "següent us permetrà escollir la tecla que servirà per canviar entre les\n"
+#~ "configuracions llatina i no llatina."
+
+#~ 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"
+#~ "\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"
+#~ "\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"
+#~ "\n"
+#~ " * If you choose a languages 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"
+#~ " * Other languages will use unicode by default;\n"
+#~ "\n"
+#~ " * 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"
+#~ "\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"
+#~ "\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."
+#~ msgstr ""
+#~ "L'idioma preferit que trieu afectarà a l'idioma de la documentació,\n"
+#~ "l'instal·lador i a tot el sistema en general. Seleccioneu primer la\n"
+#~ "regió on us trobeu i després l'idioma que parleu.\n"
+#~ "\n"
+#~ "Si feu clic al botó \"%s\" podreu seleccionar altres idiomes que vulgueu\n"
+#~ "instal·lar a la vostra estació de treball. S'instal·laran els fitxers\n"
+#~ "d'idioma específics de la documentació i de les aplicacions. Per "
+#~ "exemple,\n"
+#~ "si heu de tenir usuaris espanyols a l'ordinador, podeu triar l'anglès com "
+#~ "a\n"
+#~ "idioma per defecte a la vista d'arbre i marcar \"%s\" a la secció "
+#~ "Avançat.\n"
+#~ "\n"
+#~ "En quant al suport UTF-8 (unicode): Unicode és una nova codificació de\n"
+#~ "caràcters que cobreix tots els idiomes existents. El suport complet a\n"
+#~ "GNU/Linux encara està sota desenvolupament. Per aquesta raó, "
+#~ "Mandrakelinux\n"
+#~ "l'usarà o no depenent de les opcions que esculli l'usuari:\n"
+#~ "\n"
+#~ " * Si escolliu un idioma amb una codificació existent forta(idiomes\n"
+#~ "llatins, rus, japonès, xinès, coreà, thai, grec, turc, la majoria dels\n"
+#~ "idiomes iso-8859-2), la codificació existent s'usarà per defecte;\n"
+#~ "\n"
+#~ " * La resta d'idiomes usaran unicode per defecte;\n"
+#~ "\n"
+#~ " * Si s'instal·len dos o més idiomes i aquests idiomes no usen la "
+#~ "mateixa\n"
+#~ "codificació, llavors s'usarà unicode per tot el sistema;\n"
+#~ "\n"
+#~ " * Finalment, es pot forçar l'ús de unicode si s'escull la opció\"%s\"\n"
+#~ "independentment dels idiomes escollits.\n"
+#~ "\n"
+#~ "Noteu que no esteu limitats a escollir només un idioma addicional. Podeu\n"
+#~ "triar diversos idiomes addicionals, i fins i tot instal·lar-los tots\n"
+#~ "activant la casella \"%s\". Si habiliteu un idioma esteu instal·lant les\n"
+#~ "traduccions, els tipus de lletra, els verificadors ortogràfics, etc. "
+#~ "d'aquest idioma.\n"
+#~ "\n"
+#~ "Per passar d'un dels idiomes a un altre, podeu executar com a \"root\"\n"
+#~ "l'ordre \"/usr/sbin/localedrake\" per canviar l'idioma de tot el sistema. "
+#~ "Si\n"
+#~ "l'executeu com a usuari normal, només es canviarà l'idioma d'aquest\n"
+#~ "usuari concret."
+
+#~ 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"
+#~ "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"
+#~ "\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"
+#~ "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"
+#~ "\n"
+#~ "Wheel mice are occasionally 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."
+#~ msgstr ""
+#~ "DrakX generalment detecta el nombre de botons que té el vostre ratolí.\n"
+#~ "Si no pot, assumeix que teniu un ratolí de dos botons i el configurarà "
+#~ "per\n"
+#~ "emular el tercer botó. Es pot ``prémer' ' el tercer botó d'un ratolí de "
+#~ "dos\n"
+#~ "botons fent clic simultàniament als botons dret i esquerre. DrakX\n"
+#~ "detectarà automàticament si el ratolí utilitza la interfície PS/2, sèrie "
+#~ "o USB.\n"
+#~ "\n"
+#~ "En cas que tingueu un ratolí de 3 botons sense rodeta, podeu escollir\n"
+#~ "\"%s\". DrakX configurarà el ratolí per tal de simular la rodeta,\n"
+#~ "per fer-ho premeu el botó central i moveu el ratolí a dalt i a baix.\n"
+#~ "\n"
+#~ "Si per alguna raó voleu especificar un altre tipus de ratolí,\n"
+#~ "seleccioneu-lo a la llista.\n"
+#~ "\n"
+#~ "Si escolliu un ratolí diferent del ratolí per defecte, es mostrarà una\n"
+#~ "pantalla de prova. Utilitzeu els botons i la roda per verificar que la\n"
+#~ "configuració és correcta i que el ratolí funciona bé. Si el ratolí no\n"
+#~ "funciona bé, premeu la barra d'espai o la tecla [Intro] per cancel·lar "
+#~ "la\n"
+#~ "prova i tornar a la llista.\n"
+#~ "\n"
+#~ "De vegaDES, la roda del ratolí no es detecta automàticament. En aquest "
+#~ "cas,\n"
+#~ "haureu de seleccionar-lo a la llista. Assegureu-vos de triar el que\n"
+#~ "correspon al port a què esta connectat el ratolí. Després de seleccionar "
+#~ "un\n"
+#~ "ratolí i prémer el botó \"%s\", a la pantalla apareixerà un ratolí. "
+#~ "Mogueu la\n"
+#~ "roda del ratolí per assegurar-vos que s'ha activat correctament, "
+#~ "comprovant\n"
+#~ "que es mou també a la pantalla; després comproveu els botons i que el "
+#~ "cursor\n"
+#~ "de la pantalla es mou quan moveu el ratolí."
+
+#~ 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"
+#~ "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"
+#~ "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"
+#~ "partitions themselves, it is important that it be difficult to become\n"
+#~ "\"root\".\n"
+#~ "\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"
+#~ "\n"
+#~ "One caveat -- do not make the password too long or 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"
+#~ "\n"
+#~ "If you wish access to this computer to be controlled by an "
+#~ "authentication\n"
+#~ "server, click 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"
+#~ "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\"."
+#~ msgstr ""
+#~ "Aquesta és la decisió més important quant a la seguretat del vostre "
+#~ "sistema\n"
+#~ "GNU/Linux: heu d'introduir la contrasenya de l'usuari \"root\". El \"root"
+#~ "\"\n"
+#~ "és l'administrador del sistema i és l'únic autoritzat a fer "
+#~ "actualitzacions,\n"
+#~ "afegir usuaris, canviar la configuració del tot el sistema, etc. En "
+#~ "poques\n"
+#~ "paraules, el \"root\" ho pot fer tot! És per això que heu d'escollir una\n"
+#~ "contrasenya que sigui difícil d'endevinar; DrakX us avisarà si és massa\n"
+#~ "fàcil. Com veieu, podeu optar per no introduir cap contrasenya, però us\n"
+#~ "aconsellem vivament que no ho feu. GNU/Linux és tan vulnerable als "
+#~ "errors\n"
+#~ "de l'operador com qualsevol altre sistema operatiu. Com que l'usuari\n"
+#~ "\"root\" pot superar totes les limitacions i esborrar accidentalment "
+#~ "totes\n"
+#~ "les dades de qualsevol partició com a conseqüència d'accedir-hi sense\n"
+#~ "precaucions, és molt important que sigui difícil esdevenir \"root\".\n"
+#~ "\n"
+#~ "La contrasenya ha de ser una mescla de caràcters alfanumèrics i, com a\n"
+#~ "mínim, de 8 caràcters de longitud. No apunteu enlloc la contrasenya de\n"
+#~ "\"root\" ja que és molt fàcil comprometre el sistema si ho feu.\n"
+#~ "\n"
+#~ "Tot i això, no feu la contrasenya massa llarga o complicada perquè heu "
+#~ "de\n"
+#~ "poder recordar-la!\n"
+#~ "\n"
+#~ "La contrasenya no es mostrarà per pantalla quan la teclegeu. Per tant,\n"
+#~ "haureu d'escriure-la dues vegades per reduir la probabilitat d'errors en\n"
+#~ "l'escriptura. Si, malauradament, feu el mateix error dues vegaDES, "
+#~ "haureu\n"
+#~ "d'usar aquesta contrasenya ``incorrecta'' el primer cop que us "
+#~ "connecteu.\n"
+#~ "\n"
+#~ "Si voleu que aquest ordinador sigui controlat per un servidor\n"
+#~ "d'autenticació, feu clic al botó \"%s\".\n"
+#~ "\n"
+#~ "Si la vostra xarxa usa els serveis d'autenticació LDAP, NIS o Windows\n"
+#~ "Domain, seleccioneu l'adient per a \"%s\" . Si no sabeu quin utilitzar,\n"
+#~ "pregunteu-ho al vostre administrador de xarxa.\n"
+#~ "\n"
+#~ "Si teniu problemes per recordar les contrasenyes, si l'ordinador mai no "
+#~ "es\n"
+#~ "connectarà a Internet o si confieu absolutament en tothom que utilitza\n"
+#~ "l'ordinador, podeu triar tenir \"%s\"."
+
+#~ 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 ""
+#~ "Aquest diàleg us permet ajustar el carregador d'arrencada:\n"
+#~ "\n"
+#~ " * \"%s\": hi ha tres opcions per al carregador d'arrencada:\n"
+#~ "\n"
+#~ "    * \"%s\": si preferiu el GRUB (menú de text).\n"
+#~ "\n"
+#~ "    * \"%s\": si preferiu el LILO amb la seva interfície de menús de "
+#~ "text.\n"
+#~ "\n"
+#~ "    * \"%s\": si preferiu el LILO amb la seva interfície gràfica.\n"
+#~ "\n"
+#~ " * \"%s\": en la majoria de casos, no heu de canviar l'opció\n"
+#~ "per defecte (\"%s\"), però,si ho preferiu, el carregador d'arrencada\n"
+#~ "pot instal·lar-se en el segon disc dur (\"%s\"), o fins i tot en un \n"
+#~ "disquet (\"%s\").\n"
+#~ "\n"
+#~ " * \"%s\": quan s'arrenca o es torna a arrencar l'ordinador, aquest\n"
+#~ "és el temps de què disposa l'usuari per escollir una entrada diferent\n"
+#~ "de l'entrada per defecte en el menú d'arrencada.\n"
+#~ "\n"
+#~ " * \"%s\": ACPI és un nou estàndard (aparegut durant l'any 2002) per a "
+#~ "la\n"
+#~ "gestió d'energia, principalment dels portàtils. Si sabeu que el vostre\n"
+#~ "maquinari el suporta i que el necessiteu marqueu aquesta opció.\n"
+#~ "\n"
+#~ " * \"%s\": Si heu tingut problemes de maquinari al vostre ordinador\n"
+#~ "(conflictes IRQ, poca estabilitat, penjades de l'ordinador, ...) haurieu "
+#~ "de\n"
+#~ "probar a desactivar APIC marcant aquesta opció.\n"
+#~ "\n"
+#~ "!! Tingueu en compte que si escolliu no instal·lar un carregador\n"
+#~ "d'arrencada (seleccionant \"%s\"), heu d'estar segurs que teniu alguna\n"
+#~ "manera d'arrencar el vostre sistema Mandrakelinux! Assegureu-vos de\n"
+#~ "saber què feu abans de canviar alguna de les opcions!!\n"
+#~ "\n"
+#~ "Si feu clic al botó \"%s\" d'aquest diàleg accedireu a algunes opcions\n"
+#~ "avançaDES, reservades normalment als usuaris experts."
+
+#~ msgid "GRUB"
+#~ msgstr "GRUB"
+
+#~ msgid "/dev/hda"
+#~ msgstr "/dev/hda"
+
+#~ msgid "/dev/hdb"
+#~ msgstr "/dev/hdb"
+
+#~ msgid "/dev/fd0"
+#~ msgstr "/dev/fd0"
+
+#~ msgid "Delay before booting the default image"
+#~ msgstr "Demora abans d'arrencar la imatge predeterminada"
+
+#~ 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 ""
+#~ "Un cop configurats els paràmetres generals del carregador de "
+#~ "l'arrencada, \n"
+#~ "es mostrarà la llista d'opcions de càrrega que es veurà en arrencar la "
+#~ "màquina.\n"
+#~ "\n"
+#~ "Si hi ha algun altre sistema operatiu instal·lat en el vostre ordinador, "
+#~ "s'afegirà\n"
+#~ "automàticament al menú d'arrencada. Podeu ajustar les opcions existents "
+#~ "fent\n"
+#~ "clic a \"%s\" per crear una nova entrada, i seleccionant una entrada i "
+#~ "fent clic\n"
+#~ "a \"%s\" o a \"%s\" per modificar-la o eliminar-la. \"%s\" valida els "
+#~ "canvis.\n"
+#~ "\n"
+#~ "També és possible que no vulgueu permetre l'accés a aquests sistemes "
+#~ "operatius\n"
+#~ "a qualsevol que vagi a la consola i reiniciï l'ordinador; en aquest cas, "
+#~ "podeu suprimir\n"
+#~ "les entrades corresponents a aquests sistemes operatius per eliminar-los "
+#~ "del menú\n"
+#~ "del carregador d'arrencada, però aleshores us caldrà un disc d'arrencada "
+#~ "per poder-los\n"
+#~ "arrencar!"
+
+#~ 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"
+#~ "\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"
+#~ "\n"
+#~ " * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
+#~ "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."
+#~ msgstr ""
+#~ "LILO i GRUB són carregadors d'arrencada de GNU/Linux. Normalment,\n"
+#~ "aquesta fase es realitza de manera totalment automàtica. DrakX "
+#~ "analitzarà\n"
+#~ "el sector d'arrencada del disc i actuarà conforme al que hi trobi:\n"
+#~ "\n"
+#~ " * si troba un sector d'arrencada del Windows, el reemplaçarà amb un "
+#~ "sector\n"
+#~ "d'arrencada de GRUB/LILO. D'aquesta manera podreu carregar GNU/Linux\n"
+#~ "o un altre SO.\n"
+#~ "\n"
+#~ " * si troba un sector d'arrencada grub o LILO, el reemplaçarà amb un "
+#~ "nou.\n"
+#~ "\n"
+#~ "Si no pot prendre una decisió,  DrakX us preguntarà on ha de col·locar "
+#~ "el\n"
+#~ "carregador d'arrencada. Normalment, \"%s\" és el lloc més segur. Si "
+#~ "escolliu\n"
+#~ "\"%s\" no s'instal·larà cap carregador d'arrencada. Utilitzeu-lo només "
+#~ "si\n"
+#~ "sabeu que esteu fent."
+
+#~ 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"
+#~ "\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"
+#~ "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"
+#~ "\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."
+#~ msgstr ""
+#~ "Ara cal seleccionar el sistema d'impressió del vostre ordinador. Altres\n"
+#~ "sistemes operatius us poden oferir un, però el Mandrakelinux n'ofereix\n"
+#~ "dos. Cada sistema d'impressió és el més convenient per a un tipus de\n"
+#~ "configuració determinat.\n"
+#~ "\n"
+#~ " * \"%s\", acrònim de \"print, don't queue\" (imprimeix, no facis cua), "
+#~ "és\n"
+#~ "la millor opció si teniu una connexió directa amb la impressora i voleu\n"
+#~ "evitar els embussos a l'hora d'imprimir, i no teniu impressores de "
+#~ "xarxa.\n"
+#~ "(\"%s\" només gestionarà xarxes molt senzilles i és una mica lenta quan\n"
+#~ "s'usa en xarxa.) Escolliu \"pdq\" si és la vostra primera incursió\n"
+#~ "en GNU/Linux.\n"
+#~ "\n"
+#~ " * \"%s\" `` Common Unix Printing System'', Sistema d'impressió comú de\n"
+#~ "Unix, és una elecció excel·lent tant si voleu imprimir a la vostra\n"
+#~ "impressora local com a l'altra punta del món. És senzilla de configurar "
+#~ "i\n"
+#~ "pot actuar com a servidor o client per a l'antic sistema d'impressió \"lpd"
+#~ "\"\n"
+#~ "i, per tant, és compatible amb sistemes operatius antics que encara\n"
+#~ "necessitin serveis d'impressió. És força potent, però la configuració "
+#~ "bàsica\n"
+#~ "és gairebé tan senzilla com la de \"pdq\". Si necessiteu emular un "
+#~ "servidor\n"
+#~ "\"lpd\", heu d'habilitar el dimoni \"cups-lpd\". \"%s\" inclou frontals\n"
+#~ "gràfics per a la impressió o per escollir les opcions d'impressió\n"
+#~ "i per gestionar la impressora.\n"
+#~ "\n"
+#~ "Si ara feu una tria, i després veieu que el sistema d'impressió no us\n"
+#~ "agrada, podeu canviar-lo executant el PrinterDrake des del Centre de "
+#~ "control\n"
+#~ "de Mandrakelinux i fent clic al botó Expert."
+
+#~ 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 ""
+#~ "Podeu afegir entrades addicionals per al yaboot, ja sigui per a altres\n"
+#~ "sistemes operatius, nuclis alternatius, o per a una imatge per a "
+#~ "arrencades\n"
+#~ "d'emergència.\n"
+#~ "\n"
+#~ "Per a altres SO, l'entrada només consta d'una etiqueta i de la\n"
+#~ "partició arrel.\n"
+#~ "\n"
+#~ "Per Linux, hi ha unes quantes opcions possibles:\n"
+#~ "\n"
+#~ " * Etiqueta: el nom a escriure en l'indicador del yaboot per\n"
+#~ "seleccionar aquesta opció d'arrencada.\n"
+#~ "\n"
+#~ " * Imatge: el nom del nucli a arrencar. Normalment, vmlinux o una\n"
+#~ "variació de vmlinux amb una extensió.\n"
+#~ "\n"
+#~ " * Arrel: el dispositiu arrel o '/' per a la instal·lació del Linux.\n"
+#~ "\n"
+#~ " * Addició: en maquinari Apple, l'opció d'addició de nuclis s'utilitza\n"
+#~ "força sovint per auxiliar en la inicialització de maquinari de vídeo o "
+#~ "per\n"
+#~ "habilitar l'emulació del botó del ratolí de teclat per als 2n i 3r "
+#~ "botons,\n"
+#~ "que sovint no existeixen en un ratolí Apple convencional. Alguns "
+#~ "exemples\n"
+#~ "d'això són:\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: aquesta opció es pot utilitzar per carregar els mòduls "
+#~ "inicials,\n"
+#~ "abans que el dispositiu d'arrencada estigui disponible, o per carregar\n"
+#~ "una imatge de disc RAM en una situació d'arrencada d'emergència.\n"
+#~ "\n"
+#~ " * Initrd-size: la mida per defecte del disc RAM sol ser de 4096 kB.\n"
+#~ "Si necessiteu assignar un disc RAM gran, podeu utilitzar aquesta opció\n"
+#~ "per indicar un disc RAM més gran que el predeterminat.\n"
+#~ "\n"
+#~ " * Lectura-Escriptura: normalment, la partició arrel es munta inicialment "
+#~ "com de\n"
+#~ "només lectura per permetre una comprovació del sistema de fitxers abans "
+#~ "que el\n"
+#~ "sistema esdevingui \"viu\". Podeu substituir el valor per defecte amb "
+#~ "aquesta opció.\n"
+#~ "\n"
+#~ " * Sense Vídeo: en cas que el maquinari de vídeo d'Apple resulti "
+#~ "especialment\n"
+#~ "problemàtic, podeu seleccionar aquesta opció per arrencar en mode 'no-"
+#~ "vídeo',\n"
+#~ "amb el suport nadiu framebuffer.\n"
+#~ "\n"
+#~ " * Per defecte: seleccioneu aquesta entrada com a selecció per defecte "
+#~ "del\n"
+#~ "Linux; se selecciona prement simplement Retorn a l'indicador del yaboot.\n"
+#~ "Aquesta entrada també es ressaltarà amb un ``*'' si premeu Tab per veure "
+#~ "les\n"
+#~ "seleccions d'arrencada."
+
+#~ 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 és un carregador d'arrencada per a maquinari Macintosh NewWorld.\n"
+#~ "Pot arrencar tant GNU/Linux com MacOS o MacOSX. Normalment,\n"
+#~ "MacOS i MacOSX es detecten i instal·len correctament en el menú del\n"
+#~ "carregador d'arrencada; si no és així, però, en aquesta pantalla podeu\n"
+#~ "afegir una entrada manualment. Aneu amb compte de triar els paràmetres\n"
+#~ "correctes.\n"
+#~ "\n"
+#~ "Les opcions principals del Yaboot són:\n"
+#~ "\n"
+#~ " * Missatge d'inicialització: un senzill missatge de text que apareix "
+#~ "abans\n"
+#~ "de l'indicador d'arrencada.\n"
+#~ "\n"
+#~ " * Dispositiu d'arrencada: indica on voleu situar la informació "
+#~ "necessària\n"
+#~ "per arrencar el GNU/Linux. Normalment, haureu configurat abans una "
+#~ "partició\n"
+#~ "bootstrap que contindrà aquesta informació.\n"
+#~ "\n"
+#~ " * Demora de l'Open Firmware: a diferència del LILO, amb el Yaboot hi ha\n"
+#~ "dues demores disponibles. La primera d'elles es mesura en segons i, en\n"
+#~ "aquest punt, podeu triar entre CD, arrencada OF, MacOS o Linux.\n"
+#~ "\n"
+#~ " * Temps màxim d'arrencada del nucli: aquest temps màxim és similar a la\n"
+#~ "demora d'arrencada del LILO. Després de seleccionar el Linux tindreu "
+#~ "aquest\n"
+#~ "temps en increments de 0,1 segons abans que se seleccioni la descripció "
+#~ "per\n"
+#~ "defecte del nucli.\n"
+#~ "\n"
+#~ " * Habilita l'arrencada des de CD: si activeu aquesta opció podreu triar\n"
+#~ "``C'' per a CD al primer indicador de l'arrencada.\n"
+#~ "\n"
+#~ " * Habilita l'arrencada OF: si activeu aquesta opció podreu triar ``N`` "
+#~ "per\n"
+#~ "a Open Firmware al primer indicador de l'arrencada.\n"
+#~ "\n"
+#~ " * SO per defecte: podeu seleccionar amb quin SO, per defecte, "
+#~ "s'arrencarà\n"
+#~ "quan la demora de l'Open Firmware venci."
+
+#~ 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."
+#~ msgstr ""
+#~ "\"%s\": si es detecta una targeta de so al vostre sistema, es mostra "
+#~ "aquí.\n"
+#~ "Si veieu que la targeta de so que es mostra no és la que realment teniu "
+#~ "al\n"
+#~ "sistema, podeu fer clic al botó i seleccionar un altre programa de "
+#~ "control."
+
+#~ 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"
+#~ "\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"
+#~ "country list.\n"
+#~ "\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"
+#~ "\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"
+#~ "\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"
+#~ "\n"
+#~ " * \"%s\": by default, DrakX configures your graphical interface in\n"
+#~ "\"800x600\" or \"1024x768\" resolution. If that does not 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"
+#~ "\n"
+#~ " * \"%s\": If you wish to configure your Internet or local network "
+#~ "access\n"
+#~ "now.\n"
+#~ "\n"
+#~ " * \"%s\": this entry allows you to redefine the security level as set in "
+#~ "a\n"
+#~ "previous step ().\n"
+#~ "\n"
+#~ " * \"%s\": if you plan to connect your machine to the Internet, it's a "
+#~ "good\n"
+#~ "idea to protect yourself from intrusions by setting up a firewall. "
+#~ "Consult\n"
+#~ "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"
+#~ "\n"
+#~ " * \"%s\": here you'll be able to fine control 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 ""
+#~ "Com a revisió, DrakX presentarà un resum de la informació que\n"
+#~ "té sobre el vostre sistema. Segons el maquinari instal·lat, podeu\n"
+#~ "tenir algunes o totes les entrades següents. Cada entrada consta\n"
+#~ "de l'element de configuració que cal configurar, seguit d'un breu\n"
+#~ "resum de la configuració actual.\n"
+#~ "Feu clic al botó \"%s\" corresponent per canviar-ho.\n"
+#~ "\n"
+#~ " * \"%s\": comproveu la configuració actual del mapa de teclat i\n"
+#~ "canvieu-la si és necessari.\n"
+#~ "\n"
+#~ " * \"%s\": comproveu la selecció actual de país. Si no sou a aquest\n"
+#~ "país, feu clic al botó \"%s\" i escolliu-ne un altre. Si el vostre\n"
+#~ "país no és a la primera llista que es mostra, feu clic al botó \"%s\"\n"
+#~ "per obtenir una llista de països completa.\n"
+#~ "\n"
+#~ " * \"%s\": per defecte, DrakX dedueix la vostra zona horària en\n"
+#~ "funció del país que hagueu escollit. Aquí podeu fer clic al botó \"%s\"\n"
+#~ "si no fos correcta.\n"
+#~ "\n"
+#~ " * \"%s\": comproveu la configuració actual del ratolí i feu clic al\n"
+#~ "botó per canviar-la si fos necessari.\n"
+#~ "\n"
+#~ " * \"%s\": feu clic al botó \"%s\" per obrir l'auxiliar de configuració\n"
+#~ "de la impressora. Consulteu el capítol corresponent de la ``Guia d'\n"
+#~ "iniciació'' per tenir més informació sobre la configuració d'una nova\n"
+#~ "impressora. Aquesta interfície és similar a la utilitzada durant la\n"
+#~ "instal·lació.\n"
+#~ "\n"
+#~ " * \"%s\": si es detecta una targeta de so al vostre sistema, es\n"
+#~ "mostra aquí. Si veieu que que no és la que realment teniu al sistema,\n"
+#~ "podeu fer clic al botó per triar un altre controlador.\n"
+#~ "\n"
+#~ " * \"%s\": per defecte, DrakX configura la vostra interfície\n"
+#~ "gràfica a una resolució de \"800x600\" or \"1024x768\". Si no us\n"
+#~ "va bé, feu clic a \"%s\" per reconfigurar la interfície gràfica.\n"
+#~ "\n"
+#~ " * \"%s\": si es detecta una targeta de TV al sistema, es mostra\n"
+#~ "aquí. Si en teniu una però no és detectada, feu clic a \"%s\" per\n"
+#~ "intentar configurar-la manualment.\n"
+#~ "\n"
+#~ " * \"%s\": si es detecta una targeta XDSI al sistema, es mostra\n"
+#~ "aquí. Podeu fer clic a \"%s\" per canviar els paràmetres associats\n"
+#~ "amb la targeta.\n"
+#~ "\n"
+#~ " * \"%s\": si voleu configurar ara l'accés a Internet o a la xarxa "
+#~ "local.\n"
+#~ "\n"
+#~ " * \"%s\": aquesta entrada un permet redefinir el nivell de seguretat\n"
+#~ "definit en un pas anterior ().\n"
+#~ "\n"
+#~ " * \"%s\": si teniu previst connectar-vos a Internet, és bona idea\n"
+#~ "protegir-vos d'intrusions instal·lant un tallafocs. Consulteu-ne\n"
+#~ "els detalls a la secció corresponent de la ``Guia d'iniciació''.\n"
+#~ "\n"
+#~ " * \"%s\": si voleu canviar la configuració del carregador d'arrencada,\n"
+#~ "feu clic a aquest botó. Es recomana que això només ho facin els usuaris\n"
+#~ "avançats.\n"
+#~ "\n"
+#~ " * \"%s\": aquí podreu acabar d'ajustar els serveis que s'executaran\n"
+#~ "en el vostre ordinador. Si teniu previst utilitzar aquesta màquina com\n"
+#~ "a servidor, és aconsellable que reviseu aquesta configuració."
+
+#~ msgid ""
+#~ "No ethernet network adapter has been detected on your system.\n"
+#~ "I cannot set up this connection type."
+#~ msgstr ""
+#~ "No s'ha detectat cap adaptador de xarxa ethernet al sistema.\n"
+#~ "No puc configurar aquest tipus de connexió."
+
+#~ msgid ""
+#~ "Please choose which network adapter you want to use to connect to "
+#~ "Internet."
+#~ msgstr ""
+#~ "Si us plau, seleccioneu quin adaptador de xarxa voleu utilitzar per\n"
+#~ "connectar-vos a Internet."
+
+#~ 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."
+#~ msgstr ""
+#~ "Per trametre un informe d'error de programació, feu clic al botó "
+#~ "'Informa'.\n"
+#~ "S'obrirà una finestra del navegador web amb la pàgina %s\n"
+#~ "on trobareu un formulari per omplir. La informació que es mostra més "
+#~ "amunt s'enviarà al servidor."
+
+#~ msgid "chunk size"
+#~ msgstr "mida del fragment"
+
+#~ msgid "mkraid failed (maybe raidtools are missing?)"
+#~ msgstr "L'mkraid ha fallat (potser manquen les eines del RAID (raidtools)?)"
+
+#~ msgid "mkraid failed"
+#~ msgstr "L'mkraid ha fallat"
+
+#~ msgid "<b>Mandrake Control Center</b>"
+#~ msgstr "<b>Centre de Control Mandrakelinux</b>"
+
+#~ msgid ""
+#~ "The Mandrake Control Center is an essential collection of Mandrake-"
+#~ "specific utilities for simplifying the configuration of your computer."
+#~ msgstr ""
+#~ "El Centre de Control Mandrake és una col·lecció essencial de utilitats "
+#~ "específiques de Mandrake per simplificar la configuració del vostre "
+#~ "ordinador."
+
+#~ msgid ""
+#~ "Find all Mandrakesoft products and services at <b>MandrakeStore</b> -- "
+#~ "our full service e-commerce platform."
+#~ msgstr ""
+#~ "Conegui tots els productes i serveis de Mandrakesoft a <b>MandrakeStore</"
+#~ "b> -- la nostra plataforma de serveis de comerç electrònic."
+
+#
+#~ msgid "Become a <b>MandrakeClub</b> member!"
+#~ msgstr "Esdeveniu un membre del <b>MandrakeClub</b>!"
+
+#~ msgid ""
+#~ "\t* Special download mirror list exclusively for MandrakeClub Members"
+#~ msgstr "\t* Llista de rèpliques exclusiva pels membres del MandrakeClub"
+
+#~ msgid "\t* Special discounts for products and services at MandrakeStore"
+#~ msgstr "\t* Descomptes especials en productes i serveis de MandrakeStore"
+
+#~ msgid "\t* Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
+#~ msgstr ""
+#~ "\t* Conegui Mandrakelinux en un CD autoarrancable amb <b>MandrakeMove</b>"
+
+#~ msgid ""
+#~ "Find all Mandrakesoft products at <b>MandrakeStore</b> -- our full "
+#~ "service e-commerce platform."
+#~ msgstr ""
+#~ "Conegui tots els productes de Mandrakesoft a <b>MandrakeStore</b> -- la "
+#~ "nostra plataforma de serveis de comerç electrònic."
+
+#
+#~ msgid "<b>Become a MandrakeClub member!</b>"
+#~ msgstr "<b>Esdeveniu un membre del MandrakeClub!</b>"
+
+#~ msgid ""
+#~ "\t* <b>Vim</b>: advanced text editor with more features than standard Vi"
+#~ msgstr ""
+#~ "\t* <b>Vim</b>: editor de text avançat amb més característiques que el vi "
+#~ "estàndard"
+
+#~ msgid ""
+#~ "[OPTIONS] [PROGRAM_NAME]\n"
+#~ "\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"
+#~ msgstr ""
+#~ "[OPCIONS] [NOM_DEL_PROGRAMA]\n"
+#~ "\n"
+#~ "OPCIONS:\n"
+#~ "  --help            - imprimeix aquest missatge d'ajuda.\n"
+#~ "  --report          - el programa ha de ser una de les eines de Mandrake\n"
+#~ "  --incident        - el programa ha de ser una de les eines de Mandrake"
+
+#~ msgid "Mandrake Online"
+#~ msgstr "Mandrake Online"
+
+#~ msgid ""
+#~ "This interface has not been configured yet.\n"
+#~ "Run the \"Add an interface\" assistant from the Mandrake Control Center"
+#~ msgstr ""
+#~ "Aquesta interfície encara no s'ha configurat.\n"
+#~ "Executeu l'auxiliar \"Afegeix una interfície\" del Centre de Control de "
+#~ "Mandrake"
+
+#~ msgid ""
+#~ "This is HardDrake, a Mandrake 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 ""
+#~ "Aquest és el HardDrake, l'eina de configuració de maquinari de Mandrake.\n"
+#~ "<span foreground=\"royalblue3\">Versió:</span> %s\n"
+#~ "<span foreground=\"royalblue3\">Autor:</span> Thierry Vignaud &lt;"
+#~ "tvignaud@mandrakesoft.com&gt;\n"
+#~ "\n"
+
+#~ msgid "The alert wizard had unexpectly failled:"
+#~ msgstr "L'auxiliar d'alerta ha fallat:"
+
+#~ msgid ""
+#~ "Connection failed.\n"
+#~ "Verify your configuration in the Mandrake Control Center."
+#~ msgstr ""
+#~ "La connexió ha fallat.\n"
+#~ "Comproveu la vostra configuració al Centre de control de Mandrake."
+
+#~ msgid "The package %s is needed. Install it?"
+#~ msgstr "Cal instal·lar el paquet %s. Voleu instal·lar-lo?"
+
+#~ msgid "ignore"
+#~ msgstr "ignora"
+
+#~ msgid "no"
+#~ msgstr "no"
+
+#~ msgid "yes"
+#~ msgstr "sí"
+
+#~ msgid "SILO Installation"
+#~ msgstr "Instal·lació del SILO"
+
+#~ msgid "First sector of boot partition"
+#~ msgstr "Primer sector de la partició d'arrencada"
+
+#~ msgid "Bootloader installation"
+#~ msgstr "Instal·lació del carregador de l'arrencada"
+
+#~ msgid "SILO"
+#~ msgstr "SILO"
+
+#~ msgid "Alcatel speedtouch usb"
+#~ msgstr "Alcatel Speedtouch USB"
+
+#~ msgid "Sagem (using pppoa) usb"
+#~ msgstr "USB Sagem (utilitzant el pppoa)"
+
+#~ msgid "Harddrake2 version %s"
+#~ msgstr "Versió del Harddrake2 %s"
+
+#~ msgid "transmitted"
+#~ msgstr "transmitits"
+
+#~ msgid "received"
+#~ msgstr "rebuts"
 
 #~ msgid ""
 #~ "You can export using NFS or SMB. Please select which you'd like to use."
@@ -24777,26 +28633,26 @@ msgstr ""
 #~ msgstr "No es pot obrir %s!"
 
 #~ msgid ""
-#~ "Your card can have 3D hardware acceleration support but only with XFree %"
+#~ "Your card can have 3D hardware acceleration support but only with Xorg %"
 #~ "s.\n"
-#~ "Your card is supported by XFree %s which may have a better support in 2D."
+#~ "Your card is supported by Xorg %s which may have a better support in 2D."
 #~ msgstr ""
 #~ "La vostra targeta pot tenir acceleració 3D de maquinari, però només amb "
 #~ "l'Xfree %s.\n"
-#~ "L'XFree %s, que pot tenir un suport millor en 2D, suporta la vostra "
+#~ "L'Xorg %s, que pot tenir un suport millor en 2D, suporta la vostra "
 #~ "targeta."
 
 #~ msgid ""
-#~ "Your card can have 3D hardware acceleration support but only with XFree %"
+#~ "Your card can have 3D hardware acceleration support but only with Xorg %"
 #~ "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."
+#~ "Your card is supported by Xorg %s which may have a better support in 2D."
 #~ msgstr ""
 #~ "La vostra targeta pot tenir acceleració 3D de maquinari, però només amb "
 #~ "l'Xfree %s,\n"
 #~ "TINGUEU EN COMPTE QUE ES TRACTA D'UN SUPORT EXPERIMENTAL; L'ORDINADOR ES "
 #~ "POT PENJAR.\n"
-#~ "La vostra targeta està suportada per XFree %s que pot tenir un suport "
+#~ "La vostra targeta està suportada per Xorg %s que pot tenir un suport "
 #~ "millor en 2D."
 
 #~ msgid "Xpmac (installation display driver)"
@@ -24935,12 +28791,6 @@ msgstr ""
 #~ msgid "Scientific applications such as gnuplot"
 #~ msgstr "Aplicacions científiques com ara el gnuplot"
 
-#~ msgid "DNS/NIS "
-#~ msgstr "DNS/NIS "
-
-#~ msgid "Domain Name and Network Information Server"
-#~ msgstr "Servidor de Noms de Domini i d'Informació de la Xarxa (DNS/NIS)"
-
 #~ msgid "No wireless network adapter on your system!"
 #~ msgstr "No teniu cap adaptador wireless al sistema!"
author	Pablo Saratxaga <pablo@mandriva.com>	2004-10-07 13:03:56 +0000
committer	Pablo Saratxaga <pablo@mandriva.com>	2004-10-07 13:03:56 +0000
commit	54f5f51c6dcfc30abb2d64781404ba7bdbead24e (patch)
tree	187082ac2ce0496b9caac98ba7dabaa6dced1caa /perl-install/share/po/ca.po
parent	91daae81333182f281cc2e68616813379f3bd0e1 (diff)
download	drakx-backup-do-not-use-54f5f51c6dcfc30abb2d64781404ba7bdbead24e.tar drakx-backup-do-not-use-54f5f51c6dcfc30abb2d64781404ba7bdbead24e.tar.gz drakx-backup-do-not-use-54f5f51c6dcfc30abb2d64781404ba7bdbead24e.tar.bz2 drakx-backup-do-not-use-54f5f51c6dcfc30abb2d64781404ba7bdbead24e.tar.xz drakx-backup-do-not-use-54f5f51c6dcfc30abb2d64781404ba7bdbead24e.zip